From 563e51d75e18eeb6e9b8b448ed146091c271e93b Mon Sep 17 00:00:00 2001
From: Yvinayak07 <100944709+Yvinayak07@users.noreply.github.com>
Date: Sat, 12 Oct 2024 11:19:06 +0530
Subject: [PATCH] Updating the upgrade test file after fixing the typmod for
 CASE expression (#3015)

Updating the upgrade test file after fixing the typmod for CASE expression. Need to change the 15_9 schedule file in
BABEL_4_X_DEV, as PR for BABEL_4_X_DEV is merged first, Which includes before files in 15_9 schedule file. But as
these changes need to be merged in BABEL_3_X_DEV, we need to add after files in place of before files as 15_9
corresponds to BABEL_3_X_DEV.

Signed-off-by: yashneet vinayak <yashneet@amazon.com>
---
 .../BABEL-CASE_EXPR-vu-verify.out             | 102 +++++++++---------
 .../case_insensitive_collation-vu-verify.out  |   2 +-
 test/JDBC/input/BABEL-CASE_EXPR-vu-verify.sql |   2 +-
 test/JDBC/upgrade/15_9/schedule               |  20 ++--
 4 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/BABEL-CASE_EXPR-vu-verify.out b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/BABEL-CASE_EXPR-vu-verify.out
index f865e699bb3..3e7235a458d 100644
--- a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/BABEL-CASE_EXPR-vu-verify.out
+++ b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/BABEL-CASE_EXPR-vu-verify.out
@@ -5445,9 +5445,9 @@ abcd
 ~~END~~
 
 
---- SYS.SYSNAME tests
+--- SYSNAME tests
 SELECT CASE 1
-   WHEN 1 THEN CAST(N'بطاقة التسجيل - قياسية' AS sys.sysname)
+   WHEN 1 THEN CAST(N'بطاقة التسجيل - قياسية' AS sysname)
    WHEN 2 THEN CAST(N'بطاقة التسجيل - قياسية' AS VARCHAR(100))
 END AS RESULT
 GO
@@ -5458,7 +5458,7 @@ varchar
 
 
 SELECT CASE 1
-   WHEN 1 THEN CAST(N'بطاقة التسجيل - قياسية' AS sys.sysname)
+   WHEN 1 THEN CAST(N'بطاقة التسجيل - قياسية' AS sysname)
    WHEN 2 THEN 'بطاقة التسجيل - قياسية'
 END AS RESULT
 GO
@@ -5469,7 +5469,7 @@ varchar
 
 
 SELECT CASE 1
-   WHEN 1 THEN CAST(N'بطاقة التسجيل - قياسية' AS sys.sysname)
+   WHEN 1 THEN CAST(N'بطاقة التسجيل - قياسية' AS sysname)
    WHEN 2 THEN 'abc'
 END AS RESULT
 GO
@@ -5481,7 +5481,7 @@ varchar
 
 SELECT CASE 2
    WHEN 1 THEN 'abc'
-   WHEN 2 THEN CAST('char' AS sys.sysname)
+   WHEN 2 THEN CAST('char' AS sysname)
 END AS RESULT
 GO
 ~~START~~
@@ -5492,7 +5492,7 @@ char
 
 
 SELECT CASE 1
-   WHEN 1 THEN CAST('char' AS sys.sysname)
+   WHEN 1 THEN CAST('char' AS sysname)
 END AS RESULT
 GO
 ~~START~~
@@ -5502,7 +5502,7 @@ char
 
 
 SELECT CASE 1
-   WHEN 1 THEN CAST(N'بطاقة التسجيل - قياسية' AS sys.sysname)
+   WHEN 1 THEN CAST(N'بطاقة التسجيل - قياسية' AS sysname)
 END AS RESULT
 GO
 ~~START~~
@@ -5512,7 +5512,7 @@ varchar
 
 
 SELECT CASE 1
-   WHEN 1 THEN CAST(N'登録カード–標準' AS sys.sysname)
+   WHEN 1 THEN CAST(N'登録カード–標準' AS sysname)
 END AS RESULT
 GO
 ~~START~~
@@ -5522,7 +5522,7 @@ varchar
 
 
 SELECT CASE 1
-   WHEN 1 THEN CAST('char0' AS sys.sysname)
+   WHEN 1 THEN CAST('char0' AS sysname)
    WHEN 2 THEN CAST('char1' AS VARCHAR(100))
 END AS RESULT
 GO
@@ -5533,7 +5533,7 @@ char0
 
 
 SELECT CASE 1
-   WHEN 1 THEN CAST('char0' AS sys.sysname)
+   WHEN 1 THEN CAST('char0' AS sysname)
    WHEN 2 THEN CAST('char1' AS CHAR(100))
 END AS RESULT
 GO
@@ -5544,7 +5544,7 @@ char0
 
 
 SELECT CASE 1
-   WHEN 1 THEN CAST('char0' AS sys.sysname)
+   WHEN 1 THEN CAST('char0' AS sysname)
    WHEN 2 THEN CAST('char1' AS NCHAR(100))
 END AS RESULT
 GO
@@ -5555,7 +5555,7 @@ char0
 
 
 SELECT CASE 1
-   WHEN 1 THEN CAST('char0' AS sys.sysname)
+   WHEN 1 THEN CAST('char0' AS sysname)
    WHEN 2 THEN CAST('char1' AS TEXT)
 END AS RESULT
 GO
@@ -5566,7 +5566,7 @@ char0
 
 
 SELECT CASE 1
-   WHEN 1 THEN CAST('char0' AS sys.sysname)
+   WHEN 1 THEN CAST('char0' AS sysname)
    WHEN 2 THEN CAST('char1' AS NTEXT)
 END AS RESULT
 GO
@@ -5577,7 +5577,7 @@ char0
 
 
 SELECT CASE 1
-   WHEN 1 THEN CAST(N'بطاقة التسجيل - قياسية' AS sys.sysname)
+   WHEN 1 THEN CAST(N'بطاقة التسجيل - قياسية' AS sysname)
    WHEN 2 THEN CAST(N'بطاقة التسجيل - قياسية' AS VARCHAR(100))
 END AS RESULT
 GO
@@ -5588,7 +5588,7 @@ varchar
 
 
 SELECT CASE 1
-   WHEN 1 THEN CAST(N'بطاقة التسجيل - قياسية' AS sys.sysname)
+   WHEN 1 THEN CAST(N'بطاقة التسجيل - قياسية' AS sysname)
    WHEN 2 THEN CAST(N'بطاقة التسجيل - قياسية' AS CHAR(100))
 END AS RESULT
 GO
@@ -5599,7 +5599,7 @@ varchar
 
 
 SELECT CASE 1
-   WHEN 1 THEN CAST(N'بطاقة التسجيل - قياسية' AS sys.sysname)
+   WHEN 1 THEN CAST(N'بطاقة التسجيل - قياسية' AS sysname)
    WHEN 2 THEN CAST(N'بطاقة التسجيل - قياسية' AS NCHAR(100))
 END AS RESULT
 GO
@@ -5610,7 +5610,7 @@ nchar
 
 
 SELECT CASE 1
-   WHEN 1 THEN CAST(N'بطاقة التسجيل - قياسية' AS sys.sysname)
+   WHEN 1 THEN CAST(N'بطاقة التسجيل - قياسية' AS sysname)
    WHEN 2 THEN CAST(N'بطاقة التسجيل - قياسية' AS TEXT)
 END AS RESULT
 GO
@@ -5621,7 +5621,7 @@ text
 
 
 SELECT CASE 1
-   WHEN 1 THEN CAST(N'بطاقة التسجيل - قياسية' AS sys.sysname)
+   WHEN 1 THEN CAST(N'بطاقة التسجيل - قياسية' AS sysname)
    WHEN 2 THEN CAST(N'بطاقة التسجيل - قياسية' AS NTEXT)
 END AS RESULT
 GO
@@ -5632,7 +5632,7 @@ ntext
 
 
 SELECT CASE 1
-   WHEN 1 THEN CAST(N'登録カード–標準' AS sys.sysname)
+   WHEN 1 THEN CAST(N'登録カード–標準' AS sysname)
    WHEN 2 THEN CAST(N'登録カード–標準' AS VARCHAR(100))
 END AS RESULT
 GO
@@ -5643,7 +5643,7 @@ varchar
 
 
 SELECT CASE 1
-   WHEN 1 THEN CAST(N'登録カード–標準' AS sys.sysname)
+   WHEN 1 THEN CAST(N'登録カード–標準' AS sysname)
    WHEN 2 THEN CAST(N'登録カード–標準' AS CHAR(100))
 END AS RESULT
 GO
@@ -5654,7 +5654,7 @@ varchar
 
 
 SELECT CASE 1
-   WHEN 1 THEN CAST(N'登録カード–標準' AS sys.sysname)
+   WHEN 1 THEN CAST(N'登録カード–標準' AS sysname)
    WHEN 2 THEN CAST(N'登録カード–標準' AS NCHAR(100))
 END AS RESULT
 GO
@@ -5665,7 +5665,7 @@ nchar
 
 
 SELECT CASE 1
-   WHEN 1 THEN CAST(N'登録カード–標準' AS sys.sysname)
+   WHEN 1 THEN CAST(N'登録カード–標準' AS sysname)
    WHEN 2 THEN CAST(N'登録カード–標準' AS TEXT)
 END AS RESULT
 GO
@@ -5676,7 +5676,7 @@ text
 
 
 SELECT CASE 1
-   WHEN 1 THEN CAST(N'登録カード–標準' AS sys.sysname)
+   WHEN 1 THEN CAST(N'登録カード–標準' AS sysname)
    WHEN 2 THEN CAST(N'登録カード–標準' AS NTEXT)
 END AS RESULT
 GO
@@ -5687,7 +5687,7 @@ ntext
 
 
 SELECT CASE 2
-   WHEN 1 THEN CAST('char0' AS sys.sysname)
+   WHEN 1 THEN CAST('char0' AS sysname)
    WHEN 2 THEN CAST('char1' AS VARCHAR(100))
 END AS RESULT
 GO
@@ -5698,7 +5698,7 @@ char1
 
 
 SELECT CASE 2
-   WHEN 1 THEN CAST('char0' AS sys.sysname)
+   WHEN 1 THEN CAST('char0' AS sysname)
    WHEN 2 THEN CAST('char1' AS CHAR(100))
 END AS RESULT
 GO
@@ -5709,7 +5709,7 @@ char1
 
 
 SELECT CASE 2
-   WHEN 1 THEN CAST('char0' AS sys.sysname)
+   WHEN 1 THEN CAST('char0' AS sysname)
    WHEN 2 THEN CAST('char1' AS NCHAR(100))
 END AS RESULT
 GO
@@ -5720,7 +5720,7 @@ char1
 
 
 SELECT CASE 2
-   WHEN 1 THEN CAST('char0' AS sys.sysname)
+   WHEN 1 THEN CAST('char0' AS sysname)
    WHEN 2 THEN CAST('char1' AS TEXT)
 END AS RESULT
 GO
@@ -5731,7 +5731,7 @@ char1
 
 
 SELECT CASE 2
-   WHEN 1 THEN CAST('char0' AS sys.sysname)
+   WHEN 1 THEN CAST('char0' AS sysname)
    WHEN 2 THEN CAST('char1' AS NTEXT)
 END AS RESULT
 GO
@@ -5742,7 +5742,7 @@ char1
 
 
 SELECT CASE 2
-   WHEN 1 THEN CAST(N'بطاقة التسجيل - قياسية' AS sys.sysname)
+   WHEN 1 THEN CAST(N'بطاقة التسجيل - قياسية' AS sysname)
    WHEN 2 THEN CAST(N'بطاقة التسجيل - قياسية' AS VARCHAR(100))
 END AS RESULT
 GO
@@ -5753,7 +5753,7 @@ varchar
 
 
 SELECT CASE 2
-   WHEN 1 THEN CAST(N'بطاقة التسجيل - قياسية' AS sys.sysname)
+   WHEN 1 THEN CAST(N'بطاقة التسجيل - قياسية' AS sysname)
    WHEN 2 THEN CAST(N'بطاقة التسجيل - قياسية' AS CHAR(100))
 END AS RESULT
 GO
@@ -5764,7 +5764,7 @@ varchar
 
 
 SELECT CASE 2
-   WHEN 1 THEN CAST(N'بطاقة التسجيل - قياسية' AS sys.sysname)
+   WHEN 1 THEN CAST(N'بطاقة التسجيل - قياسية' AS sysname)
    WHEN 2 THEN CAST(N'بطاقة التسجيل - قياسية' AS NCHAR(100))
 END AS RESULT
 GO
@@ -5775,7 +5775,7 @@ nchar
 
 
 SELECT CASE 2
-   WHEN 1 THEN CAST(N'بطاقة التسجيل - قياسية' AS sys.sysname)
+   WHEN 1 THEN CAST(N'بطاقة التسجيل - قياسية' AS sysname)
    WHEN 2 THEN CAST(N'بطاقة التسجيل - قياسية' AS TEXT)
 END AS RESULT
 GO
@@ -5786,7 +5786,7 @@ text
 
 
 SELECT CASE 2
-   WHEN 1 THEN CAST(N'بطاقة التسجيل - قياسية' AS sys.sysname)
+   WHEN 1 THEN CAST(N'بطاقة التسجيل - قياسية' AS sysname)
    WHEN 2 THEN CAST(N'بطاقة التسجيل - قياسية' AS NTEXT)
 END AS RESULT
 GO
@@ -5797,7 +5797,7 @@ ntext
 
 
 SELECT CASE 2
-   WHEN 1 THEN CAST(N'登録カード–標準' AS sys.sysname)
+   WHEN 1 THEN CAST(N'登録カード–標準' AS sysname)
    WHEN 2 THEN CAST(N'登録カード–標準' AS VARCHAR(100))
 END AS RESULT
 GO
@@ -5808,7 +5808,7 @@ varchar
 
 
 SELECT CASE 2
-   WHEN 1 THEN CAST(N'登録カード–標準' AS sys.sysname)
+   WHEN 1 THEN CAST(N'登録カード–標準' AS sysname)
    WHEN 2 THEN CAST(N'登録カード–標準' AS CHAR(100))
 END AS RESULT
 GO
@@ -5819,7 +5819,7 @@ varchar
 
 
 SELECT CASE 2
-   WHEN 1 THEN CAST(N'登録カード–標準' AS sys.sysname)
+   WHEN 1 THEN CAST(N'登録カード–標準' AS sysname)
    WHEN 2 THEN CAST(N'登録カード–標準' AS NCHAR(100))
 END AS RESULT
 GO
@@ -5830,7 +5830,7 @@ nchar
 
 
 SELECT CASE 2
-   WHEN 1 THEN CAST(N'登録カード–標準' AS sys.sysname)
+   WHEN 1 THEN CAST(N'登録カード–標準' AS sysname)
    WHEN 2 THEN CAST(N'登録カード–標準' AS TEXT)
 END AS RESULT
 GO
@@ -5841,7 +5841,7 @@ text
 
 
 SELECT CASE 2
-   WHEN 1 THEN CAST(N'登録カード–標準' AS sys.sysname)
+   WHEN 1 THEN CAST(N'登録カード–標準' AS sysname)
    WHEN 2 THEN CAST(N'登録カード–標準' AS NTEXT)
 END AS RESULT
 GO
@@ -5853,7 +5853,7 @@ ntext
 
 SELECT CASE 1
    WHEN 1 THEN 'abc'
-   WHEN 2 THEN CAST('char' AS sys.sysname)
+   WHEN 2 THEN CAST('char' AS sysname)
 END AS RESULT
 GO
 ~~START~~
@@ -5864,7 +5864,7 @@ abc
 
 SELECT CASE 1
    WHEN 1 THEN 'abc'
-   WHEN 2 THEN CAST('char0' AS sys.sysname)
+   WHEN 2 THEN CAST('char0' AS sysname)
    WHEN 3 THEN CAST('char1' AS VARCHAR(100))
 END AS RESULT
 GO
@@ -5876,7 +5876,7 @@ abc
 
 SELECT CASE 1
    WHEN 1 THEN 'abc'
-   WHEN 2 THEN CAST('char0' AS sys.sysname)
+   WHEN 2 THEN CAST('char0' AS sysname)
    WHEN 3 THEN CAST('char1' AS CHAR(100))
 END AS RESULT
 GO
@@ -5888,7 +5888,7 @@ abc
 
 SELECT CASE 1
    WHEN 1 THEN 'abc'
-   WHEN 2 THEN CAST('char0' AS sys.sysname)
+   WHEN 2 THEN CAST('char0' AS sysname)
    WHEN 3 THEN CAST('char1' AS NCHAR(100))
 END AS RESULT
 GO
@@ -5900,7 +5900,7 @@ abc
 
 SELECT CASE 1
    WHEN 1 THEN 'abc'
-   WHEN 2 THEN CAST('char0' AS sys.sysname)
+   WHEN 2 THEN CAST('char0' AS sysname)
    WHEN 3 THEN CAST('char1' AS TEXT)
 END AS RESULT
 GO
@@ -5912,7 +5912,7 @@ abc
 
 SELECT CASE 1
    WHEN 1 THEN 'abc'
-   WHEN 2 THEN CAST('char0' AS sys.sysname)
+   WHEN 2 THEN CAST('char0' AS sysname)
    WHEN 3 THEN CAST('char1' AS NTEXT)
 END AS RESULT
 GO
@@ -5924,7 +5924,7 @@ abc
 
 SELECT CASE 2
    WHEN 1 THEN 'abc'
-   WHEN 2 THEN CAST('char' AS sys.sysname)
+   WHEN 2 THEN CAST('char' AS sysname)
 END AS RESULT
 GO
 ~~START~~
@@ -5935,7 +5935,7 @@ char
 
 SELECT CASE 2
    WHEN 1 THEN 'abc'
-   WHEN 2 THEN CAST('char0' AS sys.sysname)
+   WHEN 2 THEN CAST('char0' AS sysname)
    WHEN 3 THEN CAST('char1' AS VARCHAR(100))
 END AS RESULT
 GO
@@ -5947,7 +5947,7 @@ char0
 
 SELECT CASE 2
    WHEN 1 THEN 'abc'
-   WHEN 2 THEN CAST('char0' AS sys.sysname)
+   WHEN 2 THEN CAST('char0' AS sysname)
    WHEN 3 THEN CAST('char1' AS CHAR(100))
 END AS RESULT
 GO
@@ -5959,7 +5959,7 @@ char0
 
 SELECT CASE 2
    WHEN 1 THEN 'abc'
-   WHEN 2 THEN CAST('char0' AS sys.sysname)
+   WHEN 2 THEN CAST('char0' AS sysname)
    WHEN 3 THEN CAST('char1' AS NCHAR(100))
 END AS RESULT
 GO
@@ -5971,7 +5971,7 @@ char0
 
 SELECT CASE 2
    WHEN 1 THEN 'abc'
-   WHEN 2 THEN CAST('char0' AS sys.sysname)
+   WHEN 2 THEN CAST('char0' AS sysname)
    WHEN 3 THEN CAST('char1' AS TEXT)
 END AS RESULT
 GO
@@ -5983,7 +5983,7 @@ char0
 
 SELECT CASE 2
    WHEN 1 THEN 'abc'
-   WHEN 2 THEN CAST('char0' AS sys.sysname)
+   WHEN 2 THEN CAST('char0' AS sysname)
    WHEN 3 THEN CAST('char1' AS NTEXT)
 END AS RESULT
 GO
@@ -6547,7 +6547,7 @@ char0
 drop type BABEL_CASE_EXPR_TEST_UDT;
 go
 
-create type BABEL_CASE_EXPR_TEST_UDT from sys.sysname;
+create type BABEL_CASE_EXPR_TEST_UDT from sysname;
 GO
 
 SELECT CASE 1
diff --git a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/case_insensitive_collation-vu-verify.out b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/case_insensitive_collation-vu-verify.out
index bdfb52bd327..e8232fce90c 100644
--- a/test/JDBC/expected/non_default_server_collation/japanese_ci_as/case_insensitive_collation-vu-verify.out
+++ b/test/JDBC/expected/non_default_server_collation/japanese_ci_as/case_insensitive_collation-vu-verify.out
@@ -65,7 +65,7 @@ test
 select * from vB;
 go
 ~~START~~
-text
+varchar
 case-insensitive
 ~~END~~
 
diff --git a/test/JDBC/input/BABEL-CASE_EXPR-vu-verify.sql b/test/JDBC/input/BABEL-CASE_EXPR-vu-verify.sql
index 5d9874329c9..8d4c246d388 100644
--- a/test/JDBC/input/BABEL-CASE_EXPR-vu-verify.sql
+++ b/test/JDBC/input/BABEL-CASE_EXPR-vu-verify.sql
@@ -1,4 +1,4 @@
--- sla 45000
+-- sla 80000
 SELECT CASE 1
    WHEN 1 THEN COL1 
    WHEN 2 THEN COL2
diff --git a/test/JDBC/upgrade/15_9/schedule b/test/JDBC/upgrade/15_9/schedule
index 6f7d06f2309..5202e73a83d 100644
--- a/test/JDBC/upgrade/15_9/schedule
+++ b/test/JDBC/upgrade/15_9/schedule
@@ -73,7 +73,7 @@ BABEL-3192
 BABEL-3204
 BABEL-3213
 BABEL-3215
-BABEL-3221-before-16_4-or-15_9
+BABEL-3221
 BABEL-3234
 BABEL-3249
 BABEL-3268
@@ -113,12 +113,12 @@ BABEL-3828
 BABEL-383
 BABEL-3844
 BABEL-3914
-BABEL-3938-before-16_5-or-15_9
+BABEL-3938
 BABEL-3952
 BABEL-3953-datetrunc
 BABEL-404
 BABEL-405
-BABEL-4078-before-16_5-or-15_9
+BABEL-4078
 BABEL-4098
 BABEL-4214
 BABEL-4516
@@ -162,7 +162,7 @@ BABEL-LOGIN
 BABEL-LOGIN-USER-EXT
 BABEL-NEXT-VALUE-FOR
 BABEL_OBJECT_DEFINITION
-BABEL_OBJECT_ID-before-16_5-or-15_9
+BABEL_OBJECT_ID
 BABEL_OBJECT_NAME
 BABEL-PG-SYSTEM-FUNCTIONS
 BABEL-PROCID
@@ -198,7 +198,7 @@ babel_varbinary_int4_div
 bbf_view_def
 binary-index
 bitwise_not-operator
-case_insensitive_collation-before-16_5-or-15_9
+case_insensitive_collation
 cast_numeric_types_to_datetime
 cast_numeric_types_to_smalldatetime
 col_length
@@ -250,7 +250,7 @@ msdb-dbo-syspolicy_system_health_state
 nested_trigger_inside_proc
 nested_trigger_with_dml
 newid
-objectpropertyex-before-16_5-or-15_9
+objectpropertyex
 openjson
 openquery_upgrd_before_15_4
 orderby
@@ -476,7 +476,7 @@ sp_changedbowner
 float_exponent
 datetimeoffset-timezone
 BABEL-4046
-host_id-before-16_5-or-15_9
+host_id
 drop_index
 linked_srv_4229
 BABEL-4175
@@ -511,13 +511,13 @@ BABEL-730
 babel-4475
 babel-4517
 BABEL-4815
-BABEL-4641-before-16_5-or-15_9
+BABEL-4641
 BABEL-4863
 babel_test_int4_numeric_oper
 babel_test_int8_numeric_oper
 babel_test_int2_numeric_oper
 BABEL_3571
-test_like_for_AI-before-16_5-or-15_9
+test_like_for_AI
 BABEL-4869
 babel_4328_datetime
 babel_4328_datetime2
@@ -546,5 +546,5 @@ SELECT_INTO_TEST
 cast-varchar-to-time
 xml_exist-before-16_5
 BABEL-5119
-BABEL-CASE_EXPR-before-16_5-or-15_9
+BABEL-CASE_EXPR