[OSS-ONLY] Update database collation related tests (babelfish-for-pos…

…tgresql#3065)

To obtain the collation related metadata information of a table returning function we were using sp_describe_first_result_set till now. This procedure also returns the system_type_id (oid) of the datatype, which can change (but not an actual issue). As we only aim to obtain the collation related info, updated the test in such a way to obtain expected columns.

###Issues Resolved
test_db_collation

Signed-off-by: Shameem Ahmed [email protected]

test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/test_db_collation-vu-cleanup.out

@@ -39,6 +39,12 @@ GO
 DROP INDEX test_db_idx8 on test_db_collation_vu_prepare_db121_columns;
 GO
 
+DROP VIEW func_output1;
+GO
+
+DROP VIEW func_output2;
+GO
+
 DROP VIEW test_db_collation_vu_prepare_db121_v1;
 GO
 

test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/test_db_collation-vu-prepare.out

@@ -344,21 +344,34 @@ RETURNS TABLE
 AS
 RETURN
 (
-    SELECT t1.nv
+    SELECT t1.nv as col
     FROM test_db_collation_vu_prepare_db121_t1 t1
     INNER JOIN test_db_collation_vu_prepare_db121_t2 t2 ON t1.nv = t2.nv ORDER BY t1.nv
 );
 GO
 
-EXEC sp_describe_first_result_set @tsql = N'SELECT * FROM test_db_collation_vu_prepare_db121_f1()';
+-- Create view to hold the function's output
+CREATE VIEW func_output1 AS
+SELECT * FROM test_db_collation_vu_prepare_db121_f1();
+GO
+
+-- Query INFORMATION_SCHEMA to get column information
+SELECT 
+    c.COLUMN_NAME,
+    c.COLLATION_NAME
+FROM 
+    INFORMATION_SCHEMA.COLUMNS c
+JOIN
+    INFORMATION_SCHEMA.VIEWS v ON c.TABLE_NAME = v.TABLE_NAME
+WHERE 
+    v.TABLE_NAME = 'func_output1';
 GO
 ~~START~~
-bit#!#int#!#varchar#!#bit#!#int#!#nvarchar#!#smallint#!#tinyint#!#tinyint#!#varchar#!#int#!#varchar#!#varchar#!#varchar#!#nvarchar#!#int#!#varchar#!#varchar#!#varchar#!#bit#!#bit#!#bit#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar#!#bit#!#bit#!#bit#!#bit#!#bit#!#smallint#!#smallint#!#smallint#!#int#!#int#!#int#!#tinyint
-0#!#1#!#nv#!#1#!#17084#!#nvarchar#!#-1#!#0#!#0#!#bbf_unicode_cp1_ci_ai#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#0#!#0#!#0#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#0#!#<NULL>#!#0#!#0#!#0#!#<NULL>#!#<NULL>#!#<NULL>#!#231#!#-1#!#15729673#!#54
+nvarchar#!#nvarchar
+col#!#bbf_unicode_cp1_ci_ai
 ~~END~~
 
 
-
 CREATE FUNCTION test_db_collation_vu_prepare_db121_f2()
 RETURNS @res_tab TABLE
 (
@@ -375,15 +388,30 @@ BEGIN
 END;
 GO
 
-EXEC sp_describe_first_result_set @tsql = N'SELECT * FROM test_db_collation_vu_prepare_db121_f2()';
+-- Create view to hold the function's output
+CREATE VIEW func_output2 AS
+SELECT * FROM test_db_collation_vu_prepare_db121_f2();
+GO
+
+-- Query INFORMATION_SCHEMA to get column information
+SELECT 
+    c.COLUMN_NAME,
+    c.COLLATION_NAME
+FROM 
+    INFORMATION_SCHEMA.COLUMNS c
+JOIN
+    INFORMATION_SCHEMA.VIEWS v ON c.TABLE_NAME = v.TABLE_NAME
+WHERE 
+    v.TABLE_NAME = 'func_output2';
 GO
 ~~START~~
-bit#!#int#!#varchar#!#bit#!#int#!#nvarchar#!#smallint#!#tinyint#!#tinyint#!#varchar#!#int#!#varchar#!#varchar#!#varchar#!#nvarchar#!#int#!#varchar#!#varchar#!#varchar#!#bit#!#bit#!#bit#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar#!#bit#!#bit#!#bit#!#bit#!#bit#!#smallint#!#smallint#!#smallint#!#int#!#int#!#int#!#tinyint
-0#!#1#!#col1#!#1#!#17028#!#varchar#!#50#!#0#!#0#!#bbf_unicode_cp1_ci_ai#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#0#!#0#!#0#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#0#!#<NULL>#!#0#!#0#!#0#!#<NULL>#!#<NULL>#!#<NULL>#!#167#!#50#!#15729673#!#54
-0#!#2#!#col2#!#1#!#17084#!#nvarchar#!#100#!#0#!#0#!#bbf_unicode_cp1_ci_ai#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#0#!#0#!#0#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#0#!#<NULL>#!#0#!#0#!#0#!#<NULL>#!#<NULL>#!#<NULL>#!#231#!#100#!#15729673#!#54
+nvarchar#!#nvarchar
+col1#!#bbf_unicode_cp1_ci_ai
+col2#!#bbf_unicode_cp1_ci_ai
 ~~END~~
 
 
+
 CREATE VIEW test_db_collation_vu_prepare_db121_v1 AS SELECT nv FROM test_db_collation_vu_prepare_db121_t1 ORDER BY nv;
 GO
 

test/JDBC/expected/test_db_collation-vu-cleanup.out

@@ -39,6 +39,12 @@ GO
 DROP INDEX test_db_idx8 on test_db_collation_vu_prepare_db121_columns;
 GO
 
+DROP VIEW func_output1;
+GO
+
+DROP VIEW func_output2;
+GO
+
 DROP VIEW test_db_collation_vu_prepare_db121_v1;
 GO
 

test/JDBC/expected/test_db_collation-vu-prepare.out

@@ -348,21 +348,34 @@ RETURNS TABLE
 AS
 RETURN
 (
-    SELECT t1.nv
+    SELECT t1.nv as col
     FROM test_db_collation_vu_prepare_db121_t1 t1
     INNER JOIN test_db_collation_vu_prepare_db121_t2 t2 ON t1.nv = t2.nv ORDER BY t1.nv
 );
 GO
 
-EXEC sp_describe_first_result_set @tsql = N'SELECT * FROM test_db_collation_vu_prepare_db121_f1()';
+-- Create view to hold the function's output
+CREATE VIEW func_output1 AS
+SELECT * FROM test_db_collation_vu_prepare_db121_f1();
+GO
+
+-- Query INFORMATION_SCHEMA to get column information
+SELECT 
+    c.COLUMN_NAME,
+    c.COLLATION_NAME
+FROM 
+    INFORMATION_SCHEMA.COLUMNS c
+JOIN
+    INFORMATION_SCHEMA.VIEWS v ON c.TABLE_NAME = v.TABLE_NAME
+WHERE 
+    v.TABLE_NAME = 'func_output1';
 GO
 ~~START~~
-bit#!#int#!#varchar#!#bit#!#int#!#nvarchar#!#smallint#!#tinyint#!#tinyint#!#varchar#!#int#!#varchar#!#varchar#!#varchar#!#nvarchar#!#int#!#varchar#!#varchar#!#varchar#!#bit#!#bit#!#bit#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar#!#bit#!#bit#!#bit#!#bit#!#bit#!#smallint#!#smallint#!#smallint#!#int#!#int#!#int#!#tinyint
-0#!#1#!#nv#!#1#!#17084#!#nvarchar#!#-1#!#0#!#0#!#bbf_unicode_cp1_ci_ai#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#0#!#0#!#0#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#0#!#<NULL>#!#0#!#0#!#0#!#<NULL>#!#<NULL>#!#<NULL>#!#231#!#-1#!#15729673#!#54
+nvarchar#!#nvarchar
+col#!#bbf_unicode_cp1_ci_ai
 ~~END~~
 
 
-
 CREATE FUNCTION test_db_collation_vu_prepare_db121_f2()
 RETURNS @res_tab TABLE
 (
@@ -379,15 +392,30 @@ BEGIN
 END;
 GO
 
-EXEC sp_describe_first_result_set @tsql = N'SELECT * FROM test_db_collation_vu_prepare_db121_f2()';
+-- Create view to hold the function's output
+CREATE VIEW func_output2 AS
+SELECT * FROM test_db_collation_vu_prepare_db121_f2();
+GO
+
+-- Query INFORMATION_SCHEMA to get column information
+SELECT 
+    c.COLUMN_NAME,
+    c.COLLATION_NAME
+FROM 
+    INFORMATION_SCHEMA.COLUMNS c
+JOIN
+    INFORMATION_SCHEMA.VIEWS v ON c.TABLE_NAME = v.TABLE_NAME
+WHERE 
+    v.TABLE_NAME = 'func_output2';
 GO
 ~~START~~
-bit#!#int#!#varchar#!#bit#!#int#!#nvarchar#!#smallint#!#tinyint#!#tinyint#!#varchar#!#int#!#varchar#!#varchar#!#varchar#!#nvarchar#!#int#!#varchar#!#varchar#!#varchar#!#bit#!#bit#!#bit#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar#!#bit#!#bit#!#bit#!#bit#!#bit#!#smallint#!#smallint#!#smallint#!#int#!#int#!#int#!#tinyint
-0#!#1#!#col1#!#1#!#17028#!#varchar#!#50#!#0#!#0#!#bbf_unicode_cp1_ci_ai#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#0#!#0#!#0#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#0#!#<NULL>#!#0#!#0#!#0#!#<NULL>#!#<NULL>#!#<NULL>#!#167#!#50#!#15729673#!#54
-0#!#2#!#col2#!#1#!#17084#!#nvarchar#!#100#!#0#!#0#!#bbf_unicode_cp1_ci_ai#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#0#!#0#!#0#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#<NULL>#!#0#!#<NULL>#!#0#!#0#!#0#!#<NULL>#!#<NULL>#!#<NULL>#!#231#!#100#!#15729673#!#54
+nvarchar#!#nvarchar
+col1#!#bbf_unicode_cp1_ci_ai
+col2#!#bbf_unicode_cp1_ci_ai
 ~~END~~
 
 
+
 CREATE VIEW test_db_collation_vu_prepare_db121_v1 AS SELECT nv FROM test_db_collation_vu_prepare_db121_t1 ORDER BY nv;
 GO
 

test/JDBC/input/test_db_collation-vu-cleanup.mix

@@ -39,6 +39,12 @@ GO
 DROP INDEX test_db_idx8 on test_db_collation_vu_prepare_db121_columns;
 GO
 
+DROP VIEW func_output1;
+GO
+
+DROP VIEW func_output2;
+GO
+
 DROP VIEW test_db_collation_vu_prepare_db121_v1;
 GO
 

test/JDBC/input/test_db_collation-vu-prepare.mix

@@ -248,15 +248,28 @@ RETURNS TABLE
 AS
 RETURN
 (
-    SELECT t1.nv
+    SELECT t1.nv as col
     FROM test_db_collation_vu_prepare_db121_t1 t1
     INNER JOIN test_db_collation_vu_prepare_db121_t2 t2 ON t1.nv = t2.nv ORDER BY t1.nv
 );
 GO
 
-EXEC sp_describe_first_result_set @tsql = N'SELECT * FROM test_db_collation_vu_prepare_db121_f1()';
+-- Create view to hold the function's output
+CREATE VIEW func_output1 AS
+SELECT * FROM test_db_collation_vu_prepare_db121_f1();
 GO
 
+-- Query INFORMATION_SCHEMA to get column information
+SELECT 
+    c.COLUMN_NAME,
+    c.COLLATION_NAME
+FROM 
+    INFORMATION_SCHEMA.COLUMNS c
+JOIN
+    INFORMATION_SCHEMA.VIEWS v ON c.TABLE_NAME = v.TABLE_NAME
+WHERE 
+    v.TABLE_NAME = 'func_output1';
+GO
 
 CREATE FUNCTION test_db_collation_vu_prepare_db121_f2()
 RETURNS @res_tab TABLE
@@ -274,9 +287,24 @@ BEGIN
 END;
 GO
 
-EXEC sp_describe_first_result_set @tsql = N'SELECT * FROM test_db_collation_vu_prepare_db121_f2()';
+-- Create view to hold the function's output
+CREATE VIEW func_output2 AS
+SELECT * FROM test_db_collation_vu_prepare_db121_f2();
+GO
+
+-- Query INFORMATION_SCHEMA to get column information
+SELECT 
+    c.COLUMN_NAME,
+    c.COLLATION_NAME
+FROM 
+    INFORMATION_SCHEMA.COLUMNS c
+JOIN
+    INFORMATION_SCHEMA.VIEWS v ON c.TABLE_NAME = v.TABLE_NAME
+WHERE 
+    v.TABLE_NAME = 'func_output2';
 GO
 
+
 CREATE VIEW test_db_collation_vu_prepare_db121_v1 AS SELECT nv FROM test_db_collation_vu_prepare_db121_t1 ORDER BY nv;
 GO