Restore ALTER TABLE .. ADD COLUMN w/DEFAULT restriction.

This reverts commit a06e41deebdf74b8b5109329dc75b2e9d9057962 of 2011-01-26.
Per discussion, this behavior is not wanted, as it would need to change if
we ever made composite types support DEFAULT.

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 8fa9d7fa7f11547d3b9f3d21b01978ee71ab4920..1ecba0278555087a878acdbe4af1ed4088f65a77 100644 (file)
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -142,7 +142,6 @@ typedef struct AlteredTableInfo
    List       *newvals;        /* List of NewColumnValue */
    bool        new_notnull;    /* T if we added new NOT NULL constraints */
    bool        new_changeoids; /* T if we added/dropped the OID column */
-   bool        new_changetypes; /* T if we changed column types */
    Oid         newTableSpace;  /* new tablespace; 0 means no change */
    /* Objects to rebuild after completing ALTER TYPE operations */
    List       *changedConstraintOids;  /* OIDs of constraints to rebuild */
@@ -3379,14 +3378,14 @@ ATRewriteTable(AlteredTableInfo *tab, Oid OIDNewHeap, LOCKMODE lockmode)
    }
 
    /*
-    * If we change column data types or add/remove OIDs, the operation has to
-    * be propagated to tables that use this table's rowtype as a column type.
+    * If we need to rewrite the table, the operation has to be propagated to
+    * tables that use this table's rowtype as a column type.
     *
     * (Eventually this will probably become true for scans as well, but at
     * the moment a composite type does not enforce any constraints, so it's
     * not necessary/appropriate to enforce them just during ALTER.)
     */
-   if (tab->new_changetypes || tab->new_changeoids)
+   if (newrel)
        find_composite_type_dependencies(oldrel->rd_rel->reltype,
                                         RelationGetRelationName(oldrel),
                                         NULL);
@@ -6432,7 +6431,6 @@ ATPrepAlterColumnType(List **wqueue,
        newval->expr = (Expr *) transform;
 
        tab->newvals = lappend(tab->newvals, newval);
-       tab->new_changetypes = true;
    }
    else if (tab->relkind == RELKIND_FOREIGN_TABLE)
    {

diff --git a/src/test/regress/expected/rowtypes.out b/src/test/regress/expected/rowtypes.out
index 3d5f4d6c95b396e407dc1853fea8672b3f81d8b4..e5cd71421c636ebd0ddc978e0493cacedf7b8600 100644 (file)
--- a/src/test/regress/expected/rowtypes.out
+++ b/src/test/regress/expected/rowtypes.out
@@ -82,14 +82,11 @@ select * from people;
  (Joe,Blow) | 01-10-1984
 (1 row)
 
--- the default doesn't need to propagate through to the rowtypes, so this is OK
+-- at the moment this will not work due to ALTER TABLE inadequacy:
 alter table fullname add column suffix text default '';
-alter table fullname drop column suffix;
--- this one, without a default, is OK too
-alter table fullname add column suffix text default null;
--- but this should fail, due to ALTER TABLE inadequacy
-alter table fullname alter column suffix set data type integer using null;
 ERROR:  cannot alter table "fullname" because column "people"."fn" uses its rowtype
+-- but this should work:
+alter table fullname add column suffix text default null;
 select * from people;
      fn      |     bd     
 -------------+------------

diff --git a/src/test/regress/sql/rowtypes.sql b/src/test/regress/sql/rowtypes.sql
index 257213d969e98598ee642d439a1e250cbb9401f4..9041df147fe8999037ad05241344ae1d527704b6 100644 (file)
--- a/src/test/regress/sql/rowtypes.sql
+++ b/src/test/regress/sql/rowtypes.sql
@@ -45,16 +45,12 @@ insert into people values ('(Joe,Blow)', '1984-01-10');
 
 select * from people;
 
--- the default doesn't need to propagate through to the rowtypes, so this is OK
+-- at the moment this will not work due to ALTER TABLE inadequacy:
 alter table fullname add column suffix text default '';
-alter table fullname drop column suffix;
 
--- this one, without a default, is OK too
+-- but this should work:
 alter table fullname add column suffix text default null;
 
--- but this should fail, due to ALTER TABLE inadequacy
-alter table fullname alter column suffix set data type integer using null;
-
 select * from people;
 
 -- test insertion/updating of subfields