CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name ( [
{ column_name data_type [ DEFAULT default_expr ] [ column_constraint [ ... ] ]
| table_constraint
- | LIKE parent_table [ { INCLUDING | EXCLUDING } DEFAULTS ] }
+ | LIKE parent_table [ { INCLUDING | EXCLUDING } { DEFAULTS | CONSTRAINTS } ] ... }
[, ... ]
] )
[ INHERITS ( parent_table [, ... ] ) ]
- LIKE parent_table [ { INCLUDING | EXCLUDING } DEFAULTS ]
+ LIKE parent_table [ { INCLUDING | EXCLUDING } { DEFAULTS | CONSTRAINTS } ]
The LIKE clause specifies a table from which
default behavior is to exclude default expressions, resulting in
all columns of the new table having null defaults.
+ Likewise constraints for the copied column definitions will only be
+ copied if INCLUDING CONSTRAINTS is specified. Note
+ that currently even when INCLUDING CONSTRAINTS is specified
+ only CHECK constraints are copied. Also, no distinction is made between
+ column constraints and table constraints -- when constraints are
+ requested all check constraints are copied.
+
+ Note also that unlike INHERITS copied columns and
+ constraints are not merged with similarly named columns and constraints.
+ If the same name is specified explicitly or in another
+ LIKE clause an error is signalled.
+
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.186 2006/06/27 03:21:54 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.187 2006/06/27 03:43:19 momjian Exp $
*
*-------------------------------------------------------------------------
*/
static void truncate_check_rel(Relation rel);
static List *MergeAttributes(List *schema, List *supers, bool istemp,
List **supOids, List **supconstr, int *supOidCount);
-static bool change_varattnos_of_a_node(Node *node, const AttrNumber *newattno);
+static bool change_varattnos_walker(Node *node, const AttrNumber *newattno);
static void StoreCatalogInheritance(Oid relationId, List *supers);
static int findAttrByName(const char *attributeName, List *schema);
static void setRelhassubclassInRelation(Oid relationId, bool relhassubclass);
}
/*
- * complementary static functions for MergeAttributes().
- *
* Varattnos of pg_constraint.conbin must be rewritten when subclasses inherit
* constraints from parent classes, since the inherited attributes could
* be given different column numbers in multiple-inheritance cases.
*
* Note that the passed node tree is modified in place!
+ *
+ * This function is used elsewhere such as in analyze.c
+ *
*/
+
+void
+change_varattnos_of_a_node(Node *node, const AttrNumber *newattno)
+{
+ change_varattnos_walker(node, newattno);
+}
+
+/* Generate a map for change_varattnos_of_a_node from two tupledesc's. */
+
+AttrNumber *
+varattnos_map(TupleDesc old, TupleDesc new)
+{
+ int i,j;
+ AttrNumber *attmap = palloc0(sizeof(AttrNumber)*old->natts);
+ for (i=1; i <= old->natts; i++) {
+ if (old->attrs[i-1]->attisdropped) {
+ attmap[i-1] = 0;
+ continue;
+ }
+ for (j=1; j<= new->natts; j++)
+ if (!strcmp(NameStr(old->attrs[i-1]->attname), NameStr(new->attrs[j-1]->attname)))
+ attmap[i-1] = j;
+ }
+ return attmap;
+}
+
+/* Generate a map for change_varattnos_of_a_node from a tupledesc and a list of
+ * ColumnDefs */
+
+AttrNumber *
+varattnos_map_schema(TupleDesc old, List *schema)
+{
+ int i;
+ AttrNumber *attmap = palloc0(sizeof(AttrNumber)*old->natts);
+ for (i=1; i <= old->natts; i++) {
+ if (old->attrs[i-1]->attisdropped) {
+ attmap[i-1] = 0;
+ continue;
+ }
+ attmap[i-1] = findAttrByName(NameStr(old->attrs[i-1]->attname), schema);
+ }
+ return attmap;
+}
+
static bool
change_varattnos_walker(Node *node, const AttrNumber *newattno)
{
(void *) newattno);
}
-static bool
-change_varattnos_of_a_node(Node *node, const AttrNumber *newattno)
-{
- return change_varattnos_walker(node, newattno);
-}
-
/*
* StoreCatalogInheritance
* Updates the system catalogs with proper inheritance information.
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.336 2006/06/16 20:23:44 adunstan Exp $
+ * $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.337 2006/06/27 03:43:19 momjian Exp $
*
*-------------------------------------------------------------------------
*/
InhRelation *newnode = makeNode(InhRelation);
COPY_NODE_FIELD(relation);
- COPY_SCALAR_FIELD(including_defaults);
+ COPY_NODE_FIELD(options);
return newnode;
}
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/nodes/equalfuncs.c,v 1.272 2006/06/16 20:23:44 adunstan Exp $
+ * $PostgreSQL: pgsql/src/backend/nodes/equalfuncs.c,v 1.273 2006/06/27 03:43:20 momjian Exp $
*
*-------------------------------------------------------------------------
*/
_equalInhRelation(InhRelation *a, InhRelation *b)
{
COMPARE_NODE_FIELD(relation);
- COMPARE_SCALAR_FIELD(including_defaults);
+ COMPARE_NODE_FIELD(options);
return true;
}
* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/backend/parser/analyze.c,v 1.335 2006/06/21 18:30:11 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/parser/analyze.c,v 1.336 2006/06/27 03:43:20 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include "catalog/pg_type.h"
#include "commands/defrem.h"
#include "commands/prepare.h"
+#include "commands/tablecmds.h"
#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "optimizer/clauses.h"
TupleConstr *constr;
AclResult aclresult;
+ bool including_defaults = false;
+ bool including_constraints = false;
+ bool including_indexes = false;
+ ListCell *elem;
+
relation = heap_openrv(inhRelation->relation, AccessShareLock);
if (relation->rd_rel->relkind != RELKIND_RELATION)
tupleDesc = RelationGetDescr(relation);
constr = tupleDesc->constr;
+ foreach(elem, inhRelation->options)
+ {
+ int option = lfirst_int(elem);
+ switch (option)
+ {
+ case CREATE_TABLE_LIKE_INCLUDING_DEFAULTS:
+ including_defaults = true;
+ break;
+ case CREATE_TABLE_LIKE_EXCLUDING_DEFAULTS:
+ including_defaults = false;
+ break;
+ case CREATE_TABLE_LIKE_INCLUDING_CONSTRAINTS:
+ including_constraints = true;
+ break;
+ case CREATE_TABLE_LIKE_EXCLUDING_CONSTRAINTS:
+ including_constraints = false;
+ break;
+ case CREATE_TABLE_LIKE_INCLUDING_INDEXES:
+ including_indexes = true;
+ break;
+ case CREATE_TABLE_LIKE_EXCLUDING_INDEXES:
+ including_indexes = false;
+ break;
+ default:
+ elog(ERROR, "unrecognized CREATE TABLE LIKE option: %d", option);
+ }
+ }
+
+ if (including_indexes)
+ elog(ERROR, "TODO");
+
/*
* Insert the inherited attributes into the cxt for the new table
* definition.
def->typename = makeTypeNameFromOid(attribute->atttypid,
attribute->atttypmod);
def->inhcount = 0;
- def->is_local = false;
+ def->is_local = true;
def->is_not_null = attribute->attnotnull;
def->raw_default = NULL;
def->cooked_default = NULL;
/*
* Copy default if any, and the default has been requested
*/
- if (attribute->atthasdef && inhRelation->including_defaults)
+ if (attribute->atthasdef && including_defaults)
{
char *this_default = NULL;
AttrDefault *attrdef;
def->cooked_default = pstrdup(this_default);
}
}
+
+ if (including_constraints && tupleDesc->constr) {
+ int ccnum;
+ AttrNumber *attmap = varattnos_map_schema(tupleDesc, cxt->columns);
+
+ for(ccnum = 0; ccnum < tupleDesc->constr->num_check; ccnum++) {
+ char *ccname = tupleDesc->constr->check[ccnum].ccname;
+ char *ccbin = tupleDesc->constr->check[ccnum].ccbin;
+ Node *ccbin_node = stringToNode(ccbin);
+ Constraint *n = makeNode(Constraint);
+
+ change_varattnos_of_a_node(ccbin_node, attmap);
+
+ n->contype = CONSTR_CHECK;
+ n->name = pstrdup(ccname);
+ n->raw_expr = ccbin_node;
+ n->cooked_expr = NULL;
+ n->indexspace = NULL;
+ cxt->ckconstraints = lappend(cxt->ckconstraints, (Node*)n);
+ }
+ }
/*
* Close the parent rel, but keep our AccessShareLock on it until xact
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.547 2006/06/16 23:50:48 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.548 2006/06/27 03:43:20 momjian Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
opt_grant_grant_option opt_grant_admin_option
opt_nowait opt_if_exists
-%type like_including_defaults
-
%type OptRoleList
%type OptRoleElem
%type unreserved_keyword func_name_keyword
%type col_name_keyword reserved_keyword
-%type TableConstraint TableLikeClause
+%type TableConstraint TableLikeClause
+%type TableLikeOptionList
+%type TableLikeOption
%type ColQualList
%type ColConstraint ColConstraintElem ConstraintAttr
%type key_actions key_delete key_match key_update key_action
HANDLER HAVING HEADER_P HOLD HOUR_P
IF_P ILIKE IMMEDIATE IMMUTABLE IMPLICIT_P IN_P INCLUDING INCREMENT
- INDEX INHERIT INHERITS INITIALLY INNER_P INOUT INPUT_P
+ INDEX INDEXES INHERIT INHERITS INITIALLY INNER_P INOUT INPUT_P
INSENSITIVE INSERT INSTEAD INT_P INTEGER INTERSECT
INTERVAL INTO INVOKER IS ISNULL ISOLATION
* which is a part of SQL 200N
*/
TableLikeClause:
- LIKE qualified_name like_including_defaults
+ LIKE qualified_name TableLikeOptionList
{
InhRelation *n = makeNode(InhRelation);
n->relation = $2;
- n->including_defaults = $3;
-
+ n->options = $3;
$$ = (Node *)n;
}
;
-like_including_defaults:
- INCLUDING DEFAULTS { $$ = true; }
- | EXCLUDING DEFAULTS { $$ = false; }
- | /* EMPTY */ { $$ = false; }
+TableLikeOptionList:
+ TableLikeOptionList TableLikeOption { $$ = lappend_int($1, $2); }
+ | /* EMPTY */ { $$ = NIL; }
+ ;
+
+TableLikeOption:
+ INCLUDING DEFAULTS { $$ = CREATE_TABLE_LIKE_INCLUDING_DEFAULTS; }
+ | EXCLUDING DEFAULTS { $$ = CREATE_TABLE_LIKE_EXCLUDING_DEFAULTS; }
+ | INCLUDING CONSTRAINTS { $$ = CREATE_TABLE_LIKE_INCLUDING_CONSTRAINTS; }
+ | EXCLUDING CONSTRAINTS { $$ = CREATE_TABLE_LIKE_EXCLUDING_CONSTRAINTS; }
+ | INCLUDING INDEXES { $$ = CREATE_TABLE_LIKE_INCLUDING_INDEXES; }
+ | EXCLUDING INDEXES { $$ = CREATE_TABLE_LIKE_EXCLUDING_INDEXES; }
;
| INCLUDING
| INCREMENT
| INDEX
+ | INDEXES
| INHERIT
| INHERITS
| INPUT_P
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/parser/keywords.c,v 1.171 2006/03/05 15:58:32 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/parser/keywords.c,v 1.172 2006/06/27 03:43:20 momjian Exp $
*
*-------------------------------------------------------------------------
*/
{"including", INCLUDING},
{"increment", INCREMENT},
{"index", INDEX},
+ {"indexes", INDEXES},
{"inherit", INHERIT},
{"inherits", INHERITS},
{"initially", INITIALLY},
* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/include/commands/tablecmds.h,v 1.27 2006/03/05 15:58:55 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/commands/tablecmds.h,v 1.28 2006/06/27 03:43:20 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include "nodes/parsenodes.h"
#include "utils/rel.h"
+#include "access/tupdesc.h"
extern Oid DefineRelation(CreateStmt *stmt, char relkind);
extern void renamerel(Oid myrelid,
const char *newrelname);
+extern AttrNumber * varattnos_map(TupleDesc old, TupleDesc new);
+extern AttrNumber * varattnos_map_schema(TupleDesc old, List *schema);
+extern void change_varattnos_of_a_node(Node *node, const AttrNumber *newattno);
+
extern void register_on_commit_action(Oid relid, OnCommitAction action);
extern void remove_on_commit_action(Oid relid);
* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/include/nodes/parsenodes.h,v 1.311 2006/06/16 20:23:45 adunstan Exp $
+ * $PostgreSQL: pgsql/src/include/nodes/parsenodes.h,v 1.312 2006/06/27 03:43:20 momjian Exp $
*
*-------------------------------------------------------------------------
*/
{
NodeTag type;
RangeVar *relation;
- bool including_defaults;
+ List *options;
} InhRelation;
/*
char *tablespacename; /* table space to use, or NULL */
} CreateStmt;
+typedef enum CreateStmtLikeOption {
+ CREATE_TABLE_LIKE_INCLUDING_DEFAULTS,
+ CREATE_TABLE_LIKE_EXCLUDING_DEFAULTS,
+ CREATE_TABLE_LIKE_INCLUDING_CONSTRAINTS,
+ CREATE_TABLE_LIKE_EXCLUDING_CONSTRAINTS,
+ CREATE_TABLE_LIKE_INCLUDING_INDEXES,
+ CREATE_TABLE_LIKE_EXCLUDING_INDEXES,
+} CreateStmtLikeOption;
+
/* ----------
* Definitions for plain (non-FOREIGN KEY) constraints in CreateStmt
*
CREATE TABLE inhf (LIKE inhx, LIKE inhx); /* Throw error */
ERROR: column "xx" duplicated
-CREATE TABLE inhf (LIKE inhx INCLUDING DEFAULTS);
+CREATE TABLE inhf (LIKE inhx INCLUDING DEFAULTS INCLUDING CONSTRAINTS);
INSERT INTO inhf DEFAULT VALUES;
SELECT * FROM inhf; /* Single entry with value 'text' */
xx
text
(1 row)
+ALTER TABLE inhx add constraint foo CHECK (xx = 'text');
+ALTER TABLE inhx ADD PRIMARY KEY (xx);
+NOTICE: ALTER TABLE / ADD PRIMARY KEY will create implicit index "inhx_pkey" for table "inhx"
+CREATE TABLE inhg (LIKE inhx); /* Doesn't copy constraint */
+INSERT INTO inhg VALUES ('foo');
+DROP TABLE inhg;
+CREATE TABLE inhg (x text, LIKE inhx INCLUDING CONSTRAINTS, y text); /* Copies constraints */
+INSERT INTO inhg VALUES ('x', 'text', 'y'); /* Succeeds */
+INSERT INTO inhg VALUES ('x', 'text', 'y'); /* Succeeds -- Unique constraints not copied */
+INSERT INTO inhg VALUES ('x', 'foo', 'y'); /* fails due to constraint */
+ERROR: new row for relation "inhg" violates check constraint "foo"
+SELECT * FROM inhg; /* Two records with three columns in order x=x, xx=text, y=y */
+ x | xx | y
+---+------+---
+ x | text | y
+ x | text | y
+(2 rows)
+
+DROP TABLE inhg;
-- Test changing the type of inherited columns
insert into d values('test','one','two','three');
alter table a alter column aa type integer using bit_length(aa);
hash_name_heap | t
hash_txt_heap | t
ihighway | t
+ inhx | t
num_exp_add | t
num_exp_div | t
num_exp_ln | t
shighway | t
tenk1 | t
tenk2 | t
-(60 rows)
+(61 rows)
--
-- another sanity check: every system catalog that has OIDs should have
CREATE TABLE inhf (LIKE inhx, LIKE inhx); /* Throw error */
-CREATE TABLE inhf (LIKE inhx INCLUDING DEFAULTS);
+CREATE TABLE inhf (LIKE inhx INCLUDING DEFAULTS INCLUDING CONSTRAINTS);
INSERT INTO inhf DEFAULT VALUES;
SELECT * FROM inhf; /* Single entry with value 'text' */
+ALTER TABLE inhx add constraint foo CHECK (xx = 'text');
+ALTER TABLE inhx ADD PRIMARY KEY (xx);
+CREATE TABLE inhg (LIKE inhx); /* Doesn't copy constraint */
+INSERT INTO inhg VALUES ('foo');
+DROP TABLE inhg;
+CREATE TABLE inhg (x text, LIKE inhx INCLUDING CONSTRAINTS, y text); /* Copies constraints */
+INSERT INTO inhg VALUES ('x', 'text', 'y'); /* Succeeds */
+INSERT INTO inhg VALUES ('x', 'text', 'y'); /* Succeeds -- Unique constraints not copied */
+INSERT INTO inhg VALUES ('x', 'foo', 'y'); /* fails due to constraint */
+SELECT * FROM inhg; /* Two records with three columns in order x=x, xx=text, y=y */
+DROP TABLE inhg;
+
+
-- Test changing the type of inherited columns
insert into d values('test','one','two','three');
alter table a alter column aa type integer using bit_length(aa);
projects / postgresql.git / commitdiff