Passing subid of relation to handle_bbf_view_binding_on_object_drop

instead of 0

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

Author: Rahul Parande

contrib/babelfishpg_tsql/runtime/functions.c

@@ -4481,25 +4481,13 @@ objectproperty_internal(PG_FUNCTION_ARGS)
 		 */
 		if (pg_strcasecmp(property, "isschemabound") == 0)
 		{
+			bool is_weak_view = false;
+
 			if (type == OBJECT_TYPE_VIEW)
-			{
-				bool is_weak_view = false;
-				bool is_tsql_view = check_is_tsql_view(object_id, &is_weak_view);
-				
-				if (is_tsql_view)
-				{
-					/* Views are schema bound (return 1) */
-					pfree(property);
-					PG_RETURN_INT32(is_weak_view ? 0 : 1);
-				}
-				else
-				{
-					pfree(property);
-					PG_RETURN_INT32(0);
-				}
-			}
+				check_is_tsql_view(object_id, &is_weak_view);
+
 			pfree(property);
-			PG_RETURN_INT32(0);
+			PG_RETURN_INT32(((int) !is_weak_view));
 		}
 		/*
 		 * For ExecIsQuotedIdentOn and ExecIsAnsiNullsOn, we hardcoded it to 1

contrib/babelfishpg_tsql/src/catalog.c

@@ -1213,7 +1213,7 @@ search_bbf_view_def(Relation bbf_view_def_rel, Oid viewOid)
 	int16 		dbid = InvalidDbid;
 
 	if (!OidIsValid(viewOid))
-        return NULL;
+		return NULL;
 
 	schema_id = get_rel_namespace(viewOid);
 	schema_name = get_namespace_name(schema_id);

contrib/babelfishpg_tsql/src/hooks.c

@@ -285,7 +285,6 @@ static Query *create_dummy_view_query_for_broken_view(Oid viewOid);
 static bool repair_broken_view_recursive(Oid viewOid, List *visitedViews);
 static bool is_dummy_view(Oid viewOid);
 static bool update_bbf_view_flags(Oid viewOid, uint64 flags_to_set, uint64 flags_to_clear, bool update_validity);
-// static HeapTuple get_bbf_view_def_tuple(Oid viewOid);
 static Oid get_view_oid_from_rule(Oid ruleOid);
 
 /* Save hook values in case of unload */
@@ -3173,7 +3172,7 @@ bbf_object_access_hook(ObjectAccessType access, Oid classId, Oid objectId, int s
 
 			obj.classId = RelationRelationId;
 			obj.objectId = objectId;
-			obj.objectSubId = 0;
+			obj.objectSubId = subId;
 
 			/* Call view dependency handling function */
 			handle_bbf_view_binding_on_object_drop(&obj, NULL, NULL);
@@ -6949,7 +6948,7 @@ bbf_view_set_broken(Oid viewOid, bool mark_broken)
 				(flag_validity & BBF_VIEW_DEF_FLAG_IS_WEAK_VIEW) != 0;
 
 	/* Cannot mark a strong-bound view as broken */
-	if (mark_broken && !is_weak_view && !pltsql_weak_view_binding)
+	if (mark_broken && !is_weak_view)
 	{
 		ereport(ERROR,
 			(errcode(ERRCODE_DEPENDENT_OBJECTS_STILL_EXIST),
@@ -7014,8 +7013,7 @@ is_dummy_view(Oid viewOid)
 		foreach(lc, viewQuery->targetList)
 		{
 			TargetEntry *te = (TargetEntry *) lfirst(lc);
-			Const *con = (Const *) te->expr;
-			if (!te->resjunk && !IsA(te->expr, Const) && !con->constisnull)
+			if (te->resjunk || !IsA(te->expr, Const) || !((Const *) (te->expr))->constisnull)
 			{
 				is_dummy = false;
 				break;
@@ -7217,7 +7215,7 @@ repair_broken_views(Query *parsetree)
 	List 		*view_oids = NIL;
 	bool 		repaired = false;
 
-	if (sql_dialect != SQL_DIALECT_TSQL || !IS_TDS_CONN() || parsetree->rtable == NIL)
+	if (sql_dialect != SQL_DIALECT_TSQL || !IS_TDS_CONN())
 		return false;
 
 	/* Find all views referenced in the query, including those in subqueries and sublinks */
@@ -7333,12 +7331,15 @@ create_dummy_view_query_for_broken_view(Oid viewOid)
 bool
 handle_bbf_view_binding_on_object_drop(const ObjectAddress *droppedObject, Relation depRel, ViewStmt *stmt)
 {
-	ScanKeyData 	key[2];
+	ScanKeyData 	key[3];
 	SysScanDesc 	scan;
 	HeapTuple 		tup;
 	List 			*processed_views = NIL;
+	Oid 			viewOid = InvalidOid;
 	bool 			is_alter_view = false;
 	bool 			is_weak_view = false;
+	bool 			processed = true;
+	int             nkeys = 2;
 
 	/* Check if this is an ALTER VIEW operation */
 	is_alter_view = (stmt != NULL && stmt->createOrAlter);
@@ -7356,46 +7357,42 @@ handle_bbf_view_binding_on_object_drop(const ObjectAddress *droppedObject, Relat
 				Anum_pg_depend_refobjid,
 				BTEqualStrategyNumber, F_OIDEQ,
 				ObjectIdGetDatum(droppedObject->objectId));
+	if (droppedObject->objectSubId)
+	{
+		ScanKeyInit(&key[2],
+					Anum_pg_depend_refobjsubid,
+					BTEqualStrategyNumber, F_INT4EQ,
+					Int32GetDatum(droppedObject->objectSubId));
+		nkeys = 3;
+	}
 
+	// scan = systable_beginscan(depRel, DependReferenceIndexId, true,
+	// 						NULL, 2, key);
 	scan = systable_beginscan(depRel, DependReferenceIndexId, true,
-							NULL, 2, key);
+								NULL, nkeys, key);
 
 	/* Loop over all the direct dependents */
 	while ((tup = systable_getnext(scan)) != NULL)
 	{
 		Form_pg_depend depform = (Form_pg_depend) GETSTRUCT(tup);
 
 		/* Only handle entries for pg_rewrite rules with NORMAL dependency */
-		if (depform->classid == RewriteRelationId && 
-			depform->deptype == DEPENDENCY_NORMAL)
+		if (depform->classid != RewriteRelationId || depform->deptype != DEPENDENCY_NORMAL)
+			continue;
+		
+		viewOid = get_view_oid_from_rule(depform->objid);
+		
+		if (OidIsValid(viewOid) && !list_member_oid(processed_views, viewOid))
 		{
-			Oid 	viewOid = get_view_oid_from_rule(depform->objid);
-			
-			if (OidIsValid(viewOid) && !list_member_oid(processed_views, viewOid))
+			processed_views = lappend_oid(processed_views, viewOid);
+			if (!is_alter_view)
 			{
-				processed_views = lappend_oid(processed_views, viewOid);
-				if (!is_alter_view)
+				/* DROP operation: if dependent is weak view, mark broken */
+				is_weak_view = false;
+				if (check_is_tsql_view(viewOid, &is_weak_view) && is_weak_view)
 				{
-					/* DROP operation: if dependent is weak view, mark broken */
-					is_weak_view = false;
-					if (check_is_tsql_view(viewOid, &is_weak_view) && is_weak_view)
-					{
-						/* Mark view as broken */
-						bool 	updated = bbf_view_set_broken(viewOid, true);
-						
-						/* If the view was successfully marked as broken, create a dummy query */
-						if (updated)
-						{
-							Query *dummyQuery = create_dummy_view_query_for_broken_view(viewOid);
-							StoreViewQuery(viewOid, dummyQuery, true);
-						}
-						CommandCounterIncrement();
-					}
-				}
-				else
-				{
-					/* ALTER operation: mark weak & broken */
-					bool updated = bbf_view_set_broken(viewOid, true);
+					/* Mark view as broken */
+					bool 	updated = bbf_view_set_broken(viewOid, true);
 
 					/* If the view was successfully marked as broken, create a dummy query */
 					if (updated)
@@ -7404,16 +7401,35 @@ handle_bbf_view_binding_on_object_drop(const ObjectAddress *droppedObject, Relat
 						StoreViewQuery(viewOid, dummyQuery, true);
 					}
 					CommandCounterIncrement();
-					update_bbf_view_flags(viewOid, BBF_VIEW_DEF_FLAG_IS_WEAK_VIEW, 0, true);
 				}
 			}
+			else if (is_alter_view && pltsql_weak_view_binding)
+			{
+				/* ALTER operation: mark weak & broken */
+				update_bbf_view_flags(viewOid, BBF_VIEW_DEF_FLAG_IS_WEAK_VIEW, 0, true);
+				CommandCounterIncrement();
+				
+				bool updated = bbf_view_set_broken(viewOid, true);
+				
+				/* If the view was successfully marked as broken, create a dummy query */
+				if (updated)
+				{
+					Query *dummyQuery = create_dummy_view_query_for_broken_view(viewOid);
+					StoreViewQuery(viewOid, dummyQuery, true);
+				}
+			}
+			else
+			{
+				processed = false;
+				break;
+			}
 		}
 	}
 	systable_endscan(scan);
 	table_close(depRel, AccessShareLock);
 	list_free(processed_views);
 	CommandCounterIncrement();	
-	return true;
+	return processed;
 }
 
 /*

contrib/babelfishpg_tsql/src/pl_handler.c

@@ -1140,7 +1140,6 @@ pltsql_post_parse_analyze(ParseState *pstate, Query *query, JumbleState *jstate)
 			 * This check will happen when calling parse_analyze_fixed_params() present in DefineView()
 			 */
 			check_view_binding_dependencies(query);
-			pltsql_current_query_is_view_definition = false;
 		}
 	}
 	else if (query->commandType == CMD_UTILITY)
@@ -2475,7 +2474,7 @@ bbf_ProcessUtility(PlannedStmt *pstmt,
 					ViewStmt   *vstmt = (ViewStmt *) parsetree;
 					Oid			relid = RangeVarGetRelid(vstmt->view, NoLock, true);
 
-					if (vstmt->replace && check_is_tsql_view(relid, false))
+					if (vstmt->replace && check_is_tsql_view(relid, NULL))
 					{
 						ereport(ERROR,
 								(errcode(ERRCODE_INTERNAL_ERROR),

test/JDBC/expected/alter-view-vu-verify.out

@@ -399,7 +399,7 @@ ALTER VIEW alter_v24 AS SELECT a,b FROM alter_t;
 GO
 ~~ERROR (Code: 33557097)~~
 
-~~ERROR (Message: cannot mark schema-bound view as broken)~~
+~~ERROR (Message: cannot alter view because other objects depend on it)~~
 
 
 SELECT * FROM alter_v24;

test/JDBC/expected/weak-binding-vu-cleanup.out

@@ -162,6 +162,9 @@ GO
 DROP VIEW IF EXISTS complex_nested_view;
 GO
 
+DROP VIEW IF EXISTS no_top_level;
+GO
+
 USE master;
 GO
 

test/JDBC/expected/weak-binding-vu-verify.out

@@ -1492,7 +1492,7 @@ CREATE TABLE dml_test_table (
 GO
 
 CREATE VIEW dml_test_view AS
-SELECT id, name FROM dml_test_table;
+    SELECT id, name FROM dml_test_table;
 GO
 
 INSERT INTO dml_test_view (id, name) VALUES (1, 'Test1'), (2, 'Test2');
@@ -1536,9 +1536,16 @@ int#!#varchar
 ~~END~~
 
 
+-- View with top-level query having an empty rtable
+CREATE VIEW no_top_level AS
+    SELECT 
+        (SELECT MAX(id) FROM dml_test_view) AS max_id,
+        (SELECT MIN(id) FROM dml_test_view) AS min_id;
+GO
+
 
 ---------------------------------------------------------------
--- Views referenced inside CTE statements
+-- Broken Views referenced inside CTE statements
 ---------------------------------------------------------------
 WITH cte AS (
     SELECT * FROM dml_test_view
@@ -1600,9 +1607,18 @@ int#!#varchar
 ~~END~~
 
 
+-- View with top-level query having an empty rtable and broken view
+SELECT * FROM no_top_level;
+GO
+~~START~~
+int#!#int
+2#!#1
+~~END~~
+
+
 
 ---------------------------------------------------------------
--- Views referenced inside subqueries
+-- Broken Views referenced inside subqueries
 ---------------------------------------------------------------
 SELECT * FROM (
     SELECT * FROM dml_test_view
@@ -1662,7 +1678,9 @@ int#!#varchar
 
 
 
--- Views in subqueries inside where clause
+---------------------------------------------------------------
+-- Broken Views in subqueries inside where clause
+---------------------------------------------------------------
 SELECT * FROM dml_test_view
 WHERE id IN (
     SELECT id FROM dml_test_view WHERE name LIKE 'Test%'

test/JDBC/input/views/weak-binding-vu-cleanup.sql

@@ -162,6 +162,9 @@ GO
 DROP VIEW IF EXISTS complex_nested_view;
 GO
 
+DROP VIEW IF EXISTS no_top_level;
+GO
+
 USE master;
 GO
 

test/JDBC/input/views/weak-binding-vu-verify.sql

@@ -1041,7 +1041,7 @@ CREATE TABLE dml_test_table (
 GO
 
 CREATE VIEW dml_test_view AS
-SELECT id, name FROM dml_test_table;
+    SELECT id, name FROM dml_test_table;
 GO
 
 INSERT INTO dml_test_view (id, name) VALUES (1, 'Test1'), (2, 'Test2');
@@ -1062,8 +1062,15 @@ GO
 SELECT * FROM dml_test_view;
 GO
 
+-- View with top-level query having an empty rtable
+CREATE VIEW no_top_level AS
+    SELECT 
+        (SELECT MAX(id) FROM dml_test_view) AS max_id,
+        (SELECT MIN(id) FROM dml_test_view) AS min_id;
+GO
+
 ---------------------------------------------------------------
--- Views referenced inside CTE statements
+-- Broken Views referenced inside CTE statements
 ---------------------------------------------------------------
 
 WITH cte AS (
@@ -1103,8 +1110,12 @@ WITH cte AS (
 SELECT * FROM cte WHERE id = 1;
 GO
 
+-- View with top-level query having an empty rtable and broken view
+SELECT * FROM no_top_level;
+GO
+
 ---------------------------------------------------------------
--- Views referenced inside subqueries
+-- Broken Views referenced inside subqueries
 ---------------------------------------------------------------
 
 SELECT * FROM (
@@ -1140,7 +1151,9 @@ SELECT * FROM (
 ) AS subquery WHERE id = 1;
 GO
 
--- Views in subqueries inside where clause
+---------------------------------------------------------------
+-- Broken Views in subqueries inside where clause
+---------------------------------------------------------------
 
 SELECT * FROM dml_test_view
 WHERE id IN (