1. Moved logic to find schema_name, view_name, etc in search_bbf_view_def

2. Updated recursion logic to mark only direct dependency as broken or weak

Signed-off-by: Rahul Parande <rparande@amazon.com>

Author: Rahul Parande

contrib/babelfishpg_tsql/src/catalog.c

@@ -1199,17 +1199,40 @@ get_bbf_view_def_idx_oid()
 }
 
 HeapTuple
-search_bbf_view_def(Relation bbf_view_def_rel, int16 dbid, const char *logical_schema_name, const char *view_name)
+search_bbf_view_def(Relation bbf_view_def_rel, Oid viewOid)
 {
 
 	ScanKeyData scanKey[3];
 	SysScanDesc scan;
 	HeapTuple	scantup,
 				oldtup;
+	Oid 		schema_id;
+	char 		*schema_name,
+				*view_name;
+	const char  *logical_schema_name = NULL;
+	int16 		dbid = InvalidDbid;
+
+	if (OidIsValid(viewOid))
+	{
+		schema_id = get_rel_namespace(viewOid);
+		schema_name = get_namespace_name(schema_id);
+		view_name = get_rel_name(viewOid);
+		
+		if (!schema_name)
+			return NULL;
+		
+		logical_schema_name = get_logical_schema_name(schema_name, true);
+		dbid = get_dbid_from_physical_schema_name(schema_name, true);
+	}
 
 	if (!DbidIsValid(dbid) || logical_schema_name == NULL || view_name == NULL)
+	{
+		pfree(view_name);
+		pfree(schema_name);
+		if (logical_schema_name)
+			pfree((char *) logical_schema_name);
 		return NULL;
-
+	}
 
 	/* Search and drop the definition */
 	ScanKeyInit(&scanKey[0],
@@ -1280,8 +1303,7 @@ check_is_tsql_view(Oid relid, bool *is_weak_view)
 	}
 	/* Fetch the relation */
 	bbf_view_def_rel = table_open(get_bbf_view_def_oid(), AccessShareLock);
-
-	scantup = search_bbf_view_def(bbf_view_def_rel, logical_dbid, logical_schema_name, view_name);
+	scantup = search_bbf_view_def(bbf_view_def_rel, relid);
 
 	if (HeapTupleIsValid(scantup))
 	{

contrib/babelfishpg_tsql/src/catalog.h

@@ -216,8 +216,7 @@ extern Oid	bbf_view_def_idx_oid;
 
 extern Oid	get_bbf_view_def_oid(void);
 extern Oid	get_bbf_view_def_idx_oid(void);
-extern HeapTuple search_bbf_view_def(Relation bbf_view_def_rel, int16 dbid,
-									 const char *logical_schema_name, const char *view_name);
+extern HeapTuple search_bbf_view_def(Relation bbf_view_def_rel, Oid viewOid);
 extern bool check_is_tsql_view(Oid relid, bool *is_weak_view);
 extern void clean_up_bbf_view_def(int16 dbid);
 extern void drop_bbf_schema_permission_entries(int16 dbid);