]> granicus.if.org Git - postgresql/blobdiff - src/backend/commands/tablecmds.c
Increase the default value of default_statistics_target from 10 to 100,
[postgresql] / src / backend / commands / tablecmds.c
index 4bc2a25fcddde07c275e10c50f4cddcd7097c543..6c60ddd5c104f79909116f844a56df99bc7747bb 100644 (file)
@@ -3,12 +3,12 @@
  * tablecmds.c
  *       Commands for creating and altering table structures and settings
  *
- * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.229 2007/07/03 01:30:36 neilc Exp $
+ *       $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.273 2008/12/13 19:13:44 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,8 @@
 #include "access/genam.h"
 #include "access/heapam.h"
 #include "access/reloptions.h"
+#include "access/relscan.h"
+#include "access/sysattr.h"
 #include "access/xact.h"
 #include "catalog/catalog.h"
 #include "catalog/dependency.h"
 #include "catalog/pg_inherits.h"
 #include "catalog/pg_namespace.h"
 #include "catalog/pg_opclass.h"
+#include "catalog/pg_tablespace.h"
 #include "catalog/pg_trigger.h"
 #include "catalog/pg_type.h"
+#include "catalog/pg_type_fn.h"
+#include "catalog/storage.h"
 #include "catalog/toasting.h"
 #include "commands/cluster.h"
 #include "commands/defrem.h"
+#include "commands/sequence.h"
 #include "commands/tablecmds.h"
 #include "commands/tablespace.h"
 #include "commands/trigger.h"
@@ -41,6 +47,7 @@
 #include "executor/executor.h"
 #include "miscadmin.h"
 #include "nodes/makefuncs.h"
+#include "nodes/nodeFuncs.h"
 #include "nodes/parsenodes.h"
 #include "optimizer/clauses.h"
 #include "optimizer/plancat.h"
@@ -56,6 +63,8 @@
 #include "parser/parser.h"
 #include "rewrite/rewriteDefine.h"
 #include "rewrite/rewriteHandler.h"
+#include "storage/bufmgr.h"
+#include "storage/lmgr.h"
 #include "storage/smgr.h"
 #include "utils/acl.h"
 #include "utils/builtins.h"
@@ -64,7 +73,9 @@
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/relcache.h"
+#include "utils/snapmgr.h"
 #include "utils/syscache.h"
+#include "utils/tqual.h"
 
 
 /*
@@ -161,15 +172,61 @@ typedef struct NewColumnValue
        ExprState  *exprstate;          /* execution state */
 } NewColumnValue;
 
+/*
+ * Error-reporting support for RemoveRelations
+ */
+struct dropmsgstrings
+{
+       char            kind;
+       int                     nonexistent_code;
+       const char *nonexistent_msg;
+       const char *skipping_msg;
+       const char *nota_msg;
+       const char *drophint_msg;
+};
+
+static const struct dropmsgstrings dropmsgstringarray[] = {
+       {RELKIND_RELATION,
+        ERRCODE_UNDEFINED_TABLE,
+        gettext_noop("table \"%s\" does not exist"),
+        gettext_noop("table \"%s\" does not exist, skipping"),
+        gettext_noop("\"%s\" is not a table"),
+        gettext_noop("Use DROP TABLE to remove a table.")},
+       {RELKIND_SEQUENCE,
+        ERRCODE_UNDEFINED_TABLE,
+        gettext_noop("sequence \"%s\" does not exist"),
+        gettext_noop("sequence \"%s\" does not exist, skipping"),
+        gettext_noop("\"%s\" is not a sequence"),
+        gettext_noop("Use DROP SEQUENCE to remove a sequence.")},
+       {RELKIND_VIEW,
+        ERRCODE_UNDEFINED_TABLE,
+        gettext_noop("view \"%s\" does not exist"),
+        gettext_noop("view \"%s\" does not exist, skipping"),
+        gettext_noop("\"%s\" is not a view"),
+        gettext_noop("Use DROP VIEW to remove a view.")},
+       {RELKIND_INDEX,
+        ERRCODE_UNDEFINED_OBJECT,
+        gettext_noop("index \"%s\" does not exist"),
+        gettext_noop("index \"%s\" does not exist, skipping"),
+        gettext_noop("\"%s\" is not an index"),
+        gettext_noop("Use DROP INDEX to remove an index.")},
+       {RELKIND_COMPOSITE_TYPE,
+        ERRCODE_UNDEFINED_OBJECT,
+        gettext_noop("type \"%s\" does not exist"),
+        gettext_noop("type \"%s\" does not exist, skipping"),
+        gettext_noop("\"%s\" is not a type"),
+        gettext_noop("Use DROP TYPE to remove a type.")},
+       {'\0', 0, NULL, NULL, NULL, NULL}
+};
+
 
 static void truncate_check_rel(Relation rel);
 static List *MergeAttributes(List *schema, List *supers, bool istemp,
                                List **supOids, List **supconstr, int *supOidCount);
-static void MergeConstraintsIntoExisting(Relation child_rel, Relation parent_rel);
-static void MergeAttributesIntoExisting(Relation child_rel, Relation parent_rel);
-static void add_nonduplicate_constraint(Constraint *cdef,
-                                                                               ConstrCheck *check, int *ncheck);
+static bool MergeCheckConstraint(List *constraints, char *name, Node *expr);
 static bool change_varattnos_walker(Node *node, const AttrNumber *newattno);
+static void MergeAttributesIntoExisting(Relation child_rel, Relation parent_rel);
+static void MergeConstraintsIntoExisting(Relation child_rel, Relation parent_rel);
 static void StoreCatalogInheritance(Oid relationId, List *supers);
 static void StoreCatalogInheritance1(Oid relationId, Oid parentOid,
                                                 int16 seqNumber, Relation inhRelation);
@@ -197,7 +254,8 @@ static void ATController(Relation rel, List *cmds, bool recurse);
 static void ATPrepCmd(List **wqueue, Relation rel, AlterTableCmd *cmd,
                  bool recurse, bool recursing);
 static void ATRewriteCatalogs(List **wqueue);
-static void ATExecCmd(AlteredTableInfo *tab, Relation rel, AlterTableCmd *cmd);
+static void ATExecCmd(List **wqueue, AlteredTableInfo *tab, Relation rel,
+                                         AlterTableCmd *cmd);
 static void ATRewriteTables(List **wqueue);
 static void ATRewriteTable(AlteredTableInfo *tab, Oid OIDNewHeap);
 static AlteredTableInfo *ATGetQueueEntry(List **wqueue, Relation rel);
@@ -228,14 +286,18 @@ static void ATExecDropColumn(Relation rel, const char *colName,
                                 bool recurse, bool recursing);
 static void ATExecAddIndex(AlteredTableInfo *tab, Relation rel,
                           IndexStmt *stmt, bool is_rebuild);
-static void ATExecAddConstraint(AlteredTableInfo *tab, Relation rel,
-                                       Node *newConstraint);
+static void ATExecAddConstraint(List **wqueue,
+                                                               AlteredTableInfo *tab, Relation rel,
+                                                               Node *newConstraint, bool recurse);
+static void ATAddCheckConstraint(List **wqueue,
+                                                                AlteredTableInfo *tab, Relation rel,
+                                                                Constraint *constr,
+                                                                bool recurse, bool recursing);
 static void ATAddForeignKeyConstraint(AlteredTableInfo *tab, Relation rel,
                                                  FkConstraint *fkconstraint);
-static void ATPrepDropConstraint(List **wqueue, Relation rel,
-                                        bool recurse, AlterTableCmd *cmd);
 static void ATExecDropConstraint(Relation rel, const char *constrName,
-                                        DropBehavior behavior, bool quiet);
+                                                                DropBehavior behavior, 
+                                                                bool recurse, bool recursing);
 static void ATPrepAlterColumnType(List **wqueue,
                                          AlteredTableInfo *tab, Relation rel,
                                          bool recurse, bool recursing,
@@ -255,10 +317,11 @@ static void ATExecSetRelOptions(Relation rel, List *defList, bool isReset);
 static void ATExecEnableDisableTrigger(Relation rel, char *trigname,
                                                   char fires_when, bool skip_system);
 static void ATExecEnableDisableRule(Relation rel, char *rulename,
-                                                  char fires_when);
+                                               char fires_when);
 static void ATExecAddInherit(Relation rel, RangeVar *parent);
 static void ATExecDropInherit(Relation rel, RangeVar *parent);
-static void copy_relation_data(Relation rel, SMgrRelation dst);
+static void copy_relation_data(SMgrRelation rel, SMgrRelation dst,
+                                                          ForkNumber forkNum, bool istemp);
 
 
 /* ----------------------------------------------------------------
@@ -283,6 +346,7 @@ DefineRelation(CreateStmt *stmt, char relkind)
        bool            localHasOids;
        int                     parentOidCount;
        List       *rawDefaults;
+       List       *cookedDefaults;
        Datum           reloptions;
        ListCell   *listptr;
        AttrNumber      attnum;
@@ -339,7 +403,7 @@ DefineRelation(CreateStmt *stmt, char relkind)
        }
 
        /* Check permissions except when using database's default */
-       if (OidIsValid(tablespaceId))
+       if (OidIsValid(tablespaceId) && tablespaceId != MyDatabaseTableSpace)
        {
                AclResult       aclresult;
 
@@ -366,66 +430,78 @@ DefineRelation(CreateStmt *stmt, char relkind)
                                                         &inheritOids, &old_constraints, &parentOidCount);
 
        /*
-        * Create a relation descriptor from the relation schema and create the
-        * relation.  Note that in this stage only inherited (pre-cooked) defaults
-        * and constraints will be included into the new relation.
-        * (BuildDescForRelation takes care of the inherited defaults, but we have
-        * to copy inherited constraints here.)
+        * Create a tuple descriptor from the relation schema.  Note that this
+        * deals with column names, types, and NOT NULL constraints, but not
+        * default values or CHECK constraints; we handle those below.
         */
        descriptor = BuildDescForRelation(schema);
 
        localHasOids = interpretOidsOption(stmt->options);
        descriptor->tdhasoid = (localHasOids || parentOidCount > 0);
 
-       if (old_constraints || stmt->constraints)
+       /*
+        * Find columns with default values and prepare for insertion of the
+        * defaults.  Pre-cooked (that is, inherited) defaults go into a list of
+        * CookedConstraint structs that we'll pass to heap_create_with_catalog,
+        * while raw defaults go into a list of RawColumnDefault structs that
+        * will be processed by AddRelationNewConstraints.  (We can't deal with
+        * raw expressions until we can do transformExpr.)
+        *
+        * We can set the atthasdef flags now in the tuple descriptor; this just
+        * saves StoreAttrDefault from having to do an immediate update of the
+        * pg_attribute rows.
+        */
+       rawDefaults = NIL;
+       cookedDefaults = NIL;
+       attnum = 0;
+
+       foreach(listptr, schema)
        {
-               ConstrCheck *check;
-               int                     ncheck = 0;
-
-               /* make array that's certainly big enough */
-               check = (ConstrCheck *)
-                       palloc((list_length(old_constraints) +
-                                       list_length(stmt->constraints)) * sizeof(ConstrCheck));
-               /* deal with constraints from MergeAttributes */
-               foreach(listptr, old_constraints)
-               {
-                       Constraint *cdef = (Constraint *) lfirst(listptr);
+               ColumnDef  *colDef = lfirst(listptr);
 
-                       if (cdef->contype == CONSTR_CHECK)
-                               add_nonduplicate_constraint(cdef, check, &ncheck);
-               }
-               /*
-                * parse_utilcmd.c might have passed some precooked constraints too,
-                * due to LIKE tab INCLUDING CONSTRAINTS
-                */
-               foreach(listptr, stmt->constraints)
+               attnum++;
+
+               if (colDef->raw_default != NULL)
                {
-                       Constraint *cdef = (Constraint *) lfirst(listptr);
+                       RawColumnDefault *rawEnt;
+
+                       Assert(colDef->cooked_default == NULL);
 
-                       if (cdef->contype == CONSTR_CHECK && cdef->cooked_expr != NULL)
-                               add_nonduplicate_constraint(cdef, check, &ncheck);
+                       rawEnt = (RawColumnDefault *) palloc(sizeof(RawColumnDefault));
+                       rawEnt->attnum = attnum;
+                       rawEnt->raw_default = colDef->raw_default;
+                       rawDefaults = lappend(rawDefaults, rawEnt);
+                       descriptor->attrs[attnum - 1]->atthasdef = true;
                }
-               /* if we found any, insert 'em into the descriptor */
-               if (ncheck > 0)
+               else if (colDef->cooked_default != NULL)
                {
-                       if (descriptor->constr == NULL)
-                       {
-                               descriptor->constr = (TupleConstr *) palloc(sizeof(TupleConstr));
-                               descriptor->constr->defval = NULL;
-                               descriptor->constr->num_defval = 0;
-                               descriptor->constr->has_not_null = false;
-                       }
-                       descriptor->constr->num_check = ncheck;
-                       descriptor->constr->check = check;
+                       CookedConstraint *cooked;
+
+                       cooked = (CookedConstraint *) palloc(sizeof(CookedConstraint));
+                       cooked->contype = CONSTR_DEFAULT;
+                       cooked->name = NULL;
+                       cooked->attnum = attnum;
+                       cooked->expr = stringToNode(colDef->cooked_default);
+                       cooked->is_local = true;        /* not used for defaults */
+                       cooked->inhcount = 0;           /* ditto */
+                       cookedDefaults = lappend(cookedDefaults, cooked);
+                       descriptor->attrs[attnum - 1]->atthasdef = true;
                }
        }
 
+       /*
+        * Create the relation.  Inherited defaults and constraints are passed
+        * in for immediate handling --- since they don't need parsing, they
+        * can be stored immediately.
+        */
        relationId = heap_create_with_catalog(relname,
                                                                                  namespaceId,
                                                                                  tablespaceId,
                                                                                  InvalidOid,
                                                                                  GetUserId(),
                                                                                  descriptor,
+                                                                                 list_concat(cookedDefaults,
+                                                                                                         old_constraints),
                                                                                  relkind,
                                                                                  false,
                                                                                  localHasOids,
@@ -458,36 +534,10 @@ DefineRelation(CreateStmt *stmt, char relkind)
         * apply the parser's transformExpr routine, but transformExpr doesn't
         * work unless we have a pre-existing relation. So, the transformation has
         * to be postponed to this final step of CREATE TABLE.
-        *
-        * First, scan schema to find new column defaults.
-        */
-       rawDefaults = NIL;
-       attnum = 0;
-
-       foreach(listptr, schema)
-       {
-               ColumnDef  *colDef = lfirst(listptr);
-
-               attnum++;
-
-               if (colDef->raw_default != NULL)
-               {
-                       RawColumnDefault *rawEnt;
-
-                       Assert(colDef->cooked_default == NULL);
-
-                       rawEnt = (RawColumnDefault *) palloc(sizeof(RawColumnDefault));
-                       rawEnt->attnum = attnum;
-                       rawEnt->raw_default = colDef->raw_default;
-                       rawDefaults = lappend(rawDefaults, rawEnt);
-               }
-       }
-
-       /*
-        * Parse and add the defaults/constraints, if any.
         */
        if (rawDefaults || stmt->constraints)
-               AddRelationRawConstraints(rel, rawDefaults, stmt->constraints);
+               AddRelationNewConstraints(rel, rawDefaults, stmt->constraints,
+                                                                 true, true);
 
        /*
         * Clean up.  We keep lock on new relation (although it shouldn't be
@@ -499,22 +549,197 @@ DefineRelation(CreateStmt *stmt, char relkind)
 }
 
 /*
- * RemoveRelation
- *             Deletes a relation.
+ * Emit the right error or warning message for a "DROP" command issued on a
+ * non-existent relation
+ */
+static void
+DropErrorMsgNonExistent(const char *relname, char rightkind, bool missing_ok)
+{
+       const struct dropmsgstrings *rentry;
+
+       for (rentry = dropmsgstringarray; rentry->kind != '\0'; rentry++)
+       {
+               if (rentry->kind == rightkind)
+               {
+                       if (!missing_ok)
+                       {
+                               ereport(ERROR,
+                                               (errcode(rentry->nonexistent_code),
+                                                errmsg(rentry->nonexistent_msg, relname)));
+                       }
+                       else
+                       {
+                               ereport(NOTICE, (errmsg(rentry->skipping_msg, relname)));
+                               break;
+                       }
+               }
+       }
+
+       Assert(rentry->kind != '\0');           /* Should be impossible */
+}
+
+/*
+ * Emit the right error message for a "DROP" command issued on a
+ * relation of the wrong type
+ */
+static void
+DropErrorMsgWrongType(const char *relname, char wrongkind, char rightkind)
+{
+       const struct dropmsgstrings *rentry;
+       const struct dropmsgstrings *wentry;
+
+       for (rentry = dropmsgstringarray; rentry->kind != '\0'; rentry++)
+               if (rentry->kind == rightkind)
+                       break;
+       Assert(rentry->kind != '\0');
+
+       for (wentry = dropmsgstringarray; wentry->kind != '\0'; wentry++)
+               if (wentry->kind == wrongkind)
+                       break;
+       /* wrongkind could be something we don't have in our table... */
+
+       ereport(ERROR,
+                       (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+                        errmsg(rentry->nota_msg, relname),
+                        (wentry->kind != '\0') ? errhint(wentry->drophint_msg) : 0));
+}
+
+/*
+ * RemoveRelations
+ *             Implements DROP TABLE, DROP INDEX, DROP SEQUENCE, DROP VIEW
  */
 void
-RemoveRelation(const RangeVar *relation, DropBehavior behavior)
+RemoveRelations(DropStmt *drop)
 {
-       Oid                     relOid;
-       ObjectAddress object;
+       ObjectAddresses *objects;
+       char            relkind;
+       ListCell   *cell;
 
-       relOid = RangeVarGetRelid(relation, false);
+       /*
+        * First we identify all the relations, then we delete them in a single
+        * performMultipleDeletions() call.  This is to avoid unwanted
+        * DROP RESTRICT errors if one of the relations depends on another.
+        */
 
-       object.classId = RelationRelationId;
-       object.objectId = relOid;
-       object.objectSubId = 0;
+       /* Determine required relkind */
+       switch (drop->removeType)
+       {
+               case OBJECT_TABLE:
+                       relkind = RELKIND_RELATION;
+                       break;
 
-       performDeletion(&object, behavior);
+               case OBJECT_INDEX:
+                       relkind = RELKIND_INDEX;
+                       break;
+
+               case OBJECT_SEQUENCE:
+                       relkind = RELKIND_SEQUENCE;
+                       break;
+
+               case OBJECT_VIEW:
+                       relkind = RELKIND_VIEW;
+                       break;
+
+               default:
+                       elog(ERROR, "unrecognized drop object type: %d",
+                                (int) drop->removeType);
+                       relkind = 0;    /* keep compiler quiet */
+                       break;
+       }
+
+       /* Lock and validate each relation; build a list of object addresses */
+       objects = new_object_addresses();
+
+       foreach(cell, drop->objects)
+       {
+               RangeVar   *rel = makeRangeVarFromNameList((List *) lfirst(cell));
+               Oid                     relOid;
+               HeapTuple       tuple;
+               Form_pg_class classform;
+               ObjectAddress obj;
+
+               /*
+                * These next few steps are a great deal like relation_openrv, but we
+                * don't bother building a relcache entry since we don't need it.
+                *
+                * Check for shared-cache-inval messages before trying to access the
+                * relation.  This is needed to cover the case where the name
+                * identifies a rel that has been dropped and recreated since the
+                * start of our transaction: if we don't flush the old syscache entry,
+                * then we'll latch onto that entry and suffer an error later.
+                */
+               AcceptInvalidationMessages();
+
+               /* Look up the appropriate relation using namespace search */
+               relOid = RangeVarGetRelid(rel, true);
+
+               /* Not there? */
+               if (!OidIsValid(relOid))
+               {
+                       DropErrorMsgNonExistent(rel->relname, relkind, drop->missing_ok);
+                       continue;
+               }
+
+               /*
+                * In DROP INDEX, attempt to acquire lock on the parent table before
+                * locking the index.  index_drop() will need this anyway, and since
+                * regular queries lock tables before their indexes, we risk deadlock
+                * if we do it the other way around.  No error if we don't find a
+                * pg_index entry, though --- that most likely means it isn't an
+                * index, and we'll fail below.
+                */
+               if (relkind == RELKIND_INDEX)
+               {
+                       tuple = SearchSysCache(INDEXRELID,
+                                                                  ObjectIdGetDatum(relOid),
+                                                                  0, 0, 0);
+                       if (HeapTupleIsValid(tuple))
+                       {
+                               Form_pg_index index = (Form_pg_index) GETSTRUCT(tuple);
+
+                               LockRelationOid(index->indrelid, AccessExclusiveLock);
+                               ReleaseSysCache(tuple);
+                       }
+               }
+
+               /* Get the lock before trying to fetch the syscache entry */
+               LockRelationOid(relOid, AccessExclusiveLock);
+
+               tuple = SearchSysCache(RELOID,
+                                                          ObjectIdGetDatum(relOid),
+                                                          0, 0, 0);
+               if (!HeapTupleIsValid(tuple))
+                       elog(ERROR, "cache lookup failed for relation %u", relOid);
+               classform = (Form_pg_class) GETSTRUCT(tuple);
+
+               if (classform->relkind != relkind)
+                       DropErrorMsgWrongType(rel->relname, classform->relkind, relkind);
+
+               /* Allow DROP to either table owner or schema owner */
+               if (!pg_class_ownercheck(relOid, GetUserId()) &&
+                       !pg_namespace_ownercheck(classform->relnamespace, GetUserId()))
+                       aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
+                                                  rel->relname);
+
+               if (!allowSystemTableMods && IsSystemClass(classform))
+                       ereport(ERROR,
+                                       (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+                                        errmsg("permission denied: \"%s\" is a system catalog",
+                                                       rel->relname)));
+
+               /* OK, we're ready to delete this one */
+               obj.classId = RelationRelationId;
+               obj.objectId = relOid;
+               obj.objectSubId = 0;
+
+               add_exact_object_address(&obj, objects);
+
+               ReleaseSysCache(tuple);
+       }
+
+       performMultipleDeletions(objects, drop->behavior);
+
+       free_object_addresses(objects);
 }
 
 /*
@@ -534,6 +759,10 @@ ExecuteTruncate(TruncateStmt *stmt)
 {
        List       *rels = NIL;
        List       *relids = NIL;
+       List       *seq_relids = NIL;
+       EState     *estate;
+       ResultRelInfo *resultRelInfos;
+       ResultRelInfo *resultRelInfo;
        ListCell   *cell;
 
        /*
@@ -545,6 +774,12 @@ ExecuteTruncate(TruncateStmt *stmt)
                Relation        rel;
 
                rel = heap_openrv(rv, AccessExclusiveLock);
+               /* don't throw error for "TRUNCATE foo, foo" */
+               if (list_member_oid(relids, RelationGetRelid(rel)))
+               {
+                       heap_close(rel, AccessExclusiveLock);
+                       continue;
+               }
                truncate_check_rel(rel);
                rels = lappend(rels, rel);
                relids = lappend_oid(relids, RelationGetRelid(rel));
@@ -597,11 +832,77 @@ ExecuteTruncate(TruncateStmt *stmt)
 #endif
 
        /*
-        * Also check for pending AFTER trigger events on the target relations. We
-        * can't just leave those be, since they will try to fetch tuples that the
-        * TRUNCATE removes.
+        * If we are asked to restart sequences, find all the sequences,
+        * lock them (we only need AccessShareLock because that's all that
+        * ALTER SEQUENCE takes), and check permissions.  We want to do this
+        * early since it's pointless to do all the truncation work only to fail
+        * on sequence permissions.
         */
-       AfterTriggerCheckTruncate(relids);
+       if (stmt->restart_seqs)
+       {
+               foreach(cell, rels)
+               {
+                       Relation        rel = (Relation) lfirst(cell);
+                       List       *seqlist = getOwnedSequences(RelationGetRelid(rel));
+                       ListCell   *seqcell;
+
+                       foreach(seqcell, seqlist)
+                       {
+                               Oid             seq_relid = lfirst_oid(seqcell);
+                               Relation seq_rel;
+
+                               seq_rel = relation_open(seq_relid, AccessShareLock);
+
+                               /* This check must match AlterSequence! */
+                               if (!pg_class_ownercheck(seq_relid, GetUserId()))
+                                       aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
+                                                                  RelationGetRelationName(seq_rel));
+
+                               seq_relids = lappend_oid(seq_relids, seq_relid);
+
+                               relation_close(seq_rel, NoLock);
+                       }
+               }
+       }
+
+       /* Prepare to catch AFTER triggers. */
+       AfterTriggerBeginQuery();
+
+       /*
+        * To fire triggers, we'll need an EState as well as a ResultRelInfo
+        * for each relation.
+        */
+       estate = CreateExecutorState();
+       resultRelInfos = (ResultRelInfo *)
+               palloc(list_length(rels) * sizeof(ResultRelInfo));
+       resultRelInfo = resultRelInfos;
+       foreach(cell, rels)
+       {
+               Relation        rel = (Relation) lfirst(cell);
+
+               InitResultRelInfo(resultRelInfo,
+                                                 rel,
+                                                 0,                    /* dummy rangetable index */
+                                                 CMD_DELETE,   /* don't need any index info */
+                                                 false);
+               resultRelInfo++;
+       }
+       estate->es_result_relations = resultRelInfos;
+       estate->es_num_result_relations = list_length(rels);
+
+       /*
+        * Process all BEFORE STATEMENT TRUNCATE triggers before we begin
+        * truncating (this is because one of them might throw an error).
+        * Also, if we were to allow them to prevent statement execution,
+        * that would need to be handled here.
+        */
+       resultRelInfo = resultRelInfos;
+       foreach(cell, rels)
+       {
+               estate->es_result_relation_info = resultRelInfo;
+               ExecBSTruncateTriggers(estate, resultRelInfo);
+               resultRelInfo++;
+       }
 
        /*
         * OK, truncate each table.
@@ -622,8 +923,6 @@ ExecuteTruncate(TruncateStmt *stmt)
                heap_relid = RelationGetRelid(rel);
                toast_relid = rel->rd_rel->reltoastrelid;
 
-               heap_close(rel, NoLock);
-
                /*
                 * The same for the toast table, if any.
                 */
@@ -639,6 +938,50 @@ ExecuteTruncate(TruncateStmt *stmt)
                 */
                reindex_relation(heap_relid, true);
        }
+
+       /*
+        * Process all AFTER STATEMENT TRUNCATE triggers.
+        */
+       resultRelInfo = resultRelInfos;
+       foreach(cell, rels)
+       {
+               estate->es_result_relation_info = resultRelInfo;
+               ExecASTruncateTriggers(estate, resultRelInfo);
+               resultRelInfo++;
+       }
+
+       /* Handle queued AFTER triggers */
+       AfterTriggerEndQuery(estate);
+
+       /* We can clean up the EState now */
+       FreeExecutorState(estate);
+
+       /* And close the rels (can't do this while EState still holds refs) */
+       foreach(cell, rels)
+       {
+               Relation        rel = (Relation) lfirst(cell);
+
+               heap_close(rel, NoLock);
+       }
+
+       /*
+        * Lastly, restart any owned sequences if we were asked to.  This is done
+        * last because it's nontransactional: restarts will not roll back if
+        * we abort later.  Hence it's important to postpone them as long as
+        * possible.  (This is also a big reason why we locked and
+        * permission-checked the sequences beforehand.)
+        */
+       if (stmt->restart_seqs)
+       {
+               List   *options = list_make1(makeDefElem("restart", NULL));
+
+               foreach(cell, seq_relids)
+               {
+                       Oid             seq_relid = lfirst_oid(cell);
+
+                       AlterSequenceInternal(seq_relid, options);
+               }
+       }
 }
 
 /*
@@ -647,6 +990,8 @@ ExecuteTruncate(TruncateStmt *stmt)
 static void
 truncate_check_rel(Relation rel)
 {
+       AclResult       aclresult;
+
        /* Only allow truncate on regular tables */
        if (rel->rd_rel->relkind != RELKIND_RELATION)
                ereport(ERROR,
@@ -655,8 +1000,10 @@ truncate_check_rel(Relation rel)
                                                RelationGetRelationName(rel))));
 
        /* Permissions checks */
-       if (!pg_class_ownercheck(RelationGetRelid(rel), GetUserId()))
-               aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
+       aclresult = pg_class_aclcheck(RelationGetRelid(rel), GetUserId(),
+                                                                 ACL_TRUNCATE);
+       if (aclresult != ACLCHECK_OK)
+               aclcheck_error(aclresult, ACL_KIND_CLASS,
                                           RelationGetRelationName(rel));
 
        if (!allowSystemTableMods && IsSystemRelation(rel))
@@ -683,6 +1030,12 @@ truncate_check_rel(Relation rel)
                ereport(ERROR,
                                (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
                          errmsg("cannot truncate temporary tables of other sessions")));
+
+       /*
+        * Also check for active uses of the relation in the current transaction,
+        * including open scans and pending AFTER trigger events.
+        */
+       CheckTableNotInUse(rel, "TRUNCATE");
 }
 
 /*----------
@@ -840,8 +1193,8 @@ MergeAttributes(List *schema, List *supers, bool istemp,
                if (list_member_oid(parentOids, RelationGetRelid(relation)))
                        ereport(ERROR,
                                        (errcode(ERRCODE_DUPLICATE_TABLE),
-                                        errmsg("relation \"%s\" would be inherited from more than once",
-                                                       parent->relname)));
+                        errmsg("relation \"%s\" would be inherited from more than once",
+                                       parent->relname)));
 
                parentOids = lappend_oid(parentOids, RelationGetRelid(relation));
 
@@ -887,8 +1240,8 @@ MergeAttributes(List *schema, List *supers, bool istemp,
                        exist_attno = findAttrByName(attributeName, inhSchema);
                        if (exist_attno > 0)
                        {
-                               Oid             defTypeId;
-                               int32   deftypmod;
+                               Oid                     defTypeId;
+                               int32           deftypmod;
 
                                /*
                                 * Yes, try to merge the two column definitions. They must
@@ -898,8 +1251,7 @@ MergeAttributes(List *schema, List *supers, bool istemp,
                                                (errmsg("merging multiple inherited definitions of column \"%s\"",
                                                                attributeName)));
                                def = (ColumnDef *) list_nth(inhSchema, exist_attno - 1);
-                               defTypeId = typenameTypeId(NULL, def->typename);
-                               deftypmod = typenameTypeMod(NULL, def->typename, defTypeId);
+                               defTypeId = typenameTypeId(NULL, def->typename, &deftypmod);
                                if (defTypeId != attribute->atttypid ||
                                        deftypmod != attribute->atttypmod)
                                        ereport(ERROR,
@@ -978,8 +1330,9 @@ MergeAttributes(List *schema, List *supers, bool istemp,
                }
 
                /*
-                * Now copy the constraints of this parent, adjusting attnos using the
-                * completed newattno[] map
+                * Now copy the CHECK constraints of this parent, adjusting attnos
+                * using the completed newattno[] map.  Identically named constraints
+                * are merged if possible, else we throw error.
                 */
                if (constr && constr->num_check > 0)
                {
@@ -988,17 +1341,28 @@ MergeAttributes(List *schema, List *supers, bool istemp,
 
                        for (i = 0; i < constr->num_check; i++)
                        {
-                               Constraint *cdef = makeNode(Constraint);
+                               char       *name = check[i].ccname;
                                Node       *expr;
 
-                               cdef->contype = CONSTR_CHECK;
-                               cdef->name = pstrdup(check[i].ccname);
-                               cdef->raw_expr = NULL;
                                /* adjust varattnos of ccbin here */
                                expr = stringToNode(check[i].ccbin);
                                change_varattnos_of_a_node(expr, newattno);
-                               cdef->cooked_expr = nodeToString(expr);
-                               constraints = lappend(constraints, cdef);
+
+                               /* check for duplicate */
+                               if (!MergeCheckConstraint(constraints, name, expr))
+                               {
+                                       /* nope, this is a new one */
+                                       CookedConstraint *cooked;
+
+                                       cooked = (CookedConstraint *) palloc(sizeof(CookedConstraint));
+                                       cooked->contype = CONSTR_CHECK;
+                                       cooked->name = pstrdup(name);
+                                       cooked->attnum = 0;             /* not used for constraints */
+                                       cooked->expr = expr;
+                                       cooked->is_local = false;
+                                       cooked->inhcount = 1;
+                                       constraints = lappend(constraints, cooked);
+                               }
                        }
                }
 
@@ -1032,8 +1396,10 @@ MergeAttributes(List *schema, List *supers, bool istemp,
                        if (exist_attno > 0)
                        {
                                ColumnDef  *def;
-                               Oid     defTypeId, newTypeId;
-                               int32 deftypmod, newtypmod;
+                               Oid                     defTypeId,
+                                                       newTypeId;
+                               int32           deftypmod,
+                                                       newtypmod;
 
                                /*
                                 * Yes, try to merge the two column definitions. They must
@@ -1043,10 +1409,8 @@ MergeAttributes(List *schema, List *supers, bool istemp,
                                   (errmsg("merging column \"%s\" with inherited definition",
                                                   attributeName)));
                                def = (ColumnDef *) list_nth(inhSchema, exist_attno - 1);
-                               defTypeId = typenameTypeId(NULL, def->typename);
-                               deftypmod = typenameTypeMod(NULL, def->typename, defTypeId);
-                               newTypeId = typenameTypeId(NULL, newdef->typename);
-                               newtypmod = typenameTypeMod(NULL, newdef->typename, newTypeId);
+                               defTypeId = typenameTypeId(NULL, def->typename, &deftypmod);
+                               newTypeId = typenameTypeId(NULL, newdef->typename, &newtypmod);
                                if (defTypeId != newTypeId || deftypmod != newtypmod)
                                        ereport(ERROR,
                                                        (errcode(ERRCODE_DATATYPE_MISMATCH),
@@ -1115,38 +1479,46 @@ MergeAttributes(List *schema, List *supers, bool istemp,
 
 
 /*
- * In multiple-inheritance situations, it's possible to inherit
- * the same grandparent constraint through multiple parents.
- * Hence, we want to discard inherited constraints that match as to
- * both name and expression.  Otherwise, gripe if there are conflicting
- * names.  Nonconflicting constraints are added to the array check[]
- * of length *ncheck ... caller must ensure there is room!
+ * MergeCheckConstraint
+ *             Try to merge an inherited CHECK constraint with previous ones
+ *
+ * If we inherit identically-named constraints from multiple parents, we must
+ * merge them, or throw an error if they don't have identical definitions.
+ *
+ * constraints is a list of CookedConstraint structs for previous constraints.
+ *
+ * Returns TRUE if merged (constraint is a duplicate), or FALSE if it's
+ * got a so-far-unique name, or throws error if conflict.
  */
-static void
-add_nonduplicate_constraint(Constraint *cdef, ConstrCheck *check, int *ncheck)
+static bool
+MergeCheckConstraint(List *constraints, char *name, Node *expr)
 {
-       int                     i;
-
-       /* Should only see precooked constraints here */
-       Assert(cdef->contype == CONSTR_CHECK);
-       Assert(cdef->name != NULL);
-       Assert(cdef->raw_expr == NULL && cdef->cooked_expr != NULL);
+       ListCell   *lc;
 
-       for (i = 0; i < *ncheck; i++)
+       foreach(lc, constraints)
        {
-               if (strcmp(check[i].ccname, cdef->name) != 0)
+               CookedConstraint *ccon = (CookedConstraint *) lfirst(lc);
+
+               Assert(ccon->contype == CONSTR_CHECK);
+
+               /* Non-matching names never conflict */
+               if (strcmp(ccon->name, name) != 0)
                        continue;
-               if (strcmp(check[i].ccbin, cdef->cooked_expr) == 0)
-                       return;                         /* duplicate constraint, so ignore it */
+
+               if (equal(expr, ccon->expr))
+               {
+                       /* OK to merge */
+                       ccon->inhcount++;
+                       return true;
+               }
+
                ereport(ERROR,
                                (errcode(ERRCODE_DUPLICATE_OBJECT),
                                 errmsg("check constraint name \"%s\" appears multiple times but with different expressions",
-                                               cdef->name)));
+                                               name)));
        }
-       /* No match on name, so add it to array */
-       check[*ncheck].ccname = cdef->name;
-       check[*ncheck].ccbin = pstrdup(cdef->cooked_expr);
-       (*ncheck)++;
+
+       return false;
 }
 
 
@@ -1184,7 +1556,7 @@ change_varattnos_walker(Node *node, const AttrNumber *newattno)
                         * currently.
                         */
                        Assert(newattno[var->varattno - 1] > 0);
-                       var->varattno = newattno[var->varattno - 1];
+                       var->varattno = var->varoattno = newattno[var->varattno - 1];
                }
                return false;
        }
@@ -1299,7 +1671,7 @@ StoreCatalogInheritance1(Oid relationId, Oid parentOid,
 {
        TupleDesc       desc = RelationGetDescr(inhRelation);
        Datum           datum[Natts_pg_inherits];
-       char            nullarr[Natts_pg_inherits];
+       bool            nullarr[Natts_pg_inherits];
        ObjectAddress childobject,
                                parentobject;
        HeapTuple       tuple;
@@ -1311,11 +1683,11 @@ StoreCatalogInheritance1(Oid relationId, Oid parentOid,
        datum[1] = ObjectIdGetDatum(parentOid);         /* inhparent */
        datum[2] = Int16GetDatum(seqNumber);            /* inhseqno */
 
-       nullarr[0] = ' ';
-       nullarr[1] = ' ';
-       nullarr[2] = ' ';
+       nullarr[0] = false;
+       nullarr[1] = false;
+       nullarr[2] = false;
 
-       tuple = heap_formtuple(desc, datum, nullarr);
+       tuple = heap_form_tuple(desc, datum, nullarr);
 
        simple_heap_insert(inhRelation, tuple);
 
@@ -1612,61 +1984,86 @@ renameatt(Oid myrelid,
        relation_close(targetrelation, NoLock);         /* close rel but keep lock */
 }
 
+
 /*
- *             renamerel               - change the name of a relation
+ * Execute ALTER TABLE/INDEX/SEQUENCE/VIEW RENAME
  *
- *             XXX - When renaming sequences, we don't bother to modify the
- *                       sequence name that is stored within the sequence itself
- *                       (this would cause problems with MVCC). In the future,
- *                       the sequence name should probably be removed from the
- *                       sequence, AFAIK there's no need for it to be there.
+ * Caller has already done permissions checks.
  */
 void
-renamerel(Oid myrelid, const char *newrelname, ObjectType reltype)
+RenameRelation(Oid myrelid, const char *newrelname, ObjectType reltype)
 {
        Relation        targetrelation;
-       Relation        relrelation;    /* for RELATION relation */
-       HeapTuple       reltup;
-       Form_pg_class relform;
        Oid                     namespaceId;
-       char       *oldrelname;
        char            relkind;
-       bool            relhastriggers;
 
        /*
-        * Grab an exclusive lock on the target table, index, sequence or
-        * view, which we will NOT release until end of transaction.
+        * Grab an exclusive lock on the target table, index, sequence or view,
+        * which we will NOT release until end of transaction.
         */
        targetrelation = relation_open(myrelid, AccessExclusiveLock);
 
-       oldrelname = pstrdup(RelationGetRelationName(targetrelation));
        namespaceId = RelationGetNamespace(targetrelation);
-
-       if (!allowSystemTableMods && IsSystemRelation(targetrelation))
-               ereport(ERROR,
-                               (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-                                errmsg("permission denied: \"%s\" is a system catalog",
-                                               RelationGetRelationName(targetrelation))));
+       relkind = targetrelation->rd_rel->relkind;
 
        /*
-        * For compatibility with prior releases, we don't complain if
-        * ALTER TABLE or ALTER INDEX is used to rename a sequence or
-        * view.
+        * For compatibility with prior releases, we don't complain if ALTER TABLE
+        * or ALTER INDEX is used to rename a sequence or view.
         */
-       relkind = targetrelation->rd_rel->relkind;
-       if (reltype == OBJECT_SEQUENCE && relkind != 'S')
+       if (reltype == OBJECT_SEQUENCE && relkind != RELKIND_SEQUENCE)
                ereport(ERROR,
                                (errcode(ERRCODE_WRONG_OBJECT_TYPE),
                                 errmsg("\"%s\" is not a sequence",
                                                RelationGetRelationName(targetrelation))));
 
-       if (reltype == OBJECT_VIEW && relkind != 'v')
+       if (reltype == OBJECT_VIEW && relkind != RELKIND_VIEW)
                ereport(ERROR,
                                (errcode(ERRCODE_WRONG_OBJECT_TYPE),
                                 errmsg("\"%s\" is not a view",
                                                RelationGetRelationName(targetrelation))));
 
-       relhastriggers = (targetrelation->rd_rel->reltriggers > 0);
+       /*
+        * Don't allow ALTER TABLE on composite types.
+        * We want people to use ALTER TYPE for that.
+        */
+       if (relkind == RELKIND_COMPOSITE_TYPE)
+               ereport(ERROR,
+                               (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+                                errmsg("\"%s\" is a composite type",
+                                               RelationGetRelationName(targetrelation)),
+                                errhint("Use ALTER TYPE instead.")));
+
+       /* Do the work */
+       RenameRelationInternal(myrelid, newrelname, namespaceId);
+
+       /*
+        * Close rel, but keep exclusive lock!
+        */
+       relation_close(targetrelation, NoLock);
+}
+
+/*
+ *             RenameRelationInternal - change the name of a relation
+ *
+ *             XXX - When renaming sequences, we don't bother to modify the
+ *                       sequence name that is stored within the sequence itself
+ *                       (this would cause problems with MVCC). In the future,
+ *                       the sequence name should probably be removed from the
+ *                       sequence, AFAIK there's no need for it to be there.
+ */
+void
+RenameRelationInternal(Oid myrelid, const char *newrelname, Oid namespaceId)
+{
+       Relation        targetrelation;
+       Relation        relrelation;    /* for RELATION relation */
+       HeapTuple       reltup;
+       Form_pg_class relform;
+
+       /*
+        * Grab an exclusive lock on the target table, index, sequence or
+        * view, which we will NOT release until end of transaction.
+        */
+       targetrelation = relation_open(myrelid, AccessExclusiveLock);
 
        /*
         * Find relation's pg_class tuple, and make sure newrelname isn't in use.
@@ -1704,7 +2101,19 @@ renamerel(Oid myrelid, const char *newrelname, ObjectType reltype)
         * Also rename the associated type, if any.
         */
        if (OidIsValid(targetrelation->rd_rel->reltype))
-               TypeRename(targetrelation->rd_rel->reltype, newrelname, namespaceId);
+               RenameTypeInternal(targetrelation->rd_rel->reltype,
+                                                  newrelname, namespaceId);
+
+       /*
+        * Also rename the associated constraint, if any.
+        */
+       if (targetrelation->rd_rel->relkind == RELKIND_INDEX)
+       {
+               Oid                     constraintId = get_index_constraint(myrelid);
+
+               if (OidIsValid(constraintId))
+                       RenameConstraintById(constraintId, newrelname);
+       }
 
        /*
         * Close rel, but keep exclusive lock!
@@ -1712,6 +2121,55 @@ renamerel(Oid myrelid, const char *newrelname, ObjectType reltype)
        relation_close(targetrelation, NoLock);
 }
 
+/*
+ * Disallow ALTER TABLE (and similar commands) when the current backend has
+ * any open reference to the target table besides the one just acquired by
+ * the calling command; this implies there's an open cursor or active plan.
+ * We need this check because our AccessExclusiveLock doesn't protect us
+ * against stomping on our own foot, only other people's feet!
+ *
+ * For ALTER TABLE, the only case known to cause serious trouble is ALTER
+ * COLUMN TYPE, and some changes are obviously pretty benign, so this could
+ * possibly be relaxed to only error out for certain types of alterations.
+ * But the use-case for allowing any of these things is not obvious, so we
+ * won't work hard at it for now.
+ *
+ * We also reject these commands if there are any pending AFTER trigger events
+ * for the rel.  This is certainly necessary for the rewriting variants of
+ * ALTER TABLE, because they don't preserve tuple TIDs and so the pending
+ * events would try to fetch the wrong tuples.  It might be overly cautious
+ * in other cases, but again it seems better to err on the side of paranoia.
+ *
+ * REINDEX calls this with "rel" referencing the index to be rebuilt; here
+ * we are worried about active indexscans on the index.  The trigger-event
+ * check can be skipped, since we are doing no damage to the parent table.
+ *
+ * The statement name (eg, "ALTER TABLE") is passed for use in error messages.
+ */
+void
+CheckTableNotInUse(Relation rel, const char *stmt)
+{
+       int                     expected_refcnt;
+
+       expected_refcnt = rel->rd_isnailed ? 2 : 1;
+       if (rel->rd_refcnt != expected_refcnt)
+               ereport(ERROR,
+                               (errcode(ERRCODE_OBJECT_IN_USE),
+                                /* translator: first %s is a SQL command, eg ALTER TABLE */
+                                errmsg("cannot %s \"%s\" because "
+                                               "it is being used by active queries in this session",
+                                               stmt, RelationGetRelationName(rel))));
+
+       if (rel->rd_rel->relkind != RELKIND_INDEX &&
+               AfterTriggerPendingOnRel(RelationGetRelid(rel)))
+               ereport(ERROR,
+                               (errcode(ERRCODE_OBJECT_IN_USE),
+                                /* translator: first %s is a SQL command, eg ALTER TABLE */
+                                errmsg("cannot %s \"%s\" because "
+                                               "it has pending trigger events",
+                                               stmt, RelationGetRelationName(rel))));
+}
+
 /*
  * AlterTable
  *             Execute ALTER TABLE, which can be a list of subcommands
@@ -1733,8 +2191,9 @@ renamerel(Oid myrelid, const char *newrelname, ObjectType reltype)
  * expressions that need to be evaluated with respect to the old table
  * schema.
  *
- * ATRewriteCatalogs performs phase 2 for each affected table (note that
- * phases 2 and 3 do no explicit recursion, since phase 1 already did it).
+ * ATRewriteCatalogs performs phase 2 for each affected table.  (Note that
+ * phases 2 and 3 normally do no explicit recursion, since phase 1 already
+ * did it --- although some subcommands have to recurse in phase 2 instead.)
  * Certain subcommands need to be performed before others to avoid
  * unnecessary conflicts; for example, DROP COLUMN should come before
  * ADD COLUMN. Therefore phase 1 divides the subcommands into multiple
@@ -1748,27 +2207,47 @@ renamerel(Oid myrelid, const char *newrelname, ObjectType reltype)
 void
 AlterTable(AlterTableStmt *stmt)
 {
-       Relation rel = relation_openrv(stmt->relation, AccessExclusiveLock);
-       int                     expected_refcnt;
+       Relation        rel = relation_openrv(stmt->relation, AccessExclusiveLock);
 
-       /*
-        * Disallow ALTER TABLE when the current backend has any open reference
-        * to it besides the one we just got (such as an open cursor or active
-        * plan); our AccessExclusiveLock doesn't protect us against stomping on
-        * our own foot, only other people's feet!
-        *
-        * Note: the only case known to cause serious trouble is ALTER COLUMN TYPE,
-        * and some changes are obviously pretty benign, so this could possibly
-        * be relaxed to only error out for certain types of alterations.  But
-        * the use-case for allowing any of these things is not obvious, so we
-        * won't work hard at it for now.
-        */
-       expected_refcnt = rel->rd_isnailed ? 2 : 1;
-       if (rel->rd_refcnt != expected_refcnt)
-               ereport(ERROR,
-                               (errcode(ERRCODE_OBJECT_IN_USE),
-                                errmsg("relation \"%s\" is being used by active queries in this session",
-                                               RelationGetRelationName(rel))));
+       CheckTableNotInUse(rel, "ALTER TABLE");
+
+       /* Check relation type against type specified in the ALTER command */
+       switch (stmt->relkind)
+       {
+               case OBJECT_TABLE:
+                       /*
+                        * For mostly-historical reasons, we allow ALTER TABLE to apply
+                        * to all relation types.
+                        */
+                       break;
+
+               case OBJECT_INDEX:
+                       if (rel->rd_rel->relkind != RELKIND_INDEX)
+                               ereport(ERROR,
+                                               (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+                                                errmsg("\"%s\" is not an index",
+                                                               RelationGetRelationName(rel))));
+                       break;
+
+               case OBJECT_SEQUENCE:
+                       if (rel->rd_rel->relkind != RELKIND_SEQUENCE)
+                               ereport(ERROR,
+                                               (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+                                                errmsg("\"%s\" is not a sequence",
+                                                               RelationGetRelationName(rel))));
+                       break;
+
+               case OBJECT_VIEW:
+                       if (rel->rd_rel->relkind != RELKIND_VIEW)
+                               ereport(ERROR,
+                                               (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+                                                errmsg("\"%s\" is not a view",
+                                                               RelationGetRelationName(rel))));
+                       break;
+
+               default:
+                       elog(ERROR, "unrecognized object type: %d", (int) stmt->relkind);
+       }
 
        ATController(rel, stmt->cmds, interpretInhOption(stmt->relation->inhOpt));
 }
@@ -1781,12 +2260,13 @@ AlterTable(AlterTableStmt *stmt)
  * We do not reject if the relation is already open, because it's quite
  * likely that one or more layers of caller have it open.  That means it
  * is unsafe to use this entry point for alterations that could break
- * existing query plans.
+ * existing query plans.  On the assumption it's not used for such, we
+ * don't have to reject pending AFTER triggers, either.
  */
 void
 AlterTableInternal(Oid relid, List *cmds, bool recurse)
 {
-       Relation rel = relation_open(relid, AccessExclusiveLock);
+       Relation        rel = relation_open(relid, AccessExclusiveLock);
 
        ATController(rel, cmds, recurse);
 }
@@ -1854,6 +2334,12 @@ ATPrepCmd(List **wqueue, Relation rel, AlterTableCmd *cmd,
                        ATPrepAddColumn(wqueue, rel, recurse, cmd);
                        pass = AT_PASS_ADD_COL;
                        break;
+               case AT_AddColumnToView:        /* add column via CREATE OR REPLACE VIEW */
+                       ATSimplePermissions(rel, true);
+                       /* Performs own recursion */
+                       ATPrepAddColumn(wqueue, rel, recurse, cmd);
+                       pass = AT_PASS_ADD_COL;
+                       break;
                case AT_ColumnDefault:  /* ALTER COLUMN DEFAULT */
 
                        /*
@@ -1907,27 +2393,18 @@ ATPrepCmd(List **wqueue, Relation rel, AlterTableCmd *cmd,
                        break;
                case AT_AddConstraint:  /* ADD CONSTRAINT */
                        ATSimplePermissions(rel, false);
-
-                       /*
-                        * Currently we recurse only for CHECK constraints, never for
-                        * foreign-key constraints.  UNIQUE/PKEY constraints won't be seen
-                        * here.
-                        */
-                       if (IsA(cmd->def, Constraint))
-                               ATSimpleRecursion(wqueue, rel, cmd, recurse);
-                       /* No command-specific prep needed */
+                       /* Recursion occurs during execution phase */
+                       /* No command-specific prep needed except saving recurse flag */
+                       if (recurse)
+                               cmd->subtype = AT_AddConstraintRecurse;
                        pass = AT_PASS_ADD_CONSTR;
                        break;
                case AT_DropConstraint: /* DROP CONSTRAINT */
                        ATSimplePermissions(rel, false);
-                       /* Performs own recursion */
-                       ATPrepDropConstraint(wqueue, rel, recurse, cmd);
-                       pass = AT_PASS_DROP;
-                       break;
-               case AT_DropConstraintQuietly:  /* DROP CONSTRAINT for child */
-                       ATSimplePermissions(rel, false);
-                       ATSimpleRecursion(wqueue, rel, cmd, recurse);
-                       /* No command-specific prep needed */
+                       /* Recursion occurs during execution phase */
+                       /* No command-specific prep needed except saving recurse flag */
+                       if (recurse)
+                               cmd->subtype = AT_DropConstraintRecurse;
                        pass = AT_PASS_DROP;
                        break;
                case AT_AlterColumnType:                /* ALTER COLUMN TYPE */
@@ -2044,7 +2521,7 @@ ATRewriteCatalogs(List **wqueue)
                        rel = relation_open(tab->relid, NoLock);
 
                        foreach(lcmd, subcmds)
-                               ATExecCmd(tab, rel, (AlterTableCmd *) lfirst(lcmd));
+                               ATExecCmd(wqueue, tab, rel, (AlterTableCmd *) lfirst(lcmd));
 
                        /*
                         * After the ALTER TYPE pass, do cleanup work (this is not done in
@@ -2078,11 +2555,13 @@ ATRewriteCatalogs(List **wqueue)
  * ATExecCmd: dispatch a subcommand to appropriate execution routine
  */
 static void
-ATExecCmd(AlteredTableInfo *tab, Relation rel, AlterTableCmd *cmd)
+ATExecCmd(List **wqueue, AlteredTableInfo *tab, Relation rel,
+                 AlterTableCmd *cmd)
 {
        switch (cmd->subtype)
        {
                case AT_AddColumn:              /* ADD COLUMN */
+               case AT_AddColumnToView: /* add column via CREATE OR REPLACE VIEW */
                        ATExecAddColumn(tab, rel, (ColumnDef *) cmd->def);
                        break;
                case AT_ColumnDefault:  /* ALTER COLUMN DEFAULT */
@@ -2113,13 +2592,16 @@ ATExecCmd(AlteredTableInfo *tab, Relation rel, AlterTableCmd *cmd)
                        ATExecAddIndex(tab, rel, (IndexStmt *) cmd->def, true);
                        break;
                case AT_AddConstraint:  /* ADD CONSTRAINT */
-                       ATExecAddConstraint(tab, rel, cmd->def);
+                       ATExecAddConstraint(wqueue, tab, rel, cmd->def, false);
+                       break;
+               case AT_AddConstraintRecurse:   /* ADD CONSTRAINT with recursion */
+                       ATExecAddConstraint(wqueue, tab, rel, cmd->def, true);
                        break;
                case AT_DropConstraint: /* DROP CONSTRAINT */
-                       ATExecDropConstraint(rel, cmd->name, cmd->behavior, false);
+                       ATExecDropConstraint(rel, cmd->name, cmd->behavior, false, false);
                        break;
-               case AT_DropConstraintQuietly:  /* DROP CONSTRAINT for child */
-                       ATExecDropConstraint(rel, cmd->name, cmd->behavior, true);
+               case AT_DropConstraintRecurse:  /* DROP CONSTRAINT with recursion */
+                       ATExecDropConstraint(rel, cmd->name, cmd->behavior, true, false);
                        break;
                case AT_AlterColumnType:                /* ALTER COLUMN TYPE */
                        ATExecAlterColumnType(tab, rel, cmd->name, (TypeName *) cmd->def);
@@ -2155,54 +2637,54 @@ ATExecCmd(AlteredTableInfo *tab, Relation rel, AlterTableCmd *cmd)
                        ATExecSetRelOptions(rel, (List *) cmd->def, true);
                        break;
 
-               case AT_EnableTrig:                     /* ENABLE TRIGGER name */
-                       ATExecEnableDisableTrigger(rel, cmd->name, 
-                                       TRIGGER_FIRES_ON_ORIGIN, false);
+               case AT_EnableTrig:             /* ENABLE TRIGGER name */
+                       ATExecEnableDisableTrigger(rel, cmd->name,
+                                                                          TRIGGER_FIRES_ON_ORIGIN, false);
                        break;
-               case AT_EnableAlwaysTrig:       /* ENABLE ALWAYS TRIGGER name */
-                       ATExecEnableDisableTrigger(rel, cmd->name, 
-                                       TRIGGER_FIRES_ALWAYS, false);
+               case AT_EnableAlwaysTrig:               /* ENABLE ALWAYS TRIGGER name */
+                       ATExecEnableDisableTrigger(rel, cmd->name,
+                                                                          TRIGGER_FIRES_ALWAYS, false);
                        break;
-               case AT_EnableReplicaTrig:      /* ENABLE REPLICA TRIGGER name */
-                       ATExecEnableDisableTrigger(rel, cmd->name, 
-                                       TRIGGER_FIRES_ON_REPLICA, false);
+               case AT_EnableReplicaTrig:              /* ENABLE REPLICA TRIGGER name */
+                       ATExecEnableDisableTrigger(rel, cmd->name,
+                                                                          TRIGGER_FIRES_ON_REPLICA, false);
                        break;
                case AT_DisableTrig:    /* DISABLE TRIGGER name */
-                       ATExecEnableDisableTrigger(rel, cmd->name, 
-                                       TRIGGER_DISABLED, false);
+                       ATExecEnableDisableTrigger(rel, cmd->name,
+                                                                          TRIGGER_DISABLED, false);
                        break;
                case AT_EnableTrigAll:  /* ENABLE TRIGGER ALL */
-                       ATExecEnableDisableTrigger(rel, NULL, 
-                                       TRIGGER_FIRES_ON_ORIGIN, false);
+                       ATExecEnableDisableTrigger(rel, NULL,
+                                                                          TRIGGER_FIRES_ON_ORIGIN, false);
                        break;
                case AT_DisableTrigAll: /* DISABLE TRIGGER ALL */
-                       ATExecEnableDisableTrigger(rel, NULL, 
-                                       TRIGGER_DISABLED, false);
+                       ATExecEnableDisableTrigger(rel, NULL,
+                                                                          TRIGGER_DISABLED, false);
                        break;
                case AT_EnableTrigUser: /* ENABLE TRIGGER USER */
-                       ATExecEnableDisableTrigger(rel, NULL, 
-                                       TRIGGER_FIRES_ON_ORIGIN, true);
+                       ATExecEnableDisableTrigger(rel, NULL,
+                                                                          TRIGGER_FIRES_ON_ORIGIN, true);
                        break;
                case AT_DisableTrigUser:                /* DISABLE TRIGGER USER */
-                       ATExecEnableDisableTrigger(rel, NULL, 
-                                       TRIGGER_DISABLED, true);
+                       ATExecEnableDisableTrigger(rel, NULL,
+                                                                          TRIGGER_DISABLED, true);
                        break;
 
-               case AT_EnableRule:                     /* ENABLE RULE name */
-                       ATExecEnableDisableRule(rel, cmd->name, 
-                                       RULE_FIRES_ON_ORIGIN);
+               case AT_EnableRule:             /* ENABLE RULE name */
+                       ATExecEnableDisableRule(rel, cmd->name,
+                                                                       RULE_FIRES_ON_ORIGIN);
                        break;
-               case AT_EnableAlwaysRule:       /* ENABLE ALWAYS RULE name */
-                       ATExecEnableDisableRule(rel, cmd->name, 
-                                       RULE_FIRES_ALWAYS);
+               case AT_EnableAlwaysRule:               /* ENABLE ALWAYS RULE name */
+                       ATExecEnableDisableRule(rel, cmd->name,
+                                                                       RULE_FIRES_ALWAYS);
                        break;
-               case AT_EnableReplicaRule:      /* ENABLE REPLICA RULE name */
-                       ATExecEnableDisableRule(rel, cmd->name, 
-                                       RULE_FIRES_ON_REPLICA);
+               case AT_EnableReplicaRule:              /* ENABLE REPLICA RULE name */
+                       ATExecEnableDisableRule(rel, cmd->name,
+                                                                       RULE_FIRES_ON_REPLICA);
                        break;
                case AT_DisableRule:    /* DISABLE RULE name */
-                       ATExecEnableDisableRule(rel, cmd->name, 
-                                       RULE_DISABLED);
+                       ATExecEnableDisableRule(rel, cmd->name,
+                                                                       RULE_DISABLED);
                        break;
 
                case AT_AddInherit:
@@ -2305,8 +2787,8 @@ ATRewriteTables(List **wqueue)
 
                        /*
                         * Swap the physical files of the old and new heaps.  Since we are
-                        * generating a new heap, we can use RecentXmin for the table's new
-                        * relfrozenxid because we rewrote all the tuples on
+                        * generating a new heap, we can use RecentXmin for the table's
+                        * new relfrozenxid because we rewrote all the tuples on
                         * ATRewriteTable, so no older Xid remains on the table.
                         */
                        swap_relation_files(tab->relid, OIDNewHeap, RecentXmin);
@@ -2784,12 +3266,7 @@ ATSimpleRecursion(List **wqueue, Relation rel,
                        if (childrelid == relid)
                                continue;
                        childrel = relation_open(childrelid, AccessExclusiveLock);
-                       /* check for child relation in use in this session */
-                       if (childrel->rd_refcnt != 1)
-                               ereport(ERROR,
-                                               (errcode(ERRCODE_OBJECT_IN_USE),
-                                                errmsg("relation \"%s\" is being used by active queries in this session",
-                                                               RelationGetRelationName(childrel))));
+                       CheckTableNotInUse(childrel, "ALTER TABLE");
                        ATPrepCmd(wqueue, childrel, cmd, false, true);
                        relation_close(childrel, NoLock);
                }
@@ -2821,12 +3298,7 @@ ATOneLevelRecursion(List **wqueue, Relation rel,
                Relation        childrel;
 
                childrel = relation_open(childrelid, AccessExclusiveLock);
-               /* check for child relation in use in this session */
-               if (childrel->rd_refcnt != 1)
-                       ereport(ERROR,
-                                       (errcode(ERRCODE_OBJECT_IN_USE),
-                                        errmsg("relation \"%s\" is being used by active queries in this session",
-                                                       RelationGetRelationName(childrel))));
+               CheckTableNotInUse(childrel, "ALTER TABLE");
                ATPrepCmd(wqueue, childrel, cmd, true, true);
                relation_close(childrel, NoLock);
        }
@@ -2986,12 +3458,11 @@ ATExecAddColumn(AlteredTableInfo *tab, Relation rel,
        Relation        pgclass,
                                attrdesc;
        HeapTuple       reltup;
-       HeapTuple       attributeTuple;
-       Form_pg_attribute attribute;
-       FormData_pg_attribute attributeD;
+       FormData_pg_attribute attribute;
        int                     i;
        int                     minattnum,
                                maxatts;
+       char            relkind;
        HeapTuple       typeTuple;
        Oid                     typeOid;
        int32           typmod;
@@ -3013,12 +3484,11 @@ ATExecAddColumn(AlteredTableInfo *tab, Relation rel,
                if (HeapTupleIsValid(tuple))
                {
                        Form_pg_attribute childatt = (Form_pg_attribute) GETSTRUCT(tuple);
-                       Oid             ctypeId;
-                       int32   ctypmod;
+                       Oid                     ctypeId;
+                       int32           ctypmod;
 
                        /* Okay if child matches by type */
-                       ctypeId = typenameTypeId(NULL, colDef->typename);
-                       ctypmod = typenameTypeMod(NULL, colDef->typename, ctypeId);
+                       ctypeId = typenameTypeId(NULL, colDef->typename, &ctypmod);
                        if (ctypeId != childatt->atttypid ||
                                ctypmod != childatt->atttypmod)
                                ereport(ERROR,
@@ -3065,6 +3535,7 @@ ATExecAddColumn(AlteredTableInfo *tab, Relation rel,
                                                colDef->colname, RelationGetRelationName(rel))));
 
        minattnum = ((Form_pg_class) GETSTRUCT(reltup))->relnatts;
+       relkind = ((Form_pg_class) GETSTRUCT(reltup))->relkind;
        maxatts = minattnum + 1;
        if (maxatts > MaxHeapAttributeNumber)
                ereport(ERROR,
@@ -3073,45 +3544,34 @@ ATExecAddColumn(AlteredTableInfo *tab, Relation rel,
                                                MaxHeapAttributeNumber)));
        i = minattnum + 1;
 
-       typeTuple = typenameType(NULL, colDef->typename);
+       typeTuple = typenameType(NULL, colDef->typename, &typmod);
        tform = (Form_pg_type) GETSTRUCT(typeTuple);
        typeOid = HeapTupleGetOid(typeTuple);
-       typmod = typenameTypeMod(NULL, colDef->typename, typeOid);
 
        /* make sure datatype is legal for a column */
        CheckAttributeType(colDef->colname, typeOid);
 
-       attributeTuple = heap_addheader(Natts_pg_attribute,
-                                                                       false,
-                                                                       ATTRIBUTE_TUPLE_SIZE,
-                                                                       (void *) &attributeD);
-
-       attribute = (Form_pg_attribute) GETSTRUCT(attributeTuple);
-
-       attribute->attrelid = myrelid;
-       namestrcpy(&(attribute->attname), colDef->colname);
-       attribute->atttypid = typeOid;
-       attribute->attstattarget = -1;
-       attribute->attlen = tform->typlen;
-       attribute->attcacheoff = -1;
-       attribute->atttypmod = typmod;
-       attribute->attnum = i;
-       attribute->attbyval = tform->typbyval;
-       attribute->attndims = list_length(colDef->typename->arrayBounds);
-       attribute->attstorage = tform->typstorage;
-       attribute->attalign = tform->typalign;
-       attribute->attnotnull = colDef->is_not_null;
-       attribute->atthasdef = false;
-       attribute->attisdropped = false;
-       attribute->attislocal = colDef->is_local;
-       attribute->attinhcount = colDef->inhcount;
+       attribute.attrelid = myrelid;
+       namestrcpy(&(attribute.attname), colDef->colname);
+       attribute.atttypid = typeOid;
+       attribute.attstattarget = -1;
+       attribute.attlen = tform->typlen;
+       attribute.attcacheoff = -1;
+       attribute.atttypmod = typmod;
+       attribute.attnum = i;
+       attribute.attbyval = tform->typbyval;
+       attribute.attndims = list_length(colDef->typename->arrayBounds);
+       attribute.attstorage = tform->typstorage;
+       attribute.attalign = tform->typalign;
+       attribute.attnotnull = colDef->is_not_null;
+       attribute.atthasdef = false;
+       attribute.attisdropped = false;
+       attribute.attislocal = colDef->is_local;
+       attribute.attinhcount = colDef->inhcount;
 
        ReleaseSysCache(typeTuple);
 
-       simple_heap_insert(attrdesc, attributeTuple);
-
-       /* Update indexes on pg_attribute */
-       CatalogUpdateIndexes(attrdesc, attributeTuple);
+       InsertPgAttributeTuple(attrdesc, &attribute, NULL);
 
        heap_close(attrdesc, RowExclusiveLock);
 
@@ -3140,14 +3600,14 @@ ATExecAddColumn(AlteredTableInfo *tab, Relation rel,
                RawColumnDefault *rawEnt;
 
                rawEnt = (RawColumnDefault *) palloc(sizeof(RawColumnDefault));
-               rawEnt->attnum = attribute->attnum;
+               rawEnt->attnum = attribute.attnum;
                rawEnt->raw_default = copyObject(colDef->raw_default);
 
                /*
                 * This function is intended for CREATE TABLE, so it processes a
                 * _list_ of defaults, but we just do one.
                 */
-               AddRelationRawConstraints(rel, list_make1(rawEnt), NIL);
+               AddRelationNewConstraints(rel, list_make1(rawEnt), NIL, false, true);
 
                /* Make the additional catalog changes visible */
                CommandCounterIncrement();
@@ -3172,42 +3632,55 @@ ATExecAddColumn(AlteredTableInfo *tab, Relation rel,
         * the constraints more directly.)
         *
         * Note: we use build_column_default, and not just the cooked default
-        * returned by AddRelationRawConstraints, so that the right thing happens
+        * returned by AddRelationNewConstraints, so that the right thing happens
         * when a datatype's default applies.
+        *
+        * We skip this logic completely for views.
         */
-       defval = (Expr *) build_column_default(rel, attribute->attnum);
+       if (relkind != RELKIND_VIEW) {
+               defval = (Expr *) build_column_default(rel, attribute.attnum);
 
-       if (!defval && GetDomainConstraints(typeOid) != NIL)
-       {
-               Oid                     basetype = getBaseType(typeOid);
-
-               defval = (Expr *) makeNullConst(basetype);
-               defval = (Expr *) coerce_to_target_type(NULL,
-                                                                                               (Node *) defval,
-                                                                                               basetype,
-                                                                                               typeOid,
-                                                                                               typmod,
-                                                                                               COERCION_ASSIGNMENT,
-                                                                                               COERCE_IMPLICIT_CAST);
-               if (defval == NULL)             /* should not happen */
-                       elog(ERROR, "failed to coerce base type to domain");
-       }
+               if (!defval && GetDomainConstraints(typeOid) != NIL)
+               {
+                       Oid                     baseTypeId;
+                       int32           baseTypeMod;
+
+                       baseTypeMod = typmod;
+                       baseTypeId = getBaseTypeAndTypmod(typeOid, &baseTypeMod);
+                       defval = (Expr *) makeNullConst(baseTypeId, baseTypeMod);
+                       defval = (Expr *) coerce_to_target_type(NULL,
+                                                                                                       (Node *) defval,
+                                                                                                       baseTypeId,
+                                                                                                       typeOid,
+                                                                                                       typmod,
+                                                                                                       COERCION_ASSIGNMENT,
+                                                                                                       COERCE_IMPLICIT_CAST,
+                                                                                                       -1);
+                       if (defval == NULL)             /* should not happen */
+                               elog(ERROR, "failed to coerce base type to domain");
+               }
 
-       if (defval)
-       {
-               NewColumnValue *newval;
+               if (defval)
+               {
+                       NewColumnValue *newval;
+
+                       newval = (NewColumnValue *) palloc0(sizeof(NewColumnValue));
+                       newval->attnum = attribute.attnum;
+                       newval->expr = defval;
 
-               newval = (NewColumnValue *) palloc0(sizeof(NewColumnValue));
-               newval->attnum = attribute->attnum;
-               newval->expr = defval;
+                       tab->newvals = lappend(tab->newvals, newval);
+               }
 
-               tab->newvals = lappend(tab->newvals, newval);
+               /*
+                * If the new column is NOT NULL, tell Phase 3 it needs to test that.
+                */
+               tab->new_notnull |= colDef->is_not_null;
        }
 
        /*
         * Add needed dependency entries for the new column.
         */
-       add_column_datatype_dependency(myrelid, i, attribute->atttypid);
+       add_column_datatype_dependency(myrelid, i, attribute.atttypid);
 }
 
 /*
@@ -3419,7 +3892,7 @@ ATExecColumnDefault(Relation rel, const char *colName,
                 * This function is intended for CREATE TABLE, so it processes a
                 * _list_ of defaults, but we just do one.
                 */
-               AddRelationRawConstraints(rel, list_make1(rawEnt), NIL);
+               AddRelationNewConstraints(rel, list_make1(rawEnt), NIL, false, true);
        }
 }
 
@@ -3469,9 +3942,9 @@ ATExecSetStatistics(Relation rel, const char *colName, Node *newValue)
                                 errmsg("statistics target %d is too low",
                                                newtarget)));
        }
-       else if (newtarget > 1000)
+       else if (newtarget > 10000)
        {
-               newtarget = 1000;
+               newtarget = 10000;
                ereport(WARNING,
                                (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
                                 errmsg("lowering statistics target to %d",
@@ -3654,12 +4127,7 @@ ATExecDropColumn(Relation rel, const char *colName,
                        Form_pg_attribute childatt;
 
                        childrel = heap_open(childrelid, AccessExclusiveLock);
-                       /* check for child relation in use in this session */
-                       if (childrel->rd_refcnt != 1)
-                               ereport(ERROR,
-                                               (errcode(ERRCODE_OBJECT_IN_USE),
-                                                errmsg("relation \"%s\" is being used by active queries in this session",
-                                                               RelationGetRelationName(childrel))));
+                       CheckTableNotInUse(childrel, "ALTER TABLE");
 
                        tuple = SearchSysCacheCopyAttName(childrelid, colName);
                        if (!HeapTupleIsValid(tuple))           /* shouldn't happen */
@@ -3701,7 +4169,7 @@ ATExecDropColumn(Relation rel, const char *colName,
                        {
                                /*
                                 * If we were told to drop ONLY in this table (no recursion),
-                                * we need to mark the inheritors' attribute as locally
+                                * we need to mark the inheritors' attributes as locally
                                 * defined rather than inherited.
                                 */
                                childatt->attinhcount--;
@@ -3808,7 +4276,8 @@ ATExecAddIndex(AlteredTableInfo *tab, Relation rel,
  * ALTER TABLE ADD CONSTRAINT
  */
 static void
-ATExecAddConstraint(AlteredTableInfo *tab, Relation rel, Node *newConstraint)
+ATExecAddConstraint(List **wqueue, AlteredTableInfo *tab, Relation rel,
+                                       Node *newConstraint, bool recurse)
 {
        switch (nodeTag(newConstraint))
        {
@@ -3819,40 +4288,15 @@ ATExecAddConstraint(AlteredTableInfo *tab, Relation rel, Node *newConstraint)
                                /*
                                 * Currently, we only expect to see CONSTR_CHECK nodes
                                 * arriving here (see the preprocessing done in
-                                * parse_utilcmd.c).  Use a switch anyway to make it easier
-                                * to add more code later.
+                                * parse_utilcmd.c).  Use a switch anyway to make it easier to
+                                * add more code later.
                                 */
                                switch (constr->contype)
                                {
                                        case CONSTR_CHECK:
-                                               {
-                                                       List       *newcons;
-                                                       ListCell   *lcon;
-
-                                                       /*
-                                                        * Call AddRelationRawConstraints to do the work.
-                                                        * It returns a list of cooked constraints.
-                                                        */
-                                                       newcons = AddRelationRawConstraints(rel, NIL,
-                                                                                                                list_make1(constr));
-                                                       /* Add each constraint to Phase 3's queue */
-                                                       foreach(lcon, newcons)
-                                                       {
-                                                               CookedConstraint *ccon = (CookedConstraint *) lfirst(lcon);
-                                                               NewConstraint *newcon;
-
-                                                               newcon = (NewConstraint *) palloc0(sizeof(NewConstraint));
-                                                               newcon->name = ccon->name;
-                                                               newcon->contype = ccon->contype;
-                                                               /* ExecQual wants implicit-AND format */
-                                                               newcon->qual = (Node *)
-                                                                       make_ands_implicit((Expr *) ccon->expr);
-
-                                                               tab->constraints = lappend(tab->constraints,
-                                                                                                                  newcon);
-                                                       }
-                                                       break;
-                                               }
+                                               ATAddCheckConstraint(wqueue, tab, rel,
+                                                                                        constr, recurse, false);
+                                               break;
                                        default:
                                                elog(ERROR, "unrecognized constraint type: %d",
                                                         (int) constr->contype);
@@ -3864,6 +4308,9 @@ ATExecAddConstraint(AlteredTableInfo *tab, Relation rel, Node *newConstraint)
                                FkConstraint *fkconstraint = (FkConstraint *) newConstraint;
 
                                /*
+                                * Note that we currently never recurse for FK constraints,
+                                * so the "recurse" flag is silently ignored.
+                                *
                                 * Assign or validate constraint name
                                 */
                                if (fkconstraint->constr_name)
@@ -3896,6 +4343,107 @@ ATExecAddConstraint(AlteredTableInfo *tab, Relation rel, Node *newConstraint)
        }
 }
 
+/*
+ * Add a check constraint to a single table and its children
+ *
+ * Subroutine for ATExecAddConstraint.
+ *
+ * We must recurse to child tables during execution, rather than using
+ * ALTER TABLE's normal prep-time recursion.  The reason is that all the
+ * constraints *must* be given the same name, else they won't be seen as
+ * related later.  If the user didn't explicitly specify a name, then
+ * AddRelationNewConstraints would normally assign different names to the
+ * child constraints.  To fix that, we must capture the name assigned at
+ * the parent table and pass that down.
+ */
+static void
+ATAddCheckConstraint(List **wqueue, AlteredTableInfo *tab, Relation rel,
+                                        Constraint *constr, bool recurse, bool recursing)
+{
+       List       *newcons;
+       ListCell   *lcon;
+       List       *children;
+       ListCell   *child;
+
+       /* At top level, permission check was done in ATPrepCmd, else do it */
+       if (recursing)
+               ATSimplePermissions(rel, false);
+
+       /*
+        * Call AddRelationNewConstraints to do the work, making sure it works on
+        * a copy of the Constraint so transformExpr can't modify the original.
+        * It returns a list of cooked constraints.
+        *
+        * If the constraint ends up getting merged with a pre-existing one, it's
+        * omitted from the returned list, which is what we want: we do not need
+        * to do any validation work.  That can only happen at child tables,
+        * though, since we disallow merging at the top level.
+        */
+       newcons = AddRelationNewConstraints(rel, NIL,
+                                                                               list_make1(copyObject(constr)),
+                                                                               recursing, !recursing);
+
+       /* Add each constraint to Phase 3's queue */
+       foreach(lcon, newcons)
+       {
+               CookedConstraint *ccon = (CookedConstraint *) lfirst(lcon);
+               NewConstraint *newcon;
+
+               newcon = (NewConstraint *) palloc0(sizeof(NewConstraint));
+               newcon->name = ccon->name;
+               newcon->contype = ccon->contype;
+               /* ExecQual wants implicit-AND format */
+               newcon->qual = (Node *) make_ands_implicit((Expr *) ccon->expr);
+
+               tab->constraints = lappend(tab->constraints, newcon);
+
+               /* Save the actually assigned name if it was defaulted */
+               if (constr->name == NULL)
+                       constr->name = ccon->name;
+       }
+
+       /* At this point we must have a locked-down name to use */
+       Assert(constr->name != NULL);
+
+       /* Advance command counter in case same table is visited multiple times */
+       CommandCounterIncrement();
+
+       /*
+        * Propagate to children as appropriate.  Unlike most other ALTER
+        * routines, we have to do this one level of recursion at a time; we can't
+        * use find_all_inheritors to do it in one pass.
+        */
+       children = find_inheritance_children(RelationGetRelid(rel));
+
+       /*
+        * If we are told not to recurse, there had better not be any child
+        * tables; else the addition would put them out of step.
+        */
+       if (children && !recurse)
+               ereport(ERROR,
+                               (errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+                                errmsg("constraint must be added to child tables too")));
+
+       foreach(child, children)
+       {
+               Oid                     childrelid = lfirst_oid(child);
+               Relation        childrel;
+               AlteredTableInfo *childtab;
+
+               childrel = heap_open(childrelid, AccessExclusiveLock);
+               CheckTableNotInUse(childrel, "ALTER TABLE");
+
+               /* Find or create work queue entry for this table */
+               childtab = ATGetQueueEntry(wqueue, childrel);
+
+               /* Recurse to child */
+               ATAddCheckConstraint(wqueue, childtab, childrel,
+                                                        constr, recurse, true);
+
+               heap_close(childrel, NoLock);
+       }
+}
+
 /*
  * Add a foreign-key constraint to a single table
  *
@@ -4030,7 +4578,7 @@ ATAddForeignKeyConstraint(AlteredTableInfo *tab, Relation rel,
         *
         * Note that we have to be careful about the difference between the actual
         * PK column type and the opclass' declared input type, which might be
-        * only binary-compatible with it.  The declared opcintype is the right
+        * only binary-compatible with it.      The declared opcintype is the right
         * thing to probe pg_amop with.
         */
        if (numfks != numpks)
@@ -4067,10 +4615,10 @@ ATAddForeignKeyConstraint(AlteredTableInfo *tab, Relation rel,
 
                /*
                 * Check it's a btree; currently this can never fail since no other
-                * index AMs support unique indexes.  If we ever did have other
-                * types of unique indexes, we'd need a way to determine which
-                * operator strategy number is equality.  (Is it reasonable to
-                * insist that every such index AM use btree's number for equality?)
+                * index AMs support unique indexes.  If we ever did have other types
+                * of unique indexes, we'd need a way to determine which operator
+                * strategy number is equality.  (Is it reasonable to insist that
+                * every such index AM use btree's number for equality?)
                 */
                if (amid != BTREE_AM_OID)
                        elog(ERROR, "only b-tree indexes are supported for foreign keys");
@@ -4088,8 +4636,8 @@ ATAddForeignKeyConstraint(AlteredTableInfo *tab, Relation rel,
                                 eqstrategy, opcintype, opcintype, opfamily);
 
                /*
-                * Are there equality operators that take exactly the FK type?
-                * Assume we should look through any domain here.
+                * Are there equality operators that take exactly the FK type? Assume
+                * we should look through any domain here.
                 */
                fktyped = getBaseType(fktype);
 
@@ -4099,21 +4647,21 @@ ATAddForeignKeyConstraint(AlteredTableInfo *tab, Relation rel,
                        ffeqop = get_opfamily_member(opfamily, fktyped, fktyped,
                                                                                 eqstrategy);
                else
-                       ffeqop = InvalidOid;                            /* keep compiler quiet */
+                       ffeqop = InvalidOid;    /* keep compiler quiet */
 
                if (!(OidIsValid(pfeqop) && OidIsValid(ffeqop)))
                {
                        /*
-                        * Otherwise, look for an implicit cast from the FK type to
-                        * the opcintype, and if found, use the primary equality operator.
-                        * This is a bit tricky because opcintype might be a generic type
-                        * such as ANYARRAY, and so what we have to test is whether the
-                        * two actual column types can be concurrently cast to that type.
-                        * (Otherwise, we'd fail to reject combinations such as int[] and
-                        * point[].)
+                        * Otherwise, look for an implicit cast from the FK type to the
+                        * opcintype, and if found, use the primary equality operator.
+                        * This is a bit tricky because opcintype might be a polymorphic
+                        * type such as ANYARRAY or ANYENUM; so what we have to test is
+                        * whether the two actual column types can be concurrently cast to
+                        * that type.  (Otherwise, we'd fail to reject combinations such
+                        * as int[] and point[].)
                         */
-                       Oid             input_typeids[2];
-                       Oid             target_typeids[2];
+                       Oid                     input_typeids[2];
+                       Oid                     target_typeids[2];
 
                        input_typeids[0] = pktype;
                        input_typeids[1] = fktype;
@@ -4167,7 +4715,9 @@ ATAddForeignKeyConstraint(AlteredTableInfo *tab, Relation rel,
                                                                          indexOid,
                                                                          NULL,         /* no check constraint */
                                                                          NULL,
-                                                                         NULL);
+                                                                         NULL,
+                                                                         true, /* islocal */
+                                                                         0); /* inhcount */
 
        /*
         * Create the triggers that will enforce the constraint.
@@ -4568,7 +5118,8 @@ createForeignKeyTriggers(Relation rel, FkConstraint *fkconstraint,
         * Reconstruct a RangeVar for my relation (not passed in, unfortunately).
         */
        myRel = makeRangeVar(get_namespace_name(RelationGetNamespace(rel)),
-                                                pstrdup(RelationGetRelationName(rel)));
+                                                pstrdup(RelationGetRelationName(rel)),
+                                                -1);
 
        /* Make changes-so-far visible */
        CommandCounterIncrement();
@@ -4685,46 +5236,186 @@ createForeignKeyTriggers(Relation rel, FkConstraint *fkconstraint,
 
 /*
  * ALTER TABLE DROP CONSTRAINT
+ *
+ * Like DROP COLUMN, we can't use the normal ALTER TABLE recursion mechanism.
  */
 static void
-ATPrepDropConstraint(List **wqueue, Relation rel,
-                                        bool recurse, AlterTableCmd *cmd)
+ATExecDropConstraint(Relation rel, const char *constrName,
+                                        DropBehavior behavior,
+                                        bool recurse, bool recursing)
 {
+       List       *children;
+       ListCell   *child;
+       Relation        conrel;
+       Form_pg_constraint con;
+       SysScanDesc scan;
+       ScanKeyData key;
+       HeapTuple       tuple;
+       bool            found = false;
+       bool            is_check_constraint = false;
+
+       /* At top level, permission check was done in ATPrepCmd, else do it */
+       if (recursing)
+               ATSimplePermissions(rel, false);
+
+       conrel = heap_open(ConstraintRelationId, RowExclusiveLock);
+
        /*
-        * We don't want errors or noise from child tables, so we have to pass
-        * down a modified command.
+        * Find and drop the target constraint
+        */
+       ScanKeyInit(&key,
+                               Anum_pg_constraint_conrelid,
+                               BTEqualStrategyNumber, F_OIDEQ,
+                               ObjectIdGetDatum(RelationGetRelid(rel)));
+       scan = systable_beginscan(conrel, ConstraintRelidIndexId,
+                                                         true, SnapshotNow, 1, &key);
+
+       while (HeapTupleIsValid(tuple = systable_getnext(scan)))
+       {
+               ObjectAddress conobj;
+
+               con = (Form_pg_constraint) GETSTRUCT(tuple);
+
+               if (strcmp(NameStr(con->conname), constrName) != 0)
+                       continue;
+
+               /* Don't drop inherited constraints */
+               if (con->coninhcount > 0 && !recursing)
+                       ereport(ERROR,
+                               (errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+                                errmsg("cannot drop inherited constraint \"%s\" of relation \"%s\"",
+                                               constrName, RelationGetRelationName(rel))));
+
+               /* Right now only CHECK constraints can be inherited */
+               if (con->contype == CONSTRAINT_CHECK)
+                       is_check_constraint = true;
+
+               /*
+                * Perform the actual constraint deletion
+                */
+               conobj.classId = ConstraintRelationId;
+               conobj.objectId = HeapTupleGetOid(tuple);
+               conobj.objectSubId = 0;
+
+               performDeletion(&conobj, behavior);
+
+               found = true;
+       }
+
+       systable_endscan(scan);
+
+       if (!found)
+               ereport(ERROR,
+                               (errcode(ERRCODE_UNDEFINED_OBJECT),
+                                errmsg("constraint \"%s\" of relation \"%s\" does not exist",
+                                               constrName, RelationGetRelationName(rel))));
+
+       /*
+        * Propagate to children as appropriate.  Unlike most other ALTER
+        * routines, we have to do this one level of recursion at a time; we can't
+        * use find_all_inheritors to do it in one pass.
         */
-       if (recurse)
+       if (is_check_constraint)
+               children = find_inheritance_children(RelationGetRelid(rel));
+       else
+               children = NIL;
+
+       foreach(child, children)
        {
-               AlterTableCmd *childCmd = copyObject(cmd);
+               Oid                     childrelid = lfirst_oid(child);
+               Relation        childrel;
 
-               childCmd->subtype = AT_DropConstraintQuietly;
-               ATSimpleRecursion(wqueue, rel, childCmd, recurse);
-       }
-}
+               childrel = heap_open(childrelid, AccessExclusiveLock);
+               CheckTableNotInUse(childrel, "ALTER TABLE");
 
-static void
-ATExecDropConstraint(Relation rel, const char *constrName,
-                                        DropBehavior behavior, bool quiet)
-{
-       int                     deleted;
+               ScanKeyInit(&key,
+                                       Anum_pg_constraint_conrelid,
+                                       BTEqualStrategyNumber, F_OIDEQ,
+                                       ObjectIdGetDatum(childrelid));
+               scan = systable_beginscan(conrel, ConstraintRelidIndexId,
+                                                                 true, SnapshotNow, 1, &key);
 
-       deleted = RemoveRelConstraints(rel, constrName, behavior);
+               found = false;
 
-       if (!quiet)
-       {
-               /* If zero constraints deleted, complain */
-               if (deleted == 0)
+               while (HeapTupleIsValid(tuple = systable_getnext(scan)))
+               {
+                       HeapTuple copy_tuple;
+
+                       con = (Form_pg_constraint) GETSTRUCT(tuple);
+
+                       /* Right now only CHECK constraints can be inherited */
+                       if (con->contype != CONSTRAINT_CHECK)
+                               continue;
+
+                       if (strcmp(NameStr(con->conname), constrName) != 0)
+                               continue;
+
+                       found = true;
+
+                       if (con->coninhcount <= 0)              /* shouldn't happen */
+                               elog(ERROR, "relation %u has non-inherited constraint \"%s\"",
+                                        childrelid, constrName);
+
+                       copy_tuple = heap_copytuple(tuple);
+                       con = (Form_pg_constraint) GETSTRUCT(copy_tuple);
+
+                       if (recurse)
+                       {
+                               /*
+                                * If the child constraint has other definition sources,
+                                * just decrement its inheritance count; if not, recurse
+                                * to delete it.
+                                */
+                               if (con->coninhcount == 1 && !con->conislocal)
+                               {
+                                       /* Time to delete this child constraint, too */
+                                       ATExecDropConstraint(childrel, constrName, behavior,
+                                                                                true, true);
+                               }
+                               else
+                               {
+                                       /* Child constraint must survive my deletion */
+                                       con->coninhcount--;
+                                       simple_heap_update(conrel, &copy_tuple->t_self, copy_tuple);
+                                       CatalogUpdateIndexes(conrel, copy_tuple);
+
+                                       /* Make update visible */
+                                       CommandCounterIncrement();
+                               }
+                       }
+                       else
+                       {
+                               /*
+                                * If we were told to drop ONLY in this table (no
+                                * recursion), we need to mark the inheritors' constraints
+                                * as locally defined rather than inherited.
+                                */
+                               con->coninhcount--;
+                               con->conislocal = true;
+
+                               simple_heap_update(conrel, &copy_tuple->t_self, copy_tuple);
+                               CatalogUpdateIndexes(conrel, copy_tuple);
+
+                               /* Make update visible */
+                               CommandCounterIncrement();
+                       }
+
+                       heap_freetuple(copy_tuple);
+               }
+
+               systable_endscan(scan);
+
+               if (!found)
                        ereport(ERROR,
                                        (errcode(ERRCODE_UNDEFINED_OBJECT),
-                                        errmsg("constraint \"%s\" does not exist",
-                                                       constrName)));
-               /* Otherwise if more than one constraint deleted, notify */
-               else if (deleted > 1)
-                       ereport(NOTICE,
-                                       (errmsg("multiple constraints named \"%s\" were dropped",
-                                                       constrName)));
+                                        errmsg("constraint \"%s\" of relation \"%s\" does not exist",
+                                                       constrName,
+                                                       RelationGetRelationName(childrel))));
+
+               heap_close(childrel, NoLock);
        }
+
+       heap_close(conrel, RowExclusiveLock);
 }
 
 /*
@@ -4772,8 +5463,7 @@ ATPrepAlterColumnType(List **wqueue,
                                                colName)));
 
        /* Look up the target type */
-       targettype = typenameTypeId(NULL, typename);
-       targettypmod = typenameTypeMod(NULL, typename, targettype);
+       targettype = typenameTypeId(NULL, typename, &targettypmod);
 
        /* make sure datatype is legal for a column */
        CheckAttributeType(colName, targettype);
@@ -4827,12 +5517,13 @@ ATPrepAlterColumnType(List **wqueue,
                                                                          transform, exprType(transform),
                                                                          targettype, targettypmod,
                                                                          COERCION_ASSIGNMENT,
-                                                                         COERCE_IMPLICIT_CAST);
+                                                                         COERCE_IMPLICIT_CAST,
+                                                                         -1);
        if (transform == NULL)
                ereport(ERROR,
                                (errcode(ERRCODE_DATATYPE_MISMATCH),
-                                errmsg("column \"%s\" cannot be cast to type \"%s\"",
-                                               colName, TypeNameToString(typename))));
+                                errmsg("column \"%s\" cannot be cast to type %s",
+                                               colName, format_type_be(targettype))));
 
        /*
         * Add a work queue item to make ATRewriteTable update the column
@@ -4900,10 +5591,9 @@ ATExecAlterColumnType(AlteredTableInfo *tab, Relation rel,
                                                colName)));
 
        /* Look up the target type (should not fail, since prep found it) */
-       typeTuple = typenameType(NULL, typename);
+       typeTuple = typenameType(NULL, typename, &targettypmod);
        tform = (Form_pg_type) GETSTRUCT(typeTuple);
        targettype = HeapTupleGetOid(typeTuple);
-       targettypmod = typenameTypeMod(NULL, typename, targettype);
 
        /*
         * If there is a default expression for the column, get it and ensure we
@@ -4926,12 +5616,13 @@ ATExecAlterColumnType(AlteredTableInfo *tab, Relation rel,
                                                                                  defaultexpr, exprType(defaultexpr),
                                                                                        targettype, targettypmod,
                                                                                        COERCION_ASSIGNMENT,
-                                                                                       COERCE_IMPLICIT_CAST);
+                                                                                       COERCE_IMPLICIT_CAST,
+                                                                                       -1);
                if (defaultexpr == NULL)
                        ereport(ERROR,
                                        (errcode(ERRCODE_DATATYPE_MISMATCH),
-                       errmsg("default for column \"%s\" cannot be cast to type \"%s\"",
-                                  colName, TypeNameToString(typename))));
+                       errmsg("default for column \"%s\" cannot be cast to type %s",
+                                  colName, format_type_be(targettype))));
        }
        else
                defaultexpr = NULL;
@@ -5078,8 +5769,13 @@ ATExecAlterColumnType(AlteredTableInfo *tab, Relation rel,
                        case OCLASS_LANGUAGE:
                        case OCLASS_OPERATOR:
                        case OCLASS_OPCLASS:
+                       case OCLASS_OPFAMILY:
                        case OCLASS_TRIGGER:
                        case OCLASS_SCHEMA:
+                       case OCLASS_TSPARSER:
+                       case OCLASS_TSDICT:
+                       case OCLASS_TSTEMPLATE:
+                       case OCLASS_TSCONFIG:
 
                                /*
                                 * We don't expect any of these sorts of objects to depend on
@@ -5183,7 +5879,7 @@ ATExecAlterColumnType(AlteredTableInfo *tab, Relation rel,
                 */
                RemoveAttrDefault(RelationGetRelid(rel), attnum, DROP_RESTRICT, true);
 
-               StoreAttrDefault(rel, attnum, nodeToString(defaultexpr));
+               StoreAttrDefault(rel, attnum, defaultexpr);
        }
 
        /* Cleanup */
@@ -5252,10 +5948,10 @@ ATPostAlterTypeParse(char *cmd, List **wqueue)
        ListCell   *list_item;
 
        /*
-        * We expect that we will get only ALTER TABLE and CREATE INDEX statements.
-        * Hence, there is no need to pass them through parse_analyze() or the
-        * rewriter, but instead we need to pass them through parse_utilcmd.c
-        * to make them ready for execution.
+        * We expect that we will get only ALTER TABLE and CREATE INDEX
+        * statements. Hence, there is no need to pass them through
+        * parse_analyze() or the rewriter, but instead we need to pass them
+        * through parse_utilcmd.c to make them ready for execution.
         */
        raw_parsetree_list = raw_parser(cmd);
        querytree_list = NIL;
@@ -5269,8 +5965,8 @@ ATPostAlterTypeParse(char *cmd, List **wqueue)
                                                                                                                cmd));
                else if (IsA(stmt, AlterTableStmt))
                        querytree_list = list_concat(querytree_list,
-                                                       transformAlterTableStmt((AlterTableStmt *) stmt,
-                                                                                                       cmd));
+                                                        transformAlterTableStmt((AlterTableStmt *) stmt,
+                                                                                                        cmd));
                else
                        querytree_list = lappend(querytree_list, stmt);
        }
@@ -5421,8 +6117,16 @@ ATExecChangeOwner(Oid relationOid, Oid newOwnerId, bool recursing)
                                                                get_rel_name(tableId))));
                        }
                        break;
-               case RELKIND_TOASTVALUE:
                case RELKIND_COMPOSITE_TYPE:
+                       if (recursing)
+                               break;
+                       ereport(ERROR,
+                                       (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+                                        errmsg("\"%s\" is a composite type",
+                                                       NameStr(tuple_class->relname)),
+                                        errhint("Use ALTER TYPE instead.")));
+                       break;
+               case RELKIND_TOASTVALUE:
                        if (recursing)
                                break;
                        /* FALL THRU */
@@ -5440,8 +6144,8 @@ ATExecChangeOwner(Oid relationOid, Oid newOwnerId, bool recursing)
        if (tuple_class->relowner != newOwnerId)
        {
                Datum           repl_val[Natts_pg_class];
-               char            repl_null[Natts_pg_class];
-               char            repl_repl[Natts_pg_class];
+               bool            repl_null[Natts_pg_class];
+               bool            repl_repl[Natts_pg_class];
                Acl                *newAcl;
                Datum           aclDatum;
                bool            isNull;
@@ -5473,10 +6177,10 @@ ATExecChangeOwner(Oid relationOid, Oid newOwnerId, bool recursing)
                        }
                }
 
-               memset(repl_null, ' ', sizeof(repl_null));
-               memset(repl_repl, ' ', sizeof(repl_repl));
+               memset(repl_null, false, sizeof(repl_null));
+               memset(repl_repl, false, sizeof(repl_repl));
 
-               repl_repl[Anum_pg_class_relowner - 1] = 'r';
+               repl_repl[Anum_pg_class_relowner - 1] = true;
                repl_val[Anum_pg_class_relowner - 1] = ObjectIdGetDatum(newOwnerId);
 
                /*
@@ -5490,11 +6194,11 @@ ATExecChangeOwner(Oid relationOid, Oid newOwnerId, bool recursing)
                {
                        newAcl = aclnewowner(DatumGetAclP(aclDatum),
                                                                 tuple_class->relowner, newOwnerId);
-                       repl_repl[Anum_pg_class_relacl - 1] = 'r';
+                       repl_repl[Anum_pg_class_relacl - 1] = true;
                        repl_val[Anum_pg_class_relacl - 1] = PointerGetDatum(newAcl);
                }
 
-               newtuple = heap_modifytuple(tuple, RelationGetDescr(class_rel), repl_val, repl_null, repl_repl);
+               newtuple = heap_modify_tuple(tuple, RelationGetDescr(class_rel), repl_val, repl_null, repl_repl);
 
                simple_heap_update(class_rel, &newtuple->t_self, newtuple);
                CatalogUpdateIndexes(class_rel, newtuple);
@@ -5517,7 +6221,7 @@ ATExecChangeOwner(Oid relationOid, Oid newOwnerId, bool recursing)
                 */
                if (tuple_class->relkind != RELKIND_INDEX)
                        AlterTypeOwnerInternal(tuple_class->reltype, newOwnerId,
-                                                       tuple_class->relkind == RELKIND_COMPOSITE_TYPE);
+                                                        tuple_class->relkind == RELKIND_COMPOSITE_TYPE);
 
                /*
                 * If we are operating on a table, also change the ownership of any
@@ -5706,8 +6410,8 @@ ATExecSetRelOptions(Relation rel, List *defList, bool isReset)
        bool            isnull;
        Datum           newOptions;
        Datum           repl_val[Natts_pg_class];
-       char            repl_null[Natts_pg_class];
-       char            repl_repl[Natts_pg_class];
+       bool            repl_null[Natts_pg_class];
+       bool            repl_repl[Natts_pg_class];
 
        if (defList == NIL)
                return;                                 /* nothing to do */
@@ -5751,17 +6455,17 @@ ATExecSetRelOptions(Relation rel, List *defList, bool isReset)
         * propagated into relcaches during post-commit cache inval.
         */
        memset(repl_val, 0, sizeof(repl_val));
-       memset(repl_null, ' ', sizeof(repl_null));
-       memset(repl_repl, ' ', sizeof(repl_repl));
+       memset(repl_null, false, sizeof(repl_null));
+       memset(repl_repl, false, sizeof(repl_repl));
 
        if (newOptions != (Datum) 0)
                repl_val[Anum_pg_class_reloptions - 1] = newOptions;
        else
-               repl_null[Anum_pg_class_reloptions - 1] = 'n';
+               repl_null[Anum_pg_class_reloptions - 1] = true;
 
-       repl_repl[Anum_pg_class_reloptions - 1] = 'r';
+       repl_repl[Anum_pg_class_reloptions - 1] = true;
 
-       newtuple = heap_modifytuple(tuple, RelationGetDescr(pgclass),
+       newtuple = heap_modify_tuple(tuple, RelationGetDescr(pgclass),
                                                                repl_val, repl_null, repl_repl);
 
        simple_heap_update(pgclass, &newtuple->t_self, newtuple);
@@ -5786,11 +6490,13 @@ ATExecSetTableSpace(Oid tableOid, Oid newTableSpace)
        Oid                     oldTableSpace;
        Oid                     reltoastrelid;
        Oid                     reltoastidxid;
+       Oid                     newrelfilenode;
        RelFileNode newrnode;
        SMgrRelation dstrel;
        Relation        pg_class;
        HeapTuple       tuple;
        Form_pg_class rd_rel;
+       ForkNumber      forkNum;
 
        /*
         * Need lock here in case we are recursing to toast table or index
@@ -5807,6 +6513,12 @@ ATExecSetTableSpace(Oid tableOid, Oid newTableSpace)
                                 errmsg("cannot move system relation \"%s\"",
                                                RelationGetRelationName(rel))));
 
+       /* Can't move a non-shared relation into pg_global */
+       if (newTableSpace == GLOBALTABLESPACE_OID)
+               ereport(ERROR,
+                               (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+                                errmsg("only shared relations can be placed in pg_global tablespace")));
+
        /*
         * Don't allow moving temp tables of other backends ... their local buffer
         * manager is not going to cope.
@@ -5840,29 +6552,59 @@ ATExecSetTableSpace(Oid tableOid, Oid newTableSpace)
                elog(ERROR, "cache lookup failed for relation %u", tableOid);
        rd_rel = (Form_pg_class) GETSTRUCT(tuple);
 
-       /* create another storage file. Is it a little ugly ? */
-       /* NOTE: any conflict in relfilenode value will be caught here */
+       /*
+        * Since we copy the file directly without looking at the shared buffers,
+        * we'd better first flush out any pages of the source relation that are
+        * in shared buffers.  We assume no new changes will be made while we are
+        * holding exclusive lock on the rel.
+        */
+       FlushRelationBuffers(rel);
+
+       /*
+        * Relfilenodes are not unique across tablespaces, so we need to allocate
+        * a new one in the new tablespace.
+        */
+       newrelfilenode = GetNewRelFileNode(newTableSpace,
+                                                                          rel->rd_rel->relisshared,
+                                                                          NULL);
+
+       /* Open old and new relation */
        newrnode = rel->rd_node;
+       newrnode.relNode = newrelfilenode;
        newrnode.spcNode = newTableSpace;
-
        dstrel = smgropen(newrnode);
-       smgrcreate(dstrel, rel->rd_istemp, false);
-
-       /* copy relation data to the new physical file */
-       copy_relation_data(rel, dstrel);
 
-       /* schedule unlinking old physical file */
        RelationOpenSmgr(rel);
-       smgrscheduleunlink(rel->rd_smgr, rel->rd_istemp);
 
        /*
-        * Now drop smgr references.  The source was already dropped by
-        * smgrscheduleunlink.
+        * Create and copy all forks of the relation, and schedule unlinking
+        * of old physical files.
+        *
+        * NOTE: any conflict in relfilenode value will be caught in
+        *               RelationCreateStorage().
         */
+       RelationCreateStorage(newrnode, rel->rd_istemp);
+
+       /* copy main fork */
+       copy_relation_data(rel->rd_smgr, dstrel, MAIN_FORKNUM, rel->rd_istemp);
+
+       /* copy those extra forks that exist */
+       for (forkNum = MAIN_FORKNUM + 1; forkNum <= MAX_FORKNUM; forkNum++)
+       {
+               if (smgrexists(rel->rd_smgr, forkNum))
+               {
+                       smgrcreate(dstrel, forkNum, false);
+                       copy_relation_data(rel->rd_smgr, dstrel, forkNum, rel->rd_istemp);
+               }
+       }
+
+       /* drop old relation, and close new one */
+       RelationDropStorage(rel);
        smgrclose(dstrel);
 
        /* update the pg_class row */
        rd_rel->reltablespace = (newTableSpace == MyDatabaseTableSpace) ? InvalidOid : newTableSpace;
+       rd_rel->relfilenode = newrelfilenode;
        simple_heap_update(pg_class, &tuple->t_self, tuple);
        CatalogUpdateIndexes(pg_class, tuple);
 
@@ -5886,47 +6628,37 @@ ATExecSetTableSpace(Oid tableOid, Oid newTableSpace)
  * Copy data, block by block
  */
 static void
-copy_relation_data(Relation rel, SMgrRelation dst)
+copy_relation_data(SMgrRelation src, SMgrRelation dst,
+                                  ForkNumber forkNum, bool istemp)
 {
-       SMgrRelation src;
        bool            use_wal;
        BlockNumber nblocks;
        BlockNumber blkno;
        char            buf[BLCKSZ];
        Page            page = (Page) buf;
 
-       /*
-        * Since we copy the file directly without looking at the shared buffers,
-        * we'd better first flush out any pages of the source relation that are
-        * in shared buffers.  We assume no new changes will be made while we are
-        * holding exclusive lock on the rel.
-        */
-       FlushRelationBuffers(rel);
-
        /*
         * We need to log the copied data in WAL iff WAL archiving is enabled AND
         * it's not a temp rel.
         */
-       use_wal = XLogArchivingActive() && !rel->rd_istemp;
+       use_wal = XLogArchivingActive() && !istemp;
 
-       nblocks = RelationGetNumberOfBlocks(rel);
-       /* RelationGetNumberOfBlocks will certainly have opened rd_smgr */
-       src = rel->rd_smgr;
+       nblocks = smgrnblocks(src, forkNum);
 
        for (blkno = 0; blkno < nblocks; blkno++)
        {
-               smgrread(src, blkno, buf);
+               smgrread(src, forkNum, blkno, buf);
 
                /* XLOG stuff */
                if (use_wal)
-                       log_newpage(&dst->smgr_rnode, blkno, page);
+                       log_newpage(&dst->smgr_rnode, forkNum, blkno, page);
 
                /*
                 * Now write the page.  We say isTemp = true even if it's not a temp
                 * rel, because there's no need for smgr to schedule an fsync for this
                 * write; we'll do it ourselves below.
                 */
-               smgrextend(dst, blkno, buf, true);
+               smgrextend(dst, forkNum, blkno, buf, true);
        }
 
        /*
@@ -5943,8 +6675,8 @@ copy_relation_data(Relation rel, SMgrRelation dst)
         * wouldn't replay our earlier WAL entries. If we do not fsync those pages
         * here, they might still not be on disk when the crash occurs.
         */
-       if (!rel->rd_istemp)
-               smgrimmedsync(dst);
+       if (!istemp)
+               smgrimmedsync(dst, forkNum);
 }
 
 /*
@@ -5966,7 +6698,7 @@ ATExecEnableDisableTrigger(Relation rel, char *trigname,
  */
 static void
 ATExecEnableDisableRule(Relation rel, char *trigname,
-                                                  char fires_when)
+                                               char fires_when)
 {
        EnableDisableRule(rel, trigname, fires_when);
 }
@@ -6034,8 +6766,8 @@ ATExecAddInherit(Relation child_rel, RangeVar *parent)
                if (inh->inhparent == RelationGetRelid(parent_rel))
                        ereport(ERROR,
                                        (errcode(ERRCODE_DUPLICATE_TABLE),
-                                        errmsg("relation \"%s\" would be inherited from more than once",
-                                                       RelationGetRelationName(parent_rel))));
+                        errmsg("relation \"%s\" would be inherited from more than once",
+                                       RelationGetRelationName(parent_rel))));
                if (inh->inhseqno > inhseqno)
                        inhseqno = inh->inhseqno;
        }
@@ -6046,12 +6778,12 @@ ATExecAddInherit(Relation child_rel, RangeVar *parent)
         * (In particular, this disallows making a rel inherit from itself.)
         *
         * This is not completely bulletproof because of race conditions: in
-        * multi-level inheritance trees, someone else could concurrently
-        * be making another inheritance link that closes the loop but does
-        * not join either of the rels we have locked.  Preventing that seems
-        * to require exclusive locks on the entire inheritance tree, which is
-        * a cure worse than the disease.  find_all_inheritors() will cope with
-        * circularity anyway, so don't sweat it too much.
+        * multi-level inheritance trees, someone else could concurrently be
+        * making another inheritance link that closes the loop but does not join
+        * either of the rels we have locked.  Preventing that seems to require
+        * exclusive locks on the entire inheritance tree, which is a cure worse
+        * than the disease.  find_all_inheritors() will cope with circularity
+        * anyway, so don't sweat it too much.
         */
        children = find_all_inheritors(RelationGetRelid(child_rel));
 
@@ -6071,14 +6803,14 @@ ATExecAddInherit(Relation child_rel, RangeVar *parent)
                                                RelationGetRelationName(child_rel),
                                                RelationGetRelationName(parent_rel))));
 
-       /* Match up the columns and bump attinhcount and attislocal */
+       /* Match up the columns and bump attinhcount as needed */
        MergeAttributesIntoExisting(child_rel, parent_rel);
 
-       /* Match up the constraints and make sure they're present in child */
+       /* Match up the constraints and bump coninhcount as needed */
        MergeConstraintsIntoExisting(child_rel, parent_rel);
 
        /*
-        * OK, it looks valid.  Make the catalog entries that show inheritance.
+        * OK, it looks valid.  Make the catalog entries that show inheritance.
         */
        StoreCatalogInheritance1(RelationGetRelid(child_rel),
                                                         RelationGetRelid(parent_rel),
@@ -6111,7 +6843,29 @@ decompile_conbin(HeapTuple contup, TupleDesc tupdesc)
 
        expr = DirectFunctionCall2(pg_get_expr, attr,
                                                           ObjectIdGetDatum(con->conrelid));
-       return DatumGetCString(DirectFunctionCall1(textout, expr));
+       return TextDatumGetCString(expr);
+}
+
+/*
+ * Determine whether two check constraints are functionally equivalent
+ *
+ * The test we apply is to see whether they reverse-compile to the same
+ * source string.  This insulates us from issues like whether attributes
+ * have the same physical column numbers in parent and child relations.
+ */
+static bool
+constraints_equivalent(HeapTuple a, HeapTuple b, TupleDesc tupleDesc)
+{
+       Form_pg_constraint acon = (Form_pg_constraint) GETSTRUCT(a);
+       Form_pg_constraint bcon = (Form_pg_constraint) GETSTRUCT(b);
+
+       if (acon->condeferrable != bcon->condeferrable ||
+               acon->condeferred != bcon->condeferred ||
+               strcmp(decompile_conbin(a, tupleDesc),
+                          decompile_conbin(b, tupleDesc)) != 0)
+               return false;
+       else
+               return true;
 }
 
 /*
@@ -6172,8 +6926,8 @@ MergeAttributesIntoExisting(Relation child_rel, Relation parent_rel)
                        if (attribute->attnotnull && !childatt->attnotnull)
                                ereport(ERROR,
                                                (errcode(ERRCODE_DATATYPE_MISMATCH),
-                                         errmsg("column \"%s\" in child table must be marked NOT NULL",
-                                                        attributeName)));
+                               errmsg("column \"%s\" in child table must be marked NOT NULL",
+                                          attributeName)));
 
                        /*
                         * OK, bump the child column's inheritance count.  (If we fail
@@ -6197,7 +6951,8 @@ MergeAttributesIntoExisting(Relation child_rel, Relation parent_rel)
 }
 
 /*
- * Check constraints in child table match up with constraints in parent
+ * Check constraints in child table match up with constraints in parent,
+ * and increment their coninhcount.
  *
  * Called by ATExecAddInherit
  *
@@ -6215,91 +6970,87 @@ MergeAttributesIntoExisting(Relation child_rel, Relation parent_rel)
 static void
 MergeConstraintsIntoExisting(Relation child_rel, Relation parent_rel)
 {
-       Relation        catalogRelation;
-       TupleDesc       tupleDesc;
-       SysScanDesc scan;
-       ScanKeyData key;
-       HeapTuple       constraintTuple;
-       ListCell   *elem;
-       List       *constraints;
+       Relation        catalog_relation;
+       TupleDesc       tuple_desc;
+       SysScanDesc parent_scan;
+       ScanKeyData parent_key;
+       HeapTuple       parent_tuple;
 
-       /* First gather up the child's constraint definitions */
-       catalogRelation = heap_open(ConstraintRelationId, AccessShareLock);
-       tupleDesc = RelationGetDescr(catalogRelation);
+       catalog_relation = heap_open(ConstraintRelationId, RowExclusiveLock);
+       tuple_desc = RelationGetDescr(catalog_relation);
 
-       ScanKeyInit(&key,
+       /* Outer loop scans through the parent's constraint definitions */
+       ScanKeyInit(&parent_key,
                                Anum_pg_constraint_conrelid,
                                BTEqualStrategyNumber, F_OIDEQ,
-                               ObjectIdGetDatum(RelationGetRelid(child_rel)));
-       scan = systable_beginscan(catalogRelation, ConstraintRelidIndexId,
-                                                         true, SnapshotNow, 1, &key);
+                               ObjectIdGetDatum(RelationGetRelid(parent_rel)));
+       parent_scan = systable_beginscan(catalog_relation, ConstraintRelidIndexId,
+                                                                        true, SnapshotNow, 1, &parent_key);
 
-       constraints = NIL;
-       while (HeapTupleIsValid(constraintTuple = systable_getnext(scan)))
+       while (HeapTupleIsValid(parent_tuple = systable_getnext(parent_scan)))
        {
-               Form_pg_constraint con = (Form_pg_constraint) GETSTRUCT(constraintTuple);
+               Form_pg_constraint      parent_con = (Form_pg_constraint) GETSTRUCT(parent_tuple);
+               SysScanDesc                     child_scan;
+               ScanKeyData                     child_key;
+               HeapTuple                       child_tuple;
+               bool                            found = false;
 
-               if (con->contype != CONSTRAINT_CHECK)
+               if (parent_con->contype != CONSTRAINT_CHECK)
                        continue;
 
-               constraints = lappend(constraints, heap_copytuple(constraintTuple));
-       }
+               /* Search for a child constraint matching this one */
+               ScanKeyInit(&child_key,
+                                       Anum_pg_constraint_conrelid,
+                                       BTEqualStrategyNumber, F_OIDEQ,
+                                       ObjectIdGetDatum(RelationGetRelid(child_rel)));
+               child_scan = systable_beginscan(catalog_relation, ConstraintRelidIndexId,
+                                                                               true, SnapshotNow, 1, &child_key);
 
-       systable_endscan(scan);
+               while (HeapTupleIsValid(child_tuple = systable_getnext(child_scan)))
+               {
+                       Form_pg_constraint      child_con = (Form_pg_constraint) GETSTRUCT(child_tuple);
+                       HeapTuple child_copy;
 
-       /* Then scan through the parent's constraints looking for matches */
-       ScanKeyInit(&key,
-                               Anum_pg_constraint_conrelid,
-                               BTEqualStrategyNumber, F_OIDEQ,
-                               ObjectIdGetDatum(RelationGetRelid(parent_rel)));
-       scan = systable_beginscan(catalogRelation, ConstraintRelidIndexId, true,
-                                                         SnapshotNow, 1, &key);
+                       if (child_con->contype != CONSTRAINT_CHECK)
+                               continue;
 
-       while (HeapTupleIsValid(constraintTuple = systable_getnext(scan)))
-       {
-               Form_pg_constraint parent_con = (Form_pg_constraint) GETSTRUCT(constraintTuple);
-               bool            found = false;
-               Form_pg_constraint child_con = NULL;
-               HeapTuple       child_contuple = NULL;
+                       if (strcmp(NameStr(parent_con->conname),
+                                          NameStr(child_con->conname)) != 0)
+                               continue;
 
-               if (parent_con->contype != CONSTRAINT_CHECK)
-                       continue;
+                       if (!constraints_equivalent(parent_tuple, child_tuple, tuple_desc))
+                               ereport(ERROR,
+                                               (errcode(ERRCODE_DATATYPE_MISMATCH),
+                                                errmsg("child table \"%s\" has different definition for check constraint \"%s\"",
+                                                               RelationGetRelationName(child_rel),
+                                                               NameStr(parent_con->conname))));
 
-               foreach(elem, constraints)
-               {
-                       child_contuple = (HeapTuple) lfirst(elem);
-                       child_con = (Form_pg_constraint) GETSTRUCT(child_contuple);
-                       if (strcmp(NameStr(parent_con->conname),
-                                          NameStr(child_con->conname)) == 0)
-                       {
-                               found = true;
-                               break;
-                       }
+                       /*
+                        * OK, bump the child constraint's inheritance count.  (If we fail
+                        * later on, this change will just roll back.)
+                        */
+                       child_copy = heap_copytuple(child_tuple);
+                       child_con = (Form_pg_constraint) GETSTRUCT(child_copy);
+                       child_con->coninhcount++;
+                       simple_heap_update(catalog_relation, &child_copy->t_self, child_copy);
+                       CatalogUpdateIndexes(catalog_relation, child_copy);
+                       heap_freetuple(child_copy);
+
+                       found = true;
+                       break;
                }
 
+               systable_endscan(child_scan);
+
                if (!found)
                        ereport(ERROR,
                                        (errcode(ERRCODE_DATATYPE_MISMATCH),
                                         errmsg("child table is missing constraint \"%s\"",
                                                        NameStr(parent_con->conname))));
-
-               if (parent_con->condeferrable != child_con->condeferrable ||
-                       parent_con->condeferred != child_con->condeferred ||
-                       strcmp(decompile_conbin(constraintTuple, tupleDesc),
-                                  decompile_conbin(child_contuple, tupleDesc)) != 0)
-                       ereport(ERROR,
-                                       (errcode(ERRCODE_DATATYPE_MISMATCH),
-                                        errmsg("constraint definition for check constraint \"%s\" does not match",
-                                                       NameStr(parent_con->conname))));
-
-               /*
-                * TODO: add conislocal,coninhcount to constraints. This is where we
-                * would have to bump them just like attributes
-                */
        }
 
-       systable_endscan(scan);
-       heap_close(catalogRelation, AccessShareLock);
+       systable_endscan(parent_scan);
+       heap_close(catalog_relation, RowExclusiveLock);
 }
 
 /*
@@ -6314,6 +7065,9 @@ MergeConstraintsIntoExisting(Relation child_rel, Relation parent_rel)
  * parent then its columns will never be automatically dropped which may
  * surprise. But at least we'll never surprise by dropping columns someone
  * isn't expecting to be dropped which would actually mean data loss.
+ *
+ * coninhcount and conislocal for inherited constraints are adjusted in
+ * exactly the same way.
  */
 static void
 ATExecDropInherit(Relation rel, RangeVar *parent)
@@ -6324,24 +7078,26 @@ ATExecDropInherit(Relation rel, RangeVar *parent)
        ScanKeyData key[3];
        HeapTuple       inheritsTuple,
                                attributeTuple,
+                               constraintTuple,
                                depTuple;
+       List       *connames;
        bool            found = false;
 
        /*
-        * AccessShareLock on the parent is probably enough, seeing that DROP TABLE
-        * doesn't lock parent tables at all.  We need some lock since we'll be
-        * inspecting the parent's schema.
+        * AccessShareLock on the parent is probably enough, seeing that DROP
+        * TABLE doesn't lock parent tables at all.  We need some lock since we'll
+        * be inspecting the parent's schema.
         */
        parent_rel = heap_openrv(parent, AccessShareLock);
 
        /*
-        * We don't bother to check ownership of the parent table --- ownership
-        * of the child is presumed enough rights.
+        * We don't bother to check ownership of the parent table --- ownership of
+        * the child is presumed enough rights.
         */
 
        /*
-        * Find and destroy the pg_inherits entry linking the two, or error out
-        * if there is none.
+        * Find and destroy the pg_inherits entry linking the two, or error out if
+        * there is none.
         */
        catalogRelation = heap_open(InheritsRelationId, RowExclusiveLock);
        ScanKeyInit(&key[0],
@@ -6413,6 +7169,81 @@ ATExecDropInherit(Relation rel, RangeVar *parent)
        systable_endscan(scan);
        heap_close(catalogRelation, RowExclusiveLock);
 
+       /*
+        * Likewise, find inherited check constraints and disinherit them.
+        * To do this, we first need a list of the names of the parent's check
+        * constraints.  (We cheat a bit by only checking for name matches,
+        * assuming that the expressions will match.)
+        */
+       catalogRelation = heap_open(ConstraintRelationId, RowExclusiveLock);
+       ScanKeyInit(&key[0],
+                               Anum_pg_constraint_conrelid,
+                               BTEqualStrategyNumber, F_OIDEQ,
+                               ObjectIdGetDatum(RelationGetRelid(parent_rel)));
+       scan = systable_beginscan(catalogRelation, ConstraintRelidIndexId,
+                                                         true, SnapshotNow, 1, key);
+
+       connames = NIL;
+
+       while (HeapTupleIsValid(constraintTuple = systable_getnext(scan)))
+       {
+               Form_pg_constraint con = (Form_pg_constraint) GETSTRUCT(constraintTuple);
+
+               if (con->contype == CONSTRAINT_CHECK)
+                       connames = lappend(connames, pstrdup(NameStr(con->conname)));
+       }
+
+       systable_endscan(scan);
+
+       /* Now scan the child's constraints */
+       ScanKeyInit(&key[0],
+                               Anum_pg_constraint_conrelid,
+                               BTEqualStrategyNumber, F_OIDEQ,
+                               ObjectIdGetDatum(RelationGetRelid(rel)));
+       scan = systable_beginscan(catalogRelation, ConstraintRelidIndexId,
+                                                         true, SnapshotNow, 1, key);
+
+       while (HeapTupleIsValid(constraintTuple = systable_getnext(scan)))
+       {
+               Form_pg_constraint con = (Form_pg_constraint) GETSTRUCT(constraintTuple);
+               bool    match;
+               ListCell *lc;
+
+               if (con->contype != CONSTRAINT_CHECK)
+                       continue;
+
+               match = false;
+               foreach (lc, connames)
+               {
+                       if (strcmp(NameStr(con->conname), (char *) lfirst(lc)) == 0)
+                       {
+                               match = true;
+                               break;
+                       }
+               }
+
+               if (match)
+               {
+                       /* Decrement inhcount and possibly set islocal to true */
+                       HeapTuple       copyTuple = heap_copytuple(constraintTuple);
+                       Form_pg_constraint copy_con = (Form_pg_constraint) GETSTRUCT(copyTuple);
+                       if (copy_con->coninhcount <= 0)         /* shouldn't happen */
+                               elog(ERROR, "relation %u has non-inherited constraint \"%s\"",
+                                        RelationGetRelid(rel), NameStr(copy_con->conname));
+
+                       copy_con->coninhcount--;
+                       if (copy_con->coninhcount == 0)
+                               copy_con->conislocal = true;
+
+                       simple_heap_update(catalogRelation, &copyTuple->t_self, copyTuple);
+                       CatalogUpdateIndexes(catalogRelation, copyTuple);
+                       heap_freetuple(copyTuple);
+               }
+       }
+
+       systable_endscan(scan);
+       heap_close(catalogRelation, RowExclusiveLock);
+
        /*
         * Drop the dependency
         *
@@ -6461,7 +7292,8 @@ ATExecDropInherit(Relation rel, RangeVar *parent)
  * Note: caller must have checked ownership of the relation already
  */
 void
-AlterTableNamespace(RangeVar *relation, const char *newschema)
+AlterTableNamespace(RangeVar *relation, const char *newschema,
+                                       ObjectType stmttype)
 {
        Relation        rel;
        Oid                     relid;
@@ -6469,31 +7301,78 @@ AlterTableNamespace(RangeVar *relation, const char *newschema)
        Oid                     nspOid;
        Relation        classRel;
 
-       rel = heap_openrv(relation, AccessExclusiveLock);
+       rel = relation_openrv(relation, AccessExclusiveLock);
 
        relid = RelationGetRelid(rel);
        oldNspOid = RelationGetNamespace(rel);
 
-       /* heap_openrv allows TOAST, but we don't want to */
-       if (rel->rd_rel->relkind == RELKIND_TOASTVALUE)
-               ereport(ERROR,
-                               (errcode(ERRCODE_WRONG_OBJECT_TYPE),
-                                errmsg("\"%s\" is a TOAST relation",
-                                               RelationGetRelationName(rel))));
+       /* Check relation type against type specified in the ALTER command */
+       switch (stmttype)
+       {
+               case OBJECT_TABLE:
+                       /*
+                        * For mostly-historical reasons, we allow ALTER TABLE to apply
+                        * to all relation types.
+                        */
+                       break;
+
+               case OBJECT_SEQUENCE:
+                       if (rel->rd_rel->relkind != RELKIND_SEQUENCE)
+                               ereport(ERROR,
+                                               (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+                                                errmsg("\"%s\" is not a sequence",
+                                                               RelationGetRelationName(rel))));
+                       break;
+
+               case OBJECT_VIEW:
+                       if (rel->rd_rel->relkind != RELKIND_VIEW)
+                               ereport(ERROR,
+                                               (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+                                                errmsg("\"%s\" is not a view",
+                                                               RelationGetRelationName(rel))));
+                       break;
+
+               default:
+                       elog(ERROR, "unrecognized object type: %d", (int) stmttype);
+       }
 
-       /* if it's an owned sequence, disallow moving it by itself */
-       if (rel->rd_rel->relkind == RELKIND_SEQUENCE)
+       /* Can we change the schema of this tuple? */
+       switch (rel->rd_rel->relkind)
        {
-               Oid                     tableId;
-               int32           colId;
+               case RELKIND_RELATION:
+               case RELKIND_VIEW:
+                       /* ok to change schema */
+                       break;
+               case RELKIND_SEQUENCE:
+                       {
+                               /* if it's an owned sequence, disallow moving it by itself */
+                               Oid                     tableId;
+                               int32           colId;
 
-               if (sequenceIsOwned(relid, &tableId, &colId))
+                               if (sequenceIsOwned(relid, &tableId, &colId))
+                                       ereport(ERROR,
+                                                       (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+                                                        errmsg("cannot move an owned sequence into another schema"),
+                                         errdetail("Sequence \"%s\" is linked to table \"%s\".",
+                                                               RelationGetRelationName(rel),
+                                                               get_rel_name(tableId))));
+                       }
+                       break;
+               case RELKIND_COMPOSITE_TYPE:
                        ereport(ERROR,
-                                       (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                                errmsg("cannot move an owned sequence into another schema"),
-                                        errdetail("Sequence \"%s\" is linked to table \"%s\".",
-                                                          RelationGetRelationName(rel),
-                                                          get_rel_name(tableId))));
+                                       (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+                                        errmsg("\"%s\" is a composite type",
+                                                       RelationGetRelationName(rel)),
+                                        errhint("Use ALTER TYPE instead.")));
+                       break;
+               case RELKIND_INDEX:
+               case RELKIND_TOASTVALUE:
+                       /* FALL THRU */
+               default:
+                       ereport(ERROR,
+                                       (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+                                        errmsg("\"%s\" is not a table, view, or sequence",
+                                                       RelationGetRelationName(rel))));
        }
 
        /* get schema OID and check its permissions */