Address ccvalid/ccnoinherit in TupleDesc support functions.

nmisch · nmisch · commit 1d1b32a9530e · 2014-03-23T02:15:09.000-04:00
equalTupleDescs() neglected both of these ConstrCheck fields, and
CreateTupleDescCopyConstr() neglected ccnoinherit.  At this time, the
only known behavior defect resulting from these omissions is constraint
exclusion disregarding a CHECK constraint validated by an ALTER TABLE
VALIDATE CONSTRAINT statement issued earlier in the same transaction.
Back-patch to 9.2, where these fields were introduced.
diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c
@@ -203,6 +203,7 @@ CreateTupleDescCopyConstr(TupleDesc tupdesc)
 				if (constr->check[i].ccbin)
 					cpy->check[i].ccbin = pstrdup(constr->check[i].ccbin);
 				cpy->check[i].ccvalid = constr->check[i].ccvalid;
+				cpy->check[i].ccnoinherit = constr->check[i].ccnoinherit;
 			}
 		}
 
@@ -416,7 +417,9 @@ equalTupleDescs(TupleDesc tupdesc1, TupleDesc tupdesc2)
 			for (j = 0; j < n; check2++, j++)
 			{
 				if (strcmp(check1->ccname, check2->ccname) == 0 &&
-					strcmp(check1->ccbin, check2->ccbin) == 0)
+					strcmp(check1->ccbin, check2->ccbin) == 0 &&
+					check1->ccvalid == check2->ccvalid &&
+					check1->ccnoinherit == check2->ccnoinherit)
 					break;
 			}
 			if (j >= n)

Original file line number	Diff line number	Diff line change
`@@ -203,6 +203,7 @@ CreateTupleDescCopyConstr(TupleDesc tupdesc)`
`203`	`203`	`if (constr->check[i].ccbin)`
`204`	`204`	`cpy->check[i].ccbin = pstrdup(constr->check[i].ccbin);`
`205`	`205`	`cpy->check[i].ccvalid = constr->check[i].ccvalid;`
	`206`	`+ cpy->check[i].ccnoinherit = constr->check[i].ccnoinherit;`
`206`	`207`	`}`
`207`	`208`	`}`
`208`	`209`
`@@ -416,7 +417,9 @@ equalTupleDescs(TupleDesc tupdesc1, TupleDesc tupdesc2)`
`416`	`417`	`for (j = 0; j < n; check2++, j++)`
`417`	`418`	`{`
`418`	`419`	`if (strcmp(check1->ccname, check2->ccname) == 0 &&`
`419`		`- strcmp(check1->ccbin, check2->ccbin) == 0)`
	`420`	`+ strcmp(check1->ccbin, check2->ccbin) == 0 &&`
	`421`	`+ check1->ccvalid == check2->ccvalid &&`
	`422`	`+ check1->ccnoinherit == check2->ccnoinherit)`
`420`	`423`	`break;`
`421`	`424`	`}`
`422`	`425`	`if (j >= n)`