Merge branch 'PGPRO_covering_index' into PGPRO9_5

vbwagner · vbwagner · commit af691cd770e3 · 2016-05-06T14:07:09.000+03:00
diff --git a/src/include/catalog/pg_constraint.h b/src/include/catalog/pg_constraint.h
@@ -100,12 +100,6 @@ CATALOG(pg_constraint,2606)
 	 */
 	int16		conkey[1];
 
- 	/*
-	 * Columns of conrelid that the constraint does not apply to,
-	 * but included into the same index with key columns.
-	 */
-	int16		conincluding[1];
-
 	/*
 	 * If a foreign key, the referenced columns of confrelid
 	 */
@@ -144,6 +138,12 @@ CATALOG(pg_constraint,2606)
 	 * If a check constraint, source-text representation of expression
 	 */
 	text		consrc;
+
+	/*
+	 * Columns of conrelid that the constraint does not apply to,
+	 * but included into the same index with key columns.
+	 */
+	int16		conincluding[1];
 #endif
 } FormData_pg_constraint;
 
@@ -176,14 +176,15 @@ typedef FormData_pg_constraint *Form_pg_constraint;
 #define Anum_pg_constraint_coninhcount		15
 #define Anum_pg_constraint_connoinherit		16
 #define Anum_pg_constraint_conkey			17
-#define Anum_pg_constraint_conincluding		18
-#define Anum_pg_constraint_confkey			19
-#define Anum_pg_constraint_conpfeqop		20
-#define Anum_pg_constraint_conppeqop		21
-#define Anum_pg_constraint_conffeqop		22
-#define Anum_pg_constraint_conexclop		23
-#define Anum_pg_constraint_conbin			24
-#define Anum_pg_constraint_consrc			25
+#define Anum_pg_constraint_confkey			18
+#define Anum_pg_constraint_conpfeqop		19
+#define Anum_pg_constraint_conppeqop		20
+#define Anum_pg_constraint_conffeqop		21
+#define Anum_pg_constraint_conexclop		22
+#define Anum_pg_constraint_conbin			23
+#define Anum_pg_constraint_consrc			24
+#define Anum_pg_constraint_conincluding		25
+
 
 
 /* Valid values for contype */
diff --git a/src/pgpro-upgrade/covering_index.sql b/src/pgpro-upgrade/covering_index.sql
@@ -0,0 +1 @@
+insert into pg_attribute select attrelid, 'conincluding', atttypid, attstattarget, attlen, 25, attndims, attcacheoff, atttypmod, attbyval, attstorage, attalign, attnotnull, atthasdef, attisdropped, attislocal, attinhcount, attcollation, attacl, attoptions, attfdwoptions from pg_attribute where attrelid = 'pg_constraint'::regclass::oid and attname ='conkey';
diff --git a/src/pgpro-upgrade/covering_index.test b/src/pgpro-upgrade/covering_index.test
@@ -0,0 +1 @@
+select count(*)>0 from pg_attribute where attname='conincluding';
diff --git a/src/pgpro-upgrade/covering_index_2.sql b/src/pgpro-upgrade/covering_index_2.sql
@@ -0,0 +1 @@
+update pg_class set relnatts=25 where relname='pg_constraint';
diff --git a/src/pgpro-upgrade/covering_index_2.test b/src/pgpro-upgrade/covering_index_2.test
@@ -0,0 +1 @@
+select relnatts=25 from pg_class where relname='pg_constraint';

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+insert into pg_attribute select attrelid, 'conincluding', atttypid, attstattarget, attlen, 25, attndims, attcacheoff, atttypmod, attbyval, attstorage, attalign, attnotnull, atthasdef, attisdropped, attislocal, attinhcount, attcollation, attacl, attoptions, attfdwoptions from pg_attribute where attrelid = 'pg_constraint'::regclass::oid and attname ='conkey';`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+select count(*)>0 from pg_attribute where attname='conincluding';`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+update pg_class set relnatts=25 where relname='pg_constraint';`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+select relnatts=25 from pg_class where relname='pg_constraint';`