Including indexes altertype bugfix

Mikhail Samoylov · dmpgpro · commit 08148288e01d · 2017-07-12T14:08:40.000+03:00
Tests for BUG PGPRO-818
diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
@@ -118,6 +118,7 @@ bool
 CheckIndexCompatible(Oid oldId,
 					 char *accessMethodName,
 					 List *attributeList,
+					 List *includingattributeList,
 					 List *exclusionOpNames)
 {
 	bool		isconstraint;
@@ -134,6 +135,7 @@ CheckIndexCompatible(Oid oldId,
 	int16	   *coloptions;
 	IndexInfo  *indexInfo;
 	int			numberOfAttributes;
+	int			numberOfKeyAttributes;
 	int			old_natts;
 	bool		isnull;
 	bool		ret = true;
@@ -153,6 +155,9 @@ CheckIndexCompatible(Oid oldId,
 	isconstraint = false;
 
 	numberOfAttributes = list_length(attributeList);
+	numberOfKeyAttributes = numberOfAttributes;
+	if (includingattributeList != NULL)
+		numberOfKeyAttributes = list_length(attributeList) - list_length(includingattributeList);
 	Assert(numberOfAttributes > 0);
 	Assert(numberOfAttributes <= INDEX_MAX_KEYS);
 
@@ -178,6 +183,8 @@ CheckIndexCompatible(Oid oldId,
 	 * later on, and it would have failed then anyway.
 	 */
 	indexInfo = makeNode(IndexInfo);
+	indexInfo->ii_NumIndexKeyAttrs = numberOfKeyAttributes;
+	indexInfo->ii_NumIndexAttrs = numberOfAttributes;
 	indexInfo->ii_Expressions = NIL;
 	indexInfo->ii_ExpressionsState = NIL;
 	indexInfo->ii_PredicateState = NIL;
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
@@ -8941,6 +8941,7 @@ TryReuseIndex(Oid oldId, IndexStmt *stmt)
 	if (CheckIndexCompatible(oldId,
 							 stmt->accessMethod,
 							 stmt->indexParams,
+							 stmt->indexIncludingParams,
 							 stmt->excludeOpNames))
 	{
 		Relation	irel = index_open(oldId, NoLock);
diff --git a/src/include/commands/defrem.h b/src/include/commands/defrem.h
@@ -40,6 +40,7 @@ extern char *ChooseRelationName(const char *name1, const char *name2,
 extern bool CheckIndexCompatible(Oid oldId,
 					 char *accessMethodName,
 					 List *attributeList,
+					 List *includingattributeList,
 					 List *exclusionOpNames);
 extern Oid	GetDefaultOpClass(Oid type_id, Oid am_id);
 
diff --git a/src/test/regress/expected/alter_table.out b/src/test/regress/expected/alter_table.out
@@ -3098,12 +3098,12 @@ Table "public.test_add_column"
  c4     | integer | 
 
 DROP TABLE test_add_column;
-
+-- test CHANGE COLUMN SIZE WITH BTREE INDEX
 CREATE TABLE test (test_column CHARACTER VARYING(128));
 CREATE INDEX test_index ON test USING btree(upper(test_column));
 ALTER TABLE test ALTER COLUMN test_column TYPE VARCHAR(2048);
 DROP TABLE test;
-
+-- test CHANGE COLUMN SIZE WITH HASH INDEX
 CREATE TABLE test (test_column CHARACTER VARYING(128));
 CREATE INDEX test_index ON test USING HASH(upper(test_column));
 WARNING:  hash indexes are not WAL-logged and their use is discouraged
diff --git a/src/test/regress/sql/alter_table.sql b/src/test/regress/sql/alter_table.sql
@@ -1953,7 +1953,7 @@ DROP TABLE test_add_column;
 
 -- test CHANGE COLUMN SIZE WITH BTREE INDEX
 CREATE TABLE test (test_column CHARACTER VARYING(128));
-CREATE INDEX test_index ON test USING btree(upper(test_column);
+CREATE INDEX test_index ON test USING btree(upper(test_column));
 ALTER TABLE test ALTER COLUMN test_column TYPE VARCHAR(2048);
 DROP TABLE test;
 

Original file line number	Diff line number	Diff line change
`@@ -8941,6 +8941,7 @@ TryReuseIndex(Oid oldId, IndexStmt *stmt)`
`8941`	`8941`	`if (CheckIndexCompatible(oldId,`
`8942`	`8942`	`stmt->accessMethod,`
`8943`	`8943`	`stmt->indexParams,`
	`8944`	`+ stmt->indexIncludingParams,`
`8944`	`8945`	`stmt->excludeOpNames))`
`8945`	`8946`	`{`
`8946`	`8947`	`Relation irel = index_open(oldId, NoLock);`