Add DOMAIN check constraints.

Rod Taylor

Author: bmomjian

doc/src/sgml/ref/create_domain.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_domain.sgml,v 1.6 2002/09/20 03:39:15 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_domain.sgml,v 1.7 2002/11/15 02:50:05 momjian Exp $
 PostgreSQL documentation
 -->
 
@@ -200,16 +200,6 @@ CREATE TABLE countrylist (id INT4, country country_code);
   </para>
  </refsect1>
 
- <refsect1 id="SQL-CREATEDOMAIN-compatibility">
-  <title>Compatibility</title>
-
-  <para>
-   SQL99 defines CREATE DOMAIN, but says that the only allowed constraint
-   type is CHECK constraints.  CHECK constraints for domains are not yet
-   supported by <productname>PostgreSQL</productname>.
-  </para>
- </refsect1>
-
  <refsect1 id="SQL-CREATEDOMAIN-see-also">
   <title>See Also</title>
 

src/backend/catalog/heap.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.234 2002/11/11 22:19:21 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.235 2002/11/15 02:50:05 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -1500,7 +1500,8 @@ AddRelationRawConstraints(Relation rel,
 
 			ccname = cdef->name;
 			/* Check against pre-existing constraints */
-			if (ConstraintNameIsUsed(RelationGetRelid(rel),
+			if (ConstraintNameIsUsed(CONSTRAINT_RELATION,
+									 RelationGetRelid(rel),
 									 RelationGetNamespace(rel),
 									 ccname))
 				elog(ERROR, "constraint \"%s\" already exists for relation \"%s\"",
@@ -1534,7 +1535,8 @@ AddRelationRawConstraints(Relation rel,
 				 * pre-existing constraints, nor with any auto-generated
 				 * names so far.
 				 */
-				ccname = GenerateConstraintName(RelationGetRelid(rel),
+				ccname = GenerateConstraintName(CONSTRAINT_RELATION,
+												RelationGetRelid(rel),
 												RelationGetNamespace(rel),
 												&constr_name_ctr);
 
@@ -1565,7 +1567,7 @@ AddRelationRawConstraints(Relation rel,
 		/*
 		 * Transform raw parsetree to executable expression.
 		 */
-		expr = transformExpr(pstate, cdef->raw_expr);
+		expr = transformExpr(pstate, cdef->raw_expr, NULL);
 
 		/*
 		 * Make sure it yields a boolean result.
@@ -1694,7 +1696,7 @@ cookDefault(ParseState *pstate,
 	/*
 	 * Transform raw parsetree to executable expression.
 	 */
-	expr = transformExpr(pstate, raw_default);
+	expr = transformExpr(pstate, raw_default, NULL);
 
 	/*
 	 * Make sure default expr does not refer to any vars.

src/backend/catalog/pg_constraint.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_constraint.c,v 1.7 2002/09/22 00:37:09 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_constraint.c,v 1.8 2002/11/15 02:50:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -190,6 +190,19 @@ CreateConstraintEntry(const char *constraintName,
 		}
 	}
 
+	if (OidIsValid(domainId))
+	{
+		/*
+		 * Register auto dependency from constraint to owning domain
+		 */
+		ObjectAddress	domobject;
+
+		domobject.classId = RelOid_pg_type;
+		domobject.objectId = domainId;
+
+		recordDependencyOn(&conobject, &domobject, DEPENDENCY_AUTO);
+	}
+
 	if (OidIsValid(foreignRelId))
 	{
 		/*
@@ -262,7 +275,7 @@ CreateConstraintEntry(const char *constraintName,
  * this test is not very meaningful.
  */
 bool
-ConstraintNameIsUsed(Oid relId, Oid relNamespace, const char *cname)
+ConstraintNameIsUsed(CONSTRAINTCATEGORY conCat, Oid objId, Oid objNamespace, const char *cname)
 {
 	bool		found;
 	Relation	conDesc;
@@ -280,7 +293,7 @@ ConstraintNameIsUsed(Oid relId, Oid relNamespace, const char *cname)
 
 	ScanKeyEntryInitialize(&skey[1], 0x0,
 						   Anum_pg_constraint_connamespace, F_OIDEQ,
-						   ObjectIdGetDatum(relNamespace));
+						   ObjectIdGetDatum(objNamespace));
 
 	conscan = systable_beginscan(conDesc, ConstraintNameNspIndex, true,
 								 SnapshotNow, 2, skey);
@@ -289,7 +302,12 @@ ConstraintNameIsUsed(Oid relId, Oid relNamespace, const char *cname)
 	{
 		Form_pg_constraint con = (Form_pg_constraint) GETSTRUCT(tup);
 
-		if (con->conrelid == relId)
+		if (conCat == CONSTRAINT_RELATION && con->conrelid == objId)
+		{
+			found = true;
+			break;
+		}
+		else if (conCat == CONSTRAINT_DOMAIN && con->contypid == objId)
 		{
 			found = true;
 			break;
@@ -314,7 +332,7 @@ ConstraintNameIsUsed(Oid relId, Oid relNamespace, const char *cname)
  * someone else might choose the same name concurrently!
  */
 char *
-GenerateConstraintName(Oid relId, Oid relNamespace, int *counter)
+GenerateConstraintName(CONSTRAINTCATEGORY conCat, Oid objId, Oid objNamespace, int *counter)
 {
 	bool		found;
 	Relation	conDesc;
@@ -347,7 +365,7 @@ GenerateConstraintName(Oid relId, Oid relNamespace, int *counter)
 
 		ScanKeyEntryInitialize(&skey[1], 0x0,
 							   Anum_pg_constraint_connamespace, F_OIDEQ,
-							   ObjectIdGetDatum(relNamespace));
+							   ObjectIdGetDatum(objNamespace));
 
 		conscan = systable_beginscan(conDesc, ConstraintNameNspIndex, true,
 									 SnapshotNow, 2, skey);
@@ -356,7 +374,12 @@ GenerateConstraintName(Oid relId, Oid relNamespace, int *counter)
 		{
 			Form_pg_constraint con = (Form_pg_constraint) GETSTRUCT(tup);
 
-			if (con->conrelid == relId)
+			if (conCat == CONSTRAINT_RELATION && con->conrelid == objId)
+			{
+				found = true;
+				break;
+			}
+			else if (conCat == CONSTRAINT_DOMAIN && con->contypid == objId)
 			{
 				found = true;
 				break;
@@ -415,10 +438,13 @@ RemoveConstraintById(Oid conId)
 	con = (Form_pg_constraint) GETSTRUCT(tup);
 
 	/*
-	 * If the constraint is for a relation, open and exclusive-lock the
-	 * relation it's for.
+	 * If the constraint is for a relation, open and exclusive-lock
+	 * the relation it's for.
+	 *
+	 * If the constraint is for a domain, open and lock the pg_type entry
+	 * tye constraint is used on.
 	 *
-	 * XXX not clear what we should lock, if anything, for other constraints.
+	 * XXX not clear what we should lock, if anything, for assert constraints.
 	 */
 	if (OidIsValid(con->conrelid))
 	{
@@ -463,6 +489,34 @@ RemoveConstraintById(Oid conId)
 		/* Keep lock on constraint's rel until end of xact */
 		heap_close(rel, NoLock);
 	}
+	/* Lock the domain row in pg_type */
+	else if (OidIsValid(con->contypid))
+	{
+		Relation	typRel;
+		HeapTuple	typTup;
+		ScanKeyData typKey[1];
+		SysScanDesc typScan;
+
+		typRel = heap_openr(TypeRelationName, RowExclusiveLock);
+
+		ScanKeyEntryInitialize(&typKey[0], 0x0,
+							   Anum_pg_constraint_contypid, F_OIDEQ,
+							   ObjectIdGetDatum(con->contypid));
+
+		typScan = systable_beginscan(typRel, TypeOidIndex, true,
+									 SnapshotNow, 1, typKey);
+
+		typTup = systable_getnext(typScan);
+
+		if (!HeapTupleIsValid(typTup))
+			elog(ERROR, "RemoveConstraintById: Type %d does not exist",
+				 con->contypid);
+
+		systable_endscan(typScan);
+
+		/* Keep lock on domain type until end of xact */
+		heap_close(typRel, NoLock);
+	}
 
 	/* Fry the constraint itself */
 	simple_heap_delete(conDesc, &tup->t_self);

src/backend/commands/tablecmds.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.53 2002/11/11 22:19:21 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.54 2002/11/15 02:50:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2632,14 +2632,16 @@ AlterTableAddConstraint(Oid myrelid, bool recurse,
 					 */
 					if (constr->name)
 					{
-						if (ConstraintNameIsUsed(RelationGetRelid(rel),
+						if (ConstraintNameIsUsed(CONSTRAINT_RELATION,
+												 RelationGetRelid(rel),
 												 RelationGetNamespace(rel),
 												 constr->name))
 							elog(ERROR, "constraint \"%s\" already exists for relation \"%s\"",
 								 constr->name, RelationGetRelationName(rel));
 					}
 					else
-						constr->name = GenerateConstraintName(RelationGetRelid(rel),
+						constr->name = GenerateConstraintName(CONSTRAINT_RELATION,
+															  RelationGetRelid(rel),
 															  RelationGetNamespace(rel),
 															  &counter);
 
@@ -2668,15 +2670,17 @@ AlterTableAddConstraint(Oid myrelid, bool recurse,
 					 */
 					if (fkconstraint->constr_name)
 					{
-						if (ConstraintNameIsUsed(RelationGetRelid(rel),
+						if (ConstraintNameIsUsed(CONSTRAINT_RELATION,
+												   RelationGetRelid(rel),
 											   RelationGetNamespace(rel),
 											  fkconstraint->constr_name))
 							elog(ERROR, "constraint \"%s\" already exists for relation \"%s\"",
 								 fkconstraint->constr_name,
 								 RelationGetRelationName(rel));
 					}
 					else
-						fkconstraint->constr_name = GenerateConstraintName(RelationGetRelid(rel),
+						fkconstraint->constr_name = GenerateConstraintName(CONSTRAINT_RELATION,
+												   RelationGetRelid(rel),
 											   RelationGetNamespace(rel),
 															   &counter);
 
@@ -2734,7 +2738,7 @@ AlterTableAddCheckConstraint(Relation rel, Constraint *constr)
 	/*
 	 * Convert the A_EXPR in raw_expr into an EXPR
 	 */
-	expr = transformExpr(pstate, constr->raw_expr);
+	expr = transformExpr(pstate, constr->raw_expr, NULL);
 
 	/*
 	 * Make sure it yields a boolean result.