mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix DOMAIN breakage.

Browse Source
This commit is contained in:
Bruce Momjian 2002-03-19 12:52:22 +00:00
parent bc2b786af0
commit b9c7b0a2ba
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/backend/parser/gram.y
View File

@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * 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 * HISTORY
* AUTHOR DATE MAJOR EVENT * AUTHOR DATE MAJOR EVENT
@ -3184,6 +3184,14 @@ createdb_opt_item: LOCATION opt_equal Sconst
{ {
$$ = lconsi(3, makeListi1(-1)); $$ = 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; n->dbname = $3;
$$ = (Node *)n; $$ = (Node *)n;
} }
| OWNER opt_equal name
{
$$ = lconsi(4, makeList1($3));
}
| OWNER opt_equal DEFAULT
{
$$ = lconsi(4, makeList1(NULL));
}
; ;
/* /*

9
src/backend/tcop/postgres.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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 * NOTES
* this is the "main" module of the postgres backend and * this is the "main" module of the postgres backend and
@ -1722,7 +1722,7 @@ PostgresMain(int argc, char *argv[], const char *username)
if (!IsUnderPostmaster) if (!IsUnderPostmaster)
{ {
puts("\nPOSTGRES backend interactive interface "); 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; break;
case T_CreateDomainStmt: case T_CreateDomainStmt:
tag = "CREATE"; /* CREATE DOMAIN */
break;
case T_CreateStmt: case T_CreateStmt:
tag = "CREATE DOMAIN"; tag = "CREATE";
break; break;
case T_DropStmt: case T_DropStmt: