Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitdd6b1aa

Browse files
author
Michael Meskes
committed
*** empty log message ***
1 parent89c7369 commitdd6b1aa

File tree

4 files changed

+13
-5
lines changed

4 files changed

+13
-5
lines changed

‎src/interfaces/ecpg/ChangeLog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -563,6 +563,12 @@ Wed Apr 14 17:59:06 CEST 1999
563563
Fri Apr 16 18:25:18 CEST 1999
564564

565565
- Fixed small bug in ECPGfinish().
566+
567+
Sat Apr 24 12:39:07 CEST 1999
568+
569+
- Synced preproc.y with gram.y.
570+
- Allow more than one blank between EXEC and SQL.
571+
- Allow statements to be prepared from a character string, too.
566572
- Set library version to 3.0.0
567573
- Set ecpg version to 2.6.0
568574

‎src/interfaces/ecpg/preproc/keywords.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.12 1999/03/20 19:46:53 meskes Exp $
10+
* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.13 1999/04/26 05:28:47 meskes Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -213,6 +213,7 @@ static ScanKeyword ScanKeywords[] = {
213213
{"substring",SUBSTRING},
214214
{"table",TABLE},
215215
{"temp",TEMP},
216+
{"temporary",TEMPORARY},
216217
{"then",THEN},
217218
{"time",TIME},
218219
{"timestamp",TIMESTAMP},

‎src/interfaces/ecpg/preproc/pgc.l

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ cppline{space}*#.*(\\{space}*\n)*\n*
487487
}
488488
<SQL>{space}{/* ignore */ }
489489
<SQL>{other}{return yytext[0]; }
490-
<C>{exec}{space}{sql}{ BEGIN SQL;return SQL_START; }
490+
<C>{exec}{space}*{sql}{ BEGIN SQL;return SQL_START; }
491491
<C>{ccomment}{/* ignore */ }
492492
<C>{cppline}{
493493
yylval.str =mm_strdup((char*)yytext);

‎src/interfaces/ecpg/preproc/preproc.y

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -692,8 +692,8 @@ adjust_array(enum ECPGttype type_enum, int *dimension, int *length, int type_dim
692692
PARTIAL,POSITION,PRECISION,PRIMARY,PRIOR,PRIVILEGES,PROCEDURE,PUBLIC,
693693
READ,REFERENCES,RELATIVE,REVOKE,RIGHT,ROLLBACK,
694694
SCROLL,SECOND_P,SELECT,SET,SUBSTRING,
695-
TABLE,TEMP,THEN,TIME,TIMESTAMP,TIMEZONE_HOUR,TIMEZONE_MINUTE,
696-
TO,TRAILING,TRANSACTION,TRIM,TRUE_P,
695+
TABLE,TEMP,TEMPORARY,THEN,TIME,TIMESTAMP,TIMEZONE_HOUR,
696+
TIMEZONE_MINUTE,TO,TRAILING,TRANSACTION,TRIM,TRUE_P,
697697
UNION,UNIQUE,UPDATE,USER,USING,
698698
VALUES,VARCHAR,VARYING,VIEW,
699699
WHEN,WHERE,WITH,WORK,YEAR_P,ZONE
@@ -1301,6 +1301,7 @@ CreateStmt: CREATE OptTemp TABLE relation_name '(' OptTableElementList ')'
13011301
;
13021302

13031303
OptTemp:TEMP{$$ = make1_str("temp"); }
1304+
|TEMPORARY{$$ = make1_str("temporary"); }
13041305
|/* EMPTY*/{$$ = make1_str(""); }
13051306
;
13061307

@@ -5140,7 +5141,7 @@ variablelist: cinputvariable | cinputvariable ',' variablelist
51405141
* As long as the prepare statement is not supported by the backend, we will
51415142
* try to simulate it here so we get dynamic SQL
51425143
*/
5143-
ECPGPrepare:SQL_PREPAREidentFROMchar_variable
5144+
ECPGPrepare:SQL_PREPAREidentFROMexecstring
51445145
{
51455146
$$ = make4_str(make1_str("\""),$2, make1_str("\","),$4);
51465147
}

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp