mirror of
https://github.com/postgres/postgres.git
synced 2025-11-07 19:06:32 +03:00
From: "Dr. Michael Meskes" <meskes@online-club.de>
+ Thu Jul 2 20:30:14 CEST 1998 + + - Changed new style db name to allow connection types "tcp" and + "unix" only + + Tue Jul 7 15:14:14 CEST 1998 + + - Fixed some bugs in preproc.y + - Set version to 2.3.4
This commit is contained in:
@@ -3,7 +3,7 @@ include $(SRCDIR)/Makefile.global
|
||||
|
||||
MAJOR_VERSION=2
|
||||
MINOR_VERSION=3
|
||||
PATCHLEVEL=3
|
||||
PATCHLEVEL=4
|
||||
|
||||
CFLAGS+=-I../include -DMAJOR_VERSION=$(MAJOR_VERSION) \
|
||||
-DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL) \
|
||||
|
||||
@@ -4032,12 +4032,24 @@ connection_target: database_name opt_server opt_port
|
||||
}
|
||||
| db_prefix server opt_port '/' database_name opt_options
|
||||
{
|
||||
/* new style: esql:postgresql://server[:port][/dbname] */
|
||||
/* new style: <tcp|unix>:postgresql://server[:port][/dbname] */
|
||||
if (strncmp($2, "://", 3) != 0)
|
||||
{
|
||||
sprintf(errortext, "parse error at or near '%s'", $2);
|
||||
yyerror(errortext);
|
||||
}
|
||||
|
||||
if (strncmp($1, "unix", 4) == 0 && strncmp($2, "localhost", 9) != 0)
|
||||
{
|
||||
sprintf(errortext, "unix domain sockets only work on 'localhost'");
|
||||
yyerror(errortext);
|
||||
}
|
||||
|
||||
if (strncmp($1, "unix", 4) != 0 && strncmp($1, "tcp", 3) != 0)
|
||||
{
|
||||
sprintf(errortext, "only protocols 'tcp' and 'unix' are supported");
|
||||
yyerror(errortext);
|
||||
}
|
||||
|
||||
$$ = make4_str(make5_str(make1_str("\""), $1, $2, $3, make1_str("/")), $5, $6, make1_str("\""));
|
||||
}
|
||||
@@ -4061,7 +4073,7 @@ db_prefix: ident cvariable
|
||||
yyerror(errortext);
|
||||
}
|
||||
|
||||
if (strcmp($1, "esql") != 0 && strcmp($1, "ecpg") != 0 && strcmp($1, "sql") != 0 && strcmp($1, "isql") != 0 && strcmp($1, "proc") != 0)
|
||||
if (strcmp($1, "tcp") != 0 && strcmp($1, "unix") != 0)
|
||||
{
|
||||
sprintf(errortext, "Illegal connection type %s", $1);
|
||||
yyerror(errortext);
|
||||
|
||||
@@ -291,7 +291,9 @@ ECPGdump_a_struct(FILE *o, const char *name, const char * ind_name, long arrsiz,
|
||||
offset = obuf;
|
||||
}
|
||||
else
|
||||
{
|
||||
offset = offsetarg;
|
||||
}
|
||||
|
||||
sprintf(pbuf, "%s%s.", prefix ? prefix : "", name);
|
||||
prefix = pbuf;
|
||||
@@ -347,7 +349,9 @@ ECPGfree_type(struct ECPGtype * typ)
|
||||
free(typ->u.members);
|
||||
}
|
||||
else
|
||||
{
|
||||
abort();
|
||||
}
|
||||
}
|
||||
free(typ);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user