Fix DOMAIN breakage.

bmomjian · bmomjian · commit b9c7b0a2baec · 2002-03-19T12:52:22.000Z
diff --git 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
@@ -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:

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.292 2002/03/19 02:18:18 momjian Exp $`
	`14`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.293 2002/03/19 12:52:20 momjian Exp $`
`15`	`15`	`*`
`16`	`16`	`* HISTORY`
`17`	`17`	`* AUTHOR DATE MAJOR EVENT`
`@@ -3184,6 +3184,14 @@ createdb_opt_item: LOCATION opt_equal Sconst`
`3184`	`3184`	`{`
`3185`	`3185`	`$$ = lconsi(3, makeListi1(-1));`
`3186`	`3186`	`}`
	`3187`	`+ \| OWNER opt_equal name`
	`3188`	`+ {`
	`3189`	`+ $$ = lconsi(4, makeList1($3));`
	`3190`	`+ }`
	`3191`	`+ \| OWNER opt_equal DEFAULT`
	`3192`	`+ {`
	`3193`	`+ $$ = lconsi(4, makeList1(NULL));`
	`3194`	`+ }`
`3187`	`3195`	`;`
`3188`	`3196`
`3189`	`3197`
`@@ -3200,14 +3208,6 @@ DropdbStmt: DROP DATABASE database_name`
`3200`	`3208`	`n->dbname = $3;`
`3201`	`3209`	`$$ = (Node *)n;`
`3202`	`3210`	`}`
`3203`		`- \| OWNER opt_equal name`
`3204`		`- {`
`3205`		`- $$ = lconsi(4, makeList1($3));`
`3206`		`- }`
`3207`		`- \| OWNER opt_equal DEFAULT`
`3208`		`- {`
`3209`		`- $$ = lconsi(4, makeList1(NULL));`
`3210`		`- }`
`3211`	`3211`	`;`
`3212`	`3212`
`3213`	`3213`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.255 2002/03/19 02:18:20 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.256 2002/03/19 12:52:22 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* this is the "main" module of the postgres backend and`
`@@ -1722,7 +1722,7 @@ PostgresMain(int argc, char argv[], const char username)`
`1722`	`1722`	`if (!IsUnderPostmaster)`
`1723`	`1723`	`{`
`1724`	`1724`	`puts("\nPOSTGRES backend interactive interface ");`
`1725`		`- puts("$Revision: 1.255 $ $Date: 2002/03/19 02:18:20 $\n");`
	`1725`	`+ puts("$Revision: 1.256 $ $Date: 2002/03/19 12:52:22 $\n");`
`1726`	`1726`	`}`
`1727`	`1727`
`1728`	`1728`	`/*`
`@@ -2213,8 +2213,11 @@ CreateCommandTag(Node *parsetree)`
`2213`	`2213`	`break;`
`2214`	`2214`
`2215`	`2215`	`case T_CreateDomainStmt:`
	`2216`	`+ tag = "CREATE"; /* CREATE DOMAIN */`
	`2217`	`+ break;`
	`2218`	`+`
`2216`	`2219`	`case T_CreateStmt:`
`2217`		`- tag = "CREATE DOMAIN";`
	`2220`	`+ tag = "CREATE";`
`2218`	`2221`	`break;`
`2219`	`2222`
`2220`	`2223`	`case T_DropStmt:`