Added Lee Kindness' patches.

Michael Meskes · Michael Meskes · commit 504500495815 · 2001-10-18T11:01:35.000Z
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
@@ -1129,5 +1129,10 @@ Sun Oct 14 14:07:59 CEST 2001
 
 	- Fixed GRANT statement.
 	- Synced preproc.y with gram.y.
+
+Thu Oct 18 12:57:04 CEST 2001
+
+	- Added patch by Lee Kindness <lkindness@csl.co.uk> fixing several
+	  bugs.
 	- Set ecpg version to 2.9.0.
         - Set library version to 3.3.0.
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
@@ -1074,11 +1074,11 @@ OptTemp:  	TEMPORARY		{ $$ = make_str("temporary"); }
 		| LOCAL TEMPORARY	{ $$ = make_str("local temporary"); }
 		| LOCAL TEMP		{ $$ = make_str("local temp"); }
 		| GLOBAL TEMPORARY	{
-					  mmerror(ET_ERROR, "GLOBAL TEMPORARY TABLE is not currently supported");
+					  mmerror(ET_NOTICE, "Currently unsupported CREATE TABLE/GLOBAL TEMPORARY will be passed to backend");
 					  $$ = make_str("global temporary");
 					}
 		| GLOBAL TEMP		{
-					  mmerror(ET_ERROR, "GLOBAL TEMPORARY TABLE is not currently supported");
+					  mmerror(ET_NOTICE, "Currently unsupported CREATE TABLE/GLOBAL TEMP will be passed to backend");
 					  $$ = make_str("global temp");
 					}
 		| /*EMPTY*/		{ $$ = EMPTY; }
@@ -1103,8 +1103,8 @@ columnDef:  ColId Typename ColQualList opt_collate
 				{
 					if (strlen($4) > 0)
 					{
-						sprintf(errortext, "CREATE TABLE/COLLATE %s not yet implemented; clause ignored", $4);
-						mmerror(ET_NOTICE, errortext);
+ 						sprintf(errortext, "Currently unsupported CREATE TABLE/COLLATE %s will be passed to backend", $4);
+ 						mmerror(ET_NOTICE, errortext);
 					}
 					$$ = cat_str(4, $1, $2, $3, $4);
 				}
@@ -1219,7 +1219,7 @@ key_match:  MATCH FULL
 		}
 		| MATCH PARTIAL		
 		{
-			mmerror(ET_NOTICE, "FOREIGN KEY/MATCH PARTIAL not yet implemented");
+			mmerror(ET_NOTICE, "Currently unsupported FOREIGN KEY/MATCH PARTIAL will be passed to backend");
 			$$ = make_str("match partial");
 		}
 		| /*EMPTY*/
@@ -1614,7 +1614,7 @@ direction:	FORWARD		{ $$ = make_str("forward"); }
 		| BACKWARD	{ $$ = make_str("backward"); }
 		| RELATIVE      { $$ = make_str("relative"); }
                 | ABSOLUTE	{
-					mmerror(ET_NOTICE, "FETCH/ABSOLUTE not supported, backend will use RELATIVE");
+					mmerror(ET_NOTICE, "Currently unsupported FETCH/ABSOLUTE will be passed to backend, backend will use RELATIVE");
 					$$ = make_str("absolute");
 				}
 		;
@@ -1769,7 +1769,11 @@ grantee_list: grantee  				{ $$ = $1; }
 		| grantee_list ',' grantee 	{ $$ = cat_str(3, $1, make_str(","), $3); }
 		;
 
-opt_with_grant:  WITH GRANT OPTION { $$ = make_str("with grant option"); }
+opt_with_grant:  WITH GRANT OPTION
+                                {
+					mmerror(ET_NOTICE, "Currently unsupported GRANT/WITH GRANT OPTION will be passed to backend");
+					$$ = make_str("with grant option");
+				}
 		| /*EMPTY*/ { $$ = EMPTY; }
 		;
 
@@ -1919,14 +1923,14 @@ func_arg:  opt_arg func_type
 
 opt_arg:  IN    { $$ = make_str("in"); }
 	| OUT	{ 
-		  mmerror(ET_ERROR, "CREATE FUNCTION/OUT parameters are not supported");
+		  mmerror(ET_NOTICE, "Currently unsupported CREATE FUNCTION/OUT will be passed to backend");
 
 	 	  $$ = make_str("out");
 		}
 	| INOUT	{ 
-		  mmerror(ET_ERROR, "CREATE FUNCTION/INOUT parameters are not supported");
+		  mmerror(ET_NOTICE, "Currently unsupported CREATE FUNCTION/INOUT will be passed to backend");
 
-	 	  $$ = make_str("oinut");
+	 	  $$ = make_str("inout");
 		}
 	;
 
@@ -2164,7 +2168,7 @@ opt_trans: WORK 	{ $$ = ""; }
 
 opt_chain: AND NO CHAIN 	{ $$ = make_str("and no chain"); }
 	| AND CHAIN		{
-				  mmerror(ET_ERROR, "COMMIT/CHAIN not yet supported");
+				  mmerror(ET_NOTICE, "Currently unsupported COMMIT/CHAIN will be passed to backend");
 
 				  $$ = make_str("and chain");
 				}
@@ -2609,12 +2613,12 @@ OptTempTableName:  TEMPORARY opt_table relation_name
 			}
                        | GLOBAL TEMPORARY opt_table relation_name
                         {
-				mmerror(ET_ERROR, "GLOBAL TEMPORARY TABLE is not currently supported");
+				mmerror(ET_NOTICE, "Currently unsupported CREATE TABLE/GLOBAL TEMPORARY will be passed to backend");
 				$$ = cat_str(3, make_str("global temporary"), $3, $4);
                         }
                        | GLOBAL TEMP opt_table relation_name
                         {
-				mmerror(ET_ERROR, "GLOBAL TEMPORARY TABLE is not currently supported");
+				mmerror(ET_NOTICE, "Currently unsupported CREATE TABLE/GLOBAL TEMP will be passed to backend");
 				$$ = cat_str(3, make_str("global temp"), $3, $4);
                         }
                        | TABLE relation_name

Original file line number	Diff line number	Diff line change
`@@ -1074,11 +1074,11 @@ OptTemp: TEMPORARY { $$ = make_str("temporary"); }`
`1074`	`1074`	`\| LOCAL TEMPORARY { $$ = make_str("local temporary"); }`
`1075`	`1075`	`\| LOCAL TEMP { $$ = make_str("local temp"); }`
`1076`	`1076`	`\| GLOBAL TEMPORARY {`
`1077`		`- mmerror(ET_ERROR, "GLOBAL TEMPORARY TABLE is not currently supported");`
	`1077`	`+ mmerror(ET_NOTICE, "Currently unsupported CREATE TABLE/GLOBAL TEMPORARY will be passed to backend");`
`1078`	`1078`	`$$ = make_str("global temporary");`
`1079`	`1079`	`}`
`1080`	`1080`	`\| GLOBAL TEMP {`
`1081`		`- mmerror(ET_ERROR, "GLOBAL TEMPORARY TABLE is not currently supported");`
	`1081`	`+ mmerror(ET_NOTICE, "Currently unsupported CREATE TABLE/GLOBAL TEMP will be passed to backend");`
`1082`	`1082`	`$$ = make_str("global temp");`
`1083`	`1083`	`}`
`1084`	`1084`	`\| /EMPTY/ { $$ = EMPTY; }`
`@@ -1103,8 +1103,8 @@ columnDef: ColId Typename ColQualList opt_collate`
`1103`	`1103`	`{`
`1104`	`1104`	`if (strlen($4) > 0)`
`1105`	`1105`	`{`
`1106`		`- sprintf(errortext, "CREATE TABLE/COLLATE %s not yet implemented; clause ignored", $4);`
`1107`		`- mmerror(ET_NOTICE, errortext);`
	`1106`	`+ sprintf(errortext, "Currently unsupported CREATE TABLE/COLLATE %s will be passed to backend", $4);`
	`1107`	`+ mmerror(ET_NOTICE, errortext);`
`1108`	`1108`	`}`
`1109`	`1109`	`$$ = cat_str(4, $1, $2, $3, $4);`
`1110`	`1110`	`}`
`@@ -1219,7 +1219,7 @@ key_match: MATCH FULL`
`1219`	`1219`	`}`
`1220`	`1220`	`\| MATCH PARTIAL`
`1221`	`1221`	`{`
`1222`		`- mmerror(ET_NOTICE, "FOREIGN KEY/MATCH PARTIAL not yet implemented");`
	`1222`	`+ mmerror(ET_NOTICE, "Currently unsupported FOREIGN KEY/MATCH PARTIAL will be passed to backend");`
`1223`	`1223`	`$$ = make_str("match partial");`
`1224`	`1224`	`}`
`1225`	`1225`	`\| /EMPTY/`
`@@ -1614,7 +1614,7 @@ direction: FORWARD { $$ = make_str("forward"); }`
`1614`	`1614`	`\| BACKWARD { $$ = make_str("backward"); }`
`1615`	`1615`	`\| RELATIVE { $$ = make_str("relative"); }`
`1616`	`1616`	`\| ABSOLUTE {`
`1617`		`- mmerror(ET_NOTICE, "FETCH/ABSOLUTE not supported, backend will use RELATIVE");`
	`1617`	`+ mmerror(ET_NOTICE, "Currently unsupported FETCH/ABSOLUTE will be passed to backend, backend will use RELATIVE");`
`1618`	`1618`	`$$ = make_str("absolute");`
`1619`	`1619`	`}`
`1620`	`1620`	`;`
`@@ -1769,7 +1769,11 @@ grantee_list: grantee { $$ = $1; }`
`1769`	`1769`	`\| grantee_list ',' grantee { $$ = cat_str(3, $1, make_str(","), $3); }`
`1770`	`1770`	`;`
`1771`	`1771`
`1772`		`-opt_with_grant: WITH GRANT OPTION { $$ = make_str("with grant option"); }`
	`1772`	`+opt_with_grant: WITH GRANT OPTION`
	`1773`	`+ {`
	`1774`	`+ mmerror(ET_NOTICE, "Currently unsupported GRANT/WITH GRANT OPTION will be passed to backend");`
	`1775`	`+ $$ = make_str("with grant option");`
	`1776`	`+ }`
`1773`	`1777`	`\| /EMPTY/ { $$ = EMPTY; }`
`1774`	`1778`	`;`
`1775`	`1779`
`@@ -1919,14 +1923,14 @@ func_arg: opt_arg func_type`
`1919`	`1923`
`1920`	`1924`	`opt_arg: IN { $$ = make_str("in"); }`
`1921`	`1925`	`\| OUT {`
`1922`		`- mmerror(ET_ERROR, "CREATE FUNCTION/OUT parameters are not supported");`
	`1926`	`+ mmerror(ET_NOTICE, "Currently unsupported CREATE FUNCTION/OUT will be passed to backend");`
`1923`	`1927`
`1924`	`1928`	`$$ = make_str("out");`
`1925`	`1929`	`}`
`1926`	`1930`	`\| INOUT {`
`1927`		`- mmerror(ET_ERROR, "CREATE FUNCTION/INOUT parameters are not supported");`
	`1931`	`+ mmerror(ET_NOTICE, "Currently unsupported CREATE FUNCTION/INOUT will be passed to backend");`
`1928`	`1932`
`1929`		`- $$ = make_str("oinut");`
	`1933`	`+ $$ = make_str("inout");`
`1930`	`1934`	`}`
`1931`	`1935`	`;`
`1932`	`1936`
`@@ -2164,7 +2168,7 @@ opt_trans: WORK { $$ = ""; }`
`2164`	`2168`
`2165`	`2169`	`opt_chain: AND NO CHAIN { $$ = make_str("and no chain"); }`
`2166`	`2170`	`\| AND CHAIN {`
`2167`		`- mmerror(ET_ERROR, "COMMIT/CHAIN not yet supported");`
	`2171`	`+ mmerror(ET_NOTICE, "Currently unsupported COMMIT/CHAIN will be passed to backend");`
`2168`	`2172`
`2169`	`2173`	`$$ = make_str("and chain");`
`2170`	`2174`	`}`
`@@ -2609,12 +2613,12 @@ OptTempTableName: TEMPORARY opt_table relation_name`
`2609`	`2613`	`}`
`2610`	`2614`	`\| GLOBAL TEMPORARY opt_table relation_name`
`2611`	`2615`	`{`
`2612`		`- mmerror(ET_ERROR, "GLOBAL TEMPORARY TABLE is not currently supported");`
	`2616`	`+ mmerror(ET_NOTICE, "Currently unsupported CREATE TABLE/GLOBAL TEMPORARY will be passed to backend");`
`2613`	`2617`	`$$ = cat_str(3, make_str("global temporary"), $3, $4);`
`2614`	`2618`	`}`
`2615`	`2619`	`\| GLOBAL TEMP opt_table relation_name`
`2616`	`2620`	`{`
`2617`		`- mmerror(ET_ERROR, "GLOBAL TEMPORARY TABLE is not currently supported");`
	`2621`	`+ mmerror(ET_NOTICE, "Currently unsupported CREATE TABLE/GLOBAL TEMP will be passed to backend");`
`2618`	`2622`	`$$ = cat_str(3, make_str("global temp"), $3, $4);`
`2619`	`2623`	`}`
`2620`	`2624`	`\| TABLE relation_name`