1
0
mirror of https://github.com/postgres/postgres.git synced 2025-07-03 20:02:46 +03:00

*** empty log message ***

This commit is contained in:
Michael Meskes
1999-04-26 05:28:48 +00:00
parent 89c7369d0e
commit dd6b1aaa25
4 changed files with 13 additions and 5 deletions

View File

@ -563,6 +563,12 @@ Wed Apr 14 17:59:06 CEST 1999
Fri Apr 16 18:25:18 CEST 1999 Fri Apr 16 18:25:18 CEST 1999
- Fixed small bug in ECPGfinish(). - Fixed small bug in ECPGfinish().
Sat Apr 24 12:39:07 CEST 1999
- Synced preproc.y with gram.y.
- Allow more than one blank between EXEC and SQL.
- Allow statements to be prepared from a character string, too.
- Set library version to 3.0.0 - Set library version to 3.0.0
- Set ecpg version to 2.6.0 - Set ecpg version to 2.6.0

View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.12 1999/03/20 19:46:53 meskes Exp $ * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.13 1999/04/26 05:28:47 meskes Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -213,6 +213,7 @@ static ScanKeyword ScanKeywords[] = {
{"substring", SUBSTRING}, {"substring", SUBSTRING},
{"table", TABLE}, {"table", TABLE},
{"temp", TEMP}, {"temp", TEMP},
{"temporary", TEMPORARY},
{"then", THEN}, {"then", THEN},
{"time", TIME}, {"time", TIME},
{"timestamp", TIMESTAMP}, {"timestamp", TIMESTAMP},

View File

@ -487,7 +487,7 @@ cppline {space}*#.*(\\{space}*\n)*\n*
} }
<SQL>{space} { /* ignore */ } <SQL>{space} { /* ignore */ }
<SQL>{other} { return yytext[0]; } <SQL>{other} { return yytext[0]; }
<C>{exec}{space}{sql} { BEGIN SQL; return SQL_START; } <C>{exec}{space}*{sql} { BEGIN SQL; return SQL_START; }
<C>{ccomment} { /* ignore */ } <C>{ccomment} { /* ignore */ }
<C>{cppline} { <C>{cppline} {
yylval.str = mm_strdup((char*)yytext); yylval.str = mm_strdup((char*)yytext);

View File

@ -692,8 +692,8 @@ adjust_array(enum ECPGttype type_enum, int *dimension, int *length, int type_dim
PARTIAL, POSITION, PRECISION, PRIMARY, PRIOR, PRIVILEGES, PROCEDURE, PUBLIC, PARTIAL, POSITION, PRECISION, PRIMARY, PRIOR, PRIVILEGES, PROCEDURE, PUBLIC,
READ, REFERENCES, RELATIVE, REVOKE, RIGHT, ROLLBACK, READ, REFERENCES, RELATIVE, REVOKE, RIGHT, ROLLBACK,
SCROLL, SECOND_P, SELECT, SET, SUBSTRING, SCROLL, SECOND_P, SELECT, SET, SUBSTRING,
TABLE, TEMP, THEN, TIME, TIMESTAMP, TIMEZONE_HOUR, TIMEZONE_MINUTE, TABLE, TEMP, TEMPORARY, THEN, TIME, TIMESTAMP, TIMEZONE_HOUR,
TO, TRAILING, TRANSACTION, TRIM, TRUE_P, TIMEZONE_MINUTE, TO, TRAILING, TRANSACTION, TRIM, TRUE_P,
UNION, UNIQUE, UPDATE, USER, USING, UNION, UNIQUE, UPDATE, USER, USING,
VALUES, VARCHAR, VARYING, VIEW, VALUES, VARCHAR, VARYING, VIEW,
WHEN, WHERE, WITH, WORK, YEAR_P, ZONE WHEN, WHERE, WITH, WORK, YEAR_P, ZONE
@ -1301,6 +1301,7 @@ CreateStmt: CREATE OptTemp TABLE relation_name '(' OptTableElementList ')'
; ;
OptTemp: TEMP { $$ = make1_str("temp"); } OptTemp: TEMP { $$ = make1_str("temp"); }
| TEMPORARY { $$ = make1_str("temporary"); }
| /* EMPTY */ { $$ = make1_str(""); } | /* EMPTY */ { $$ = make1_str(""); }
; ;
@ -5140,7 +5141,7 @@ variablelist: cinputvariable | cinputvariable ',' variablelist
* As long as the prepare statement is not supported by the backend, we will * As long as the prepare statement is not supported by the backend, we will
* try to simulate it here so we get dynamic SQL * try to simulate it here so we get dynamic SQL
*/ */
ECPGPrepare: SQL_PREPARE ident FROM char_variable ECPGPrepare: SQL_PREPARE ident FROM execstring
{ {
$$ = make4_str(make1_str("\""), $2, make1_str("\", "), $4); $$ = make4_str(make1_str("\""), $2, make1_str("\", "), $4);
} }