Merge remote-tracking branch 'upstream/BABEL_5_X_DEV' into jira-babel-ssms-perf-5x

Author: Rucha Kulkarni

contrib/babelfishpg_tsql/runtime/functions.c

@@ -4455,35 +4455,15 @@ CREATE OR REPLACE FUNCTION objectproperty(
     )
 RETURNS INT AS
 'babelfishpg_tsql', 'objectproperty_internal'
-LANGUAGE C STABLE;
+LANGUAGE C STABLE STRICT;
 
 CREATE OR REPLACE FUNCTION OBJECTPROPERTYEX(
     id INT,
     property SYS.VARCHAR
 )
-RETURNS SYS.SQL_VARIANT
-AS $$
-BEGIN
-	property := PG_CATALOG.RTRIM(LOWER(COALESCE(property, '')));
-	
-	IF NOT EXISTS(SELECT ao.object_id FROM sys.all_objects ao WHERE object_id = id)
-	THEN
-		RETURN NULL;
-	END IF;
-
-	IF property = 'basetype' COLLATE "C" -- BaseType
-	THEN
-		RETURN (SELECT CAST(ao.type AS SYS.SQL_VARIANT) 
-                FROM sys.all_objects ao
-                WHERE ao.object_id = id
-                LIMIT 1
-                );
-    END IF;
-
-    RETURN CAST(OBJECTPROPERTY(id, property) AS SYS.SQL_VARIANT);
-END
-$$
-LANGUAGE plpgsql STABLE;
+RETURNS SYS.SQL_VARIANT AS
+'babelfishpg_tsql', 'objectpropertyex_internal'
+LANGUAGE C STABLE STRICT;
 
 CREATE OR REPLACE FUNCTION sys.sid_binary(IN login sys.nvarchar)
 RETURNS SYS.VARBINARY

contrib/babelfishpg_tsql/sql/sys_functions.sql

@@ -421,6 +421,22 @@ CREATE OR REPLACE AGGREGATE sys.tsql_select_for_xml_text_agg(
     FINALFUNC = tsql_query_to_xml_text_ffunc
 );
 
+CREATE OR REPLACE FUNCTION objectproperty(
+    id INT,
+    property SYS.VARCHAR
+    )
+RETURNS INT AS
+'babelfishpg_tsql', 'objectproperty_internal'
+LANGUAGE C STABLE STRICT;
+
+CREATE OR REPLACE FUNCTION OBJECTPROPERTYEX(
+    id INT,
+    property SYS.VARCHAR
+)
+RETURNS SYS.SQL_VARIANT AS
+'babelfishpg_tsql', 'objectpropertyex_internal'
+LANGUAGE C STABLE STRICT;
+
 -- Drops the temporary procedure used by the upgrade script.
 -- Please have this be one of the last statements executed in this upgrade script.
 DROP PROCEDURE sys.babelfish_drop_deprecated_object(varchar, varchar, varchar, varchar);

contrib/babelfishpg_tsql/sql/upgrades/babelfishpg_tsql--5.6.0--5.7.0.sql

@@ -1797,7 +1797,7 @@ tsql_get_constraint_nsp_oid(Oid object_id, Oid user_id)
 				 */
 				if (OidIsValid(con->conrelid))
 				{
-					if (pg_class_aclcheck(con->conrelid, user_id, ACL_SELECT) == ACLCHECK_OK)
+					if (pg_class_aclcheck(con->conrelid, user_id, ACL_SELECT | ACL_INSERT | ACL_UPDATE | ACL_DELETE | ACL_REFERENCES) == ACLCHECK_OK)
 						namespace_oid = con->connamespace;
 				}
 			}

contrib/babelfishpg_tsql/src/pltsql_utils.c

@@ -1129,7 +1129,7 @@ SELECT OBJECTPROPERTY(OBJECT_ID('objectproperty_vu_prepare_IsTrigger_trigger', '
 GO
 ~~START~~
 int
-<NULL>
+1
 ~~END~~
 
 
@@ -1151,6 +1151,25 @@ int
 ~~END~~
 
 
+-- =============== Trigger properties ===============
+-- ExecIsAnsiNullsOn on trigger
+SELECT OBJECTPROPERTY(OBJECT_ID('objectproperty_vu_prepare_IsTrigger_trigger', 'TR'), 'ExecIsAnsiNullsOn')
+GO
+~~START~~
+int
+1
+~~END~~
+
+
+-- ExecIsQuotedIdentOn on trigger
+SELECT OBJECTPROPERTY(OBJECT_ID('objectproperty_vu_prepare_IsTrigger_trigger', 'TR'), 'ExecIsQuotedIdentOn')
+GO
+~~START~~
+int
+1
+~~END~~
+
+
 -- tsql user=objectproperty_login_1 password=12345678
 -- user does not have permission on the object (should return NULL)
 SELECT OBJECTPROPERTY(OBJECT_ID('IsTrigger_trigger', 'TR'), 'IsTrigger')

test/JDBC/expected/objectproperty-vu-verify.out

@@ -1567,7 +1567,7 @@ SELECT OBJECTPROPERTY(OBJECT_ID('IsTrigger_trigger', 'TR'), 'IsTrigger')
 GO
 ~~START~~
 int
-<NULL>
+1
 ~~END~~
 
 
@@ -3202,7 +3202,7 @@ SELECT OBJECTPROPERTY(OBJECT_ID('IsTrigger_trigger', 'TR'), 'IsTrigger')
 GO
 ~~START~~
 int
-<NULL>
+1
 ~~END~~
 
 

test/JDBC/expected/objectproperty.out

@@ -1,15 +1,78 @@
-DROP TABLE objectpropertyex_ownerid_schema.objectpropertyex_ownerid_table
+-- =============== ACL tests ===============
+DROP USER objectpropertyex_test_user
 GO
 
-DROP SCHEMA objectpropertyex_ownerid_schema
+DROP LOGIN objectpropertyex_test_login
+GO
+
+-- =============== Cross-database scoping ===============
+DROP DATABASE objectpropertyex_otherdb
+GO
+
+
+-- =============== Properties test objects ===============
+DROP INDEX objectpropertyex_idx ON objectpropertyex_indexed_table
+GO
+
+DROP TABLE objectpropertyex_indexed_table
+GO
+
+DROP TABLE objectpropertyex_noindex_table
+GO
+
+DROP TABLE objectpropertyex_default_table
+GO
+
+DROP TABLE objectpropertyex_notshipped_table
+GO
+
+DROP FUNCTION objectpropertyex_schemabound_fn
+GO
+
+DROP FUNCTION objectpropertyex_noschemabound_fn
+GO
+
+
+-- =============== IsSchemaBound - schema-bound view ===============
+DROP VIEW objectpropertyex_schemabound_view
+GO
+
+
+-- =============== BaseType - additional object types ===============
+DROP FUNCTION objectpropertyex_tvf
+GO
+
+DROP FUNCTION objectpropertyex_itvf
+GO
+
+DROP SEQUENCE objectpropertyex_test_seq
+GO
+
+DROP TABLE objectpropertyex_fk_table
+GO
+
+DROP TABLE objectpropertyex_constraint_table
+GO
+
+DROP TRIGGER objectpropertyex_test_trigger
+GO
+
+DROP TABLE objectpropertyex_trigger_table
+GO
+
+
+-- =============== Special Input Cases ===============
+DROP TABLE objectpropertyex_specialinput_table
 GO
 
 
 -- =============== BaseType ===============
--- Cleanup
 DROP TABLE objectpropertyex_basetype_table
 GO
 
+DROP TYPE objectpropertyex_basetype_tt
+GO
+
 DROP VIEW objectpropertyex_basetype_view
 GO
 
@@ -20,7 +83,22 @@ DROP PROC objectpropertyex_basetype_proc
 GO
 
 
--- =============== Special Input Cases ===============
--- Cleanup
-DROP TABLE objectpropertyex_specialinput_table
+-- =============== OwnerId ===============
+DROP TABLE objectpropertyex_ownerid_schema.objectpropertyex_ownerid_table
+GO
+
+DROP SCHEMA objectpropertyex_ownerid_schema
+GO
+
+-- =============== Permission edge cases ===============
+DROP TABLE objectpropertyex_oid_helper
+GO
+
+DROP TABLE objectpropertyex_perm_table
+GO
+
+DROP USER objectpropertyex_perm_user
+GO
+
+DROP LOGIN objectpropertyex_perm_login
 GO

test/JDBC/expected/objectpropertyex-before-16_5-or-15_9-vu-cleanup.out

@@ -10,6 +10,9 @@ GO
 CREATE TABLE objectpropertyex_basetype_table(a int)
 GO
 
+CREATE TYPE objectpropertyex_basetype_tt AS TABLE(a int)
+GO
+
 CREATE VIEW objectpropertyex_basetype_view AS
 SELECT 1
 GO
@@ -32,3 +35,123 @@ GO
 -- Setup
 CREATE TABLE objectpropertyex_specialinput_table(a int)
 GO
+
+
+-- =============== BaseType - additional object types ===============
+-- Trigger
+CREATE TABLE objectpropertyex_trigger_table(a int)
+GO
+
+CREATE TRIGGER objectpropertyex_test_trigger ON objectpropertyex_trigger_table
+AFTER INSERT AS
+BEGIN
+    SELECT 1
+END
+GO
+
+-- Constraints: PK, FK, CHECK, DEFAULT
+CREATE TABLE objectpropertyex_constraint_table(
+    a int,
+    b int DEFAULT 42,
+    c int CHECK (c > 0),
+    CONSTRAINT objectpropertyex_pk PRIMARY KEY (a)
+)
+GO
+
+CREATE TABLE objectpropertyex_fk_table(
+    x int,
+    CONSTRAINT objectpropertyex_fk FOREIGN KEY (x) REFERENCES objectpropertyex_constraint_table(a)
+)
+GO
+
+-- Sequence
+CREATE SEQUENCE objectpropertyex_test_seq START WITH 1
+GO
+
+-- Inline table-valued function
+CREATE FUNCTION objectpropertyex_itvf()
+RETURNS TABLE
+AS
+RETURN (SELECT 1 AS col1)
+GO
+
+-- Multi-statement table-valued function
+CREATE FUNCTION objectpropertyex_tvf()
+RETURNS @result TABLE (col1 int)
+AS
+BEGIN
+    INSERT @result VALUES (1)
+    RETURN
+END
+GO
+
+
+-- =============== Properties test objects ===============
+-- IsSchemaBound
+CREATE FUNCTION objectpropertyex_schemabound_fn()
+RETURNS int
+WITH SCHEMABINDING
+BEGIN
+    RETURN 1
+END
+GO
+
+CREATE FUNCTION objectpropertyex_noschemabound_fn()
+RETURNS int
+BEGIN
+    RETURN 1
+END
+GO
+
+-- IsIndexed
+CREATE TABLE objectpropertyex_indexed_table(a int)
+GO
+
+CREATE INDEX objectpropertyex_idx ON objectpropertyex_indexed_table(a)
+GO
+
+CREATE TABLE objectpropertyex_noindex_table(a int)
+GO
+
+-- IsDefaultCnst
+CREATE TABLE objectpropertyex_default_table(a int DEFAULT 10)
+GO
+
+-- IsMSShipped
+CREATE TABLE objectpropertyex_notshipped_table(a int)
+GO
+
+
+-- =============== IsSchemaBound - schema-bound view ===============
+CREATE VIEW objectpropertyex_schemabound_view
+WITH SCHEMABINDING
+AS
+SELECT 1 AS col1
+GO
+
+-- =============== Cross-database scoping ===============
+CREATE DATABASE objectpropertyex_otherdb
+GO
+
+USE objectpropertyex_otherdb
+GO
+
+CREATE TABLE objectpropertyex_otherdb_table(a int)
+GO
+
+USE master
+GO
+
+-- =============== Permission edge cases (OID helper) ===============
+CREATE TABLE objectpropertyex_perm_table(a int)
+GO
+
+CREATE TRIGGER objectpropertyex_perm_trigger ON objectpropertyex_perm_table INSTEAD OF INSERT
+AS
+BEGIN
+    SELECT * FROM objectpropertyex_perm_table
+END
+GO
+-- Store OIDs so restricted users can bypass OBJECT_ID() limitation
+CREATE TABLE objectpropertyex_oid_helper(name varchar(100), oid_val int)
+GO