diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/parser/gram.y | 18 | ||||
| -rw-r--r-- | src/backend/tcop/postgres.c | 9 |
2 files changed, 15 insertions, 12 deletions
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 58b9eeb89e5..1994875bd1c 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.292 2002/03/19 02:18:18 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.293 2002/03/19 12:52:20 momjian Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -3184,6 +3184,14 @@ createdb_opt_item: LOCATION opt_equal Sconst { $$ = lconsi(3, makeListi1(-1)); } + | OWNER opt_equal name + { + $$ = lconsi(4, makeList1($3)); + } + | OWNER opt_equal DEFAULT + { + $$ = lconsi(4, makeList1(NULL)); + } ; @@ -3200,14 +3208,6 @@ DropdbStmt: DROP DATABASE database_name n->dbname = $3; $$ = (Node *)n; } - | OWNER opt_equal name - { - $$ = lconsi(4, makeList1($3)); - } - | OWNER opt_equal DEFAULT - { - $$ = lconsi(4, makeList1(NULL)); - } ; /* diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 70665e114f9..44adf23cb7b 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.255 2002/03/19 02:18:20 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.256 2002/03/19 12:52:22 momjian Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -1722,7 +1722,7 @@ PostgresMain(int argc, char *argv[], const char *username) if (!IsUnderPostmaster) { puts("\nPOSTGRES backend interactive interface "); - puts("$Revision: 1.255 $ $Date: 2002/03/19 02:18:20 $\n"); + puts("$Revision: 1.256 $ $Date: 2002/03/19 12:52:22 $\n"); } /* @@ -2213,8 +2213,11 @@ CreateCommandTag(Node *parsetree) break; case T_CreateDomainStmt: + tag = "CREATE"; /* CREATE DOMAIN */ + break; + case T_CreateStmt: - tag = "CREATE DOMAIN"; + tag = "CREATE"; break; case T_DropStmt: |