Commitfaebf2f

committed

Turn constraints off for sequences & views

elog(WARN,"ADD ATTRIBUTE: DEFAULT is not implemented, yet");Call ExecConstraints in CopyFrom

1 parent530876f commitfaebf2fCopy full SHA for faebf2f

File tree

+25

-13

lines changed

+25

-13

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.12 1997/08/21 03:01:27 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.13 1997/08/22 14:22:07 vadim Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`* The PortalExecutorHeapMemory crap needs to be eliminated`
`@@ -283,7 +283,9 @@ PerformAddAttribute(char *relationName,`
`283`	`283`	`* we can't add a not null attribute`
`284`	`284`	`*/`
`285`	`285`	`if (colDef->is_not_null)`
`286`		`-elog(WARN,"Can't add a not null attribute to a existent relation");`
	`286`	`+elog(WARN,"Can't add a not null attribute to a existent relation");`
	`287`	`+if (colDef->defval)`
	`288`	`+elog(WARN,"ADD ATTRIBUTE: DEFAULT is not implemented, yet");`
`287`	`289`	`/*`
`288`	`290`	`* if the first element in the 'schema' list is a "*" then we are`
`289`	`291`	`* supposed to add this attribute to all classes that inherit from`

Lines changed: 13 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`*`
`8`	`8`	`* IDENTIFICATION`
`9`		`- * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.26 1997/08/19 04:43:28 vadim Exp $`
	`9`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.27 1997/08/22 14:22:09 vadim Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -608,15 +608,18 @@ CopyFrom(Relation rel, bool binary, bool oids, FILE fp, char delim)`
`608`	`608`	`* ----------------`
`609`	`609`	`*/`
`610`	`610`
`611`		`-if (rel->rd_att->constr&&rel->rd_att->constr->has_not_null)`
`612`		`- {`
`613`		`-intattrChk;`
`614`		`-for (attrChk=1;attrChk <=rel->rd_att->natts;attrChk++) {`
`615`		`-if (rel->rd_att->attrs[attrChk-1]->attnotnull&&heap_attisnull(tuple,attrChk))`
`616`		`-elog(WARN,"CopyFrom: Fail to add null value in not null attribute %s",`
`617`		`-rel->rd_att->attrs[attrChk-1]->attname.data);`
`618`		`- }`
`619`		`- }`
	`611`	`+if (rel->rd_att->constr )`
	`612`	`+ {`
	`613`	`+HeapTuplenewtuple;`
	`614`	`+`
	`615`	`+newtuple=ExecConstraints ("CopyFrom",rel,tuple);`
	`616`	`+`
	`617`	`+if (newtuple!=tuple )`
	`618`	`+ {`
	`619`	`+pfree (tuple);`
	`620`	`+tuple=newtuple;`
	`621`	`+ }`
	`622`	`+ }`
`620`	`623`
`621`	`624`	`heap_insert(rel,tuple);`
`622`	`625`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,8 @@ DefineSequence (CreateSeqStmt *seq)`
`97`	`97`	`typnam->arrayBounds=NULL;`
`98`	`98`	`coldef=makeNode(ColumnDef);`
`99`	`99`	`coldef->typename=typnam;`
	`100`	`+coldef->defval=NULL;`
	`101`	`+coldef->is_not_null= false;`
`100`	`102`	`null[i-1]=' ';`
`101`	`103`
`102`	`104`	`switch (i)`
`@@ -149,6 +151,7 @@ DefineSequence (CreateSeqStmt *seq)`
`149`	`151`	`stmt->archiveLoc=-1;/* default */`
`150`	`152`	`stmt->archiveType=ARCH_NONE;`
`151`	`153`	`stmt->inhRelnames=NIL;`
	`154`	`+stmt->constraints=NIL;`
`152`	`155`
`153`	`156`	`ItsSequenceCreation= true;/* hack */`
`154`	`157`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/commands/view.c,v 1.7 1997/01/10 20:17:20 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/view.c,v 1.8 1997/08/22 14:22:14 vadim Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -77,6 +77,9 @@ DefineVirtualRelation(char relname, List tlist)`
`77`	`77`	`def->colname=pstrdup(resname);`
`78`	`78`
`79`	`79`	`def->typename=typename;`
	`80`	`+`
	`81`	`+def->is_not_null= false;`
	`82`	`+def->defval= (char*)NULL;`
`80`	`83`
`81`	`84`	`attrList=lappend(attrList,def);`
`82`	`85`	`}`
`@@ -95,6 +98,7 @@ DefineVirtualRelation(char relname, List tlist)`
`95`	`98`	`createStmt.archiveType=ARCH_NONE;`
`96`	`99`	`createStmt.location=-1;`
`97`	`100`	`createStmt.archiveLoc=-1;`
	`101`	`+createStmt.constraints=NIL;`
`98`	`102`
`99`	`103`	`/*`
`100`	`104`	`* finally create the relation...`

Comments

(0)