*** empty log message ***

Michael Meskes · Michael Meskes · commit 6f66fd8c2e1f · 1999-03-07T08:01:18.000Z
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
@@ -472,7 +472,7 @@ Mon Feb 22 19:47:45 CET 1999
 
 	- Added 'at <db_connection>' option to all commands it is apllicable
 	  to. Due to changing the API of some libecpg functions this
-	  requires me to increase the major version number.
+	  requires me to increase the major version number of libecpg.
 	- Synced pgc.l with scan.l.
 	- Added support for unions.
 
@@ -498,5 +498,9 @@ Thu Mar  4 19:49:28 CET 1999
 	- Switched memory allocation to calloc() to make sure memory is
 	  cleared.
 	- Fixed varchar auto-allocating.
+
+Sat Mar  6 14:06:07 CET 1999
+
+	- Replaced placeholder ';;' by '?' since this is what standard says.
 	- Set library version to 3.0.0
-	- Set ecpg version to 3.0.0
+	- Set ecpg version to 2.6.0
diff --git a/src/interfaces/ecpg/lib/ecpglib.c b/src/interfaces/ecpg/lib/ecpglib.c
@@ -129,7 +129,7 @@ register_error(long code, char *fmt,...)
 static struct connection *
 get_connection(const char *connection_name)
 {
-	struct connection *con = all_connections;;
+	struct connection *con = all_connections;
 	
 	if (connection_name == NULL || strcmp(connection_name, "CURRENT") == 0)
 		return actual_connection;
@@ -377,11 +377,11 @@ next_insert(char *text)
 	char *ptr = text;
 	bool string = false;
 	
-	for (; ptr[1] != '\0' && (ptr[0] != ';' || ptr[1] != ';' || string); ptr++)
-		if (ptr[0] == '\'')
+	for (; *ptr != '\0' && (*ptr != '?' || string); ptr++)
+		if (*ptr == '\'')
 			string = string ? false : true;
 			
-	return (ptr[1] == '\0') ? NULL : ptr;
+	return (*ptr == '\0') ? NULL : ptr;
 }
 
 static bool
@@ -604,7 +604,7 @@ ECPGexecute(struct statement * stmt)
 			strcat(newcopy,
 				   copiedquery
 				   + (p - newcopy)
-				   + sizeof(";;") - 1 /* don't count the '\0' */);
+				   + sizeof("?") - 1 /* don't count the '\0' */);
 		}
 
 		/*
@@ -675,7 +675,7 @@ ECPGexecute(struct statement * stmt)
 				{
 					ECPGlog("ECPGexecute line %d: Incorrect number of matches: %d\n",
 							stmt->lineno, ntuples);
-					register_error(ECPG_NOT_FOUND, "Data not found line %d.", stmt->lineno);
+					register_error(ECPG_NOT_FOUND, "No data found line %d.", stmt->lineno);
 					status = false;
 					break;
 				}
@@ -1266,8 +1266,8 @@ replace_variables(char *text)
 			
 		if (!string && *ptr == ':')
 		{
-			ptr[0] = ptr[1] = ';';
-			for (ptr += 2; *ptr && isvarchar(*ptr); ptr++)
+			*ptr = '?';
+			for (++ptr; *ptr && isvarchar(*ptr); ptr++)
 				*ptr = ' ';
 		}
 	}
@@ -1307,7 +1307,7 @@ ECPGprepare(int lineno, char *name, char *variable)
         stmt->command = ecpg_strdup(variable, lineno);
         stmt->inlist = stmt->outlist = NULL;
         
-        /* if we have C variables in our statment replace them with ';;' */
+        /* if we have C variables in our statment replace them with '?' */
         replace_variables(stmt->command);                	
         
 	/* add prepared statement to our list */
diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile
@@ -1,8 +1,8 @@
 SRCDIR= ../../..
 include $(SRCDIR)/Makefile.global
 
-MAJOR_VERSION=3
-MINOR_VERSION=0
+MAJOR_VERSION=2
+MINOR_VERSION=6
 PATCHLEVEL=0
 
 CFLAGS+=-I../include -DMAJOR_VERSION=$(MAJOR_VERSION) \
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
@@ -1097,7 +1097,7 @@ user_group_clause:  IN GROUP user_group_list	{ $$ = cat2_str(make1_str("in group
 			| /*EMPTY*/		{ $$ = make1_str(""); }
 		;
 
-user_valid_clause:  VALID UNTIL Sconst			{ $$ = cat2_str(make1_str("valid until"), $3);; }
+user_valid_clause:  VALID UNTIL Sconst			{ $$ = cat2_str(make1_str("valid until"), $3); }
 			| /*EMPTY*/			{ $$ = make1_str(""); }
 		;
 
@@ -2221,7 +2221,7 @@ set_opt:  SETOF					{ $$ = make1_str("setof"); }
 
 RemoveStmt:  DROP remove_type name
 				{
-					$$ = cat3_str(make1_str("drop"), $2, $3);;
+					$$ = cat3_str(make1_str("drop"), $2, $3);
 				}
 		;
 
@@ -2931,7 +2931,7 @@ opt_select_limit:      LIMIT select_limit_value ',' select_offset_value
                | LIMIT select_limit_value OFFSET select_offset_value
                        { $$ = cat4_str(make1_str("limit"), $2, make1_str("offset"), $4); }
                | LIMIT select_limit_value
-                       { $$ = cat2_str(make1_str("limit"), $2);; }
+                       { $$ = cat2_str(make1_str("limit"), $2); }
                | OFFSET select_offset_value LIMIT select_limit_value
                        { $$ = cat4_str(make1_str("offset"), $2, make1_str("limit"), $4); }
                | OFFSET select_offset_value
@@ -3835,7 +3835,7 @@ a_expr:  attr opt_indirection
 		| case_expr
 				{       $$ = $1; }
 		| cinputvariable
-			        { $$ = make1_str(";;"); }
+			        { $$ = make1_str("?"); }
 		;
 
 /* Restricted expressions
@@ -3982,7 +3982,7 @@ extract_list:  extract_arg FROM a_expr
 		| /* EMPTY */
 				{	$$ = make1_str(""); }
 		| cinputvariable
-			        { $$ = make1_str(";;"); }
+			        { $$ = make1_str("?"); }
 		;
 
 extract_arg:  datetime		{ $$ = $1; }
@@ -4734,7 +4734,7 @@ ECPGCursorStmt:  DECLARE name opt_cursor CURSOR FOR ident cursor_clause
 				        this->next = cur;
 				        this->name = $2;
 					this->connection = connection;
-				        this->command =  cat5_str(make1_str("declare"), mm_strdup($2), $3, make1_str("cursor for ;;"), $7);
+				        this->command =  cat5_str(make1_str("declare"), mm_strdup($2), $3, make1_str("cursor for ?"), $7);
 					this->argsresult = NULL;
 
 					thisquery->type = &ecpg_query;
@@ -5037,7 +5037,7 @@ ECPGExecute : EXECUTE SQL_IMMEDIATE execstring
 
 		add_variable(&argsinsert, thisquery, &no_indicator); 
 
-		$$ = make1_str(";;");
+		$$ = make1_str("?");
 	}
 	| EXECUTE ident 
 	{
@@ -5052,7 +5052,7 @@ ECPGExecute : EXECUTE SQL_IMMEDIATE execstring
 		add_variable(&argsinsert, thisquery, &no_indicator); 
 	} opt_using
 	{
-		$$ = make1_str(";;");
+		$$ = make1_str("?");
 	}
 
 execstring: char_variable |
@@ -5860,7 +5860,7 @@ cinputvariable : cvariable indicator {
 
 civariableonly : cvariable {
 		add_variable(&argsinsert, find_variable($1), &no_indicator); 
-		$$ = make1_str(";;");
+		$$ = make1_str("?");
 }
 
 cvariable: CVARIABLE			{ $$ = $1; }
diff --git a/src/interfaces/ecpg/test/test1.pgc b/src/interfaces/ecpg/test/test1.pgc
@@ -63,7 +63,7 @@ exec sql end declare section;
 	printf("Inserted %d tuples via execute immediate\n", sqlca.sqlerrd[2]);
 
         strcpy(msg, "execute insert 4");
-        sprintf(command, "insert into test(name, amount, letter) select name, amount+;;, letter from test");
+        sprintf(command, "insert into test(name, amount, letter) select name, amount+?, letter from test");
 	exec sql prepare I from :command;
         exec sql at pm execute I using :increment;
         
diff --git a/src/interfaces/ecpg/test/test3.pgc b/src/interfaces/ecpg/test/test3.pgc

Original file line number	Diff line number	Diff line change
`@@ -1097,7 +1097,7 @@ user_group_clause: IN GROUP user_group_list { $$ = cat2_str(make1_str("in group`
`1097`	`1097`	`\| /EMPTY/ { $$ = make1_str(""); }`
`1098`	`1098`	`;`
`1099`	`1099`
`1100`		`-user_valid_clause: VALID UNTIL Sconst { $$ = cat2_str(make1_str("valid until"), $3);; }`
	`1100`	`+user_valid_clause: VALID UNTIL Sconst { $$ = cat2_str(make1_str("valid until"), $3); }`
`1101`	`1101`	`\| /EMPTY/ { $$ = make1_str(""); }`
`1102`	`1102`	`;`
`1103`	`1103`
`@@ -2221,7 +2221,7 @@ set_opt: SETOF { $$ = make1_str("setof"); }`
`2221`	`2221`
`2222`	`2222`	`RemoveStmt: DROP remove_type name`
`2223`	`2223`	`{`
`2224`		`- $$ = cat3_str(make1_str("drop"), $2, $3);;`
	`2224`	`+ $$ = cat3_str(make1_str("drop"), $2, $3);`
`2225`	`2225`	`}`
`2226`	`2226`	`;`
`2227`	`2227`
`@@ -2931,7 +2931,7 @@ opt_select_limit: LIMIT select_limit_value ',' select_offset_value`
`2931`	`2931`	`\| LIMIT select_limit_value OFFSET select_offset_value`
`2932`	`2932`	`{ $$ = cat4_str(make1_str("limit"), $2, make1_str("offset"), $4); }`
`2933`	`2933`	`\| LIMIT select_limit_value`
`2934`		`- { $$ = cat2_str(make1_str("limit"), $2);; }`
	`2934`	`+ { $$ = cat2_str(make1_str("limit"), $2); }`
`2935`	`2935`	`\| OFFSET select_offset_value LIMIT select_limit_value`
`2936`	`2936`	`{ $$ = cat4_str(make1_str("offset"), $2, make1_str("limit"), $4); }`
`2937`	`2937`	`\| OFFSET select_offset_value`
`@@ -3835,7 +3835,7 @@ a_expr: attr opt_indirection`
`3835`	`3835`	`\| case_expr`
`3836`	`3836`	`{ $$ = $1; }`
`3837`	`3837`	`\| cinputvariable`
`3838`		`- { $$ = make1_str(";;"); }`
	`3838`	`+ { $$ = make1_str("?"); }`
`3839`	`3839`	`;`
`3840`	`3840`
`3841`	`3841`	`/* Restricted expressions`
`@@ -3982,7 +3982,7 @@ extract_list: extract_arg FROM a_expr`
`3982`	`3982`	`\| /* EMPTY */`
`3983`	`3983`	`{ $$ = make1_str(""); }`
`3984`	`3984`	`\| cinputvariable`
`3985`		`- { $$ = make1_str(";;"); }`
	`3985`	`+ { $$ = make1_str("?"); }`
`3986`	`3986`	`;`
`3987`	`3987`
`3988`	`3988`	`extract_arg: datetime { $$ = $1; }`
`@@ -4734,7 +4734,7 @@ ECPGCursorStmt: DECLARE name opt_cursor CURSOR FOR ident cursor_clause`
`4734`	`4734`	`this->next = cur;`
`4735`	`4735`	`this->name = $2;`
`4736`	`4736`	`this->connection = connection;`
`4737`		`- this->command = cat5_str(make1_str("declare"), mm_strdup($2), $3, make1_str("cursor for ;;"), $7);`
	`4737`	`+ this->command = cat5_str(make1_str("declare"), mm_strdup($2), $3, make1_str("cursor for ?"), $7);`
`4738`	`4738`	`this->argsresult = NULL;`
`4739`	`4739`
`4740`	`4740`	`thisquery->type = &ecpg_query;`
`@@ -5037,7 +5037,7 @@ ECPGExecute : EXECUTE SQL_IMMEDIATE execstring`
`5037`	`5037`
`5038`	`5038`	`add_variable(&argsinsert, thisquery, &no_indicator);`
`5039`	`5039`
`5040`		`- $$ = make1_str(";;");`
	`5040`	`+ $$ = make1_str("?");`
`5041`	`5041`	`}`
`5042`	`5042`	`\| EXECUTE ident`
`5043`	`5043`	`{`
`@@ -5052,7 +5052,7 @@ ECPGExecute : EXECUTE SQL_IMMEDIATE execstring`
`5052`	`5052`	`add_variable(&argsinsert, thisquery, &no_indicator);`
`5053`	`5053`	`} opt_using`
`5054`	`5054`	`{`
`5055`		`- $$ = make1_str(";;");`
	`5055`	`+ $$ = make1_str("?");`
`5056`	`5056`	`}`
`5057`	`5057`
`5058`	`5058`	`execstring: char_variable \|`
`@@ -5860,7 +5860,7 @@ cinputvariable : cvariable indicator {`
`5860`	`5860`
`5861`	`5861`	`civariableonly : cvariable {`
`5862`	`5862`	`add_variable(&argsinsert, find_variable($1), &no_indicator);`
`5863`		`- $$ = make1_str(";;");`
	`5863`	`+ $$ = make1_str("?");`
`5864`	`5864`	`}`
`5865`	`5865`
`5866`	`5866`	`cvariable: CVARIABLE { $$ = $1; }`