From 2ff205c66cd8a2d71167950bc02f7d02df750c9a Mon Sep 17 00:00:00 2001 From: Jason Teng Date: Wed, 12 Jun 2024 19:21:47 +0000 Subject: [PATCH 1/6] Initial commit for Babelfish v2.10 Signed-off-by: Jason Teng --- .../upgrade-test-configuration.yml | 12 + .github/template/version-branch-template.yml | 3 + contrib/babelfishpg_tsql/Version.config | 2 +- .../babelfishpg_tsql--2.9.0--2.10.0.sql | 62 +++ .../babelfishpg_tsql/src/babelfish_version.h | 4 +- test/JDBC/upgrade/14_12/schedule | 433 ++++++++++++++++++ 6 files changed, 513 insertions(+), 3 deletions(-) create mode 100644 contrib/babelfishpg_tsql/sql/upgrades/babelfishpg_tsql--2.9.0--2.10.0.sql create mode 100644 test/JDBC/upgrade/14_12/schedule diff --git a/.github/configuration/upgrade-test-configuration.yml b/.github/configuration/upgrade-test-configuration.yml index 757c35a5ba..3d56f6cbfc 100644 --- a/.github/configuration/upgrade-test-configuration.yml +++ b/.github/configuration/upgrade-test-configuration.yml @@ -58,6 +58,18 @@ upgrade-version: [{ } ] }, +{ + upgrade-path: [ + { + version: '14.12', + upgrade-type: null + }, + { + version: target.latest, + upgrade-type: minor + } + ] +}, { upgrade-path: [ { diff --git a/.github/template/version-branch-template.yml b/.github/template/version-branch-template.yml index d73a4dbc23..cd06636ce0 100644 --- a/.github/template/version-branch-template.yml +++ b/.github/template/version-branch-template.yml @@ -37,6 +37,9 @@ '14.11': engine_branch: BABEL_2_8_STABLE__PG_14_11 extension_branch: BABEL_2_8_STABLE +'14.12': + engine_branch: BABEL_2_9_STABLE__PG_14_12 + extension_branch: BABEL_2_9_STABLE 'source.latest': engine_branch: latest extension_branch: latest diff --git a/contrib/babelfishpg_tsql/Version.config b/contrib/babelfishpg_tsql/Version.config index e2fb0ab18f..59157caf2a 100644 --- a/contrib/babelfishpg_tsql/Version.config +++ b/contrib/babelfishpg_tsql/Version.config @@ -2,6 +2,6 @@ # places during the build process PGTSQL_MAJOR_VERSION=2 -PGTSQL_MINOR_VERSION=9 +PGTSQL_MINOR_VERSION=10 PGTSQL_MICRO_VERSION=0 diff --git a/contrib/babelfishpg_tsql/sql/upgrades/babelfishpg_tsql--2.9.0--2.10.0.sql b/contrib/babelfishpg_tsql/sql/upgrades/babelfishpg_tsql--2.9.0--2.10.0.sql new file mode 100644 index 0000000000..e43e6351b4 --- /dev/null +++ b/contrib/babelfishpg_tsql/sql/upgrades/babelfishpg_tsql--2.9.0--2.10.0.sql @@ -0,0 +1,62 @@ +-- complain if script is sourced in psql, rather than via ALTER EXTENSION +\echo Use "ALTER EXTENSION ""babelfishpg_tsql"" UPDATE TO '2.10.0'" to load this file. \quit + +-- add 'sys' to search path for the convenience +SELECT set_config('search_path', 'sys, '||current_setting('search_path'), false); + +-- This is a temporary procedure which is called during upgrade to update guest schema +-- for the guest users in the already existing databases +CREATE OR REPLACE PROCEDURE sys.babelfish_update_user_catalog_for_guest_schema() +LANGUAGE C +AS 'babelfishpg_tsql', 'update_user_catalog_for_guest_schema'; + +CALL sys.babelfish_update_user_catalog_for_guest_schema(); + +-- Drop this procedure after it gets executed once. +DROP PROCEDURE sys.babelfish_update_user_catalog_for_guest_schema(); + +-- Drops an object if it does not have any dependent objects. +-- Is a temporary procedure for use by the upgrade script. Will be dropped at the end of the upgrade. +-- Please have this be one of the first statements executed in this upgrade script. +CREATE OR REPLACE PROCEDURE babelfish_drop_deprecated_object(object_type varchar, schema_name varchar, object_name varchar) AS +$$ +DECLARE + error_msg text; + query1 text; + query2 text; +BEGIN + + query1 := pg_catalog.format('alter extension babelfishpg_tsql drop %s %s.%s', object_type, schema_name, object_name); + query2 := pg_catalog.format('drop %s %s.%s', object_type, schema_name, object_name); + + execute query1; + execute query2; +EXCEPTION + when object_not_in_prerequisite_state then --if 'alter extension' statement fails + GET STACKED DIAGNOSTICS error_msg = MESSAGE_TEXT; + raise warning '%', error_msg; + when dependent_objects_still_exist then --if 'drop view' statement fails + GET STACKED DIAGNOSTICS error_msg = MESSAGE_TEXT; + raise warning '%', error_msg; +end +$$ +LANGUAGE plpgsql; + +-- Please add your SQLs here +/* + * Note: These SQL statements may get executed multiple times specially when some features get backpatched. + * So make sure that any SQL statement (DDL/DML) being added here can be executed multiple times without affecting + * final behaviour. + */ + + + +-- 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); + +-- After upgrade, always run analyze for all babelfish catalogs. +CALL sys.analyze_babelfish_catalogs(); + +-- Reset search_path to not affect any subsequent scripts +SELECT set_config('search_path', trim(leading 'sys, ' from current_setting('search_path')), false); diff --git a/contrib/babelfishpg_tsql/src/babelfish_version.h b/contrib/babelfishpg_tsql/src/babelfish_version.h index 1764cf3e8e..582d5aeef4 100644 --- a/contrib/babelfishpg_tsql/src/babelfish_version.h +++ b/contrib/babelfishpg_tsql/src/babelfish_version.h @@ -8,7 +8,7 @@ *------------------------------------------------------------------------- */ -#define BABELFISH_VERSION_STR "2.9.0" -#define BABELFISH_INTERNAL_VERSION_STR "Babelfish 14.12.0.0" +#define BABELFISH_VERSION_STR "2.10.0" +#define BABELFISH_INTERNAL_VERSION_STR "Babelfish 14.13.0.0" #define BABEL_COMPATIBILITY_VERSION "12.0.2000.8" #define BABEL_COMPATIBILITY_MAJOR_VERSION "12" diff --git a/test/JDBC/upgrade/14_12/schedule b/test/JDBC/upgrade/14_12/schedule new file mode 100644 index 0000000000..f4502e3ac7 --- /dev/null +++ b/test/JDBC/upgrade/14_12/schedule @@ -0,0 +1,433 @@ +# Schedule File for JDBC Test Framework for local run +# 1. Lines starting with '#' will be treated as comments +# 2. To run a postgres command: cmd#!#postgresql#!# +# 3. To run a T-SQL command: cmd#!#sqlserver#!# +# 4. Keyword "all" is equivalent to running all test files in +# input folder +# 5. To add a test, add test name (without extension, -vu-prepare, -vu-verify and -vu-cleanup. For example if test file name is TestBigInt-vu-prepare.txt write TestBigInt) on a new line + +# This should be the first test to check there are no duplicated object_ids +BABEL-3613 + +babelfish_cast_floor +babel_try_parse +TestBigInt +TestBinary +TestBIT +TestChar +TestDatetime2 +TestDatetime +TestDate +TestDecimal +TestFloat +TestImage +TestInt +TestMoney +TestNumeric +TestReal +TestSmallDatetime +TestSmallInt +TestSmallMoney +TestSQLVariant +TestText +TestTime +TestTinyInt +TestUDD +TestUniqueIdentifier +TestVarChar +TestXML +sys-assembly_types +sys-database_mirroring +sys-databases +sys-numbered_procedures +BABEL-3121 +sys-events +sys-suser_sid +sys-trigger_events +BABEL-2688 +BABEL-328 +BABEL-3192 +BABEL-3221 +BABEL-3204 +BABEL-3234 +BABEL-3402 +cast_numeric_types_to_datetime +cast_numeric_types_to_smalldatetime +routines_definition +column_domain_usage +constraint_column_usage +sp_describe_first_result_set +sys-host_name +SYSTEM_USER +indexproperty +sys-all_parameters +msdb-dbo-syspolicy_configuration +sys-all_views +datepart +sys-server_principals +fulltextserviceproperty +is_srvrolemember +msdb-dbo-fn_syspolicy_is_automation_enabled +objectproperty +objectpropertyex +sys-column-property +sys-configurations +sys-datefirst +sys-lock_timeout +sys-max_connections +sys-original_login +sys-schema-name +sys-objects +sys-procedures +sys-sysdatabases +sys-sysobjects +sys-trigger_nestlevel +schema_resolution_proc +BABEL-404 +BABEL-493 +BABEL-621-before-14_13 +BABEL-775 +BABEL-1206 +BABEL-1251 +BABEL-1319 +BABEL-1444 +BABEL-1465 +BABEL-1466 +BABEL-1654 +BABEL-1715 +BABEL-2086 +BABEL-3314 +BABEL-TABLEOPTIONS +BABEL-2765 +BABEL-2819 +BABEL-2917 +BABEL-2955 +BABEL-3358 +BABEL-3747 +BABEL-3781 +temp-tables +table-variable +TestNotNull +Test-Identity +Test-Computed-Columns +BABEL-1189 +BABEL-1062 +BABEL-1243 +BABEL-1493 +BABEL-1963 +BABEL-2203 +BABEL-2208 +BABEL-2257 +BABEL-2449 +BABEL-2535 +BABEL-2787-2 +BABEL-2787 +BABEL-2805 +BABEL-2812 +BABEL-2845 +BABEL-2884 +BABEL-2944 +BABEL-3116 +BABEL-3117 +BABEL-3118 +BABEL-3249 +BABEL-3486 +BABEL-3474 +BABEL-3614 +BABEL-3646 +BABEL-3748 +BABEL-383 +BABEL-405 +BABEL-937 +forjson +forjson-subquery +forjson-datatypes +forjson-nesting +forxml +forxml-subquery +BABEL-PROCID +babel_trigger +insteadoftriggers_with_transaction +insteadof_nested_trigger_inside_proc +insteadof_nested_trigger_with_dml +nested_trigger_inside_proc +nested_trigger_with_dml +newid_before_14_12_or_15_7_or_16_3 +triggers_with_transaction +Test-sp_addrole +Test-sp_addrolemember +Test-sp_droprole +Test-sp_droprolemember +Test-sp_helpdbfixedrole +Test-sp_helpsrvrolemember +Test-sp_helpuser +Test-sp_set_session_context +Test-sp_set_session_context-dep +TestTableType +BABEL-CROSS-DB +BABEL-LOGIN +BABEL-USER +BABEL-ROLE +babelfish_sysdatabases +babelfish_namespace_ext +babelfish_authid_login_ext +babelfish_authid_user_ext +babelfish_inconsistent_metadata +babelfish_migration_mode +schema_resolution_func +BABEL-3147-before-16_3-or-15_7-or-14_12 +collation_tests_arabic +collation_tests_greek +collation_tests_mongolian +collation_tests_polish +collation_tests +babel_datetime +babel_char +BABEL-SQUARE +BABEL-728 +babel_function_string +BABEL-1566 +BABEL-3360 +BABEL-3380 +babel_isnumeric +HAS_DBACCESS +BABEL-1475 +BABEL-1510 +BABEL-3213 +BABEL-3010 +BABEL-3369 +BABEL-3370 +BABEL-RAND +BABEL-741 +BABEL-ROLE-MEMBER +tdscollation +BABEL-EXTENDEDPROPERTY +BABEL-EXECUTE_AS_CALLER +sys-filegroups +sys-filetables +sys-fulltext_indexes +sys-hash_indexes +sys-plan_guides +sp_tablecollations +sys-assemblies +BABEL-LOGIN-USER-EXT +bitwise_not-operator +BABEL-1683 +BABEL-1953 +schema_resolution_trigger +select-strip-parens +sys_all_objects-dep +sys-columns-dep +sys-databases-dep +sys-foreign_key_columns-dep +sys-foreign_keys-dep +sys-identity_columns-dep +sys-indexes-dep +sys-key_constraints-dep +sys-schemas-dep +sys-sp_tables_view-dep +sys-sysforeignkeys-dep +sys-tables-dep +sys-types-dep +sys-views-dep +sys-check_constraints-dep +sys-computed_columns-dep +sys-default_constraints-dep +sys-index_columns-dep +sys-sp_databases-dep +sys-syscolumns-dep +sys-dm_exec_connections-dep +sys-dm_exec_sessions-dep +sys-table_types-dep +sys-sql_modules-before-14_12-dep +sys-all_sql_modules-before-14_12-dep +sys-system_sql_modules-dep +sys-triggers-dep +sys-proc_param_helper-dep +BABEL-2877 +sys-sp_pkeys +sys-sp_statistics +BABEL-APPLOCK +BABEL-1438 +BABEL-SP_DATATYPE_INFO +BABEL-SPCOLUMNS +BABEL-SP_TABLES +BABEL-SP_SPECIAL_COLUMNS +BABEL-SP_TABLE_PRIVILIGES +BABEL-SP_FKEYS +BABEL-SP_STORED_PROCEDURES +BABEL-SP_SPROC_COLUMNS +BABEL-3000 +sys-sp_pkeys-dep +sys-sp_statistics-dep +BABEL-SPCOLUMNS-dep +BABEL-SP_COLUMNS_MANAGED-dep +BABEL-SP_SPECIAL_COLUMNS-dep +BABEL-SP_SPECIAL_COLUMNS_100-dep +BABEL-SP_FKEYS-dep +BABEL-SP_STORED_PROCEDURES-dep +BABEL-SP_SPROC_COLUMNS-dep +BABEL-SP_SPROC_COLUMNS_100-dep +BABEL-3000-dep +Test-sp_helprole-dep +Test-sp_helprolemember-dep +format +format-dep +msdb-dbo-syspolicy_system_health_state +dateadd_internal_df +sys-all_columns +sys-all_columns-dep +sys-all_sql_modules +sys-assembly_modules +sys-change_tracking_databases +sys-change_tracking_tables +sys-check_constraints +sys-columns +sys-computed_columns +sys-data_spaces +sys-database_files +sys-database_filestream_options +sys-database_recovery_status +sys-default_constraints +sys-dm_exec_connections +sys-dm_exec_sessions +sys-dm_hadr_cluster +sys-dm_hadr_database_replica_states +sys-dm_os_host_info +sys-endpoints +sys-extended_properties +sys-filetable_system_defined_objects +sys-foreign_key_columns +sys-foreign_keys +sys-fulltext_catalogs +sys-fulltext_index_columns +sys-fulltext_languages +sys-fulltext_stoplists +sys-identity_columns +sys-index_columns +sys-indexes +sys-key_constraints +sys-master_files +sys-nestlevel-dep +sys-partitions +sys-partitions-dep +sys-registered_search_property_lists +sys-schemas +sys-selective_xml_index_paths +sys-sid_binary +sys-sp_databases +sys-sp_tables_view +sys-spatial_index_tessellations +sys-spatial_indexes +sys-stats +sys-synonyms +sys-syscharsets +sys-syscolumns +sys-sysforeignkeys +sys-syslanguages +sys-system_sql_modules +sys-sql_modules +sys-table_types +sys-tables +sys-triggers +sys-types +sys-views +sys-xml_indexes +sys-xml_schema_collections +sys_all_objects +sys_babelfish_configurations_view +BABEL-1249 +BABEL-1291 +BABEL-1994-CHAR +BABEL-1994-VARCHAR +BABEL-889 +babel_417 +babel_datatype_sqlvariant +babel_sqlvariant_cast_compare +BABEL-3347 +BABEL-3144 +sys-all_parameters-dep +BABEL-3556 +BABEL-3588 +BABEL-3268 +BABEL-3513 +BABEL_GRANT_CONNECT +BABEL-sp_helpdb +BABEL-2795 +babelfish_integrity_checker +get_tds_id +BABEL-PG-SYSTEM-FUNCTIONS +BABEL-3655 +BABEL-3702 +openjson +sys-table_types_internal +sys-table_types_internal-dep +BABEL-CHECK-CONSTRAINT +BABEL-3640 +sys-sysindexes +sys-system_objects +ISC-Views +ISC-Tables +ISC-Columns +#ISC-Check-Constraints +ISC-Table_Constraints +sys_server_principals_dep +sys_database_principals_dep +datediff_big +atn2 +app_name +str +ISC-sequences +jira-BABEL-3504-upgrade +case_insensitive_collation +sys-has_perms_by_name +sys-has_perms_by_name-dep +BABEL_OBJECT_ID +BABEL_SCHEMATA +isc-schemata-dep +AVG-Aggregate-common +AVG-Aggregate-Dep +bbf_view_def +Test-sp_babelfish_volatility +BABEL-3802 +BABEL-3914 +BABEL_OBJECT_NAME +sys-systypes +BABEL_OBJECT_DEFINITION +datediff_internal_date +Test-sp_rename +Test-sp_rename-dep +BABEL-3657 +BABEL-733 +BABEL-3938 +BABEL-NEXT-VALUE-FOR +BABEL-4098 +TestVariableDataLength +binary-index +BABEL-4078 +BABEL-3215 +orderby +babel_int4_varbinary_div +babel_varbinary_int4_div +sys-sql_expression_dependencies +smalldatetimefromparts-dep +BABEL_4330 +Test_ISNULL +BABEL-4410 +#AUTO_ANALYZE #uncomment this test when preparing for new minor version +BABEL-4231 +sys_asymmetric_keys +sys_certificates +sys_database_permissions +babel-4475 +BABEL-4606 +BABEL-4672 +babel-4517 +BABEL-4641-before-16_3-or-15_7-or-14_12 +BABEL_4817 +BABEL-4863-before-16_3-or-15_7-or-14_12 +babel_726-before-14_12-or-15_7-or-16_3 +BABEL-4869 +babel_4328_datetime-before-14_12 +babel_4328_datetime2-before-14_12 +babel_4328_datetimeoffset-before-14_12 From 5e5574db5dbbb00f028a7f38f92b8ce129a9c96c Mon Sep 17 00:00:00 2001 From: Jason Teng Date: Wed, 12 Jun 2024 19:35:20 +0000 Subject: [PATCH 2/6] Update expected_drop.out Signed-off-by: Jason Teng --- test/python/expected/sql_validation_framework/expected_drop.out | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/python/expected/sql_validation_framework/expected_drop.out b/test/python/expected/sql_validation_framework/expected_drop.out index 1d22c25213..f073415a71 100644 --- a/test/python/expected/sql_validation_framework/expected_drop.out +++ b/test/python/expected/sql_validation_framework/expected_drop.out @@ -28,6 +28,7 @@ Unexpected drop found for procedure sys.babelfish_drop_deprecated_object in file Unexpected drop found for procedure sys.babelfish_drop_deprecated_object in file babelfishpg_tsql--2.6.0--2.7.0.sql Unexpected drop found for procedure sys.babelfish_drop_deprecated_object in file babelfishpg_tsql--2.7.0--2.8.0.sql Unexpected drop found for procedure sys.babelfish_drop_deprecated_object in file babelfishpg_tsql--2.8.0--2.9.0.sql +Unexpected drop found for procedure sys.babelfish_drop_deprecated_object in file babelfishpg_tsql--2.9.0--2.10.0.sql Unexpected drop found for procedure sys.babelfish_drop_deprecated_table in file babelfishpg_tsql--2.1.0--2.2.0.sql Unexpected drop found for procedure sys.babelfish_drop_deprecated_view in file babelfishpg_tsql--1.0.0--1.1.0.sql Unexpected drop found for procedure sys.babelfish_drop_deprecated_view in file babelfishpg_tsql--2.1.0--2.2.0.sql @@ -38,5 +39,6 @@ Unexpected drop found for procedure sys.babelfish_update_user_catalog_for_guest Unexpected drop found for procedure sys.babelfish_update_user_catalog_for_guest_schema in file babelfishpg_tsql--2.6.0--2.7.0.sql Unexpected drop found for procedure sys.babelfish_update_user_catalog_for_guest_schema in file babelfishpg_tsql--2.7.0--2.8.0.sql Unexpected drop found for procedure sys.babelfish_update_user_catalog_for_guest_schema in file babelfishpg_tsql--2.8.0--2.9.0.sql +Unexpected drop found for procedure sys.babelfish_update_user_catalog_for_guest_schema in file babelfishpg_tsql--2.9.0--2.10.0.sql Unexpected drop found for procedure sys.create_xp_qv_in_master_dbo in file babelfishpg_tsql--1.1.0--1.2.0.sql Unexpected drop found for procedure sys.sp_babelfish_grant_usage_to_all in file babelfishpg_tsql--1.1.0--1.2.0.sql From 6f6d8979f4057716af320ceb6c9ac92962aa2c49 Mon Sep 17 00:00:00 2001 From: Jason Teng Date: Wed, 12 Jun 2024 19:37:15 +0000 Subject: [PATCH 3/6] Remove invalid tests from 14_12 schedule file Signed-off-by: Jason Teng --- test/JDBC/upgrade/14_12/schedule | 7 ------- 1 file changed, 7 deletions(-) diff --git a/test/JDBC/upgrade/14_12/schedule b/test/JDBC/upgrade/14_12/schedule index f4502e3ac7..a89b9ab993 100644 --- a/test/JDBC/upgrade/14_12/schedule +++ b/test/JDBC/upgrade/14_12/schedule @@ -85,7 +85,6 @@ sys-trigger_nestlevel schema_resolution_proc BABEL-404 BABEL-493 -BABEL-621-before-14_13 BABEL-775 BABEL-1206 BABEL-1251 @@ -423,11 +422,5 @@ babel-4475 BABEL-4606 BABEL-4672 babel-4517 -BABEL-4641-before-16_3-or-15_7-or-14_12 BABEL_4817 -BABEL-4863-before-16_3-or-15_7-or-14_12 -babel_726-before-14_12-or-15_7-or-16_3 BABEL-4869 -babel_4328_datetime-before-14_12 -babel_4328_datetime2-before-14_12 -babel_4328_datetimeoffset-before-14_12 From 0a3231ad9bf58029414bf0b80094d7a0b7d88742 Mon Sep 17 00:00:00 2001 From: Jason Teng Date: Wed, 12 Jun 2024 20:16:49 +0000 Subject: [PATCH 4/6] Fix BABEL-3514 test to account for 2-digit minor version Signed-off-by: Jason Teng --- test/JDBC/expected/BABEL-3514.out | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/JDBC/expected/BABEL-3514.out b/test/JDBC/expected/BABEL-3514.out index 65b07d4899..7a1321c381 100644 --- a/test/JDBC/expected/BABEL-3514.out +++ b/test/JDBC/expected/BABEL-3514.out @@ -1,6 +1,7 @@ -- psql select - cast(case when cast(sys.SERVERPROPERTY('BabelfishVersion') as varchar(20)) LIKE '_._._' + cast(case when (cast(sys.SERVERPROPERTY('BabelfishVersion') as varchar(20)) LIKE '_._._' OR + cast(sys.SERVERPROPERTY('BabelfishVersion') as varchar(20)) LIKE '_.__._' ) THEN 'valid babelfish version' else 'invalid babelfish version' end as text); GO From d570548488c4707c205bdef7f1331f6caeb96283 Mon Sep 17 00:00:00 2001 From: Jason Teng Date: Thu, 13 Jun 2024 15:37:03 +0000 Subject: [PATCH 5/6] Typo Signed-off-by: Jason Teng --- test/JDBC/input/BABEL-3514.mix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/JDBC/input/BABEL-3514.mix b/test/JDBC/input/BABEL-3514.mix index c4d0d03425..615e9b7dde 100644 --- a/test/JDBC/input/BABEL-3514.mix +++ b/test/JDBC/input/BABEL-3514.mix @@ -1,6 +1,7 @@ -- psql select - cast(case when cast(sys.SERVERPROPERTY('BabelfishVersion') as varchar(20)) LIKE '_._._' + cast(case when (cast(sys.SERVERPROPERTY('BabelfishVersion') as varchar(20)) LIKE '_._._' OR + cast(sys.SERVERPROPERTY('BabelfishVersion') as varchar(20)) LIKE '_.__._' ) THEN 'valid babelfish version' else 'invalid babelfish version' end as text); GO \ No newline at end of file From 88a9a881948a7764f9ed6c9751d444046fa688b3 Mon Sep 17 00:00:00 2001 From: Jason Teng Date: Thu, 13 Jun 2024 15:52:47 +0000 Subject: [PATCH 6/6] Remove more invalid 14.12 upgrade tests Signed-off-by: Jason Teng --- test/JDBC/upgrade/14_12/schedule | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/JDBC/upgrade/14_12/schedule b/test/JDBC/upgrade/14_12/schedule index a89b9ab993..c8facdd0de 100644 --- a/test/JDBC/upgrade/14_12/schedule +++ b/test/JDBC/upgrade/14_12/schedule @@ -151,7 +151,6 @@ insteadof_nested_trigger_inside_proc insteadof_nested_trigger_with_dml nested_trigger_inside_proc nested_trigger_with_dml -newid_before_14_12_or_15_7_or_16_3 triggers_with_transaction Test-sp_addrole Test-sp_addrolemember @@ -174,7 +173,6 @@ babelfish_authid_user_ext babelfish_inconsistent_metadata babelfish_migration_mode schema_resolution_func -BABEL-3147-before-16_3-or-15_7-or-14_12 collation_tests_arabic collation_tests_greek collation_tests_mongolian @@ -238,8 +236,6 @@ sys-syscolumns-dep sys-dm_exec_connections-dep sys-dm_exec_sessions-dep sys-table_types-dep -sys-sql_modules-before-14_12-dep -sys-all_sql_modules-before-14_12-dep sys-system_sql_modules-dep sys-triggers-dep sys-proc_param_helper-dep