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

Commitfc590b6

Browse files
committed
From: Michael Meskes <Michael.Meskes@usa.net>+ Tue Feb 2 07:40:52 CET 1999++ - Brought preproc.y in sync again with gram.y.+ - Set ecpg version to 2.4.9+
1 parenta03b817 commitfc590b6

File tree

4 files changed

+19
-9
lines changed

4 files changed

+19
-9
lines changed

‎src/interfaces/ecpg/ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,3 +395,8 @@ Fri Jan 29 18:03:52 CET 1999
395395
- Fixed bug that caused function names to be translated to lower case.
396396
- Set ecpg version to 2.4.8
397397

398+
Tue Feb 2 07:40:52 CET 1999
399+
400+
- Brought preproc.y in sync again with gram.y.
401+
- Set ecpg version to 2.4.9
402+

‎src/interfaces/ecpg/preproc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ include $(SRCDIR)/Makefile.global
33

44
MAJOR_VERSION=2
55
MINOR_VERSION=4
6-
PATCHLEVEL=8
6+
PATCHLEVEL=9
77

88
CFLAGS+=-I../include -DMAJOR_VERSION=$(MAJOR_VERSION)\
99
-DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL)\

‎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.8 1999/01/18 17:17:01 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.9 1999/02/04 04:58:04 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -212,6 +212,7 @@ static ScanKeyword ScanKeywords[] = {
212212
{"stdout",STDOUT},
213213
{"substring",SUBSTRING},
214214
{"table",TABLE},
215+
{"temp",TEMP},
215216
{"then",THEN},
216217
{"time",TIME},
217218
{"timestamp",TIMESTAMP},

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ output_statement(char * stmt, int mode)
554554
PARTIAL,POSITION,PRECISION,PRIMARY,PRIOR,PRIVILEGES,PROCEDURE,PUBLIC,
555555
READ,REFERENCES,RELATIVE,REVOKE,RIGHT,ROLLBACK,
556556
SCROLL,SECOND_P,SELECT,SET,SUBSTRING,
557-
TABLE,THEN,TIME,TIMESTAMP,TIMEZONE_HOUR,TIMEZONE_MINUTE,
557+
TABLE,TEMP,THEN,TIME,TIMESTAMP,TIMEZONE_HOUR,TIMEZONE_MINUTE,
558558
TO,TRAILING,TRANSACTION,TRIM,TRUE_P,
559559
UNION,UNIQUE,UPDATE,USER,USING,
560560
VALUES,VARCHAR,VARYING,VIEW,
@@ -637,7 +637,7 @@ output_statement(char * stmt, int mode)
637637
%type<str>opt_decimalCharactercharacteropt_varyingopt_charset
638638
%type<str>opt_collateDatetimedatetimeopt_timezoneopt_interval
639639
%type<str>numerica_expr_or_nullrow_exprrow_descriptorrow_list
640-
%type<str>SelectStmtSubSelectresult
640+
%type<str>SelectStmtSubSelectresultOptTemp
641641
%type<str>opt_tableopt_unionopt_uniquesort_clausesortby_list
642642
%type<str>sortbyOptUseOpopt_inh_starrelation_name_listname_list
643643
%type<str>group_clausehaving_clausefrom_clausec_list
@@ -1095,13 +1095,17 @@ copy_delimiter: USING DELIMITERS Sconst{ $$ = cat2_str(make1_str("using delim
10951095
*
10961096
*****************************************************************************/
10971097

1098-
CreateStmt:CREATETABLErelation_name'('OptTableElementList')'
1098+
CreateStmt:CREATEOptTempTABLErelation_name'('OptTableElementList')'
10991099
OptInherit
11001100
{
1101-
$$ =cat4_str(make1_str("create table"),$3, make3_str(make1_str("("),$5, make1_str(")")),$7);
1101+
$$ =cat5_str(make1_str("create"),$2, make1_str("table"), make3_str(make1_str("("),$6, make1_str(")")),$8);
11021102
}
11031103
;
11041104

1105+
OptTemp:TEMP{$$ = make1_str("temp"); }
1106+
|/* EMPTY*/{$$ = make1_str(""); }
1107+
;
1108+
11051109
OptTableElementList:OptTableElementList','OptTableElement
11061110
{
11071111
$$ = cat3_str($1, make1_str(","),$3);
@@ -1461,9 +1465,9 @@ OptInherit: INHERITS '(' relation_name_list ')' { $$ = make3_str(make1_str("inh
14611465
|/*EMPTY*/ {$$ = make1_str(""); }
14621466
;
14631467

1464-
CreateAsStmt:CREATETABLErelation_nameOptCreateAsASSubSelect
1468+
CreateAsStmt:CREATEOptTempTABLErelation_nameOptCreateAsASSubSelect
14651469
{
1466-
$$ = cat5_str(make1_str("createtable"),$3,$4, make1_str("as"),$6);
1470+
$$ = cat5_str(cat3_str(make1_str("create"),$2, make1_str("table")),$4,$5, make1_str("as"),$7);
14671471
}
14681472
;
14691473

@@ -2691,7 +2695,7 @@ SubSelect: SELECT opt_unique res_target_list2
26912695
}
26922696
;
26932697

2694-
result:INTOopt_tablerelation_name{$$=cat3_str(make1_str("into"),$2,$3); }
2698+
result:INTOOptTempopt_tablerelation_name{$$=cat4_str(make1_str("into"),$2,$3,$4); }
26952699
|INTOinto_list{$$ = make1_str(""); }
26962700
|/*EMPTY*/{$$ = make1_str(""); }
26972701
;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp