Dump and restore handling

Author: anju15bharti

src/backend/access/nbtree/nbtinsert.c

@@ -665,20 +665,21 @@ _bt_check_unique(Relation rel, BTInsertState insertstate, Relation heapRel,
 															  isnull);
 
 						{
-								const char *conname = RelationGetRelationName(rel);
-								if (bbf_get_original_index_name_hook)
-									conname = bbf_get_original_index_name_hook(conname);
-								if (bbf_get_original_constraint_name_hook && strlen(conname) >= NAMEDATALEN - 1)
-									conname = bbf_get_original_constraint_name_hook(conname);
-								ereport(ERROR,
-										(errcode(ERRCODE_UNIQUE_VIOLATION),
-										 errmsg("duplicate key value violates unique constraint \"%s\"",
-												conname),
-										 key_desc ? errdetail("Key %s already exists.",
-															  key_desc) : 0,
-										 errtableconstraint(heapRel,
-															RelationGetRelationName(rel))));
-								}
+							const char *conname = RelationGetRelationName(rel);
+
+							if (bbf_get_original_index_name_hook)
+								conname = bbf_get_original_index_name_hook(conname);
+							if (bbf_get_original_constraint_name_hook && strlen(conname) >= NAMEDATALEN - 1)
+								conname = bbf_get_original_constraint_name_hook(conname);
+							ereport(ERROR,
+									(errcode(ERRCODE_UNIQUE_VIOLATION),
+									 errmsg("duplicate key value violates unique constraint \"%s\"",
+											conname),
+									 key_desc ? errdetail("Key %s already exists.",
+														  key_desc) : 0,
+									 errtableconstraint(heapRel,
+														RelationGetRelationName(rel))));
+						}
 					}
 				}
 				else if (all_dead && (!inposting ||

src/bin/pg_dump/dump_babel_utils.c

@@ -1056,6 +1056,7 @@ setBabelfishDependenciesForLogicalDatabaseDump(Archive *fout)
 	 * sys.babelfish_namespace_ext
 	 * sys.babelfish_extended_properties
 	 * sys.babelfish_schema_permissions
+	 * sys.babelfish_identifier_mapping
 	 * sys.babelfish_partition_function
 	 * sys.babelfish_partition_scheme
 	 * sys.babelfish_partition_depend
@@ -1065,6 +1066,7 @@ setBabelfishDependenciesForLogicalDatabaseDump(Archive *fout)
 						 "FROM pg_class "
 						 "WHERE relname in ('babelfish_schema_permissions', "
 						 "'babelfish_namespace_ext', "
+						 "'babelfish_identifier_mapping', "
 						 "'babelfish_partition_function', "
 						 "'babelfish_partition_scheme', "
 						 "'babelfish_partition_depend', "
@@ -1137,6 +1139,12 @@ addFromClauseForLogicalDatabaseDump(PQExpBuffer buf, TableInfo *tbinfo)
 						  "ON a.nspname = b.nspname "
 						  "WHERE b.dbid = %d",
 						  fmtQualifiedDumpable(tbinfo), bbf_db_id);
+	else if (strcmp(tbinfo->dobj.name, "babelfish_identifier_mapping") == 0)
+		appendPQExpBuffer(buf, " FROM ONLY %s a "
+						  "INNER JOIN sys.babelfish_namespace_ext b "
+						  "ON a.nspname = b.nspname "
+						  "WHERE b.dbid = %d",
+						  fmtQualifiedDumpable(tbinfo), bbf_db_id);
 	else if(strcmp(tbinfo->dobj.name, "babelfish_authid_user_ext") == 0)
 	{
 		appendPQExpBuffer(buf, " FROM ONLY %s a "
@@ -1200,6 +1208,7 @@ addFromClauseForPhysicalDatabaseDump(PQExpBuffer buf, TableInfo *tbinfo)
 						fmtQualifiedDumpable(tbinfo), babel_init_user);
 	else if(strcmp(tbinfo->dobj.name, "babelfish_domain_mapping") == 0 ||
 			strcmp(tbinfo->dobj.name, "babelfish_function_ext") == 0 ||
+			strcmp(tbinfo->dobj.name, "babelfish_identifier_mapping") == 0 ||
 			strcmp(tbinfo->dobj.name, "babelfish_view_def") == 0 ||
 			strcmp(tbinfo->dobj.name, "babelfish_server_options") == 0 ||
 			strcmp(tbinfo->dobj.name, "babelfish_extended_properties") == 0 ||