fix failures

Author: anju15bharti

contrib/babelfishpg_tds/src/backend/tds/tdsresponse.c

@@ -1250,8 +1250,14 @@ PrepareRowDescription(TupleDesc typeinfo, PlannedStmt *plannedstmt, List *target
 			 * Use tle->resname if available and longer than attname,
 			 * since attname is limited to NAMEDATALEN-1 (63 chars).
 			 */
-			if (tle->resname && strlen(tle->resname) > strlen(NameStr(att->attname)))
+			if (tle->resname && strlen(tle->resname) > strlen(NameStr(att->attname))
+				&& pg_verifymbstr(tle->resname, strlen(tle->resname), true))
 				appendStringInfoString(&col->colName, tle->resname);
+			else if (tle->resname && strlen(tle->resname) > strlen(NameStr(att->attname)))
+			{
+				elog(WARNING, "invalid UTF8 in tle->resname for column %d, falling back to attname", attno + 1);
+				appendStringInfoString(&col->colName, NameStr(att->attname));
+			}
 			else
 			{
 				appendStringInfoString(&col->colName, NameStr(att->attname));

contrib/babelfishpg_tsql/sql/babelfishpg_tsql.sql

@@ -3299,7 +3299,7 @@ BEGIN
 							DECLARE @physical_schema_name sys.nvarchar(776) = '';
 							SELECT @physical_schema_name = nspname FROM sys.babelfish_namespace_ext WHERE dbid = sys.db_id() AND orig_name = @schemaname;
 							SELECT @curr_relname = relname FROM pg_catalog.pg_trigger tr LEFT JOIN pg_catalog.pg_class c ON tr.tgrelid = c.oid LEFT JOIN pg_catalog.pg_namespace n ON c.relnamespace = n.oid 
-							WHERE tr.tgname = @subname AND n.nspname = @physical_schema_name;
+							WHERE tr.tgname = sys.babelfish_truncate_identifier(pg_catalog.lower(@subname)) AND n.nspname = @physical_schema_name;
 						END
 				END
 			ELSE

contrib/babelfishpg_tsql/sql/upgrades/babelfishpg_tsql--6.1.0--6.2.0.sql

@@ -446,19 +446,10 @@ bbf_rewrite_truncated_identifiers(const char *msg)
 			const char *found;
 			const char *search_msg = result ? result : msg;
 
+			/* Replace all occurrences of this key in the message */
 			found = strstr(search_msg, key);
-			if (found)
+			while (found)
 			{
-				/*
-				 * Only replace if the match is a complete identifier — i.e. the
-				 * character immediately after the match is not an identifier char.
-				 * This prevents partial replacement inside compound names like
-				 * construct_unique_index_name results.
-				 */
-				char after = found[key_len];
-				if (after != '\0' && (isalnum((unsigned char) after) || after == '_'))
-					continue;
-
 				{
 					int prefix_len = found - search_msg;
 					int orig_len = strlen(entry->original_name);
@@ -468,7 +459,9 @@ bbf_rewrite_truncated_identifiers(const char *msg)
 					memcpy(newmsg, search_msg, prefix_len);
 					memcpy(newmsg + prefix_len, entry->original_name, orig_len);
 					memcpy(newmsg + prefix_len + orig_len, found + key_len, suffix_len + 1);
+					search_msg = newmsg;
 					result = newmsg;
+					found = strstr(search_msg + prefix_len + orig_len, key);
 				}
 			}
 		}
@@ -3160,9 +3153,9 @@ get_name_db_owner(HeapTuple tuple, TupleDesc dsc)
 	char	   *name_str = text_to_cstring(name);
 	char	   *name_db_owner = palloc0(MAX_BBF_NAMEDATALEND);
 
-	truncate_identifier(name_str, strlen(name_str), false);
+	truncate_tsql_identifier(name_str);
 	snprintf(name_db_owner, MAX_BBF_NAMEDATALEND, "%s_db_owner", name_str);
-	truncate_identifier(name_db_owner, strlen(name_db_owner), false);
+	truncate_tsql_identifier(name_db_owner);
 	return CStringGetDatum(name_db_owner);
 }
 
@@ -3174,9 +3167,9 @@ get_name_dbo(HeapTuple tuple, TupleDesc dsc)
 	char	   *name_str = text_to_cstring(name);
 	char	   *name_dbo = palloc0(MAX_BBF_NAMEDATALEND);
 
-	truncate_identifier(name_str, strlen(name_str), false);
+	truncate_tsql_identifier(name_str);
 	snprintf(name_dbo, MAX_BBF_NAMEDATALEND, "%s_dbo", name_str);
-	truncate_identifier(name_dbo, strlen(name_dbo), false);
+	truncate_tsql_identifier(name_dbo);
 	return CStringGetDatum(name_dbo);
 }
 
@@ -3188,9 +3181,9 @@ get_name_guest(HeapTuple tuple, TupleDesc dsc)
 	char	   *name_str = text_to_cstring(name);
 	char	   *name_dbo = palloc0(MAX_BBF_NAMEDATALEND);
 
-	truncate_identifier(name_str, strlen(name_str), false);
+	truncate_tsql_identifier(name_str);
 	snprintf(name_dbo, MAX_BBF_NAMEDATALEND, "%s_guest", name_str);
-	truncate_identifier(name_dbo, strlen(name_dbo), false);
+	truncate_tsql_identifier(name_dbo);
 	return CStringGetDatum(name_dbo);
 }
 
@@ -5444,7 +5437,9 @@ update_sysdatabases_db_name(const char *old_db_name, const char *new_db_name)
 
 	/* Set up the new database. */
 	values[Anum_sysdatabases_name - 1]   = CStringGetTextDatum(new_db_name);
-	replaces[Anum_sysdatabases_name - 1] = true;	
+	replaces[Anum_sysdatabases_name - 1] = true;
+	values[Anum_sysdatabases_orig_name - 1] = CStringGetTextDatum(new_db_name);
+	replaces[Anum_sysdatabases_orig_name - 1] = true;	
 
 	tuple = heap_modify_tuple(db_found,
 							  sysdatabases_rel_descr,

contrib/babelfishpg_tsql/src/catalog.c

@@ -851,7 +851,7 @@ pltsql_bbfCustomProcessUtility(ParseState *pstate, PlannedStmt *pstmt, const cha
 		}
 		case T_AlterTableStmt:
 		{
-			if (sql_dialect != SQL_DIALECT_TSQL && !IsBinaryUpgrade)
+			if (sql_dialect != SQL_DIALECT_TSQL && !IsBinaryUpgrade && !babelfish_dump_restore)
 			{
 				AlterTableStmt *atstmt = (AlterTableStmt *) parsetree;
 				ListCell *lcmd;

contrib/babelfishpg_tsql/src/hooks.c

@@ -1269,10 +1269,9 @@ get_physical_schema_name_by_mode(char *db_name, const char *schema_name, Migrati
 	/* Cache for error messages - with and without db prefix */
 	{
 		const char *orig = bbf_lookup_ident_name(name);
-		const char *val = orig ? orig : name;
-		/* Cache with full physical name */
+		const char *val = orig ? orig : schema_name;
 		bbf_cache_ident_name(result, val);
-		/* Cache without db prefix (what PG shows in errors) */
+		/* Also cache without db prefix for PG errors that strip it */
 		{
 			int db_len = strlen(db_name);
 			if (strncmp(result, db_name, db_len) == 0 && result[db_len] == '_')
@@ -1356,11 +1355,6 @@ get_physical_user_name(char *db_name, char *user_name, bool suppress_db_error, b
 		const char *orig = bbf_lookup_ident_name(new_user_name);
 		const char *val = orig ? orig : user_name;
 		bbf_cache_ident_name(result, val);
-		{
-			int db_len = strlen(db_name);
-			if (strncmp(result, db_name, db_len) == 0 && result[db_len] == '_')
-				bbf_cache_ident_name(result + db_len + 1, val);
-		}
 	}
 
 	/* 

contrib/babelfishpg_tsql/src/multidb.c

@@ -8726,13 +8726,34 @@ void pltsql_bbfSelectIntoUtility(ParseState *pstate, PlannedStmt *pstmt, const c
 			 */
 			Query *query = castNode(Query, ((CreateTableAsStmt *)parsetree)->query);
 			ListCell *tlc;
+			List *saved_resnames = NIL;
+
+			/* Save original resnames and truncate for table creation */
 			foreach(tlc, query->targetList)
 			{
 				TargetEntry *tle = (TargetEntry *) lfirst(tlc);
+				saved_resnames = lappend(saved_resnames, tle->resname);
 				if (tle->resname && strlen(tle->resname) >= NAMEDATALEN)
 					tle->resname = downcase_truncate_identifier(tle->resname, strlen(tle->resname), false);
 			}
-			*address = ExecCreateTableAs(pstate, (CreateTableAsStmt *)parsetree, params, queryEnv, qc);
+
+			PG_TRY();
+			{
+				*address = ExecCreateTableAs(pstate, (CreateTableAsStmt *)parsetree, params, queryEnv, qc);
+			}
+			PG_CATCH();
+			{
+				/* Restore original resnames on failure */
+				ListCell *slc = list_head(saved_resnames);
+				foreach(tlc, query->targetList)
+				{
+					TargetEntry *tle = (TargetEntry *) lfirst(tlc);
+					tle->resname = (char *) lfirst(slc);
+					slc = lnext(saved_resnames, slc);
+				}
+				PG_RE_THROW();
+			}
+			PG_END_TRY();
 		}
 		else
 		{

contrib/babelfishpg_tsql/src/pl_handler.c

@@ -4108,6 +4108,7 @@ gen_sp_rename_subcmds(const char *objname, const char *newname, const char *sche
 	else if ((objtype == OBJECT_TRIGGER))
 	{
 		ObjectWithArgs *objwargs;
+		orig_proc_funcname = pstrdup(newname);
 		renamestmt->renameType = objtype;
 		renamestmt->relation->schemaname = pstrdup(str_tolower(schemaname, strlen(schemaname), DEFAULT_COLLATION_OID));
 		renamestmt->relation->relname = downcase_truncate_identifier(curr_relname, strlen(curr_relname), false);

contrib/babelfishpg_tsql/src/procedures.c

@@ -12,7 +12,7 @@ SELECT pg_catalog.pg_get_viewdef(oid, true) FROM pg_class WHERE relname = 'view_
 GO
 ~~START~~
 text
- SELECT 1 AS "abnkxalnclksncfjnajcb jdsb;fcbo3230b498a93d3d3c201b75df000f7422";
+ SELECT 1 AS "AbnkxalnclKSNcfjNAJCb jdsb;FCBo3230b498a93d3d3c201b75df000f7422";
 ~~END~~
 
 
@@ -21,7 +21,7 @@ SELECT pg_catalog.pg_get_viewdef(oid, true) FROM pg_class WHERE relname = 'view_
 GO
 ~~START~~
 text
- SELECT 1 AS "abnkxalnclksncfjnajcb jdsb;fcbo98276e81604b6c8f5b25ae3f87180e62";
+ SELECT 1 AS "AbnkxalnclKSNcfjNAJCb jdsb;FCBo98276e81604b6c8f5b25ae3f87180e62";
 ~~END~~
 
 

test/JDBC/expected/BABEL-4231-vu-verify.out

@@ -0,0 +1,29 @@
+-- tsql
+USE master
+GO
+DROP TABLE guest.BABEL5119_t4
+GO
+DROP TABLE guest.BABEL5119_t5
+GO
+DROP TABLE guest.BABEL5119_t6
+GO
+DROP VIEW guest.BABEL5119_v4
+GO
+DROP VIEW guest.BABEL5119_v5
+GO
+DROP VIEW guest.BABEL5119_v6
+GO
+DROP PROCEDURE guest.BABEL5119_p4
+GO
+DROP PROCEDURE guest.BABEL5119_p5
+GO
+DROP PROCEDURE guest.BABEL5119_p6
+GO
+DROP LOGIN login_babel5119_1
+GO
+DROP DATABASE BABEL5119_db
+GO
+DROP LOGIN login_babel5119_2
+GO
+DROP USER user_babel5119_1
+go