scrappy · scrappy · commit db921be31990 · 1998-07-07T17:59:32.000Z
From: "Dr. Michael Meskes" &lt;meskes@online-club.de&gt;

+ 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
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
@@ -248,3 +248,13 @@ Wed Jun  3 13:38:57 CEST 1998
 	  CREATE RULE
 	- Set library version to 2.3
 	- Set version to 2.3.3
+
+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
diff --git a/src/interfaces/ecpg/lib/ecpglib.c b/src/interfaces/ecpg/lib/ecpglib.c
@@ -895,7 +895,9 @@ ECPGdisconnect(int lineno, const char *connection_name)
 			return false;
 		}
 		else
+		{
 			ECPGfinish(con);
+		}
 	}
 	
 	return true;
diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile
@@ -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) \
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
@@ -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);
diff --git a/src/interfaces/ecpg/preproc/type.c b/src/interfaces/ecpg/preproc/type.c
@@ -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);
 }
diff --git a/src/interfaces/ecpg/test/test2.pgc b/src/interfaces/ecpg/test/test2.pgc
@@ -26,7 +26,7 @@ exec sql end declare section;
                 ECPGdebug(1, dbgs);
 
 	strcpy(msg, "connect");
-	exec sql connect to mm;
+	exec sql connect to tcp:postgresql://localhost:5432/mm;
 
 	strcpy(msg, "create");
 	exec sql create table meskes(name char(8), born integer, age smallint, married char(8));

Original file line number	Diff line number	Diff line change
`@@ -895,7 +895,9 @@ ECPGdisconnect(int lineno, const char *connection_name)`
`895`	`895`	`return false;`
`896`	`896`	`}`
`897`	`897`	`else`
	`898`	`+ {`
`898`	`899`	`ECPGfinish(con);`
	`900`	`+ }`
`899`	`901`	`}`
`900`	`902`
`901`	`903`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -4032,12 +4032,24 @@ connection_target: database_name opt_server opt_port`
`4032`	`4032`	`}`
`4033`	`4033`	`\| db_prefix server opt_port '/' database_name opt_options`
`4034`	`4034`	`{`
`4035`		`- /* new style: esql:postgresql://server[:port][/dbname] */`
	`4035`	`+ /* new style: <tcp\|unix>:postgresql://server[:port][/dbname] */`
`4036`	`4036`	`if (strncmp($2, "://", 3) != 0)`
`4037`	`4037`	`{`
`4038`	`4038`	`sprintf(errortext, "parse error at or near '%s'", $2);`
`4039`	`4039`	`yyerror(errortext);`
`4040`	`4040`	`}`
	`4041`	`+`
	`4042`	`+ if (strncmp($1, "unix", 4) == 0 && strncmp($2, "localhost", 9) != 0)`
	`4043`	`+ {`
	`4044`	`+ sprintf(errortext, "unix domain sockets only work on 'localhost'");`
	`4045`	`+ yyerror(errortext);`
	`4046`	`+ }`
	`4047`	`+`
	`4048`	`+ if (strncmp($1, "unix", 4) != 0 && strncmp($1, "tcp", 3) != 0)`
	`4049`	`+ {`
	`4050`	`+ sprintf(errortext, "only protocols 'tcp' and 'unix' are supported");`
	`4051`	`+ yyerror(errortext);`
	`4052`	`+ }`
`4041`	`4053`
`4042`	`4054`	`$$ = make4_str(make5_str(make1_str("\""), $1, $2, $3, make1_str("/")), $5, $6, make1_str("\""));`
`4043`	`4055`	`}`
`@@ -4061,7 +4073,7 @@ db_prefix: ident cvariable`
`4061`	`4073`	`yyerror(errortext);`
`4062`	`4074`	`}`
`4063`	`4075`
`4064`		`- if (strcmp($1, "esql") != 0 && strcmp($1, "ecpg") != 0 && strcmp($1, "sql") != 0 && strcmp($1, "isql") != 0 && strcmp($1, "proc") != 0)`
	`4076`	`+ if (strcmp($1, "tcp") != 0 && strcmp($1, "unix") != 0)`
`4065`	`4077`	`{`
`4066`	`4078`	`sprintf(errortext, "Illegal connection type %s", $1);`
`4067`	`4079`	`yyerror(errortext);`
Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,9 @@ ECPGdump_a_struct(FILE o, const char name, const char * ind_name, long arrsiz,`
`291`	`291`	`offset = obuf;`
`292`	`292`	`}`
`293`	`293`	`else`
	`294`	`+ {`
`294`	`295`	`offset = offsetarg;`
	`296`	`+ }`
`295`	`297`
`296`	`298`	`sprintf(pbuf, "%s%s.", prefix ? prefix : "", name);`
`297`	`299`	`prefix = pbuf;`
`@@ -347,7 +349,9 @@ ECPGfree_type(struct ECPGtype * typ)`
`347`	`349`	`free(typ->u.members);`
`348`	`350`	`}`
`349`	`351`	`else`
	`352`	`+ {`
`350`	`353`	`abort();`
	`354`	`+ }`
`351`	`355`	`}`
`352`	`356`	`free(typ);`
`353`	`357`	`}`