Fix DOMAIN breakage.
authorBruce Momjian <bruce@momjian.us>
Tue, 19 Mar 2002 12:52:22 +0000 (12:52 +0000)
committerBruce Momjian <bruce@momjian.us>
Tue, 19 Mar 2002 12:52:22 +0000 (12:52 +0000)
src/backend/parser/gram.y
src/backend/tcop/postgres.c

index 58b9eeb89e510435bfa6b6de4cc5c570cb9d99bc..1994875bd1c8a54f0c8b71426a834cacd7340e60 100644 (file)
@@ -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));
-               }
        ;
 
 /*
index 70665e114f96e4d8685b10b5b6ff946319c52c69..44adf23cb7bb4a6d4b21ca4ed65466b31c35bb70 100644 (file)
@@ -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: