Merge branch 'CORE-155-covering-indexes' into localpgpro9_5

alubennikova · alubennikova · commit 1baf0df236d5 · 2016-05-04T17:46:56.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 */
