YQL-20258 sql syntax

commit_hash:c2440ce49cc8c7637134ddf8081b32251ff75fd4

57 files changed, 174 insertions, 248 deletions

diff --git a/yql/essentials/tests/sql/minirun/part0/canondata/result.json b/yql/essentials/tests/sql/minirun/part0/canondata/result.json
index 1c396145928..5e3880d6769 100644
--- a/yql/essentials/tests/sql/minirun/part0/canondata/result.json
+++ b/yql/essentials/tests/sql/minirun/part0/canondata/result.json
@@ -1599,9 +1599,9 @@
     ],
     "test.test[side_effects-logical_bools_skipped-default.txt-Debug]": [
         {
-            "checksum": "8b6626a9dab8801a26b7c73c581d72f0",
-            "size": 343,
-            "uri": "https://{canondata_backend}/1937367/129cce9c3960b60552c52a20100a5a905edd36fc/resource.tar.gz#test.test_side_effects-logical_bools_skipped-default.txt-Debug_/opt.yql"
+            "checksum": "cd3d05b2d54e913992265ba01a0f15a0",
+            "size": 263,
+            "uri": "https://{canondata_backend}/1920236/a94f74b1bad714906251fde1726144dcd1e806ea/resource.tar.gz#test.test_side_effects-logical_bools_skipped-default.txt-Debug_/opt.yql"
         }
     ],
     "test.test[side_effects-logical_bools_skipped-default.txt-Results]": [
diff --git a/yql/essentials/tests/sql/minirun/part1/canondata/result.json b/yql/essentials/tests/sql/minirun/part1/canondata/result.json
index 0878568c70d..ba9522c7007 100644
--- a/yql/essentials/tests/sql/minirun/part1/canondata/result.json
+++ b/yql/essentials/tests/sql/minirun/part1/canondata/result.json
@@ -405,6 +405,20 @@
             "uri": "https://{canondata_backend}/1942525/de08258017cc5af0ffebae7eed18816be5f209c8/resource.tar.gz#test.test_csee-expr-default.txt-Results_/results.txt"
         }
     ],
+    "test.test[csee-general_side_effects--Debug]": [
+        {
+            "checksum": "511df1c9535497b27a109a7cf510d346",
+            "size": 308,
+            "uri": "https://{canondata_backend}/1936842/5a9564ab9fe48f711bf21dbf5b117fd301016b38/resource.tar.gz#test.test_csee-general_side_effects--Debug_/opt.yql"
+        }
+    ],
+    "test.test[csee-general_side_effects--Results]": [
+        {
+            "checksum": "c1a2349a70d54af225bd022f9a58d961",
+            "size": 695,
+            "uri": "https://{canondata_backend}/1942671/944dfccbebd09fee6f2e59b06fbbe0d715cf675b/resource.tar.gz#test.test_csee-general_side_effects--Results_/results.txt"
+        }
+    ],
     "test.test[csee-lambda_in_l0_and_l1-default.txt-Debug]": [
         {
             "checksum": "e4fba2930701a904fc92629bdb156653",
diff --git a/yql/essentials/tests/sql/minirun/part3/canondata/result.json b/yql/essentials/tests/sql/minirun/part3/canondata/result.json
index 1374b8323ee..c415025a2ca 100644
--- a/yql/essentials/tests/sql/minirun/part3/canondata/result.json
+++ b/yql/essentials/tests/sql/minirun/part3/canondata/result.json
@@ -418,6 +418,20 @@
             "uri": "https://{canondata_backend}/1936273/f5fddf8cad694dcd6aca7915ab0377d93c54588a/resource.tar.gz#test.test_csee-same_l1-default.txt-Results_/results.txt"
         }
     ],
+    "test.test[csee-semilattice_rt_side_effects--Debug]": [
+        {
+            "checksum": "34110466d3de2b6b85726fc1c2006fb4",
+            "size": 281,
+            "uri": "https://{canondata_backend}/1936842/9187e6b14ad023b345db1b7a8ba62ebcc59c33f7/resource.tar.gz#test.test_csee-semilattice_rt_side_effects--Debug_/opt.yql"
+        }
+    ],
+    "test.test[csee-semilattice_rt_side_effects--Results]": [
+        {
+            "checksum": "c1a2349a70d54af225bd022f9a58d961",
+            "size": 695,
+            "uri": "https://{canondata_backend}/1899731/729ed7d656adb81e012b56aa913fd1bdfc603899/resource.tar.gz#test.test_csee-semilattice_rt_side_effects--Results_/results.txt"
+        }
+    ],
     "test.test[datetime-date_diff_sub-default.txt-Debug]": [
         {
             "checksum": "e128a80d7121dc4ecb0de559a98dbd59",
diff --git a/yql/essentials/tests/sql/minirun/part5/canondata/result.json b/yql/essentials/tests/sql/minirun/part5/canondata/result.json
index c92d0592ea1..f09bd9e9d40 100644
--- a/yql/essentials/tests/sql/minirun/part5/canondata/result.json
+++ b/yql/essentials/tests/sql/minirun/part5/canondata/result.json
@@ -1903,9 +1903,9 @@
     ],
     "test.test[side_effects-x_not_x-default.txt-Debug]": [
         {
-            "checksum": "3a6d7d2c548f8192694ff607180e0e59",
-            "size": 1120,
-            "uri": "https://{canondata_backend}/1900335/2e7a3a0284dd25621ff685fc5c99cf0aa70fd6a5/resource.tar.gz#test.test_side_effects-x_not_x-default.txt-Debug_/opt.yql"
+            "checksum": "d0370044a90a31e7911d40846e68cb38",
+            "size": 1037,
+            "uri": "https://{canondata_backend}/1775059/a12ef15343d91b6ee196e1615e5fa2b4859c5de7/resource.tar.gz#test.test_side_effects-x_not_x-default.txt-Debug_/opt.yql"
         }
     ],
     "test.test[side_effects-x_not_x-default.txt-Results]": [
diff --git a/yql/essentials/tests/sql/minirun/part7/canondata/result.json b/yql/essentials/tests/sql/minirun/part7/canondata/result.json
index 41bea8da200..bc57dc87467 100644
--- a/yql/essentials/tests/sql/minirun/part7/canondata/result.json
+++ b/yql/essentials/tests/sql/minirun/part7/canondata/result.json
@@ -384,20 +384,6 @@
             "uri": "https://{canondata_backend}/1942525/7665133ac15a3f92aef975c99a4dfe3023179a69/resource.tar.gz#test.test_compute_range-huge_in-default.txt-Results_/results.txt"
         }
     ],
-    "test.test[csee-general_side_effects-default.txt-Debug]": [
-        {
-            "checksum": "38c5b0fc32b880a8e6b909defa4aa40d",
-            "size": 386,
-            "uri": "https://{canondata_backend}/1597364/7c724dca2c8fc7db3842aa32f1b65e865740eb0c/resource.tar.gz#test.test_csee-general_side_effects-default.txt-Debug_/opt.yql"
-        }
-    ],
-    "test.test[csee-general_side_effects-default.txt-Results]": [
-        {
-            "checksum": "c1a2349a70d54af225bd022f9a58d961",
-            "size": 695,
-            "uri": "https://{canondata_backend}/1597364/7c724dca2c8fc7db3842aa32f1b65e865740eb0c/resource.tar.gz#test.test_csee-general_side_effects-default.txt-Results_/results.txt"
-        }
-    ],
     "test.test[datetime-date_implicit_casts-default.txt-Debug]": [
         {
             "checksum": "2cdfd9b9555629a03ccbe417b073bd0d",
@@ -1414,9 +1400,9 @@
     ],
     "test.test[side_effects-logical_bools_unreachable-default.txt-Debug]": [
         {
-            "checksum": "659dd68806d5307bbd1469116079e6fa",
-            "size": 304,
-            "uri": "https://{canondata_backend}/1937367/671e3ad35d46785ff29a521b44f889ed7a487cc7/resource.tar.gz#test.test_side_effects-logical_bools_unreachable-default.txt-Debug_/opt.yql"
+            "checksum": "2299b8c92f2489fa453539c267109e68",
+            "size": 226,
+            "uri": "https://{canondata_backend}/995452/9c505829f69fd534435bbc451e9c217e8826a0d4/resource.tar.gz#test.test_side_effects-logical_bools_unreachable-default.txt-Debug_/opt.yql"
         }
     ],
     "test.test[side_effects-logical_bools_unreachable-default.txt-Results]": [
diff --git a/yql/essentials/tests/sql/minirun/part8/canondata/result.json b/yql/essentials/tests/sql/minirun/part8/canondata/result.json
index c3acfb92b93..2e42891af21 100644
--- a/yql/essentials/tests/sql/minirun/part8/canondata/result.json
+++ b/yql/essentials/tests/sql/minirun/part8/canondata/result.json
@@ -1575,9 +1575,9 @@
     ],
     "test.test[side_effects-logical_bools_override-default.txt-Debug]": [
         {
-            "checksum": "659dd68806d5307bbd1469116079e6fa",
-            "size": 304,
-            "uri": "https://{canondata_backend}/1937367/464904f3fe8948f1469d56c6971b4f31adbe3bda/resource.tar.gz#test.test_side_effects-logical_bools_override-default.txt-Debug_/opt.yql"
+            "checksum": "2299b8c92f2489fa453539c267109e68",
+            "size": 226,
+            "uri": "https://{canondata_backend}/1920236/9791d782773cdc5341138dfbdc4479106ec3adf7/resource.tar.gz#test.test_side_effects-logical_bools_override-default.txt-Debug_/opt.yql"
         }
     ],
     "test.test[side_effects-logical_bools_override-default.txt-Results]": [
diff --git a/yql/essentials/tests/sql/minirun/part9/canondata/result.json b/yql/essentials/tests/sql/minirun/part9/canondata/result.json
index 09b1b15eb7e..3061eb226e6 100644
--- a/yql/essentials/tests/sql/minirun/part9/canondata/result.json
+++ b/yql/essentials/tests/sql/minirun/part9/canondata/result.json
@@ -412,20 +412,6 @@
             "uri": "https://{canondata_backend}/1917492/b593de516ed40422ea60a2e9802be856ec60a7a0/resource.tar.gz#test.test_csee-same_closure_l2-default.txt-Results_/results.txt"
         }
     ],
-    "test.test[csee-semilattice_rt_side_effects-default.txt-Debug]": [
-        {
-            "checksum": "4bed5659c9d0fbad77a047537bc1d79d",
-            "size": 359,
-            "uri": "https://{canondata_backend}/1936997/65ea6418aa0e2025d12946f38481f705ac1d3632/resource.tar.gz#test.test_csee-semilattice_rt_side_effects-default.txt-Debug_/opt.yql"
-        }
-    ],
-    "test.test[csee-semilattice_rt_side_effects-default.txt-Results]": [
-        {
-            "checksum": "c1a2349a70d54af225bd022f9a58d961",
-            "size": 695,
-            "uri": "https://{canondata_backend}/1936997/65ea6418aa0e2025d12946f38481f705ac1d3632/resource.tar.gz#test.test_csee-semilattice_rt_side_effects-default.txt-Results_/results.txt"
-        }
-    ],
     "test.test[datetime-date_in-default.txt-Debug]": [
         {
             "checksum": "3e6ba7312997f15d807aa25613e84db6",
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/result.json b/yql/essentials/tests/sql/sql2yql/canondata/result.json
index 48fa7478aa5..2be61dd59ce 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/result.json
+++ b/yql/essentials/tests/sql/sql2yql/canondata/result.json
@@ -2297,9 +2297,9 @@
     ],
     "test_sql2yql.test[csee-general_side_effects]": [
         {
-            "checksum": "fbfa88e76954c47760044e94a6dfcee6",
-            "size": 1172,
-            "uri": "https://{canondata_backend}/1937150/ec0019724df75083b0e89cab22f57e10ef36744e/resource.tar.gz#test_sql2yql.test_csee-general_side_effects_/sql.yql"
+            "checksum": "b48adad75a163d935504562f57b22df3",
+            "size": 1088,
+            "uri": "https://{canondata_backend}/1942415/bbf1ba60dcf973a3d96872c60402019f6e601403/resource.tar.gz#test_sql2yql.test_csee-general_side_effects_/sql.yql"
         }
     ],
     "test_sql2yql.test[csee-l2_dup_l1]": [
@@ -2430,9 +2430,9 @@
     ],
     "test_sql2yql.test[csee-semilattice_rt_side_effects]": [
         {
-            "checksum": "30d0445a735d88bed498810c29769d9a",
-            "size": 1184,
-            "uri": "https://{canondata_backend}/1937150/ec0019724df75083b0e89cab22f57e10ef36744e/resource.tar.gz#test_sql2yql.test_csee-semilattice_rt_side_effects_/sql.yql"
+            "checksum": "ca33d21b9b0a6ca9d9cda0e5226fb228",
+            "size": 1100,
+            "uri": "https://{canondata_backend}/1942415/bbf1ba60dcf973a3d96872c60402019f6e601403/resource.tar.gz#test_sql2yql.test_csee-semilattice_rt_side_effects_/sql.yql"
         }
     ],
     "test_sql2yql.test[datetime-all_timezones]": [
@@ -7876,149 +7876,149 @@
     ],
     "test_sql2yql.test[side_effects-convert_empty_dict_to_dict]": [
         {
-            "checksum": "e56e4f61b39764e2ea9fd1d80a212a11",
-            "size": 1230,
-            "uri": "https://{canondata_backend}/1937150/ec0019724df75083b0e89cab22f57e10ef36744e/resource.tar.gz#test_sql2yql.test_side_effects-convert_empty_dict_to_dict_/sql.yql"
+            "checksum": "e9c36b14f49b21b1692b2c9d1b60fe65",
+            "size": 1144,
+            "uri": "https://{canondata_backend}/1775059/be020ceb210e118c9d8f06ae73e0f97466c49478/resource.tar.gz#test_sql2yql.test_side_effects-convert_empty_dict_to_dict_/sql.yql"
         }
     ],
     "test_sql2yql.test[side_effects-convert_empty_list_to_list]": [
         {
-            "checksum": "d121227645c810c41e854a5cc1e6ae47",
-            "size": 1245,
-            "uri": "https://{canondata_backend}/1937150/ec0019724df75083b0e89cab22f57e10ef36744e/resource.tar.gz#test_sql2yql.test_side_effects-convert_empty_list_to_list_/sql.yql"
+            "checksum": "274dc7ed6fb512967f40ff67e737e824",
+            "size": 1159,
+            "uri": "https://{canondata_backend}/1775059/be020ceb210e118c9d8f06ae73e0f97466c49478/resource.tar.gz#test_sql2yql.test_side_effects-convert_empty_list_to_list_/sql.yql"
         }
     ],
     "test_sql2yql.test[side_effects-convert_null_to_optional]": [
         {
-            "checksum": "04664ecaa46526819d5b0d3a02e65d57",
-            "size": 1194,
-            "uri": "https://{canondata_backend}/1937150/ec0019724df75083b0e89cab22f57e10ef36744e/resource.tar.gz#test_sql2yql.test_side_effects-convert_null_to_optional_/sql.yql"
+            "checksum": "1fb4b25be60cb858ee95b4f1c9e6119e",
+            "size": 1108,
+            "uri": "https://{canondata_backend}/1775059/be020ceb210e118c9d8f06ae73e0f97466c49478/resource.tar.gz#test_sql2yql.test_side_effects-convert_null_to_optional_/sql.yql"
         }
     ],
     "test_sql2yql.test[side_effects-empty_extend]": [
         {
-            "checksum": "7e4291731ea329a790b9a4539756df0c",
-            "size": 1224,
-            "uri": "https://{canondata_backend}/1937150/ec0019724df75083b0e89cab22f57e10ef36744e/resource.tar.gz#test_sql2yql.test_side_effects-empty_extend_/sql.yql"
+            "checksum": "b05de0a2cf50dbfb336c9b2811bd69a2",
+            "size": 1138,
+            "uri": "https://{canondata_backend}/1775059/be020ceb210e118c9d8f06ae73e0f97466c49478/resource.tar.gz#test_sql2yql.test_side_effects-empty_extend_/sql.yql"
         }
     ],
     "test_sql2yql.test[side_effects-empty_join]": [
         {
-            "checksum": "a248319e2d6c25ea465ef05f2da66e44",
-            "size": 2542,
-            "uri": "https://{canondata_backend}/1937150/ec0019724df75083b0e89cab22f57e10ef36744e/resource.tar.gz#test_sql2yql.test_side_effects-empty_join_/sql.yql"
+            "checksum": "9a3d0c6fdfc82dbea8944534d011484c",
+            "size": 2456,
+            "uri": "https://{canondata_backend}/1775059/be020ceb210e118c9d8f06ae73e0f97466c49478/resource.tar.gz#test_sql2yql.test_side_effects-empty_join_/sql.yql"
         }
     ],
     "test_sql2yql.test[side_effects-empty_select_members]": [
         {
-            "checksum": "c9b4e7d16e11da7a5ea01f367df07af3",
-            "size": 1185,
-            "uri": "https://{canondata_backend}/1937150/ec0019724df75083b0e89cab22f57e10ef36744e/resource.tar.gz#test_sql2yql.test_side_effects-empty_select_members_/sql.yql"
+            "checksum": "ae5bef026b54110b21edd3910e1ae5a9",
+            "size": 1183,
+            "uri": "https://{canondata_backend}/1775059/be020ceb210e118c9d8f06ae73e0f97466c49478/resource.tar.gz#test_sql2yql.test_side_effects-empty_select_members_/sql.yql"
         }
     ],
     "test_sql2yql.test[side_effects-empty_top]": [
         {
-            "checksum": "66fb4e8ef241e5cc15c6dd8d7a6bebe8",
-            "size": 1181,
-            "uri": "https://{canondata_backend}/1937150/ec0019724df75083b0e89cab22f57e10ef36744e/resource.tar.gz#test_sql2yql.test_side_effects-empty_top_/sql.yql"
+            "checksum": "3978f3637f376b10ea5484193817ef6c",
+            "size": 1095,
+            "uri": "https://{canondata_backend}/1775059/be020ceb210e118c9d8f06ae73e0f97466c49478/resource.tar.gz#test_sql2yql.test_side_effects-empty_top_/sql.yql"
         }
     ],
     "test_sql2yql.test[side_effects-equal_same]": [
         {
-            "checksum": "01b2fb8faa4f6e13870a7734f163f767",
-            "size": 1202,
-            "uri": "https://{canondata_backend}/1784117/186b01cacb929d89a12343cbcb7b00ff658c9418/resource.tar.gz#test_sql2yql.test_side_effects-equal_same_/sql.yql"
+            "checksum": "cc72edb725f7f653260f44e53481eaa5",
+            "size": 1116,
+            "uri": "https://{canondata_backend}/1775059/be020ceb210e118c9d8f06ae73e0f97466c49478/resource.tar.gz#test_sql2yql.test_side_effects-equal_same_/sql.yql"
         }
     ],
     "test_sql2yql.test[side_effects-exists]": [
         {
-            "checksum": "a1ab4e234b7b265e9c16a54843d882ce",
-            "size": 1170,
-            "uri": "https://{canondata_backend}/1937150/ec0019724df75083b0e89cab22f57e10ef36744e/resource.tar.gz#test_sql2yql.test_side_effects-exists_/sql.yql"
+            "checksum": "297271770fec36b8239968176112d215",
+            "size": 1084,
+            "uri": "https://{canondata_backend}/995452/42971723429ce585c6cb841efc5b461b995ec248/resource.tar.gz#test_sql2yql.test_side_effects-exists_/sql.yql"
         }
     ],
     "test_sql2yql.test[side_effects-guess]": [
         {
-            "checksum": "77fd085fe39fcdb2e8745b25d0f16516",
-            "size": 1312,
-            "uri": "https://{canondata_backend}/1937150/ec0019724df75083b0e89cab22f57e10ef36744e/resource.tar.gz#test_sql2yql.test_side_effects-guess_/sql.yql"
+            "checksum": "6fec2ccb07d7f728ec7b9ef15ed7fa38",
+            "size": 1226,
+            "uri": "https://{canondata_backend}/1775059/be020ceb210e118c9d8f06ae73e0f97466c49478/resource.tar.gz#test_sql2yql.test_side_effects-guess_/sql.yql"
         }
     ],
     "test_sql2yql.test[side_effects-list_has_items]": [
         {
-            "checksum": "213f508d1fddc73a2ce588f6a7dfd92f",
-            "size": 1169,
-            "uri": "https://{canondata_backend}/1937150/ec0019724df75083b0e89cab22f57e10ef36744e/resource.tar.gz#test_sql2yql.test_side_effects-list_has_items_/sql.yql"
+            "checksum": "a5e46982097017229b885b83cd188dc6",
+            "size": 1083,
+            "uri": "https://{canondata_backend}/1775059/be020ceb210e118c9d8f06ae73e0f97466c49478/resource.tar.gz#test_sql2yql.test_side_effects-list_has_items_/sql.yql"
         }
     ],
     "test_sql2yql.test[side_effects-list_length]": [
         {
-            "checksum": "ebca0d1d9de8022ce49685e875f7ee2a",
-            "size": 1167,
-            "uri": "https://{canondata_backend}/1937150/ec0019724df75083b0e89cab22f57e10ef36744e/resource.tar.gz#test_sql2yql.test_side_effects-list_length_/sql.yql"
+            "checksum": "d097a4399833769b9298b9cb3caeaf43",
+            "size": 1081,
+            "uri": "https://{canondata_backend}/1775059/be020ceb210e118c9d8f06ae73e0f97466c49478/resource.tar.gz#test_sql2yql.test_side_effects-list_length_/sql.yql"
         }
     ],
     "test_sql2yql.test[side_effects-logical_bools]": [
         {
-            "checksum": "b9f72e2b40707024abd57cfce9bf0dd8",
-            "size": 1638,
-            "uri": "https://{canondata_backend}/1937150/ec0019724df75083b0e89cab22f57e10ef36744e/resource.tar.gz#test_sql2yql.test_side_effects-logical_bools_/sql.yql"
+            "checksum": "805ee1e4d21eb5c034ee5eaa021c6a5f",
+            "size": 1552,
+            "uri": "https://{canondata_backend}/1775059/be020ceb210e118c9d8f06ae73e0f97466c49478/resource.tar.gz#test_sql2yql.test_side_effects-logical_bools_/sql.yql"
         }
     ],
     "test_sql2yql.test[side_effects-logical_bools_override]": [
         {
-            "checksum": "c466ff547cb44882ce1988a5d6897214",
-            "size": 1668,
-            "uri": "https://{canondata_backend}/1937150/ec0019724df75083b0e89cab22f57e10ef36744e/resource.tar.gz#test_sql2yql.test_side_effects-logical_bools_override_/sql.yql"
+            "checksum": "54e9002e66000343805bd7b586322758",
+            "size": 1582,
+            "uri": "https://{canondata_backend}/1775059/be020ceb210e118c9d8f06ae73e0f97466c49478/resource.tar.gz#test_sql2yql.test_side_effects-logical_bools_override_/sql.yql"
         }
     ],
     "test_sql2yql.test[side_effects-logical_bools_skipped]": [
         {
-            "checksum": "b0d1d83c71bf7665bb2cb0bbeb871343",
-            "size": 1636,
-            "uri": "https://{canondata_backend}/1937150/ec0019724df75083b0e89cab22f57e10ef36744e/resource.tar.gz#test_sql2yql.test_side_effects-logical_bools_skipped_/sql.yql"
+            "checksum": "4b98380283562502fefdd9dd5ad4235d",
+            "size": 1550,
+            "uri": "https://{canondata_backend}/1775059/be020ceb210e118c9d8f06ae73e0f97466c49478/resource.tar.gz#test_sql2yql.test_side_effects-logical_bools_skipped_/sql.yql"
         }
     ],
     "test_sql2yql.test[side_effects-logical_bools_unreachable]": [
         {
-            "checksum": "c4c235996cbb93b6ba94a8e947380818",
-            "size": 1638,
-            "uri": "https://{canondata_backend}/1937150/ec0019724df75083b0e89cab22f57e10ef36744e/resource.tar.gz#test_sql2yql.test_side_effects-logical_bools_unreachable_/sql.yql"
+            "checksum": "d827cee6f31d1ccc1cf006e977e70b41",
+            "size": 1552,
+            "uri": "https://{canondata_backend}/1775059/be020ceb210e118c9d8f06ae73e0f97466c49478/resource.tar.gz#test_sql2yql.test_side_effects-logical_bools_unreachable_/sql.yql"
         }
     ],
     "test_sql2yql.test[side_effects-member]": [
         {
-            "checksum": "3e0716b2bcf43e26c0434bea899c6479",
-            "size": 1247,
-            "uri": "https://{canondata_backend}/1937150/ec0019724df75083b0e89cab22f57e10ef36744e/resource.tar.gz#test_sql2yql.test_side_effects-member_/sql.yql"
+            "checksum": "59ea2480e97905085de700f9b82d3fb3",
+            "size": 1161,
+            "uri": "https://{canondata_backend}/1775059/be020ceb210e118c9d8f06ae73e0f97466c49478/resource.tar.gz#test_sql2yql.test_side_effects-member_/sql.yql"
         }
     ],
     "test_sql2yql.test[side_effects-nth]": [
         {
-            "checksum": "8ad2458acf8ac5ef91e660f59e047550",
-            "size": 1214,
-            "uri": "https://{canondata_backend}/1937150/ec0019724df75083b0e89cab22f57e10ef36744e/resource.tar.gz#test_sql2yql.test_side_effects-nth_/sql.yql"
+            "checksum": "e69841a96c29d5a153de50a660bb826c",
+            "size": 1128,
+            "uri": "https://{canondata_backend}/1775059/be020ceb210e118c9d8f06ae73e0f97466c49478/resource.tar.gz#test_sql2yql.test_side_effects-nth_/sql.yql"
         }
     ],
     "test_sql2yql.test[side_effects-way]": [
         {
-            "checksum": "83be0f5e3450995c830700326797aafd",
-            "size": 1262,
-            "uri": "https://{canondata_backend}/1937150/ec0019724df75083b0e89cab22f57e10ef36744e/resource.tar.gz#test_sql2yql.test_side_effects-way_/sql.yql"
+            "checksum": "35cba58dcf67abf3d3a6335e5c651fde",
+            "size": 1176,
+            "uri": "https://{canondata_backend}/1775059/be020ceb210e118c9d8f06ae73e0f97466c49478/resource.tar.gz#test_sql2yql.test_side_effects-way_/sql.yql"
         }
     ],
     "test_sql2yql.test[side_effects-x_not_x]": [
         {
-            "checksum": "f34a8367e396f68205fa5a66d52a2b1c",
-            "size": 3215,
-            "uri": "https://{canondata_backend}/1937150/ec0019724df75083b0e89cab22f57e10ef36744e/resource.tar.gz#test_sql2yql.test_side_effects-x_not_x_/sql.yql"
+            "checksum": "2a6ce8f1bbe498b80e120764a07ab7a3",
+            "size": 3115,
+            "uri": "https://{canondata_backend}/1775059/be020ceb210e118c9d8f06ae73e0f97466c49478/resource.tar.gz#test_sql2yql.test_side_effects-x_not_x_/sql.yql"
         }
     ],
     "test_sql2yql.test[side_effects-x_not_x_fail]": [
         {
-            "checksum": "4b15297d081e697bab57d3210da7b75b",
-            "size": 1388,
-            "uri": "https://{canondata_backend}/1937150/ec0019724df75083b0e89cab22f57e10ef36744e/resource.tar.gz#test_sql2yql.test_side_effects-x_not_x_fail_/sql.yql"
+            "checksum": "8a1ee092df1ec564d1a3e60d9c497b62",
+            "size": 1302,
+            "uri": "https://{canondata_backend}/1775059/be020ceb210e118c9d8f06ae73e0f97466c49478/resource.tar.gz#test_sql2yql.test_side_effects-x_not_x_fail_/sql.yql"
         }
     ],
     "test_sql2yql.test[type_literal-evaluate]": [
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-general_side_effects_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-general_side_effects_/formatted.sql
index 23621379698..25cd60c9548 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-general_side_effects_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-general_side_effects_/formatted.sql
@@ -1,6 +1,4 @@
-PRAGMA warning('disable', '4510');
-
 SELECT
-    Yql::WithSideEffectsMode(1, AsAtom('General'))
-    + Yql::WithSideEffectsMode(1, AsAtom('General'))
+    WithSideEffectsMode(1, 'General')
+    + WithSideEffectsMode(1, 'General')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-semilattice_rt_side_effects_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-semilattice_rt_side_effects_/formatted.sql
index fb29b4e6504..9d79efdd66b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-semilattice_rt_side_effects_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-semilattice_rt_side_effects_/formatted.sql
@@ -1,6 +1,4 @@
-PRAGMA warning('disable', '4510');
-
 SELECT
-    Yql::WithSideEffectsMode(1, AsAtom('SemilatticeRT'))
-    + Yql::WithSideEffectsMode(1, AsAtom('SemilatticeRT'))
+    WithSideEffectsMode(1, 'SemilatticeRT')
+    + WithSideEffectsMode(1, 'SemilatticeRT')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-convert_empty_dict_to_dict_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-convert_empty_dict_to_dict_/formatted.sql
index 6b5f36b78a3..b878690cd7f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-convert_empty_dict_to_dict_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-convert_empty_dict_to_dict_/formatted.sql
@@ -1,6 +1,4 @@
 /* custom error: Condition violated */
-PRAGMA warning('disable', '4510');
-
 SELECT
-    if(TRUE, Yql::WithSideEffectsMode(ensure({}, FALSE), AsAtom('General')), {1, 2, 3})
+    if(TRUE, WithSideEffects(ensure({}, FALSE)), {1, 2, 3})
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-convert_empty_list_to_list_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-convert_empty_list_to_list_/formatted.sql
index 289cadf7d21..b7374db12f5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-convert_empty_list_to_list_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-convert_empty_list_to_list_/formatted.sql
@@ -1,6 +1,4 @@
 /* custom error: Condition violated */
-PRAGMA warning('disable', '4510');
-
 SELECT
-    if(TRUE, Yql::WithSideEffectsMode(ensure([], FALSE), AsAtom('General')), [1, 2, 3])
+    if(TRUE, WithSideEffects(ensure([], FALSE)), [1, 2, 3])
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-convert_null_to_optional_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-convert_null_to_optional_/formatted.sql
index 1a6bbbddd32..af9da015171 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-convert_null_to_optional_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-convert_null_to_optional_/formatted.sql
@@ -1,6 +1,4 @@
 /* custom error: Condition violated */
-PRAGMA warning('disable', '4510');
-
 SELECT
-    if(TRUE, Yql::WithSideEffectsMode(ensure(NULL, FALSE), AsAtom('General')), 1)
+    if(TRUE, WithSideEffects(ensure(NULL, FALSE)), 1)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-empty_extend_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-empty_extend_/formatted.sql
index 8dfc5e4835c..cf6650014e7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-empty_extend_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-empty_extend_/formatted.sql
@@ -1,6 +1,4 @@
 /* custom error: Condition violated */
-PRAGMA warning('disable', '4510');
-
 SELECT
-    ListExtend([1], Yql::WithSideEffectsMode(Ensure(ListTake([2], 0), FALSE), AsAtom('General')))
+    ListExtend([1], WithSideEffects(Ensure(ListTake([2], 0), FALSE)))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-empty_join_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-empty_join_/formatted.sql
index 78c752fc519..f22be00844c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-empty_join_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-empty_join_/formatted.sql
@@ -1,8 +1,6 @@
 /* custom error: Condition violated */
-PRAGMA warning('disable', '4510');
-
 $input1 = ListTake([<|x: 1|>], 0);
-$input2 = Yql::WithSideEffectsMode(Ensure([<|y: 1|>], FALSE), AsAtom('General'));
+$input2 = WithSideEffects(Ensure([<|y: 1|>], FALSE));
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-empty_select_members_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-empty_select_members_/formatted.sql
index 93d10c5dfb1..be4b2b87e72 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-empty_select_members_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-empty_select_members_/formatted.sql
@@ -2,5 +2,5 @@
 PRAGMA warning('disable', '4510');
 
 SELECT
-    Yql::SelectMembers(Yql::WithSideEffectsMode(Ensure(<|a: 1|>, FALSE), AsAtom('General')), (AsAtom('b'),))
+    Yql::SelectMembers(WithSideEffects(Ensure(<|a: 1|>, FALSE)), (AsAtom('b'),))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-empty_top_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-empty_top_/formatted.sql
index 825d54c5f54..6b12fef9385 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-empty_top_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-empty_top_/formatted.sql
@@ -1,6 +1,4 @@
 /* custom error: Condition violated */
-PRAGMA warning('disable', '4510');
-
 SELECT
-    ListTop(Yql::WithSideEffectsMode(Ensure([1], FALSE), AsAtom('General')), 0)
+    ListTop(WithSideEffects(Ensure([1], FALSE)), 0)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-equal_same_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-equal_same_/formatted.sql
index 73c2d64224c..bb39e137feb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-equal_same_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-equal_same_/formatted.sql
@@ -1,7 +1,5 @@
 /* custom error: Condition violated */
-PRAGMA warning('disable', '4510');
-
-$t = Yql::WithSideEffectsMode(Ensure(TRUE, FALSE), AsAtom('General'));
+$t = WithSideEffects(Ensure(TRUE, FALSE));
 
 SELECT
     $t == $t
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-exists_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-exists_/formatted.sql
index 4690aaaac79..1aca7657ab4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-exists_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-exists_/formatted.sql
@@ -1,6 +1,4 @@
 /* custom error: Condition violated */
-PRAGMA warning('disable', '4510');
-
 SELECT
-    just(Yql::WithSideEffectsMode(Ensure(1, FALSE), AsAtom('General'))) IS NOT NULL
+    just(WithSideEffects(Ensure(1, FALSE))) IS NOT NULL
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-guess_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-guess_/formatted.sql
index 0bb5ac6fb60..84eca684158 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-guess_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-guess_/formatted.sql
@@ -1,8 +1,6 @@
 /* custom error: Condition violated */
-PRAGMA warning('disable', '4510');
-
 $vt = Variant<Int32, String>;
 
 SELECT
-    Variant(Yql::WithSideEffectsMode(Ensure(1, FALSE), AsAtom('General')), '0', $vt).1
+    Variant(WithSideEffects(Ensure(1, FALSE)), '0', $vt).1
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-list_has_items_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-list_has_items_/formatted.sql
index 5167d3d808e..5f410395b1e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-list_has_items_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-list_has_items_/formatted.sql
@@ -1,6 +1,4 @@
 /* custom error: Condition violated */
-PRAGMA warning('disable', '4510');
-
 SELECT
-    ListHasItems([Yql::WithSideEffectsMode(Ensure(1, FALSE), AsAtom('General'))])
+    ListHasItems([WithSideEffects(Ensure(1, FALSE))])
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-list_length_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-list_length_/formatted.sql
index 4f5b9ecaece..998a60380a1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-list_length_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-list_length_/formatted.sql
@@ -1,6 +1,4 @@
 /* custom error: Condition violated */
-PRAGMA warning('disable', '4510');
-
 SELECT
-    ListLength([Yql::WithSideEffectsMode(Ensure(1, FALSE), AsAtom('General'))])
+    ListLength([WithSideEffects(Ensure(1, FALSE))])
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-logical_bools_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-logical_bools_/formatted.sql
index ce7499cd79c..bfeead2a98d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-logical_bools_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-logical_bools_/formatted.sql
@@ -1,8 +1,6 @@
 /* custom error: Condition violated */
-PRAGMA warning('disable', '4510');
-
 SELECT
-    (NOT Yql::WithSideEffectsMode(x, AsAtom('General'))) AND FALSE
+    (NOT WithSideEffects(x)) AND FALSE
 FROM (
     SELECT
         Ensure(FALSE, FALSE) AS x
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-logical_bools_override_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-logical_bools_override_/formatted.sql
index 413c6a4f8b5..c335f81e7c9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-logical_bools_override_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-logical_bools_override_/formatted.sql
@@ -1,7 +1,5 @@
-PRAGMA warning('disable', '4510');
-
 SELECT
-    Yql::WithSideEffectsMode((NOT Yql::WithSideEffectsMode(x, AsAtom('General'))), AsAtom('None'))
+    WithSideEffectsMode((NOT WithSideEffects(x)), 'None')
     AND FALSE
 FROM (
     SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-logical_bools_skipped_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-logical_bools_skipped_/formatted.sql
index e4421ac87c0..0a1ac3dfaee 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-logical_bools_skipped_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-logical_bools_skipped_/formatted.sql
@@ -1,7 +1,5 @@
-PRAGMA warning('disable', '4510');
-
 SELECT
-    (NOT Yql::WithSideEffectsMode(x, AsAtom('General'))) AND TRUE
+    (NOT WithSideEffects(x)) AND TRUE
 FROM (
     SELECT
         Ensure(FALSE, TRUE) AS x
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-logical_bools_unreachable_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-logical_bools_unreachable_/formatted.sql
index 602e0e37a4c..bfbcab7d622 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-logical_bools_unreachable_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-logical_bools_unreachable_/formatted.sql
@@ -1,7 +1,5 @@
-PRAGMA warning('disable', '4510');
-
 SELECT
-    FALSE AND (NOT Yql::WithSideEffectsMode(x, AsAtom('General')))
+    FALSE AND (NOT WithSideEffects(x))
 FROM (
     SELECT
         Ensure(FALSE, FALSE) AS x
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-member_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-member_/formatted.sql
index de1e9442001..19f696c590a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-member_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-member_/formatted.sql
@@ -1,6 +1,4 @@
 /* custom error: Condition violated */
-PRAGMA warning('disable', '4510');
-
 SELECT
-    <|a: 1, b: Yql::WithSideEffectsMode(Ensure(2, FALSE), AsAtom('General'))|>.a
+    <|a: 1, b: WithSideEffects(Ensure(2, FALSE))|>.a
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-nth_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-nth_/formatted.sql
index 70977f7c019..f31096a2491 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-nth_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-nth_/formatted.sql
@@ -1,6 +1,4 @@
 /* custom error: Condition violated */
-PRAGMA warning('disable', '4510');
-
 SELECT
-    (1, Yql::WithSideEffectsMode(Ensure(2, FALSE), AsAtom('General'))).0
+    (1, WithSideEffects(Ensure(2, FALSE))).0
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-way_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-way_/formatted.sql
index 7b549e080f8..6958cd90bfb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-way_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-way_/formatted.sql
@@ -1,8 +1,6 @@
 /* custom error: Condition violated */
-PRAGMA warning('disable', '4510');
-
 $vt = Variant<Int32, String>;
 
 SELECT
-    Way(Variant(Yql::WithSideEffectsMode(Ensure(1, FALSE), AsAtom('General')), '0', $vt))
+    Way(Variant(WithSideEffects(Ensure(1, FALSE)), '0', $vt))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-x_not_x_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-x_not_x_/formatted.sql
index 15fb492eb37..1aa291a5ef6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-x_not_x_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-x_not_x_/formatted.sql
@@ -1,14 +1,13 @@
 PRAGMA config.flags('OptimizerFlags', 'OptimizeXNotX');
-PRAGMA warning('disable', '4510');
 
 SELECT
-    k1 AND Yql::WithSideEffectsMode(k2, AsAtom('General')) AND NOT k1,
-    k1 AND Yql::WithSideEffectsMode(k2, AsAtom('General')) AND k1 AND NOT k1,
-    k1 AND NOT k1 AND Yql::WithSideEffectsMode(k2, AsAtom('General')),
-    k1 AND NOT k1 AND Yql::WithSideEffectsMode(k2, AsAtom('General')) AND k1,
-    k1 AND NOT k1 AND Yql::WithSideEffectsMode(k2, AsAtom('General')) AND k1 AND NOT k1,
-    k1 AND NOT k1 AND Yql::WithSideEffectsMode(k2, AsAtom('General')) AND k2 AND NOT k2,
-    Yql::WithSideEffectsMode(k1, AsAtom('General')) AND NOT Yql::WithSideEffectsMode(k1, AsAtom('General')),
+    k1 AND WithSideEffects(k2) AND NOT k1,
+    k1 AND WithSideEffects(k2) AND k1 AND NOT k1,
+    k1 AND NOT k1 AND WithSideEffects(k2),
+    k1 AND NOT k1 AND WithSideEffects(k2) AND k1,
+    k1 AND NOT k1 AND WithSideEffects(k2) AND k1 AND NOT k1,
+    k1 AND NOT k1 AND WithSideEffects(k2) AND k2 AND NOT k2,
+    WithSideEffects(k1) AND NOT WithSideEffects(k1),
 FROM
     AS_TABLE([
         <|k1: TRUE, k2: TRUE|>,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-x_not_x_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-x_not_x_fail_/formatted.sql
index 5f7dc71ca5e..f7db6c48a14 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-x_not_x_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_side_effects-x_not_x_fail_/formatted.sql
@@ -1,9 +1,8 @@
 /* custom error:shoud_fail*/
 PRAGMA config.flags('OptimizerFlags', 'OptimizeXNotX');
-PRAGMA warning('disable', '4510');
 
 SELECT
-    k1 AND Yql::WithSideEffectsMode(ENSURE(TRUE, FALSE, 'shoud_fail'), AsAtom('General')) AND NOT k1,
+    k1 AND WithSideEffects(ENSURE(TRUE, FALSE, 'shoud_fail')) AND NOT k1,
 FROM
     AS_TABLE([
         <|k1: TRUE|>,
diff --git a/yql/essentials/tests/sql/suites/csee/general_side_effects.cfg b/yql/essentials/tests/sql/suites/csee/general_side_effects.cfg
new file mode 100644
index 00000000000..617474f8d63
--- /dev/null
+++ b/yql/essentials/tests/sql/suites/csee/general_side_effects.cfg
@@ -0,0 +1 @@
+langver 2025.04
diff --git a/yql/essentials/tests/sql/suites/csee/general_side_effects.yql b/yql/essentials/tests/sql/suites/csee/general_side_effects.yql
index 8d3240c38fd..a15bb99783a 100644
--- a/yql/essentials/tests/sql/suites/csee/general_side_effects.yql
+++ b/yql/essentials/tests/sql/suites/csee/general_side_effects.yql
@@ -1,5 +1,3 @@
-pragma warning("disable","4510");
 select
-  Yql::WithSideEffectsMode(1, AsAtom('General')) +
-  Yql::WithSideEffectsMode(1, AsAtom('General'))
-
+  WithSideEffectsMode(1, 'General') +
+  WithSideEffectsMode(1, 'General')
diff --git a/yql/essentials/tests/sql/suites/csee/semilattice_rt_side_effects.cfg b/yql/essentials/tests/sql/suites/csee/semilattice_rt_side_effects.cfg
new file mode 100644
index 00000000000..617474f8d63
--- /dev/null
+++ b/yql/essentials/tests/sql/suites/csee/semilattice_rt_side_effects.cfg
@@ -0,0 +1 @@
+langver 2025.04
diff --git a/yql/essentials/tests/sql/suites/csee/semilattice_rt_side_effects.yql b/yql/essentials/tests/sql/suites/csee/semilattice_rt_side_effects.yql
index 9391f2dba5b..92adfeb3934 100644
--- a/yql/essentials/tests/sql/suites/csee/semilattice_rt_side_effects.yql
+++ b/yql/essentials/tests/sql/suites/csee/semilattice_rt_side_effects.yql
@@ -1,5 +1,3 @@
-pragma warning("disable","4510");
 select
-  Yql::WithSideEffectsMode(1, AsAtom('SemilatticeRT')) +
-  Yql::WithSideEffectsMode(1, AsAtom('SemilatticeRT'))
-
+  WithSideEffectsMode(1, 'SemilatticeRT') +
+  WithSideEffectsMode(1, 'SemilatticeRT')
diff --git a/yql/essentials/tests/sql/suites/side_effects/convert_empty_dict_to_dict.yql b/yql/essentials/tests/sql/suites/side_effects/convert_empty_dict_to_dict.yql
index 2716a64baa5..d569a9f3eac 100644
--- a/yql/essentials/tests/sql/suites/side_effects/convert_empty_dict_to_dict.yql
+++ b/yql/essentials/tests/sql/suites/side_effects/convert_empty_dict_to_dict.yql
@@ -1,3 +1,2 @@
 /* custom error: Condition violated */
-pragma warning('disable', '4510');
-select if(true, Yql::WithSideEffectsMode(ensure({}, false),AsAtom('General')), {1,2,3});
+select if(true, WithSideEffects(ensure({}, false)), {1,2,3});
diff --git a/yql/essentials/tests/sql/suites/side_effects/convert_empty_list_to_list.yql b/yql/essentials/tests/sql/suites/side_effects/convert_empty_list_to_list.yql
index b8fbc680ede..f8009c23b71 100644
--- a/yql/essentials/tests/sql/suites/side_effects/convert_empty_list_to_list.yql
+++ b/yql/essentials/tests/sql/suites/side_effects/convert_empty_list_to_list.yql
@@ -1,3 +1,2 @@
 /* custom error: Condition violated */
-pragma warning('disable', '4510');
-select if(true, Yql::WithSideEffectsMode(ensure([], false),AsAtom('General')), [1,2,3]);
+select if(true, WithSideEffects(ensure([], false)), [1,2,3]);
diff --git a/yql/essentials/tests/sql/suites/side_effects/convert_null_to_optional.yql b/yql/essentials/tests/sql/suites/side_effects/convert_null_to_optional.yql
index 6145ecc23aa..aa36726564c 100644
--- a/yql/essentials/tests/sql/suites/side_effects/convert_null_to_optional.yql
+++ b/yql/essentials/tests/sql/suites/side_effects/convert_null_to_optional.yql
@@ -1,3 +1,2 @@
 /* custom error: Condition violated */
-pragma warning('disable', '4510');
-select if(true, Yql::WithSideEffectsMode(ensure(null, false),AsAtom('General')), 1);
+select if(true, WithSideEffects(ensure(null, false)), 1);
diff --git a/yql/essentials/tests/sql/suites/side_effects/default.cfg b/yql/essentials/tests/sql/suites/side_effects/default.cfg
index e69de29bb2d..617474f8d63 100644
--- a/yql/essentials/tests/sql/suites/side_effects/default.cfg
+++ b/yql/essentials/tests/sql/suites/side_effects/default.cfg
@@ -0,0 +1 @@
+langver 2025.04
diff --git a/yql/essentials/tests/sql/suites/side_effects/empty_extend.yql b/yql/essentials/tests/sql/suites/side_effects/empty_extend.yql
index d8a2dd2c7f5..bda2a0de90a 100644
--- a/yql/essentials/tests/sql/suites/side_effects/empty_extend.yql
+++ b/yql/essentials/tests/sql/suites/side_effects/empty_extend.yql
@@ -1,4 +1,2 @@
 /* custom error: Condition violated */
-pragma warning("disable","4510");
-
-select ListExtend([1],Yql::WithSideEffectsMode(Ensure(ListTake([2],0),false),AsAtom('General')))
+select ListExtend([1],WithSideEffects(Ensure(ListTake([2],0),false)))
diff --git a/yql/essentials/tests/sql/suites/side_effects/empty_join.yql b/yql/essentials/tests/sql/suites/side_effects/empty_join.yql
index 20fc142f3e1..444cfd46976 100644
--- a/yql/essentials/tests/sql/suites/side_effects/empty_join.yql
+++ b/yql/essentials/tests/sql/suites/side_effects/empty_join.yql
@@ -1,7 +1,6 @@
 /* custom error: Condition violated */
-pragma warning("disable","4510");
 $input1 = ListTake([<|x:1|>],0);
-$input2 = Yql::WithSideEffectsMode(Ensure([<|y:1|>],false),AsAtom('General'));
+$input2 = WithSideEffects(Ensure([<|y:1|>],false));
 
 select * from (select * from AS_TABLE($input1)) as a
 join (select * from AS_TABLE($input2)) as b on a.x=b.y;
diff --git a/yql/essentials/tests/sql/suites/side_effects/empty_select_members.yql b/yql/essentials/tests/sql/suites/side_effects/empty_select_members.yql
index 418b7b653d0..3ec741190b3 100644
--- a/yql/essentials/tests/sql/suites/side_effects/empty_select_members.yql
+++ b/yql/essentials/tests/sql/suites/side_effects/empty_select_members.yql
@@ -1,4 +1,3 @@
 /* custom error: Condition violated */
 pragma warning("disable","4510");
-
-select Yql::SelectMembers(Yql::WithSideEffectsMode(Ensure(<|a:1|>,false),AsAtom('General')),(AsAtom('b'),));
+select Yql::SelectMembers(WithSideEffects(Ensure(<|a:1|>,false)),(AsAtom('b'),));
diff --git a/yql/essentials/tests/sql/suites/side_effects/empty_top.yql b/yql/essentials/tests/sql/suites/side_effects/empty_top.yql
index 8028e07668d..f11d02f511a 100644
--- a/yql/essentials/tests/sql/suites/side_effects/empty_top.yql
+++ b/yql/essentials/tests/sql/suites/side_effects/empty_top.yql
@@ -1,4 +1,2 @@
 /* custom error: Condition violated */
-pragma warning("disable","4510");
-
-select ListTop(Yql::WithSideEffectsMode(Ensure([1],false),AsAtom('General')),0);
+select ListTop(WithSideEffects(Ensure([1],false)),0);
diff --git a/yql/essentials/tests/sql/suites/side_effects/equal_same.yql b/yql/essentials/tests/sql/suites/side_effects/equal_same.yql
index ae44da8ea4e..51e5cede554 100644
--- a/yql/essentials/tests/sql/suites/side_effects/equal_same.yql
+++ b/yql/essentials/tests/sql/suites/side_effects/equal_same.yql
@@ -1,5 +1,3 @@
 /* custom error: Condition violated */
-pragma warning("disable","4510");
-
-$t = Yql::WithSideEffectsMode(Ensure(true,false), AsAtom('General'));
+$t = WithSideEffects(Ensure(true,false));
 select $t == $t;
diff --git a/yql/essentials/tests/sql/suites/side_effects/exists.yql b/yql/essentials/tests/sql/suites/side_effects/exists.yql
index 4325c85cf68..07ba8f42a56 100644
--- a/yql/essentials/tests/sql/suites/side_effects/exists.yql
+++ b/yql/essentials/tests/sql/suites/side_effects/exists.yql
@@ -1,4 +1,2 @@
 /* custom error: Condition violated */
-pragma warning("disable","4510");
-
-select just(Yql::WithSideEffectsMode(Ensure(1,false),AsAtom('General'))) is not null
+select just(WithSideEffects(Ensure(1,false))) is not null
diff --git a/yql/essentials/tests/sql/suites/side_effects/guess.yql b/yql/essentials/tests/sql/suites/side_effects/guess.yql
index 466c5d6bd46..1bdced84428 100644
--- a/yql/essentials/tests/sql/suites/side_effects/guess.yql
+++ b/yql/essentials/tests/sql/suites/side_effects/guess.yql
@@ -1,5 +1,3 @@
 /* custom error: Condition violated */
-pragma warning("disable","4510");
-
 $vt = Variant<Int32,String>;
-select Variant(Yql::WithSideEffectsMode(Ensure(1,false),AsAtom('General')),"0",$vt).1
+select Variant(WithSideEffects(Ensure(1,false)),"0",$vt).1
diff --git a/yql/essentials/tests/sql/suites/side_effects/list_has_items.yql b/yql/essentials/tests/sql/suites/side_effects/list_has_items.yql
index c1ffa5fc272..0c5c16620bc 100644
--- a/yql/essentials/tests/sql/suites/side_effects/list_has_items.yql
+++ b/yql/essentials/tests/sql/suites/side_effects/list_has_items.yql
@@ -1,4 +1,2 @@
 /* custom error: Condition violated */
-pragma warning("disable","4510");
-
-select ListHasItems([Yql::WithSideEffectsMode(Ensure(1,false),AsAtom('General'))])
+select ListHasItems([WithSideEffects(Ensure(1,false))])
diff --git a/yql/essentials/tests/sql/suites/side_effects/list_length.yql b/yql/essentials/tests/sql/suites/side_effects/list_length.yql
index b97976116cb..9027f132739 100644
--- a/yql/essentials/tests/sql/suites/side_effects/list_length.yql
+++ b/yql/essentials/tests/sql/suites/side_effects/list_length.yql
@@ -1,4 +1,2 @@
 /* custom error: Condition violated */
-pragma warning("disable","4510");
-
-select ListLength([Yql::WithSideEffectsMode(Ensure(1,false),AsAtom('General'))])
+select ListLength([WithSideEffects(Ensure(1,false))])
diff --git a/yql/essentials/tests/sql/suites/side_effects/logical_bools.yql b/yql/essentials/tests/sql/suites/side_effects/logical_bools.yql
index a1d6f32094a..6fb57083c3b 100644
--- a/yql/essentials/tests/sql/suites/side_effects/logical_bools.yql
+++ b/yql/essentials/tests/sql/suites/side_effects/logical_bools.yql
@@ -1,3 +1,2 @@
 /* custom error: Condition violated */
-pragma warning("disable","4510");
-select (not Yql::WithSideEffectsMode(x, AsAtom('General'))) and false from (select Ensure(false, false) as x)
+select (not WithSideEffects(x)) and false from (select Ensure(false, false) as x)
diff --git a/yql/essentials/tests/sql/suites/side_effects/logical_bools_override.yql b/yql/essentials/tests/sql/suites/side_effects/logical_bools_override.yql
index f88f24b8079..9ec19e4da15 100644
--- a/yql/essentials/tests/sql/suites/side_effects/logical_bools_override.yql
+++ b/yql/essentials/tests/sql/suites/side_effects/logical_bools_override.yql
@@ -1,3 +1,2 @@
-pragma warning("disable","4510");
-select Yql::WithSideEffectsMode((not Yql::WithSideEffectsMode(x, AsAtom('General'))),AsAtom('None'))
+select WithSideEffectsMode((not WithSideEffects(x)),'None')
     and false from (select Ensure(false, false) as x)
diff --git a/yql/essentials/tests/sql/suites/side_effects/logical_bools_skipped.yql b/yql/essentials/tests/sql/suites/side_effects/logical_bools_skipped.yql
index 8ecc30132a6..89e7efb26fa 100644
--- a/yql/essentials/tests/sql/suites/side_effects/logical_bools_skipped.yql
+++ b/yql/essentials/tests/sql/suites/side_effects/logical_bools_skipped.yql
@@ -1,2 +1 @@
-pragma warning("disable","4510");
-select (not Yql::WithSideEffectsMode(x, AsAtom('General'))) and true from (select Ensure(false, true) as x)
+select (not WithSideEffects(x)) and true from (select Ensure(false, true) as x)
diff --git a/yql/essentials/tests/sql/suites/side_effects/logical_bools_unreachable.yql b/yql/essentials/tests/sql/suites/side_effects/logical_bools_unreachable.yql
index f26ce0040f9..221f8b90c57 100644
--- a/yql/essentials/tests/sql/suites/side_effects/logical_bools_unreachable.yql
+++ b/yql/essentials/tests/sql/suites/side_effects/logical_bools_unreachable.yql
@@ -1,2 +1 @@
-pragma warning("disable","4510");
-select false and (not Yql::WithSideEffectsMode(x, AsAtom('General'))) from (select Ensure(false, false) as x)
+select false and (not WithSideEffects(x)) from (select Ensure(false, false) as x)
diff --git a/yql/essentials/tests/sql/suites/side_effects/member.yql b/yql/essentials/tests/sql/suites/side_effects/member.yql
index b99dc93bfbc..491cd0aac00 100644
--- a/yql/essentials/tests/sql/suites/side_effects/member.yql
+++ b/yql/essentials/tests/sql/suites/side_effects/member.yql
@@ -1,4 +1,2 @@
 /* custom error: Condition violated */
-pragma warning("disable","4510");
-
-select <|a:1,b:Yql::WithSideEffectsMode(Ensure(2,false),AsAtom('General'))|>.a
+select <|a:1,b:WithSideEffects(Ensure(2,false))|>.a
diff --git a/yql/essentials/tests/sql/suites/side_effects/nth.yql b/yql/essentials/tests/sql/suites/side_effects/nth.yql
index 02a6c39fb51..1cfa41ffe4b 100644
--- a/yql/essentials/tests/sql/suites/side_effects/nth.yql
+++ b/yql/essentials/tests/sql/suites/side_effects/nth.yql
@@ -1,4 +1,2 @@
 /* custom error: Condition violated */
-pragma warning("disable","4510");
-
-select (1,Yql::WithSideEffectsMode(Ensure(2,false),AsAtom('General'))).0
+select (1,WithSideEffects(Ensure(2,false))).0
diff --git a/yql/essentials/tests/sql/suites/side_effects/way.yql b/yql/essentials/tests/sql/suites/side_effects/way.yql
index 957d3675bc8..a92e9669400 100644
--- a/yql/essentials/tests/sql/suites/side_effects/way.yql
+++ b/yql/essentials/tests/sql/suites/side_effects/way.yql
@@ -1,5 +1,3 @@
 /* custom error: Condition violated */
-pragma warning("disable","4510");
-
 $vt = Variant<Int32,String>;
-select Way(Variant(Yql::WithSideEffectsMode(Ensure(1,false),AsAtom('General')),"0",$vt))
+select Way(Variant(WithSideEffects(Ensure(1,false)),"0",$vt))
diff --git a/yql/essentials/tests/sql/suites/side_effects/x_not_x.yql b/yql/essentials/tests/sql/suites/side_effects/x_not_x.yql
index 5cf547e14c4..fb5287bd72a 100644
--- a/yql/essentials/tests/sql/suites/side_effects/x_not_x.yql
+++ b/yql/essentials/tests/sql/suites/side_effects/x_not_x.yql
@@ -1,14 +1,13 @@
 pragma config.flags("OptimizerFlags", "OptimizeXNotX");
-pragma warning("disable","4510");
 
 SELECT
-    k1 AND Yql::WithSideEffectsMode(k2, AsAtom('General')) AND NOT k1,
-    k1 AND Yql::WithSideEffectsMode(k2, AsAtom('General')) AND k1 AND NOT k1,
-    k1 AND NOT k1 AND Yql::WithSideEffectsMode(k2, AsAtom('General')),
-    k1 AND NOT k1 AND Yql::WithSideEffectsMode(k2, AsAtom('General')) AND k1,
-    k1 AND NOT k1 AND Yql::WithSideEffectsMode(k2, AsAtom('General')) AND k1 AND NOT k1,
-    k1 AND NOT k1 AND Yql::WithSideEffectsMode(k2, AsAtom('General')) AND k2 AND NOT k2,
-    Yql::WithSideEffectsMode(k1, AsAtom('General')) AND NOT Yql::WithSideEffectsMode(k1, AsAtom('General')),
+    k1 AND WithSideEffects(k2) AND NOT k1,
+    k1 AND WithSideEffects(k2) AND k1 AND NOT k1,
+    k1 AND NOT k1 AND WithSideEffects(k2),
+    k1 AND NOT k1 AND WithSideEffects(k2) AND k1,
+    k1 AND NOT k1 AND WithSideEffects(k2) AND k1 AND NOT k1,
+    k1 AND NOT k1 AND WithSideEffects(k2) AND k2 AND NOT k2,
+    WithSideEffects(k1) AND NOT WithSideEffects(k1),
 FROM
     AS_TABLE([
         <|k1: TRUE,  k2: TRUE|>,
diff --git a/yql/essentials/tests/sql/suites/side_effects/x_not_x_fail.yql b/yql/essentials/tests/sql/suites/side_effects/x_not_x_fail.yql
index b6ae2b862c6..0c7b8cbde83 100644
--- a/yql/essentials/tests/sql/suites/side_effects/x_not_x_fail.yql
+++ b/yql/essentials/tests/sql/suites/side_effects/x_not_x_fail.yql
@@ -1,9 +1,8 @@
 /* custom error:shoud_fail*/
 pragma config.flags("OptimizerFlags", "OptimizeXNotX");
-pragma warning("disable","4510");
 
 SELECT
-    k1 AND Yql::WithSideEffectsMode(ENSURE(TRUE, FALSE, 'shoud_fail'), AsAtom('General')) AND NOT k1,
+    k1 AND WithSideEffects(ENSURE(TRUE, FALSE, 'shoud_fail')) AND NOT k1,
 FROM
     AS_TABLE([
         <|k1: TRUE|>,