fix more failures

Author: anju15bharti

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

@@ -32,9 +32,6 @@
 #include "parser/parse_type.h"
 #include "parser/parsetree.h"
 #include "utils/fmgroids.h"
-#include "utils/builtins.h"
-#include "rewrite/rewriteHandler.h"
-#include "utils/lsyscache.h"
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
 #include "utils/memdebug.h"
@@ -1237,6 +1234,7 @@ PrepareRowDescription(TupleDesc typeinfo, PlannedStmt *plannedstmt, List *target
 		 */
 		SetParamMetadataCommonInfo(col, finfo);
 		initStringInfo(&(col->colName));
+		appendStringInfoString(&col->colName, NameStr(att->attname));
 
 		/* Do we have a non-resjunk tlist item? */
 		while (tlist_item &&
@@ -1246,91 +1244,13 @@ PrepareRowDescription(TupleDesc typeinfo, PlannedStmt *plannedstmt, List *target
 		{
 			tle = (TargetEntry *) lfirst(tlist_item);
 
-			/*
-			 * 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))
-				&& 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));
-
-				/* For SELECT *, try attoptions for full original name */
-				if (col->colName.len >= NAMEDATALEN - 1 && tle->resorigtbl != InvalidOid && tle->resorigcol > 0)
-				{
-					HeapTuple atttup = SearchSysCache2(ATTNUM,
-													   ObjectIdGetDatum(tle->resorigtbl),
-													   Int16GetDatum(tle->resorigcol));
-					if (HeapTupleIsValid(atttup))
-					{
-						bool isnull;
-						Datum opts = SysCacheGetAttr(ATTNUM, atttup, Anum_pg_attribute_attoptions, &isnull);
-						if (!isnull)
-						{
-							ArrayType *arr = DatumGetArrayTypeP(opts);
-							Datum *elems;
-							int n;
-							deconstruct_array(arr, TEXTOID, -1, false, TYPALIGN_INT, &elems, NULL, &n);
-							for (int i = 0; i < n; i++)
-							{
-								char *s = text_to_cstring(DatumGetTextP(elems[i]));
-								if (strncmp(s, "bbf_original_name=", 18) == 0)
-								{
-									resetStringInfo(&col->colName);
-									appendStringInfoString(&col->colName, s + 18);
-									break;
-								}
-							}
-						}
-						ReleaseSysCache(atttup);
-					}
-				}
-
-				/* Fallback: for views, lookup pg_rewrite for full column name */
-				if (col->colName.len >= NAMEDATALEN - 1 && tle->resorigtbl != InvalidOid)
-				{
-					char relkind = get_rel_relkind(tle->resorigtbl);
-					if (relkind == RELKIND_VIEW)
-					{
-						Relation vrel = relation_open(tle->resorigtbl, AccessShareLock);
-						Query *vquery = get_view_query(vrel);
-						ListCell *vlc;
-						int vcolno = 0;
-
-						foreach(vlc, vquery->targetList)
-						{
-							TargetEntry *vtle = (TargetEntry *) lfirst(vlc);
-							if (vtle->resjunk)
-								continue;
-							vcolno++;
-							if (vcolno == tle->resorigcol && vtle->resname &&
-								strlen(vtle->resname) > (Size) col->colName.len)
-							{
-								resetStringInfo(&col->colName);
-								appendStringInfoString(&col->colName, vtle->resname);
-								break;
-							}
-						}
-						relation_close(vrel, AccessShareLock);
-					}
-				}
-			}
-
 			col->relOid = tle->resorigtbl;
 			col->attrNum = tle->resorigcol;
 
 			tlist_item = lnext(targetlist, tlist_item);
 		}
 		else
 		{
-			appendStringInfoString(&col->colName, NameStr(att->attname));
 			/* No info available, so send zeroes */
 			col->relOid = 0;
 			col->attrNum = 0;

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

@@ -1330,21 +1330,25 @@ language plpgsql STABLE;
 -- Note: full view recreation needed - copy from sys_views.sql
 -- Drop deprecated views
 
--- Drop per-database wrapper views that depend on deprecated sysdatabases
+-- Drop wrapper views before dropping deprecated
 DO $$
-DECLARE
-    db_name TEXT;
-    schema_name TEXT;
+DECLARE r RECORD;
 BEGIN
-    FOR db_name IN SELECT name FROM sys.babelfish_sysdatabases
-    LOOP
-        schema_name := db_name || '_dbo';
-        IF EXISTS (SELECT 1 FROM pg_class c JOIN pg_namespace n ON c.relnamespace = n.oid WHERE c.relname = 'sysdatabases' AND n.nspname = schema_name) THEN
-            EXECUTE format('DROP VIEW IF EXISTS %I.sysdatabases', schema_name);
-        END IF;
+    FOR r IN SELECT name FROM sys.babelfish_sysdatabases LOOP
+        EXECUTE format('DROP VIEW IF EXISTS %I.sysdatabases', r.name || '_dbo');
     END LOOP;
 END $$;
 CALL sys.babelfish_drop_deprecated_object('view', 'sys', 'sysdatabases_deprecated_in_6_2_0');
+-- Recreate wrapper views
+DO $$
+DECLARE r RECORD;
+BEGIN
+    FOR r IN SELECT name FROM sys.babelfish_sysdatabases LOOP
+        EXECUTE format('CREATE VIEW %I.sysdatabases AS SELECT * FROM sys.sysdatabases', r.name || '_dbo');
+        EXECUTE format('ALTER TABLE %I.sysdatabases OWNER TO %I', r.name || '_dbo', r.name || '_dbo');
+    END LOOP;
+END $$;
+
 CALL sys.babelfish_drop_deprecated_object('view', 'sys', 'pg_namespace_ext_deprecated_in_6_2_0');
 CALL sys.babelfish_drop_deprecated_object('view', 'sys', 'sp_tables_view_deprecated_in_6_2_0');
 CALL sys.babelfish_drop_deprecated_object('view', 'sys', 'sp_special_columns_view_deprecated_in_6_2_0');
@@ -1462,6 +1466,44 @@ CREATE OR REPLACE VIEW information_schema_tsql.columns_internal AS
 		AND ext.dbid = sys.db_id();
 
 GRANT SELECT ON information_schema_tsql.columns_internal TO PUBLIC;
+CREATE OR REPLACE VIEW information_schema_tsql.tables AS
+ WITH tt_internal AS MATERIALIZED (
+  SELECT * FROM sys.table_types_internal
+ )
+ SELECT CAST(nc.dbname AS sys.nvarchar(128)) AS "TABLE_CATALOG",
+     CAST(ext.orig_name AS sys.nvarchar(128)) AS "TABLE_SCHEMA",
+     CAST(
+    COALESCE(
+     (SELECT PG_CATALOG.string_agg(
+      CASE
+      WHEN option LIKE 'bbf_original_rel_name=%' THEN substring(option, 23)
+      ELSE NULL
+      END, ',')
+     FROM unnest(c.reloptions) AS option),
+    c.relname)
+   AS sys._ci_sysname) AS "TABLE_NAME",
+
+     CAST(
+    CASE WHEN c.relkind IN ('r', 'p') THEN 'BASE TABLE'
+      WHEN c.relkind = 'v' THEN 'VIEW'
+      ELSE null END
+    AS sys.varchar(10)) COLLATE sys.database_default AS "TABLE_TYPE"
+
+ FROM sys.pg_namespace_ext nc JOIN pg_class c ON (nc.oid = c.relnamespace)
+     LEFT OUTER JOIN sys.babelfish_namespace_ext ext on nc.nspname = ext.nspname
+     LEFT JOIN tt_internal tt ON c.oid = tt.typrelid
+
+ WHERE c.relkind IN ('r', 'v', 'p')
+  AND c.relispartition = false
+  AND (NOT pg_is_other_temp_schema(nc.oid))
+  AND tt.typrelid IS NULL
+  AND (pg_has_role(c.relowner, 'USAGE')
+   OR has_table_privilege(c.oid, 'SELECT, INSERT, UPDATE, DELETE, TRUNCATE, REFERENCES, TRIGGER')
+   OR has_any_column_privilege(c.oid, 'SELECT, INSERT, UPDATE, REFERENCES') )
+  AND ext.dbid = sys.db_id()
+  AND (NOT c.relname = 'sysdatabases');
+
+GRANT SELECT ON information_schema_tsql.tables TO PUBLIC;
 
 
 -- 5o. Recreate constraint and object views to resolve original names from babelfish_identifier_mapping
@@ -3226,39 +3268,6 @@ WHERE a.atthasdef = 't' and a.attgenerated = ''
 AND has_column_privilege(a.attrelid, a.attname, 'SELECT,INSERT,UPDATE,REFERENCES');
 GRANT SELECT ON sys.default_constraints TO PUBLIC;
 
-create or replace view sys.shipped_objects_not_in_sys AS
--- This portion of view retrieves information on objects that reside in a schema in one specfic database.
--- For example, 'master_dbo' schema can only exist in the 'master' database.
--- Internally stored schema name (nspname) must be provided.
-select t.name,t.type, ns.oid as schemaid from
-(
-  values
-    ('xp_qv','master_dbo','P'),
-    ('xp_instance_regread','master_dbo','P'),
-    ('sp_addlinkedserver', 'master_dbo', 'P'),
-    ('sp_addlinkedsrvlogin', 'master_dbo', 'P'),
-    ('sp_dropserver', 'master_dbo', 'P'),
-    ('sp_droplinkedsrvlogin', 'master_dbo', 'P'),
-    ('sp_testlinkedserver', 'master_dbo', 'P'),
-    ('sp_enum_oledb_providers','master_dbo','P'),
-    ('fn_syspolicy_is_automation_enabled', 'msdb_dbo', 'FN'),
-    ('syspolicy_configuration', 'msdb_dbo', 'V'),
-    ('syspolicy_system_health_state', 'msdb_dbo', 'V')
-) t(name,schema_name, type)
-inner join pg_catalog.pg_namespace ns on t.schema_name = ns.nspname
-
-union all
-
--- This portion of view retrieves information on objects that reside in a schema in any number of databases.
--- For example, 'dbo' schema can exist in the 'master', 'tempdb', 'msdb', and any user created database.
-select t.name,t.type, ns.oid as schemaid from
-(
-  values
-    ('sysdatabases','dbo','V')
-) t (name, schema_name, type)
-inner join sys.babelfish_namespace_ext b on t.schema_name = b.orig_name
-inner join pg_catalog.pg_namespace ns on b.nspname = ns.nspname;
-GRANT SELECT ON sys.shipped_objects_not_in_sys TO PUBLIC;
 
 create or replace view sys.procedures as
 select

contrib/babelfishpg_tsql/src/hooks.c

@@ -4312,6 +4312,10 @@ is_antlr_parse_cache_enabled_for_routine(HeapTuple proctup, HeapTuple bbftup)
 	if (!HeapTupleIsValid(bbftup))
 		return pltsql_enable_antlr_parse_cache;
 
+	/* Guard against old tuples that don't have this column yet (e.g. after pg_upgrade) */
+	if (HeapTupleHeaderGetNatts(bbftup->t_data) < Anum_bbf_function_ext_antlr_parse_cache_enabled)
+		return pltsql_enable_antlr_parse_cache;
+
 	cache_flag = SysCacheGetAttr(PROCNAMENSPSIGNATURE, bbftup,
 								 Anum_bbf_function_ext_antlr_parse_cache_enabled,
 								 &isnull);

contrib/babelfishpg_tsql/src/pl_handler.c

@@ -8726,34 +8726,18 @@ 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);
-			}
-
-			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);
+					tle->resname = pstrdup(tle->resname);
+					truncate_identifier(tle->resname, strlen(tle->resname), false);
 				}
-				PG_RE_THROW();
 			}
-			PG_END_TRY();
+
+			*address = ExecCreateTableAs(pstate, (CreateTableAsStmt *)parsetree, params, queryEnv, qc);
 		}
 		else
 		{