Remove finger from dike: composite types are now allowed as table columns.

tglsfdc · tglsfdc · commit f24c5098fdcd · 2004-06-06T04:52:55.000Z
Still a few things to do, like binary I/O and regression tests and docs,
but might as well let people play with the toy.
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/catalog/heap.c,v 1.267 2004/06/04 03:24:04 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/catalog/heap.c,v 1.268 2004/06/06 04:52:55 tgl Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -417,9 +417,9 @@ CheckAttributeType(const char *attname, Oid atttypid)
 	 * (usually as a result of a 'retrieve into' - jolly)
 	 *
 	 * Refuse any attempt to create a pseudo-type column or one that uses a
-	 * composite type.  (Eventually we would like to allow standalone
-	 * composite types, but that needs some nontrivial work yet,
-	 * particularly TOAST support.)
+	 * non-standalone composite type.  (We could support using table rowtypes
+	 * as attributes, if we were willing to make ALTER TABLE hugely more
+	 * complex, but for now let's limit the damage ...)
 	 */
 	if (atttypid == UNKNOWNOID)
 		ereport(WARNING,
@@ -437,11 +437,9 @@ CheckAttributeType(const char *attname, Oid atttypid)
 	}
 	else if (att_typtype == 'c')
 	{
-#if 0
 		Oid			typrelid = get_typ_typrelid(atttypid);
 
 		if (get_rel_relkind(typrelid) != RELKIND_COMPOSITE_TYPE)
-#endif
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
 					 errmsg("column \"%s\" has composite type %s",

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/catalog/heap.c,v 1.267 2004/06/04 03:24:04 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/catalog/heap.c,v 1.268 2004/06/06 04:52:55 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*`
`14`	`14`	`* INTERFACE ROUTINES`
`@@ -417,9 +417,9 @@ CheckAttributeType(const char *attname, Oid atttypid)`
`417`	`417`	`* (usually as a result of a 'retrieve into' - jolly)`
`418`	`418`	`*`
`419`	`419`	`* Refuse any attempt to create a pseudo-type column or one that uses a`
`420`		`- * composite type. (Eventually we would like to allow standalone`
`421`		`- * composite types, but that needs some nontrivial work yet,`
`422`		`- * particularly TOAST support.)`
	`420`	`+ * non-standalone composite type. (We could support using table rowtypes`
	`421`	`+ * as attributes, if we were willing to make ALTER TABLE hugely more`
	`422`	`+ * complex, but for now let's limit the damage ...)`
`423`	`423`	`*/`
`424`	`424`	`if (atttypid == UNKNOWNOID)`
`425`	`425`	`ereport(WARNING,`
`@@ -437,11 +437,9 @@ CheckAttributeType(const char *attname, Oid atttypid)`
`437`	`437`	`}`
`438`	`438`	`else if (att_typtype == 'c')`
`439`	`439`	`{`
`440`		`-#if 0`
`441`	`440`	`Oid typrelid = get_typ_typrelid(atttypid);`
`442`	`441`
`443`	`442`	`if (get_rel_relkind(typrelid) != RELKIND_COMPOSITE_TYPE)`
`444`		`-#endif`
`445`	`443`	`ereport(ERROR,`
`446`	`444`	`(errcode(ERRCODE_INVALID_TABLE_DEFINITION),`
`447`	`445`	`errmsg("column \"%s\" has composite type %s",`