diff --git a/test/JDBC/expected/BABEL-4529-before-15_6-or-14_11-vu-cleanup.out b/test/JDBC/expected/BABEL-4529-before-15_6-or-14_11-vu-cleanup.out new file mode 100644 index 0000000000..53b0edc4c3 --- /dev/null +++ b/test/JDBC/expected/BABEL-4529-before-15_6-or-14_11-vu-cleanup.out @@ -0,0 +1,50 @@ +DROP VIEW IF EXISTS babel_4529_stats +GO + +DROP VIEW IF EXISTS babel_4529_dm_exec_connections +GO + +DROP VIEW IF EXISTS babel_4529_syscolumns +GO + +DROP VIEW IF EXISTS babel_4529_system_objects +GO + +DROP VIEW IF EXISTS babel_4529_xml_indexes +GO + +DROP VIEW IF EXISTS babel_4529_sysforeignkeys +GO + +DROP VIEW IF EXISTS babel_4529_data_spaces +GO + +DROP VIEW IF EXISTS babel_4529_sysprocesses +GO + +DROP VIEW IF EXISTS babel_4529_key_constraints +GO + +DROP VIEW IF EXISTS babel_4529_foreign_keys +GO + +DROP VIEW IF EXISTS babel_4529_sysviews +GO + +DROP VIEW IF EXISTS babel_4529_systables +GO + +DROP VIEW IF EXISTS babel_4529_default_constraints +GO + +DROP VIEW IF EXISTS babel_4529_check_constraints +GO + +DROP VIEW IF EXISTS babel_4529_types +GO + +DROP VIEW IF EXISTS babel_4529_sp_sproc_columns_view +GO + +DROP VIEW IF EXISTS babel_4529_systypes +GO diff --git a/test/JDBC/expected/BABEL-4529-before-15_6-or-14_11-vu-prepare.out b/test/JDBC/expected/BABEL-4529-before-15_6-or-14_11-vu-prepare.out new file mode 100644 index 0000000000..561d6d7c49 --- /dev/null +++ b/test/JDBC/expected/BABEL-4529-before-15_6-or-14_11-vu-prepare.out @@ -0,0 +1,84 @@ +CREATE VIEW babel_4529_stats +AS +SELECT stats_generation_method_desc FROM sys.stats +GO + +CREATE VIEW babel_4529_dm_exec_connections +AS +SELECT local_net_address, client_net_address, endpoint_id FROM sys.dm_exec_connections where local_net_address = 'test_address_4529'; +GO + +CREATE VIEW babel_4529_syscolumns +AS +SELECT printfmt FROM sys.syscolumns where name = 'test_name_4529' +GO + +CREATE VIEW babel_4529_system_objects +AS +SELECT * FROM sys.system_objects where name='test_key_constraints' +GO + +CREATE VIEW babel_4529_xml_indexes +AS +SELECT secondary_type FROM sys.xml_indexes +GO + +CREATE VIEW babel_4529_sysforeignkeys +AS +SELECT * FROM sys.sysforeignkeys where fkeyid IS NULL +GO + +CREATE VIEW babel_4529_data_spaces +AS +SELECT type FROM sys.data_spaces where type='FG' +GO + +CREATE VIEW babel_4529_sysprocesses +AS +SELECT * FROM sys.sysprocesses WHERE loginname = 'test_name_4529' +GO + +CREATE VIEW babel_4529_key_constraints +AS +SELECT type FROM sys.key_constraints where parent_object_id IS NULL +GO + +CREATE VIEW babel_4529_foreign_keys +AS +SELECT type FROM sys.foreign_keys where name = 'test_name_4529' +GO + +CREATE VIEW babel_4529_sysviews +AS +SELECT name, type, type_desc, create_date, modify_date, is_ms_shipped, is_published, is_schema_published, with_check_option, is_date_correlation_view, is_tracked_by_cdc, object_id, schema_id FROM sys.views where name = 'test_name_4529' +GO + +CREATE VIEW babel_4529_systables +AS +SELECT type FROM sys.tables where name = 'test_name_4529' +GO + +CREATE VIEW babel_4529_default_constraints +AS +SELECT type FROM sys.default_constraints where name = 'test_name_4529' +GO + +CREATE VIEW babel_4529_check_constraints +AS +SELECT type FROM sys.check_constraints where name = 'test_name_4529' +GO + +CREATE VIEW babel_4529_types +AS +SELECT name, collation_name, precision, scale, is_user_defined, is_assembly_type, is_table_type, default_object_id, rule_object_id, system_type_id, user_type_id, schema_id FROM sys.types where name = 'test_name_4529' +GO + +CREATE VIEW babel_4529_sp_sproc_columns_view +AS +SELECT precision, scale FROM sys.sp_sproc_columns_view where PROCEDURE_QUALIFIER = 'test_name_4529' +GO + +CREATE VIEW babel_4529_systypes +AS +SELECT prec FROM sys.systypes where name = 'test_name_4529' +GO diff --git a/test/JDBC/expected/BABEL-4529-before-15_6-or-14_11-vu-verify.out b/test/JDBC/expected/BABEL-4529-before-15_6-or-14_11-vu-verify.out new file mode 100644 index 0000000000..21d116c0aa --- /dev/null +++ b/test/JDBC/expected/BABEL-4529-before-15_6-or-14_11-vu-verify.out @@ -0,0 +1,119 @@ +SELECT * FROM babel_4529_stats +GO +~~START~~ +varchar +~~END~~ + + +SELECT * FROM babel_4529_dm_exec_connections +GO +~~START~~ +varchar#!#varchar#!#int +~~END~~ + + +SELECT * FROM babel_4529_syscolumns +GO +~~START~~ +varchar +~~END~~ + + +SELECT * FROM babel_4529_system_objects +GO +~~START~~ +varchar#!#int#!#int#!#int#!#int#!#char#!#nvarchar#!#datetime#!#datetime#!#bit#!#bit#!#bit#!#int#!#varchar#!#int#!#varchar +~~END~~ + + +SELECT * FROM babel_4529_xml_indexes +GO +~~START~~ +char +~~END~~ + + +SELECT * FROM babel_4529_sysforeignkeys +GO +~~START~~ +varchar#!#int#!#int#!#int#!#smallint#!#smallint#!#smallint +~~END~~ + + +SELECT * FROM babel_4529_data_spaces +GO +~~START~~ +char +FG +~~END~~ + + +SELECT * FROM babel_4529_sysprocesses +GO +~~START~~ +int#!#int#!#int#!#varbinary#!#int#!#text#!#text#!#int#!#int#!#int#!#int#!#int#!#varchar#!#varchar#!#int#!#int#!#text#!#varbinary#!#nchar#!#text#!#varchar#!#text#!#varchar#!#varchar#!#varchar#!#varchar#!#varchar#!#varbinary#!#varbinary#!#int#!#int#!#int +~~END~~ + + +SELECT * FROM babel_4529_key_constraints +GO +~~START~~ +char +~~END~~ + + +SELECT * FROM babel_4529_foreign_keys +GO +~~START~~ +char +~~END~~ + + +SELECT * FROM babel_4529_sysviews +GO +~~START~~ +varchar#!#varchar#!#varchar#!#datetime#!#datetime#!#int#!#int#!#int#!#int#!#int#!#int#!#int#!#int +~~END~~ + + +SELECT * FROM babel_4529_systables +GO +~~START~~ +char +~~END~~ + + +SELECT * FROM babel_4529_default_constraints +GO +~~START~~ +char +~~END~~ + + +SELECT * FROM babel_4529_check_constraints +GO +~~START~~ +char +~~END~~ + + +SELECT * FROM babel_4529_types +GO +~~START~~ +text#!#varchar#!#int#!#int#!#int#!#int#!#int#!#int#!#int#!#int#!#int#!#int +~~END~~ + + +SELECT * FROM babel_4529_sp_sproc_columns_view +GO +~~START~~ +int#!#smallint +~~END~~ + + +SELECT * FROM babel_4529_systypes +GO +~~START~~ +int +~~END~~ + diff --git a/test/JDBC/expected/BABEL-4529-vu-prepare.out b/test/JDBC/expected/BABEL-4529-vu-prepare.out index f6e7094d2b..561d6d7c49 100644 --- a/test/JDBC/expected/BABEL-4529-vu-prepare.out +++ b/test/JDBC/expected/BABEL-4529-vu-prepare.out @@ -5,7 +5,7 @@ GO CREATE VIEW babel_4529_dm_exec_connections AS -SELECT local_net_address, client_net_address, endpoint_id FROM sys.dm_exec_connections where session_id IS NULL; +SELECT local_net_address, client_net_address, endpoint_id FROM sys.dm_exec_connections where local_net_address = 'test_address_4529'; GO CREATE VIEW babel_4529_syscolumns diff --git a/test/JDBC/input/BABEL-4529-before-15_6-or-14_11-vu-cleanup.sql b/test/JDBC/input/BABEL-4529-before-15_6-or-14_11-vu-cleanup.sql new file mode 100644 index 0000000000..53b0edc4c3 --- /dev/null +++ b/test/JDBC/input/BABEL-4529-before-15_6-or-14_11-vu-cleanup.sql @@ -0,0 +1,50 @@ +DROP VIEW IF EXISTS babel_4529_stats +GO + +DROP VIEW IF EXISTS babel_4529_dm_exec_connections +GO + +DROP VIEW IF EXISTS babel_4529_syscolumns +GO + +DROP VIEW IF EXISTS babel_4529_system_objects +GO + +DROP VIEW IF EXISTS babel_4529_xml_indexes +GO + +DROP VIEW IF EXISTS babel_4529_sysforeignkeys +GO + +DROP VIEW IF EXISTS babel_4529_data_spaces +GO + +DROP VIEW IF EXISTS babel_4529_sysprocesses +GO + +DROP VIEW IF EXISTS babel_4529_key_constraints +GO + +DROP VIEW IF EXISTS babel_4529_foreign_keys +GO + +DROP VIEW IF EXISTS babel_4529_sysviews +GO + +DROP VIEW IF EXISTS babel_4529_systables +GO + +DROP VIEW IF EXISTS babel_4529_default_constraints +GO + +DROP VIEW IF EXISTS babel_4529_check_constraints +GO + +DROP VIEW IF EXISTS babel_4529_types +GO + +DROP VIEW IF EXISTS babel_4529_sp_sproc_columns_view +GO + +DROP VIEW IF EXISTS babel_4529_systypes +GO diff --git a/test/JDBC/input/BABEL-4529-before-15_6-or-14_11-vu-prepare.sql b/test/JDBC/input/BABEL-4529-before-15_6-or-14_11-vu-prepare.sql new file mode 100644 index 0000000000..561d6d7c49 --- /dev/null +++ b/test/JDBC/input/BABEL-4529-before-15_6-or-14_11-vu-prepare.sql @@ -0,0 +1,84 @@ +CREATE VIEW babel_4529_stats +AS +SELECT stats_generation_method_desc FROM sys.stats +GO + +CREATE VIEW babel_4529_dm_exec_connections +AS +SELECT local_net_address, client_net_address, endpoint_id FROM sys.dm_exec_connections where local_net_address = 'test_address_4529'; +GO + +CREATE VIEW babel_4529_syscolumns +AS +SELECT printfmt FROM sys.syscolumns where name = 'test_name_4529' +GO + +CREATE VIEW babel_4529_system_objects +AS +SELECT * FROM sys.system_objects where name='test_key_constraints' +GO + +CREATE VIEW babel_4529_xml_indexes +AS +SELECT secondary_type FROM sys.xml_indexes +GO + +CREATE VIEW babel_4529_sysforeignkeys +AS +SELECT * FROM sys.sysforeignkeys where fkeyid IS NULL +GO + +CREATE VIEW babel_4529_data_spaces +AS +SELECT type FROM sys.data_spaces where type='FG' +GO + +CREATE VIEW babel_4529_sysprocesses +AS +SELECT * FROM sys.sysprocesses WHERE loginname = 'test_name_4529' +GO + +CREATE VIEW babel_4529_key_constraints +AS +SELECT type FROM sys.key_constraints where parent_object_id IS NULL +GO + +CREATE VIEW babel_4529_foreign_keys +AS +SELECT type FROM sys.foreign_keys where name = 'test_name_4529' +GO + +CREATE VIEW babel_4529_sysviews +AS +SELECT name, type, type_desc, create_date, modify_date, is_ms_shipped, is_published, is_schema_published, with_check_option, is_date_correlation_view, is_tracked_by_cdc, object_id, schema_id FROM sys.views where name = 'test_name_4529' +GO + +CREATE VIEW babel_4529_systables +AS +SELECT type FROM sys.tables where name = 'test_name_4529' +GO + +CREATE VIEW babel_4529_default_constraints +AS +SELECT type FROM sys.default_constraints where name = 'test_name_4529' +GO + +CREATE VIEW babel_4529_check_constraints +AS +SELECT type FROM sys.check_constraints where name = 'test_name_4529' +GO + +CREATE VIEW babel_4529_types +AS +SELECT name, collation_name, precision, scale, is_user_defined, is_assembly_type, is_table_type, default_object_id, rule_object_id, system_type_id, user_type_id, schema_id FROM sys.types where name = 'test_name_4529' +GO + +CREATE VIEW babel_4529_sp_sproc_columns_view +AS +SELECT precision, scale FROM sys.sp_sproc_columns_view where PROCEDURE_QUALIFIER = 'test_name_4529' +GO + +CREATE VIEW babel_4529_systypes +AS +SELECT prec FROM sys.systypes where name = 'test_name_4529' +GO diff --git a/test/JDBC/input/BABEL-4529-before-15_6-or-14_11-vu-verify.sql b/test/JDBC/input/BABEL-4529-before-15_6-or-14_11-vu-verify.sql new file mode 100644 index 0000000000..2762e4f5d1 --- /dev/null +++ b/test/JDBC/input/BABEL-4529-before-15_6-or-14_11-vu-verify.sql @@ -0,0 +1,50 @@ +SELECT * FROM babel_4529_stats +GO + +SELECT * FROM babel_4529_dm_exec_connections +GO + +SELECT * FROM babel_4529_syscolumns +GO + +SELECT * FROM babel_4529_system_objects +GO + +SELECT * FROM babel_4529_xml_indexes +GO + +SELECT * FROM babel_4529_sysforeignkeys +GO + +SELECT * FROM babel_4529_data_spaces +GO + +SELECT * FROM babel_4529_sysprocesses +GO + +SELECT * FROM babel_4529_key_constraints +GO + +SELECT * FROM babel_4529_foreign_keys +GO + +SELECT * FROM babel_4529_sysviews +GO + +SELECT * FROM babel_4529_systables +GO + +SELECT * FROM babel_4529_default_constraints +GO + +SELECT * FROM babel_4529_check_constraints +GO + +SELECT * FROM babel_4529_types +GO + +SELECT * FROM babel_4529_sp_sproc_columns_view +GO + +SELECT * FROM babel_4529_systypes +GO diff --git a/test/JDBC/input/BABEL-4529-vu-prepare.sql b/test/JDBC/input/BABEL-4529-vu-prepare.sql index f6e7094d2b..561d6d7c49 100644 --- a/test/JDBC/input/BABEL-4529-vu-prepare.sql +++ b/test/JDBC/input/BABEL-4529-vu-prepare.sql @@ -5,7 +5,7 @@ GO CREATE VIEW babel_4529_dm_exec_connections AS -SELECT local_net_address, client_net_address, endpoint_id FROM sys.dm_exec_connections where session_id IS NULL; +SELECT local_net_address, client_net_address, endpoint_id FROM sys.dm_exec_connections where local_net_address = 'test_address_4529'; GO CREATE VIEW babel_4529_syscolumns diff --git a/test/JDBC/jdbc_schedule b/test/JDBC/jdbc_schedule index 0be0c2ac3f..5683cf00b4 100644 --- a/test/JDBC/jdbc_schedule +++ b/test/JDBC/jdbc_schedule @@ -92,6 +92,9 @@ ignore#!#forjson-datatypes-before-14_10-or-15_5-vu-cleanup ignore#!#sys-parsename-before-15_6-or-16_1-vu-prepare ignore#!#sys-parsename-before-15_6-or-16_1-vu-verify ignore#!#sys-parsename-before-15_6-or-16_1-vu-cleanup +ignore#!#BABEL-4529-before-15_6-or-14_11-vu-prepare +ignore#!#BABEL-4529-before-15_6-or-14_11-vu-verify +ignore#!#BABEL-4529-before-15_6-or-14_11-vu-cleanup ignore#!#AUTO_ANALYZE-before-15-5-or-14-10-vu-prepare ignore#!#AUTO_ANALYZE-before-15-5-or-14-10-vu-verify ignore#!#orderby-before-15_3-vu-prepare diff --git a/test/JDBC/upgrade/14_10/schedule b/test/JDBC/upgrade/14_10/schedule index bc09c09033..0a7910d85b 100644 --- a/test/JDBC/upgrade/14_10/schedule +++ b/test/JDBC/upgrade/14_10/schedule @@ -419,5 +419,4 @@ BABEL-2999 BABEL-4606 sys-parsename-before-15_6-or-16_1 permission_restrictions_from_pg -BABEL-4529 - +BABEL-4529-before-15_6-or-14_11 diff --git a/test/JDBC/upgrade/15_5/schedule b/test/JDBC/upgrade/15_5/schedule index a2d65f520a..53893aa204 100644 --- a/test/JDBC/upgrade/15_5/schedule +++ b/test/JDBC/upgrade/15_5/schedule @@ -486,4 +486,4 @@ babel_index_nulls_order BABEL-2999 BABEL-4606 permission_restrictions_from_pg -BABEL-4529 +BABEL-4529-before-15_6-or-14_11 diff --git a/test/python/expected/sql_validation_framework/expected_create.out b/test/python/expected/sql_validation_framework/expected_create.out index f0dda59a88..f453abfa90 100644 --- a/test/python/expected/sql_validation_framework/expected_create.out +++ b/test/python/expected/sql_validation_framework/expected_create.out @@ -85,7 +85,6 @@ Could not find tests for view sys.sp_columns_100_view Could not find tests for view sys.sp_fkeys_view Could not find tests for view sys.sp_pkeys_view Could not find tests for view sys.sp_special_columns_view -Could not find tests for view sys.sp_sproc_columns_view Could not find tests for view sys.sp_statistics_view Could not find tests for view sys.sp_stored_procedures_view Could not find tests for view sys.sp_table_privileges_view @@ -211,7 +210,6 @@ Could not find upgrade tests for view sys.sp_columns_100_view Could not find upgrade tests for view sys.sp_fkeys_view Could not find upgrade tests for view sys.sp_pkeys_view Could not find upgrade tests for view sys.sp_special_columns_view -Could not find upgrade tests for view sys.sp_sproc_columns_view Could not find upgrade tests for view sys.sp_statistics_view Could not find upgrade tests for view sys.sp_stored_procedures_view Could not find upgrade tests for view sys.sp_table_privileges_view