* Fixed issue with missing index schema name when make "COMMENT ON" s…

…tatement
olivierdalang · Oct 2, 2021 · 732162a · 732162a
1 parent 004c888
commit 732162a
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 6 deletions.
diff --git a/src/api/CatalogApi.js b/src/api/CatalogApi.js
@@ -488,6 +488,7 @@ class CatalogApi {
 					result[fullTableName].indexes[index.indexname] = {
 						definition: index.indexdef,
 						comment: index.comment,
+						schema: table.schemaname,
 					};
 				});
 
@@ -602,6 +603,7 @@ class CatalogApi {
 					result[fullViewName].indexes[index.indexname] = {
 						definition: index.indexdef,
 						comment: index.comment,
+						schema: view.schemaname,
 					};
 				});
 

diff --git a/src/api/CompareApi.js b/src/api/CompareApi.js
@@ -580,21 +580,45 @@ class CompareApi {
 						sqlScript.push(sql.generateDropIndexScript(index));
 					}
 					sqlScript.push(`\n${sourceTableIndexes[index].definition};\n`);
-					sqlScript.push(sql.generateChangeCommentScript(objectType.INDEX, index, sourceTableIndexes[index].comment));
+					sqlScript.push(
+						sql.generateChangeCommentScript(
+							objectType.INDEX,
+							`"${sourceTableIndexes[index].schema}"."${index}"`,
+							sourceTableIndexes[index].comment
+						)
+					);
 				} else {
 					if (droppedIndexes.includes(index)) {
 						//It will recreate a dropped index because changes happens on involved columns
 						sqlScript.push(`\n${sourceTableIndexes[index].definition};\n`);
-						sqlScript.push(sql.generateChangeCommentScript(objectType.INDEX, index, sourceTableIndexes[index].comment));
+						sqlScript.push(
+							sql.generateChangeCommentScript(
+								objectType.INDEX,
+								`"${sourceTableIndexes[index].schema}"."${index}"`,
+								sourceTableIndexes[index].comment
+							)
+						);
 					} else {
 						if (sourceTableIndexes[index].comment != targetTableIndexes[index].comment)
-							sqlScript.push(sql.generateChangeCommentScript(objectType.INDEX, index, sourceTableIndexes[index].comment));
+							sqlScript.push(
+								sql.generateChangeCommentScript(
+									objectType.INDEX,
+									`"${sourceTableIndexes[index].schema}"."${index}"`,
+									sourceTableIndexes[index].comment
+								)
+							);
 					}
 				}
 			} else {
 				//Table index not exists on target database, then generate script to add index
 				sqlScript.push(`\n${sourceTableIndexes[index].definition};\n`);
-				sqlScript.push(sql.generateChangeCommentScript(objectType.INDEX, index, sourceTableIndexes[index].comment));
+				sqlScript.push(
+					sql.generateChangeCommentScript(
+						objectType.INDEX,
+						`"${sourceTableIndexes[index].schema}"."${index}"`,
+						sourceTableIndexes[index].comment
+					)
+				);
 			}
 		}
 

diff --git a/src/sqlScriptGenerator.js b/src/sqlScriptGenerator.js
@@ -188,7 +188,9 @@ var helper = {
 
 		let indexesComment = [];
 		for (let index in schema.indexes) {
-			indexesComment.push(this.generateChangeCommentScript(objectType.INDEX, index, schema.indexes[index].comment));
+			indexesComment.push(
+				this.generateChangeCommentScript(objectType.INDEX, `"${schema.indexes[index].schema}"."${index}"`, schema.indexes[index].comment)
+			);
 		}
 
 		let script = `\nCREATE TABLE IF NOT EXISTS ${table} (\n\t${columns.join(",\n\t")}\n)${options};\n${indexes.join("\n")}\n${privileges.join(

diff --git a/test/compareTest.js b/test/compareTest.js
@@ -15,7 +15,7 @@ Config.compareOptions.schemaCompare.dropMissingFunction = true;
 Config.compareOptions.schemaCompare.dropMissingAggregate = true;
 
 Config.compareOptions.dataCompare.enable = true;
-Config.compareOptions.dataCompare.tables.push(new TableDefinition("test_generic", ["id","a_camelCaseField"]));
+Config.compareOptions.dataCompare.tables.push(new TableDefinition("test_generic", ["id","a_camelCaseField","a_string_array2"]));
 Config.compareOptions.dataCompare.tables.push(new TableDefinition("test_columnd_def_value", ["id"]));
 Config.compareOptions.dataCompare.tables.push(new TableDefinition("diff_test", ["id"]));