diff options
| author | Bruce Momjian <bruce@momjian.us> | 2004-04-21 00:34:18 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2004-04-21 00:34:18 +0000 |
| commit | 49d3d9cf40a6b0b9d891e6bfcaeffd154d87b293 (patch) | |
| tree | ffc65e1fe03393d274158c773c05592e783d18d9 /src/backend/parser | |
| parent | 2d1221bf8983de9d3858b3688fd50ee9f25c564f (diff) | |
Change COPY CSV keyword to be:
FORCE QUOTE to force quotes
FORCE NOT NULL to quote null input values
Diffstat (limited to 'src/backend/parser')
| -rw-r--r-- | src/backend/parser/gram.y | 13 | ||||
| -rw-r--r-- | src/backend/parser/keywords.c | 3 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 461a39dbb70..de8597ed9ef 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.451 2004/04/19 17:22:30 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.452 2004/04/21 00:34:18 momjian Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -370,7 +370,7 @@ static void doNegateFloat(Value *v); KEY LANCOMPILER LANGUAGE LARGE_P LAST_P LEADING LEFT LEVEL LIKE LIMIT - LISTEN LITERAL LOAD LOCAL LOCALTIME LOCALTIMESTAMP LOCATION + LISTEN LOAD LOCAL LOCALTIME LOCALTIMESTAMP LOCATION LOCK_P MATCH MAXVALUE MINUTE_P MINVALUE MODE MONTH_P MOVE @@ -1374,13 +1374,13 @@ copy_opt_item: { $$ = makeDefElem("escape", (Node *)makeString($3)); } - | FORCE columnList + | FORCE QUOTE columnList { - $$ = makeDefElem("force", (Node *)$2); + $$ = makeDefElem("force_quote", (Node *)$3); } - | LITERAL columnList + | FORCE NOT NULL_P columnList { - $$ = makeDefElem("literal", (Node *)$2); + $$ = makeDefElem("force_notnull", (Node *)$4); } ; @@ -7496,7 +7496,6 @@ unreserved_keyword: | LAST_P | LEVEL | LISTEN - | LITERAL | LOAD | LOCAL | LOCATION diff --git a/src/backend/parser/keywords.c b/src/backend/parser/keywords.c index 613d22ac30c..a3c765a1952 100644 --- a/src/backend/parser/keywords.c +++ b/src/backend/parser/keywords.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/keywords.c,v 1.148 2004/04/19 17:22:31 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/parser/keywords.c,v 1.149 2004/04/21 00:34:18 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -187,7 +187,6 @@ static const ScanKeyword ScanKeywords[] = { {"like", LIKE}, {"limit", LIMIT}, {"listen", LISTEN}, - {"literal", LITERAL}, {"load", LOAD}, {"local", LOCAL}, {"localtime", LOCALTIME}, |