change double quotes to single quotes

commit_hash:7890ab16bc6488d4f13fd6ec6cd512107c0cba51

1044 files changed, 6597 insertions, 6577 deletions

diff --git a/yql/essentials/sql/v1/format/sql_format.cpp b/yql/essentials/sql/v1/format/sql_format.cpp
index 8c4b04760f..72007d15e2 100644
--- a/yql/essentials/sql/v1/format/sql_format.cpp
+++ b/yql/essentials/sql/v1/format/sql_format.cpp
@@ -87,6 +87,15 @@ TParsedToken TransformTokenForValidate(TParsedToken token) {
     return token;
 }
 
+TStringBuf SkipQuotes(const TString& content) {
+    TStringBuf str = content;
+    str.SkipPrefix("\"");
+    str.ChopSuffix("\"");
+    str.SkipPrefix("'");
+    str.ChopSuffix("'");
+    return str;
+}
+
 bool Validate(const TParsedTokenList& query, const TParsedTokenList& formattedQuery) {
     auto in = query.begin();
     auto out = formattedQuery.begin();
@@ -105,6 +114,10 @@ bool Validate(const TParsedTokenList& query, const TParsedTokenList& formattedQu
                 if (!AsciiEqualsIgnoreCase(inToken.Content, outToken.Content)) {
                     return false;
                 }
+            } else if (inToken.Name == "STRING_VALUE") {
+                if (SkipQuotes(inToken.Content) != SkipQuotes(outToken.Content)) {
+                    return false;
+                }
             } else {
                 if (inToken.Content != outToken.Content) {
                     return false;
@@ -1698,6 +1711,13 @@ private:
             }
         }
 
+        if (ParsedTokens[TokenIndex].Name == "STRING_VALUE") {
+            TStringBuf checkStr = str;
+            if (checkStr.SkipPrefix("\"") && checkStr.ChopSuffix("\"") && !checkStr.Contains("'")) {
+                str = TStringBuilder() << '\'' << checkStr << '\'';
+            }
+        }
+
         Out(str);
 
         if (TokenIndex + 1 >= ParsedTokens.size() || ParsedTokens[TokenIndex + 1].Line > LastLine) {
diff --git a/yql/essentials/sql/v1/format/sql_format_ut.h b/yql/essentials/sql/v1/format/sql_format_ut.h
index 7927267378..c56c5636b7 100644
--- a/yql/essentials/sql/v1/format/sql_format_ut.h
+++ b/yql/essentials/sql/v1/format/sql_format_ut.h
@@ -329,20 +329,20 @@ Y_UNIT_TEST(TableStoreOperations) {
 Y_UNIT_TEST(ExternalDataSourceOperations) {
     TCases cases = {
         {"creAte exTernAl daTa SouRce usEr With (a = \"b\")",
-            "CREATE EXTERNAL DATA SOURCE usEr WITH (a = \"b\");\n"},
-            {"creAte exTernAl daTa SouRce if not exists usEr With (a = \"b\")",
-            "CREATE EXTERNAL DATA SOURCE IF NOT EXISTS usEr WITH (a = \"b\");\n"},
-            {"creAte oR rePlaCe exTernAl daTa SouRce usEr With (a = \"b\")",
-            "CREATE OR REPLACE EXTERNAL DATA SOURCE usEr WITH (a = \"b\");\n"},
-            {"create external data source eds with (a=\"a\",b=\"b\",c = true)",
-            "CREATE EXTERNAL DATA SOURCE eds WITH (\n\ta = \"a\",\n\tb = \"b\",\n\tc = TRUE\n);\n"},
-            {"alter external data source eds set a true, reset (b, c), set (x=y, z=false)",
+            "CREATE EXTERNAL DATA SOURCE usEr WITH (a = 'b');\n"},
+        {"creAte exTernAl daTa SouRce if not exists usEr With (a = \"b\")",
+            "CREATE EXTERNAL DATA SOURCE IF NOT EXISTS usEr WITH (a = 'b');\n"},
+        {"creAte oR rePlaCe exTernAl daTa SouRce usEr With (a = \"b\")",
+            "CREATE OR REPLACE EXTERNAL DATA SOURCE usEr WITH (a = 'b');\n"},
+        {"create external data source eds with (a=\"a\",b=\"b\",c = true)",
+            "CREATE EXTERNAL DATA SOURCE eds WITH (\n\ta = 'a',\n\tb = 'b',\n\tc = TRUE\n);\n"},
+        {"alter external data source eds set a true, reset (b, c), set (x=y, z=false)",
             "ALTER EXTERNAL DATA SOURCE eds\n\tSET a TRUE,\n\tRESET (b, c),\n\tSET (x = y, z = FALSE)\n;\n"},
-            {"alter external data source eds reset (a), set (x=y)",
+        {"alter external data source eds reset (a), set (x=y)",
             "ALTER EXTERNAL DATA SOURCE eds\n\tRESET (a),\n\tSET (x = y)\n;\n"},
         {"dRop exTerNal Data SouRce usEr",
             "DROP EXTERNAL DATA SOURCE usEr;\n"},
-            {"dRop exTerNal Data SouRce if exists usEr",
+        {"dRop exTerNal Data SouRce if exists usEr",
             "DROP EXTERNAL DATA SOURCE IF EXISTS usEr;\n"},
     };
 
@@ -369,13 +369,13 @@ Y_UNIT_TEST(AsyncReplication) {
 Y_UNIT_TEST(ExternalTableOperations) {
     TCases cases = {
         {"creAte exTernAl TabLe usEr (a int) With (a = \"b\")",
-            "CREATE EXTERNAL TABLE usEr (\n\ta int\n)\nWITH (a = \"b\");\n"},
+            "CREATE EXTERNAL TABLE usEr (\n\ta int\n)\nWITH (a = 'b');\n"},
         {"creAte oR rePlaCe exTernAl TabLe usEr (a int) With (a = \"b\")",
-            "CREATE OR REPLACE EXTERNAL TABLE usEr (\n\ta int\n)\nWITH (a = \"b\");\n"},
+            "CREATE OR REPLACE EXTERNAL TABLE usEr (\n\ta int\n)\nWITH (a = 'b');\n"},
         {"creAte exTernAl TabLe iF NOt Exists usEr (a int) With (a = \"b\")",
-            "CREATE EXTERNAL TABLE IF NOT EXISTS usEr (\n\ta int\n)\nWITH (a = \"b\");\n"},
+            "CREATE EXTERNAL TABLE IF NOT EXISTS usEr (\n\ta int\n)\nWITH (a = 'b');\n"},
         {"create external table user (a int) with (a=\"b\",c=\"d\")",
-            "CREATE EXTERNAL TABLE user (\n\ta int\n)\nWITH (\n\ta = \"b\",\n\tc = \"d\"\n);\n"},
+            "CREATE EXTERNAL TABLE user (\n\ta int\n)\nWITH (\n\ta = 'b',\n\tc = 'd'\n);\n"},
         {"alter  external table user add column col1 int32, drop column col2, reset(prop), set (prop2 = 42, x=y), set a true",
             "ALTER EXTERNAL TABLE user\n\tADD COLUMN col1 int32,\n\tDROP COLUMN col2,\n\tRESET (prop),\n\tSET (prop2 = 42, x = y),\n\tSET a TRUE\n;\n"},
         {"dRop exTerNal taBlE usEr",
@@ -455,13 +455,13 @@ Y_UNIT_TEST(AlterTable) {
         {"alter table user add changefeed user with (initial_scan = FaLsE)",
             "ALTER TABLE user\n\tADD CHANGEFEED user WITH (initial_scan = FALSE)\n;\n"},
         {"alter table user add changefeed user with (retention_period = Interval(\"P1D\"))",
-            "ALTER TABLE user\n\tADD CHANGEFEED user WITH (retention_period = Interval(\"P1D\"))\n;\n"},
+            "ALTER TABLE user\n\tADD CHANGEFEED user WITH (retention_period = Interval('P1D'))\n;\n"},
         {"alter table user add changefeed user with (virtual_timestamps = TruE)",
             "ALTER TABLE user\n\tADD CHANGEFEED user WITH (virtual_timestamps = TRUE)\n;\n"},
         {"alter table user add changefeed user with (virtual_timestamps = fAlSe)",
             "ALTER TABLE user\n\tADD CHANGEFEED user WITH (virtual_timestamps = FALSE)\n;\n"},
         {"alter table user add changefeed user with (barriers_interval = Interval(\"PT1S\"))",
-            "ALTER TABLE user\n\tADD CHANGEFEED user WITH (barriers_interval = Interval(\"PT1S\"))\n;\n"},
+            "ALTER TABLE user\n\tADD CHANGEFEED user WITH (barriers_interval = Interval('PT1S'))\n;\n"},
         {"alter table user add changefeed user with (topic_min_active_partitions = 1)",
             "ALTER TABLE user\n\tADD CHANGEFEED user WITH (topic_min_active_partitions = 1)\n;\n"},
         {"alter table user add changefeed user with (topic_auto_partitioning = 'ENABLED', topic_min_active_partitions = 1, topic_max_active_partitions = 7)",
@@ -1394,7 +1394,7 @@ FROM Input MATCH_RECOGNIZE(
     DEFINE A as A, B as B
 );
 )",
-R"(PRAGMA FeatureR010 = "prototype";
+R"(PRAGMA FeatureR010 = 'prototype';
 
 USE plato;
 
@@ -1649,12 +1649,12 @@ Y_UNIT_TEST(DropView) {
 Y_UNIT_TEST(ResourcePoolOperations) {
     TCases cases = {
         {"creAte reSourCe poOl naMe With (a = \"b\")",
-            "CREATE RESOURCE POOL naMe WITH (a = \"b\");\n"},
-            {"create resource pool eds with (a=\"a\",b=\"b\",c = true)",
-            "CREATE RESOURCE POOL eds WITH (\n\ta = \"a\",\n\tb = \"b\",\n\tc = TRUE\n);\n"},
-            {"alTer reSOurcE poOl naMe resEt (b, c), seT (x=y, z=false)",
+            "CREATE RESOURCE POOL naMe WITH (a = 'b');\n"},
+        {"create resource pool eds with (a=\"a\",b=\"b\",c = true)",
+            "CREATE RESOURCE POOL eds WITH (\n\ta = 'a',\n\tb = 'b',\n\tc = TRUE\n);\n"},
+        {"alTer reSOurcE poOl naMe resEt (b, c), seT (x=y, z=false)",
             "ALTER RESOURCE POOL naMe\n\tRESET (b, c),\n\tSET (x = y, z = FALSE)\n;\n"},
-            {"alter resource pool eds reset (a), set (x=y)",
+        {"alter resource pool eds reset (a), set (x=y)",
             "ALTER RESOURCE POOL eds\n\tRESET (a),\n\tSET (x = y)\n;\n"},
         {"dRop reSourCe poOl naMe",
             "DROP RESOURCE POOL naMe;\n"},
@@ -1667,11 +1667,11 @@ Y_UNIT_TEST(ResourcePoolOperations) {
 Y_UNIT_TEST(BackupCollectionOperations) {
     TCases cases = {
         {"creAte  BackuP colLection `-naMe` wIth (a = \"b\")",
-            "CREATE BACKUP COLLECTION `-naMe` WITH (a = \"b\");\n"},
-        {"creAte  BackuP colLection `-naMe`     DATabase wIth (a = \"b\")",
-            "CREATE BACKUP COLLECTION `-naMe` DATABASE WITH (a = \"b\");\n"},
+            "CREATE BACKUP COLLECTION `-naMe` WITH (a = 'b');\n"},
+        {"creAte  BackuP colLection `-naMe`     DATabase wIth (a = 'b')",
+            "CREATE BACKUP COLLECTION `-naMe` DATABASE WITH (a = 'b');\n"},
         {"creAte  BackuP colLection    `-naMe`   (   tabLe      `tbl1`      , TablE `tbl2`) wIth (a = \"b\")",
-            "CREATE BACKUP COLLECTION `-naMe` (TABLE `tbl1`, TABLE `tbl2`) WITH (a = \"b\");\n"},
+            "CREATE BACKUP COLLECTION `-naMe` (TABLE `tbl1`, TABLE `tbl2`) WITH (a = 'b');\n"},
         {"alTer bACKuP coLLECTION naMe resEt (b, c), seT (x=y, z=false)",
             "ALTER BACKUP COLLECTION naMe\n\tRESET (b, c),\n\tSET (x = y, z = FALSE)\n;\n"},
         {"alTer bACKuP coLLECTION naMe aDD         DATAbase",
@@ -1692,7 +1692,7 @@ Y_UNIT_TEST(Analyze) {
     TCases cases = {
         {"analyze table (col1, col2, col3)",
             "ANALYZE table (col1, col2, col3);\n"},
-            {"analyze table",
+        {"analyze table",
             "ANALYZE table;\n"}
     };
 
@@ -1703,12 +1703,12 @@ Y_UNIT_TEST(Analyze) {
 Y_UNIT_TEST(ResourcePoolClassifierOperations) {
     TCases cases = {
         {"creAte reSourCe poOl ClaSsiFIer naMe With (a = \"b\")",
-            "CREATE RESOURCE POOL CLASSIFIER naMe WITH (a = \"b\");\n"},
-            {"create resource pool classifier eds with (a=\"a\",b=\"b\",c = true)",
-            "CREATE RESOURCE POOL CLASSIFIER eds WITH (\n\ta = \"a\",\n\tb = \"b\",\n\tc = TRUE\n);\n"},
-            {"alTer reSOurcE poOl ClaSsiFIer naMe resEt (b, c), seT (x=y, z=false)",
+            "CREATE RESOURCE POOL CLASSIFIER naMe WITH (a = 'b');\n"},
+        {"create resource pool classifier eds with (a=\"a\",b=\"b\",c = true)",
+            "CREATE RESOURCE POOL CLASSIFIER eds WITH (\n\ta = 'a',\n\tb = 'b',\n\tc = TRUE\n);\n"},
+        {"alTer reSOurcE poOl ClaSsiFIer naMe resEt (b, c), seT (x=y, z=false)",
             "ALTER RESOURCE POOL CLASSIFIER naMe\n\tRESET (b, c),\n\tSET (x = y, z = FALSE)\n;\n"},
-            {"alter resource pool classifier eds reset (a), set (x=y)",
+        {"alter resource pool classifier eds reset (a), set (x=y)",
             "ALTER RESOURCE POOL CLASSIFIER eds\n\tRESET (a),\n\tSET (x = y)\n;\n"},
         {"dRop reSourCe poOl ClaSsiFIer naMe",
             "DROP RESOURCE POOL CLASSIFIER naMe;\n"},
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_and_table_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_and_table_/formatted.sql
index f48cb523e3..73c39aa79b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_and_table_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_and_table_/formatted.sql
@@ -1,7 +1,7 @@
 /* syntax version 1 */
 /* postgres can not */
-$cluster = "pla" || "to";
-$name = "In" || "put";
+$cluster = 'pla' || 'to';
+$name = 'In' || 'put';
 
 SELECT
     count(*)
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_table_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_table_/formatted.sql
index 61ffb950ed..6945535f0b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_table_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_table_/formatted.sql
@@ -8,7 +8,7 @@ SELECT
 FROM
     yt: $foo.Input
 WHERE
-    key < "100"
+    key < '100'
 ORDER BY
     key
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_table_for_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_table_for_/formatted.sql
index 89765f17a3..79de82e92f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_table_for_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_table_for_/formatted.sql
@@ -9,7 +9,7 @@ DEFINE ACTION $a($x) AS
     FROM
         yt: $foo.Input
     WHERE
-        key < "100"
+        key < '100'
     ORDER BY
         key
     ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_use_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_use_/formatted.sql
index 13b1450a31..4d3128458d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_use_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_use_/formatted.sql
@@ -10,7 +10,7 @@ SELECT
 FROM
     Input
 WHERE
-    key < "100"
+    key < '100'
 ORDER BY
     key
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_use_compact_named_exprs_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_use_compact_named_exprs_/formatted.sql
index 8ed1801d80..f99ba06412 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_use_compact_named_exprs_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_use_compact_named_exprs_/formatted.sql
@@ -9,7 +9,7 @@ SELECT
 FROM
     yt: $foo.Input
 WHERE
-    key < "100"
+    key < '100'
 ORDER BY
     key
 ;
@@ -23,7 +23,7 @@ DEFINE ACTION $bar() AS
     FROM
         yt: $foo.Input
     WHERE
-        key < "100"
+        key < '100'
     ORDER BY
         key
     ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-combine_subqueries_with_table_param_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-combine_subqueries_with_table_param_/formatted.sql
index 0a0e4a9c66..3691aab4ad 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-combine_subqueries_with_table_param_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-combine_subqueries_with_table_param_/formatted.sql
@@ -8,10 +8,10 @@ $combineQueries = ($query, $list) -> {
             ($world) -> {
                 $queries = ListMap(
                     $list, ($arg) -> {
-                        RETURN FuncCode("Apply", QuoteCode($query), $world, ReprCode($arg));
+                        RETURN FuncCode('Apply', QuoteCode($query), $world, ReprCode($arg));
                     }
                 );
-                RETURN FuncCode("UnionAll", $queries);
+                RETURN FuncCode('UnionAll', $queries);
             }
         )
     );
@@ -25,7 +25,7 @@ DEFINE SUBQUERY $calc($table) AS
     ;
 END DEFINE;
 
-$fullQuery = $combineQueries($calc, AsList("Input", "Input"));
+$fullQuery = $combineQueries($calc, AsList('Input', 'Input'));
 
 SELECT
     count(*)
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-dep_world_action_quote_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-dep_world_action_quote_/formatted.sql
index 918fc7dd62..eb8153377f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-dep_world_action_quote_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-dep_world_action_quote_/formatted.sql
@@ -21,10 +21,10 @@ DEFINE ACTION $aaa($z) AS
     END DEFINE;
     $ccc = EvaluateCode(QuoteCode($bbb));
     DO
-        $ccc("1")
+        $ccc('1')
     ;
 END DEFINE;
 
-EVALUATE FOR $z IN AsList(AsTuple("Input", "foo"), AsTuple("Input", "bar")) DO
+EVALUATE FOR $z IN AsList(AsTuple('Input', 'foo'), AsTuple('Input', 'bar')) DO
     $aaa($z)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-dep_world_quote_code_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-dep_world_quote_code_/formatted.sql
index e2fbb4d493..127b81e851 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-dep_world_quote_code_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-dep_world_quote_code_/formatted.sql
@@ -8,10 +8,10 @@ $combineQueries = ($query, $list) -> {
             ($world) -> {
                 $queries = ListMap(
                     $list, ($arg) -> {
-                        RETURN FuncCode("Apply", QuoteCode($query), $world, ReprCode($arg));
+                        RETURN FuncCode('Apply', QuoteCode($query), $world, ReprCode($arg));
                     }
                 );
-                RETURN FuncCode("Extend", $queries);
+                RETURN FuncCode('Extend', $queries);
             }
         )
     );
@@ -41,10 +41,10 @@ DEFINE ACTION $aaa($z) AS
     ;
 END DEFINE;
 
-EVALUATE FOR $z IN AsList("Input") DO
+EVALUATE FOR $z IN AsList('Input') DO
     $aaa($z)
 ;
 
 DO
-    $aaa("Input")
+    $aaa('Input')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_anon_table_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_anon_table_/formatted.sql
index 3516c524e4..97d5ca70c0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_anon_table_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_anon_table_/formatted.sql
@@ -2,8 +2,8 @@
 /* postgres can not */
 USE plato;
 
-$a = CAST(Unicode::ToUpper("T"u) AS String) || "able";
-$b = CAST(Unicode::ToUpper("T"u) AS String) || "able";
+$a = CAST(Unicode::ToUpper("T"u) AS String) || 'able';
+$b = CAST(Unicode::ToUpper("T"u) AS String) || 'able';
 
 INSERT INTO @$a
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_asatom_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_asatom_/formatted.sql
index b9f311128f..5703fcb99b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_asatom_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_asatom_/formatted.sql
@@ -1,5 +1,5 @@
 /* syntax version 1 */
 /* postgres can not */
 SELECT
-    Yql::String(AsAtom("a" || CAST(Unicode::ToUpper("b"u) AS String)))
+    Yql::String(AsAtom('a' || CAST(Unicode::ToUpper("b"u) AS String)))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_astagged_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_astagged_/formatted.sql
index e85f6820ff..98a93ca62e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_astagged_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_astagged_/formatted.sql
@@ -1,5 +1,5 @@
 /* syntax version 1 */
 /* postgres can not */
 SELECT
-    AsTagged(0, CAST(Unicode::ToUpper("t"u) AS String) || "ag")
+    AsTagged(0, CAST(Unicode::ToUpper("t"u) AS String) || 'ag')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_atom_wrong_type_expr_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_atom_wrong_type_expr_/formatted.sql
index eeeefbea94..36b807effb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_atom_wrong_type_expr_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_atom_wrong_type_expr_/formatted.sql
@@ -2,7 +2,7 @@
 /* custom error: Expected data or optional of data, but got: List<String> */
 USE plato;
 
-$n = ["foo"];
+$n = ['foo'];
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_capture_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_capture_/formatted.sql
index 97108d992f..7fbb2b13cc 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_capture_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_capture_/formatted.sql
@@ -1,7 +1,7 @@
 /* syntax version 1 */
 /* postgres can not */
-$capture = Re2::Capture(".*" || CAST(Unicode::ToLower("(\\D+)"u) AS String) || ".*");
+$capture = Re2::Capture('.*' || CAST(Unicode::ToLower("(\\D+)"u) AS String) || '.*');
 
 SELECT
-    $capture(" 123 ")
+    $capture(' 123 ')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_code_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_code_/formatted.sql
index 1ab3cec98c..e5647a77ec 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_code_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_code_/formatted.sql
@@ -1,13 +1,13 @@
 /* syntax version 1 */
 /* postgres can not */
 SELECT
-    EvaluateCode(FuncCode("Int32", AtomCode("1")))
+    EvaluateCode(FuncCode('Int32', AtomCode('1')))
 ;
 
 $inc = EvaluateCode(
     LambdaCode(
         ($x) -> {
-            RETURN FuncCode("+", $x, FuncCode("Int32", AtomCode("1")));
+            RETURN FuncCode('+', $x, FuncCode('Int32', AtomCode('1')));
         }
     )
 );
@@ -23,10 +23,10 @@ $addPrefixForMembers = ($strValue) -> {
                 $members = StructTypeComponents(TypeHandle(TypeOf($strValue)));
                 $list = ListMap(
                     $members, ($x) -> {
-                        RETURN ListCode(AtomCode("prefix" || $x.Name), FuncCode("Member", $str, AtomCode($x.Name)));
+                        RETURN ListCode(AtomCode('prefix' || $x.Name), FuncCode('Member', $str, AtomCode($x.Name)));
                     }
                 );
-                RETURN FuncCode("AsStruct", $list);
+                RETURN FuncCode('AsStruct', $list);
             }
         )
     );
@@ -34,5 +34,5 @@ $addPrefixForMembers = ($strValue) -> {
 };
 
 SELECT
-    $addPrefixForMembers(AsStruct(1 AS foo, "2" AS bar))
+    $addPrefixForMembers(AsStruct(1 AS foo, '2' AS bar))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_code_nested_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_code_nested_/formatted.sql
index 6a1b1e00ae..efa91f5d74 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_code_nested_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_code_nested_/formatted.sql
@@ -9,8 +9,8 @@ SELECT
 SELECT
     EvaluateCode(
         FuncCode(
-            "EvaluateCode",
-            FuncCode("ReprCode", ReprCode(1))
+            'EvaluateCode',
+            FuncCode('ReprCode', ReprCode(1))
         )
     )
 ;
@@ -18,12 +18,12 @@ SELECT
 SELECT
     EvaluateCode(
         FuncCode(
-            "EvaluateCode",
+            'EvaluateCode',
             FuncCode(
-                "ReprCode",
+                'ReprCode',
                 FuncCode(
-                    "EvaluateCode",
-                    FuncCode("ReprCode", ReprCode(1))
+                    'EvaluateCode',
+                    FuncCode('ReprCode', ReprCode(1))
                 )
             )
         )
@@ -33,7 +33,7 @@ SELECT
 SELECT
     EvaluateCode(
         FuncCode(
-            "EvaluateExpr",
+            'EvaluateExpr',
             QuoteCode(1 + 2)
         )
     )
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_column_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_column_/formatted.sql
index 094b5060ae..a01950a9bb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_column_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_column_/formatted.sql
@@ -5,7 +5,7 @@ USE plato;
 $x = CAST(Unicode::ToLower("foo"u) AS String);
 
 SELECT
-    AsStruct("1" AS foo, 2 AS bar).$x
+    AsStruct('1' AS foo, 2 AS bar).$x
 ;
 
 $x = CAST(Unicode::ToLower("value"u) AS String);
@@ -51,7 +51,7 @@ FROM
 GROUP BY
     t.$x AS x
 HAVING
-    min(t.$y) != ""
+    min(t.$y) != ''
 ORDER BY
     x
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_drop_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_drop_/formatted.sql
index f5c4966334..38afeb2ce5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_drop_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_drop_/formatted.sql
@@ -6,7 +6,7 @@ $path = (
     SELECT
         min(Path)
     FROM
-        folder("")
+        folder('')
 );
 
 DROP TABLE $path;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_each_input_table_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_each_input_table_/formatted.sql
index 06168b196c..a5c76dcf6d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_each_input_table_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_each_input_table_/formatted.sql
@@ -2,7 +2,7 @@
 /* syntax version 1 */
 USE plato;
 
-$a = ListMap(ListFromRange(0, 2), ($_x) -> (CAST(Unicode::ToUpper("i"u) AS String) || "nput"));
+$a = ListMap(ListFromRange(0, 2), ($_x) -> (CAST(Unicode::ToUpper("i"u) AS String) || 'nput'));
 
 SELECT
     count(*)
@@ -10,7 +10,7 @@ FROM
     each($a VIEW raw)
 ;
 
-$a = ListMap(ListFromRange(0, 1), ($_x) -> (CAST(Unicode::ToUpper("i"u) AS String) || "nput"));
+$a = ListMap(ListFromRange(0, 1), ($_x) -> (CAST(Unicode::ToUpper("i"u) AS String) || 'nput'));
 
 SELECT
     count(*)
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_ensuretype_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_ensuretype_/formatted.sql
index 2ffce923d8..d7dfa6c172 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_ensuretype_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_ensuretype_/formatted.sql
@@ -1,5 +1,5 @@
 /* syntax version 1 */
 /* postgres can not */
 SELECT
-    EnsureType("a", String, CAST(Unicode::ToUpper("me"u) AS String) || "ssage")
+    EnsureType('a', String, CAST(Unicode::ToUpper("me"u) AS String) || 'ssage')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_extract_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_extract_/formatted.sql
index 66c1125728..b150e2e8dd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_extract_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_extract_/formatted.sql
@@ -1,7 +1,7 @@
 /* syntax version 1 */
 /* postgres can not */
-$list = AsList(AsStruct(1 AS One, "2" AS Two), AsStruct(3 AS One, "4" AS Two));
+$list = AsList(AsStruct(1 AS One, '2' AS Two), AsStruct(3 AS One, '4' AS Two));
 
 SELECT
-    ListExtract($list, CAST(Unicode::ToUpper("o"u) AS String) || "ne")
+    ListExtract($list, CAST(Unicode::ToUpper("o"u) AS String) || 'ne')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_filter_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_filter_/formatted.sql
index b952dc40a5..95d12e80ba 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_filter_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_filter_/formatted.sql
@@ -2,14 +2,14 @@
 /* postgres can not */
 USE plato;
 
-$arg1 = "" || "";
+$arg1 = '' || '';
 
 $arg2 = ($_item) -> {
     RETURN TRUE;
 };
 
-$arg3 = "" || "";
-$arg4 = "" || "raw";
+$arg3 = '' || '';
+$arg4 = '' || 'raw';
 
 SELECT
     count(*)
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_folder_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_folder_/formatted.sql
index d60717fe93..516ff014ba 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_folder_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_folder_/formatted.sql
@@ -5,5 +5,5 @@ USE plato;
 SELECT
     *
 FROM
-    Folder(``, "foo;bar")
+    Folder(``, 'foo;bar')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_folder_via_file_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_folder_via_file_/formatted.sql
index a9c907805c..96c24dffc2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_folder_via_file_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_folder_via_file_/formatted.sql
@@ -2,7 +2,7 @@
 /* postgres can not */
 USE plato;
 
-PRAGMA yt.FolderInlineItemsLimit = "0";
+PRAGMA yt.FolderInlineItemsLimit = '0';
 
 $list = (
     SELECT
@@ -11,9 +11,9 @@ $list = (
         SELECT
             Path
         FROM
-            folder("")
+            folder('')
         WHERE
-            Type == "table"
+            Type == 'table'
         LIMIT 30
     )
 );
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_folder_via_file_in_job_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_folder_via_file_in_job_/formatted.sql
index b18b1b01e0..113cd32e99 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_folder_via_file_in_job_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_folder_via_file_in_job_/formatted.sql
@@ -2,7 +2,7 @@
 /* postgres can not */
 USE plato;
 
-PRAGMA yt.FolderInlineItemsLimit = "0";
+PRAGMA yt.FolderInlineItemsLimit = '0';
 
 $script = @@
 def f(s):
@@ -18,9 +18,9 @@ $list = (
         SELECT
             Path
         FROM
-            folder("")
+            folder('')
         WHERE
-            Type == "table" AND $callable(Path)
+            Type == 'table' AND $callable(Path)
         LIMIT 30
     )
 );
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_if_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_if_/formatted.sql
index cc5d363800..192aea16ca 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_if_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_if_/formatted.sql
@@ -8,16 +8,16 @@ DEFINE ACTION $action1($x) AS
     ;
 END DEFINE;
 
-EVALUATE IF CAST(Unicode::ToUpper("i"u) AS String) == "I" DO
+EVALUATE IF CAST(Unicode::ToUpper("i"u) AS String) == 'I' DO
     $action1(1)
 ELSE DO
     $action1(2)
 ;
 
-EVALUATE IF CAST(Unicode::ToUpper("i"u) AS String) != "I" DO
+EVALUATE IF CAST(Unicode::ToUpper("i"u) AS String) != 'I' DO
     $action1(3)
 ;
 
-EVALUATE IF CAST(Unicode::ToUpper("i"u) AS String) == "I" DO
+EVALUATE IF CAST(Unicode::ToUpper("i"u) AS String) == 'I' DO
     $action1(4)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_if_guard_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_if_guard_/formatted.sql
index 168e62ba1e..9a893f68d3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_if_guard_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_if_guard_/formatted.sql
@@ -2,7 +2,7 @@
 /* postgres can not */
 USE plato;
 
-$list = ListTake(AsList("Input"), 0);
+$list = ListTake(AsList('Input'), 0);
 
 DEFINE ACTION $process() AS
     SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_input_output_table_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_input_output_table_/formatted.sql
index a76146b498..f706105cf4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_input_output_table_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_input_output_table_/formatted.sql
@@ -2,18 +2,18 @@
 /* postgres can not */
 USE plato;
 
-$a = CAST(Unicode::ToUpper("o"u) AS String) || "utput";
-$b = CAST(Unicode::ToUpper("i"u) AS String) || "nput";
+$a = CAST(Unicode::ToUpper("o"u) AS String) || 'utput';
+$b = CAST(Unicode::ToUpper("i"u) AS String) || 'nput';
 
 INSERT INTO $a
 SELECT
     key AS key,
-    "" AS subkey,
-    "value:" || value AS value
+    '' AS subkey,
+    'value:' || value AS value
 FROM
     $b
 WHERE
-    key < "100"
+    key < '100'
 ORDER BY
     key
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_input_output_table_subquery_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_input_output_table_subquery_/formatted.sql
index ab671c554f..34e6a583a6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_input_output_table_subquery_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_input_output_table_subquery_/formatted.sql
@@ -4,12 +4,12 @@ USE plato;
 
 $a = (
     SELECT
-        CAST(Unicode::ToUpper("o"u) AS String) || "utpu"
+        CAST(Unicode::ToUpper("o"u) AS String) || 'utpu'
 );
 
 $b = (
     SELECT
-        CAST(Unicode::ToUpper("i"u) AS String) || "npu"
+        CAST(Unicode::ToUpper("i"u) AS String) || 'npu'
 );
 
 $a = $a || CAST(Unicode::ToLower("T"u) AS String);
@@ -18,12 +18,12 @@ $b = $b || CAST(Unicode::ToLower("T"u) AS String);
 INSERT INTO $a
 SELECT
     key AS key,
-    "" AS subkey,
-    "value:" || value AS value
+    '' AS subkey,
+    'value:' || value AS value
 FROM
     $b
 WHERE
-    key < "100"
+    key < '100'
 ORDER BY
     key
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_like_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_like_/formatted.sql
index 3d5bda2214..d3c53ccfb2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_like_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_like_/formatted.sql
@@ -2,10 +2,10 @@
 /* postgres can not */
 USE plato;
 
-$arg1 = "" || "";
-$arg2 = CAST(Unicode::ToUpper("i"u) AS String) || "npu_";
-$arg3 = "" || "";
-$arg4 = "" || "raw";
+$arg1 = '' || '';
+$arg2 = CAST(Unicode::ToUpper("i"u) AS String) || 'npu_';
+$arg3 = '' || '';
+$arg4 = '' || 'raw';
 
 SELECT
     count(*)
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_on_modif_table_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_on_modif_table_fail_/formatted.sql
index f0de77f3a0..10a558a2ea 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_on_modif_table_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_on_modif_table_fail_/formatted.sql
@@ -5,10 +5,10 @@ USE plato;
 
 INSERT INTO Output
 SELECT
-    "key" AS field
+    'key' AS field
 UNION ALL
 SELECT
-    "subkey" AS field
+    'subkey' AS field
 ;
 
 COMMIT;
@@ -21,7 +21,7 @@ $whitelist =
 ;
 
 SELECT
-    ForceSpreadMembers([("key", key)], Unwrap($whitelist))
+    ForceSpreadMembers([('key', key)], Unwrap($whitelist))
 FROM
     Input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_pragma_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_pragma_/formatted.sql
index da9224ad32..14f5e9c72f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_pragma_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_pragma_/formatted.sql
@@ -1,5 +1,5 @@
 /* syntax version 1 */
 /* postgres can not */
-$a = "1" || CAST(Unicode::ToUpper("m") AS String);
+$a = '1' || CAST(Unicode::ToUpper('m') AS String);
 
 PRAGMA yt.DataSizePerJob = $a;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_range_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_range_/formatted.sql
index 249ad01de4..6cec72bb22 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_range_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_range_/formatted.sql
@@ -2,11 +2,11 @@
 /* postgres can not */
 USE plato;
 
-$arg1 = "" || "";
-$arg2 = CAST(Unicode::ToUpper("i"u) AS String) || "nput";
-$arg3 = CAST(Unicode::ToUpper("i"u) AS String) || "nput";
-$arg4 = "" || "";
-$arg5 = "" || "raw";
+$arg1 = '' || '';
+$arg2 = CAST(Unicode::ToUpper("i"u) AS String) || 'nput';
+$arg3 = CAST(Unicode::ToUpper("i"u) AS String) || 'nput';
+$arg4 = '' || '';
+$arg5 = '' || 'raw';
 
 SELECT
     count(*)
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_regexp_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_regexp_/formatted.sql
index d4a40e9a92..7a4921a85b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_regexp_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_regexp_/formatted.sql
@@ -2,10 +2,10 @@
 /* postgres can not */
 USE plato;
 
-$arg1 = "" || "";
-$arg2 = (Unicode::ToUpper("i") ?? "") || "npu.";
-$arg3 = "" || "";
-$arg4 = "" || "raw";
+$arg1 = '' || '';
+$arg2 = (Unicode::ToUpper('i') ?? '') || 'npu.';
+$arg3 = '' || '';
+$arg4 = '' || 'raw';
 
 SELECT
     count(*)
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_resourcetype_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_resourcetype_/formatted.sql
index 8d4a2db019..8c37d6cba0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_resourcetype_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_resourcetype_/formatted.sql
@@ -1,5 +1,5 @@
 /* syntax version 1 */
 /* postgres can not */
 SELECT
-    FormatType(ResourceType(CAST(Unicode::ToUpper("r"u) AS String) || "es"))
+    FormatType(ResourceType(CAST(Unicode::ToUpper("r"u) AS String) || 'es'))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_table_with_view_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_table_with_view_/formatted.sql
index 6a5d9a9411..3fc0f3b8e4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_table_with_view_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_table_with_view_/formatted.sql
@@ -2,7 +2,7 @@
 /* postgres can not */
 USE plato;
 
-$x = "Input";
+$x = 'Input';
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_taggedtype_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_taggedtype_/formatted.sql
index 3f1d199e52..6eae2a5613 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_taggedtype_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_taggedtype_/formatted.sql
@@ -1,5 +1,5 @@
 /* syntax version 1 */
 /* postgres can not */
 SELECT
-    FormatType(TaggedType(DataType("Int32"), CAST(Unicode::ToUpper("r"u) AS String) || "es"))
+    FormatType(TaggedType(DataType('Int32'), CAST(Unicode::ToUpper("r"u) AS String) || 'es'))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_type_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_type_/formatted.sql
index be24aa922e..559cc42ce7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_type_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_type_/formatted.sql
@@ -1,5 +1,5 @@
 /* syntax version 1 */
 /* postgres can not */
 SELECT
-    FormatType(EvaluateType(ParseTypeHandle("Int32" || "?")))
+    FormatType(EvaluateType(ParseTypeHandle('Int32' || '?')))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_typeof_output_table_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_typeof_output_table_/formatted.sql
index 5d8a8c3082..d33cd48665 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_typeof_output_table_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_typeof_output_table_/formatted.sql
@@ -5,7 +5,7 @@ USE plato;
 
 INSERT INTO Output
 SELECT
-    key || "foo" AS key2
+    key || 'foo' AS key2
 FROM
     Input
 ;
@@ -24,7 +24,7 @@ SELECT
 
 INSERT INTO Output WITH TRUNCATE
 SELECT
-    key || "foo" AS key3
+    key || 'foo' AS key3
 FROM
     Input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_unresolved_type_arg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_unresolved_type_arg_/formatted.sql
index 9fb2e124bc..14b06e017b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_unresolved_type_arg_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_unresolved_type_arg_/formatted.sql
@@ -10,15 +10,15 @@ $myAddSuffix = ($row, $value) -> {
         LambdaCode(
             ($r) -> {
                 RETURN FuncCode(
-                    "AsStruct",
+                    'AsStruct',
                     ListMap(
                         StructTypeComponents(TypeHandle($type)),
                         ($i) -> {
                             RETURN ListCode(
                                 AtomCode($i.Name),
                                 FuncCode(
-                                    "Concat",
-                                    FuncCode("Member", $r, AtomCode($i.Name)),
+                                    'Concat',
+                                    FuncCode('Member', $r, AtomCode($i.Name)),
                                     ReprCode($value)
                                 )
                             );
@@ -32,7 +32,7 @@ $myAddSuffix = ($row, $value) -> {
 };
 
 SELECT
-    $myAddSuffix(TableRow(), "*")
+    $myAddSuffix(TableRow(), '*')
 FROM
     Input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_values_output_table_subquery_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_values_output_table_subquery_/formatted.sql
index b1c8f1d66c..1fa13aee2f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_values_output_table_subquery_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_values_output_table_subquery_/formatted.sql
@@ -4,7 +4,7 @@ USE plato;
 
 $a = (
     SELECT
-        CAST(Unicode::ToUpper("o"u) AS String) || "utpu"
+        CAST(Unicode::ToUpper("o"u) AS String) || 'utpu'
 );
 
 $a = $a || CAST(Unicode::ToLower("T"u) AS String);
@@ -15,5 +15,5 @@ INSERT INTO $a (
     value
 )
 VALUES
-    (1, "foo", FALSE)
+    (1, 'foo', FALSE)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_variant_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_variant_/formatted.sql
index 3e9ec17754..198ba26e42 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_variant_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_variant_/formatted.sql
@@ -1,7 +1,7 @@
 /* syntax version 1 */
 /* postgres can not */
-$vt = ParseType("Variant<One:Int32,Two:String>");
+$vt = ParseType('Variant<One:Int32,Two:String>');
 
 SELECT
-    VARIANT (12, CAST(Unicode::ToUpper("o"u) AS String) || "ne", $vt)
+    VARIANT (12, CAST(Unicode::ToUpper("o"u) AS String) || 'ne', $vt)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-evaluate_match_type_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-evaluate_match_type_/formatted.sql
index c0fc6d174e..7e09815f16 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-evaluate_match_type_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-evaluate_match_type_/formatted.sql
@@ -3,7 +3,7 @@
 USE plato;
 
 $keep_only_last = ($row) -> {
-    $members = ListFilter(StructMembers($row), ($x) -> (FIND($x, "key") IS NOT NULL));
+    $members = ListFilter(StructMembers($row), ($x) -> (FIND($x, 'key') IS NOT NULL));
     RETURN ChooseMembers($row, $members);
 };
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-evaluate_pure_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-evaluate_pure_/formatted.sql
index 60d0512a25..71b4e15863 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-evaluate_pure_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-evaluate_pure_/formatted.sql
@@ -15,7 +15,7 @@ FROM
 ;
 
 SELECT
-    YQL::String(EvaluateAtom("foo" || "bar"))
+    YQL::String(EvaluateAtom('foo' || 'bar'))
 ;
 
 SELECT
@@ -23,20 +23,20 @@ SELECT
     CurrentUtcTimestamp()
 ;
 
-$y = Yson("{a=7u;c=[<d=%true>1;#;\"привет\";-3.4]}");
+$y = Yson('{a=7u;c=[<d=%true>1;#;\"привет\";-3.4]}');
 
 SELECT
     Yson::Equals(EvaluateExpr($y), $y)
 ;
 
 SELECT
-    EvaluateExpr(TzDate("2000-01-01,Europe/Moscow"))
+    EvaluateExpr(TzDate('2000-01-01,Europe/Moscow'))
 ;
 
 SELECT
-    EvaluateExpr(TzDatetime("2000-01-01T01:02:03,Europe/Moscow"))
+    EvaluateExpr(TzDatetime('2000-01-01T01:02:03,Europe/Moscow'))
 ;
 
 SELECT
-    EvaluateExpr(TzTimestamp("2000-01-01T01:02:03.456789,Europe/Moscow"))
+    EvaluateExpr(TzTimestamp('2000-01-01T01:02:03.456789,Europe/Moscow'))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-export_action_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-export_action_/formatted.sql
index ae2a1828b9..722431d09d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-export_action_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-export_action_/formatted.sql
@@ -1,10 +1,10 @@
 /* syntax version 1 */
 /* postgres can not */
 /* kikimr can not - range not supported */
-PRAGMA library("lib1.sql");
+PRAGMA library('lib1.sql');
 
 IMPORT lib1 SYMBOLS $action;
 
 DO
-    $action("Input")
+    $action('Input')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-insert_each_from_folder_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-insert_each_from_folder_/formatted.sql
index 5064421b3f..221eaff529 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-insert_each_from_folder_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-insert_each_from_folder_/formatted.sql
@@ -10,9 +10,9 @@ $list = (
         SELECT
             Path
         FROM
-            folder("")
+            folder('')
         WHERE
-            Type == "table" AND Path LIKE "Input%"
+            Type == 'table' AND Path LIKE 'Input%'
         ORDER BY
             Path DESC
         LIMIT 30
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-large_evaluate_for_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-large_evaluate_for_fail_/formatted.sql
index ed41ea1ea9..aa2878983d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-large_evaluate_for_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-large_evaluate_for_fail_/formatted.sql
@@ -1,7 +1,7 @@
 /* syntax version 1 */
 /* postgres can not */
 /* custom error: Too large list for EVALUATE FOR, allowed: 3, got: 10 */
-PRAGMA config.flags("EvaluateForLimit", "3");
+PRAGMA config.flags('EvaluateForLimit', '3');
 
 EVALUATE FOR $_i IN ListFromRange(0, 10) DO
     EMPTY_ACTION()
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-mixed_eval_typeof_world1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-mixed_eval_typeof_world1_/formatted.sql
index fd853e1e31..0da77a15e1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-mixed_eval_typeof_world1_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-mixed_eval_typeof_world1_/formatted.sql
@@ -13,11 +13,11 @@ $force_remove_members = ($struct, $to_remove) -> {
                     }
                 );
                 RETURN FuncCode(
-                    "AsStruct",
+                    'AsStruct',
                     ListMap(
                         $to_keep,
                         ($x) -> {
-                            RETURN ListCode(AtomCode($x), FuncCode("Member", $st, AtomCode($x)));
+                            RETURN ListCode(AtomCode($x), FuncCode('Member', $st, AtomCode($x)));
                         }
                     )
                 );
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_eval_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_eval_/formatted.sql
index 12f2d0a106..edbacbe5ce 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_eval_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_eval_/formatted.sql
@@ -10,11 +10,11 @@ $make_struct = CALLABLE (
 $kekify_struct = ($struct) -> {
     RETURN EvaluateCode(
         FuncCode(
-            "AsStruct",
+            'AsStruct',
             ListMap(
                 StructTypeComponents(TypeHandle(TypeOf($struct))),
                 ($_component) -> {
-                    RETURN ListCode(AtomCode("kek"), ReprCode(42));
+                    RETURN ListCode(AtomCode('kek'), ReprCode(42));
                 }
             )
         )
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_rewrite_io_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_rewrite_io_/formatted.sql
index e8c218ba4d..aabfa6b5ca 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_rewrite_io_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_rewrite_io_/formatted.sql
@@ -4,12 +4,12 @@ $input =
     SELECT
         *
     FROM
-        AS_TABLE([<|a: "foo", b: "123"|>])
+        AS_TABLE([<|a: 'foo', b: '123'|>])
 ;
 
 $mapping =
     SELECT
-        {"a": "String", "b": "Int32"}
+        {'a': 'String', 'b': 'Int32'}
     FROM
         Input
     LIMIT 1
@@ -27,11 +27,11 @@ $converter = ($row) -> {
         LambdaCode(
             ($rowCode) -> {
                 RETURN FuncCode(
-                    "AsStruct", ListMap(
+                    'AsStruct', ListMap(
                         StructMembers($row), ($name) -> {
                             RETURN ListCode(
                                 AtomCode($name),
-                                FuncCode("Apply", QuoteCode($transformer(Unwrap($mapping[$name]))), FuncCode("Member", $rowCode, AtomCode($name)))
+                                FuncCode('Apply', QuoteCode($transformer(Unwrap($mapping[$name]))), FuncCode('Member', $rowCode, AtomCode($name)))
                             );
                         }
                     )
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-pass_action_as_param_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-pass_action_as_param_/formatted.sql
index 79bda03fe5..93172f4692 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-pass_action_as_param_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-pass_action_as_param_/formatted.sql
@@ -15,7 +15,7 @@ DO
 
 DEFINE ACTION $sel_foo() AS
     SELECT
-        "foo"
+        'foo'
     ;
 END DEFINE;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_apply_quoted_code_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_apply_quoted_code_/formatted.sql
index 07054ca186..a1d7eee6b1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_apply_quoted_code_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_apply_quoted_code_/formatted.sql
@@ -11,9 +11,9 @@ $structApply = ($strValue, $f) -> {
                 $members = StructTypeComponents(TypeHandle(TypeOf($strValue)));
                 RETURN Yql::Fold(
                     $members, ReprCode(FALSE), ($item, $state) -> {
-                        $member = FuncCode("Member", $strCode, AtomCode($item.Name));
-                        $apply = FuncCode("Apply", QuoteCode($f), $member);
-                        RETURN FuncCode("Or", $state, $apply);
+                        $member = FuncCode('Member', $strCode, AtomCode($item.Name));
+                        $apply = FuncCode('Apply', QuoteCode($f), $member);
+                        RETURN FuncCode('Or', $state, $apply);
                     }
                 );
             }
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_format_free_args_code_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_format_free_args_code_/formatted.sql
index 2d3d9f9767..b3a9044000 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_format_free_args_code_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_format_free_args_code_/formatted.sql
@@ -1,7 +1,7 @@
 $x = EvaluateCode(
     LambdaCode(
         ($arg1, $arg2) -> {
-            $f = FuncCode("Concat", $arg1, $arg2);
+            $f = FuncCode('Concat', $arg1, $arg2);
             RETURN ReprCode(FormatCode($f));
         }
     )
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_make_code_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_make_code_/formatted.sql
index 3edfc66d6e..e760dbbe9a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_make_code_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_make_code_/formatted.sql
@@ -3,31 +3,31 @@
 SELECT
     FormatCode(
         ListCode(
-            AtomCode("1"),
-            AsList(AtomCode("2"), AtomCode("3")),
+            AtomCode('1'),
+            AsList(AtomCode('2'), AtomCode('3')),
             FuncCode(
-                "Func",
-                AtomCode("4"),
-                AsList(AtomCode("5"), AtomCode("6"))
+                'Func',
+                AtomCode('4'),
+                AsList(AtomCode('5'), AtomCode('6'))
             ),
             LambdaCode(
                 () -> {
-                    RETURN AtomCode("7");
+                    RETURN AtomCode('7');
                 }
             ),
             LambdaCode(
                 ($x) -> {
-                    RETURN FuncCode("-", $x);
+                    RETURN FuncCode('-', $x);
                 }
             ),
             LambdaCode(
                 ($x, $y) -> {
-                    RETURN FuncCode("*", $x, $y);
+                    RETURN FuncCode('*', $x, $y);
                 }
             ),
             LambdaCode(
                 2, ($args) -> {
-                    RETURN FuncCode("+", Unwrap($args[0]), Unwrap($args[1]));
+                    RETURN FuncCode('+', Unwrap($args[0]), Unwrap($args[1]));
                 }
             ),
         )
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_parse_type_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_parse_type_/formatted.sql
index 6c11a9e429..980b0afd66 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_parse_type_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_parse_type_/formatted.sql
@@ -1,5 +1,5 @@
 /* postgres can not */
 /* syntax version 1 */
 SELECT
-    FormatType(ParseTypeHandle("Int32" || "?"))
+    FormatType(ParseTypeHandle('Int32' || '?'))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_quote_code_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_quote_code_/formatted.sql
index 57a358bfb7..bf1d874ef0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_quote_code_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_quote_code_/formatted.sql
@@ -1,9 +1,9 @@
 /* postgres can not */
 /* syntax version 1 */
 SELECT
-    FormatCode(QuoteCode(AsAtom("foo"))),
+    FormatCode(QuoteCode(AsAtom('foo'))),
     FormatCode(QuoteCode(AsTuple())),
-    FormatCode(QuoteCode(AsTuple(AsAtom("foo"), AsAtom("bar")))),
+    FormatCode(QuoteCode(AsTuple(AsAtom('foo'), AsAtom('bar')))),
     FormatCode(QuoteCode(1)),
     FormatCode(
         QuoteCode(
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_repr_code_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_repr_code_/formatted.sql
index ea3207c736..68bd1cea38 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_repr_code_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_repr_code_/formatted.sql
@@ -5,7 +5,7 @@ $fact = EvaluateCode(
         ListFromRange(1, 11),
         ReprCode(1),
         ($item, $state) -> {
-            RETURN FuncCode("*", $state, ReprCode($item));
+            RETURN FuncCode('*', $state, ReprCode($item));
         }
     )
 );
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_type_kind_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_type_kind_/formatted.sql
index 2816022bf7..0d0fdf3924 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_type_kind_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_type_kind_/formatted.sql
@@ -5,5 +5,5 @@ SELECT
     TypeKind(TypeHandle(TypeOf(AsList(1)))),
     TypeKind(TypeHandle(TypeOf(NULL))),
     TypeKind(TypeHandle(TypeOf(TypeOf(1)))),
-    TypeKind(TypeHandle(TypeOf(AsAtom("1"))))
+    TypeKind(TypeHandle(TypeOf(AsAtom('1'))))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_type_splitmake_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_type_splitmake_/formatted.sql
index 272b5bac58..d440e63470 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_type_splitmake_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_type_splitmake_/formatted.sql
@@ -18,18 +18,18 @@ $formatCallable = ($x) -> {
 };
 
 SELECT
-    DataTypeComponents(ParseTypeHandle("Int32")),
-    DataTypeComponents(ParseTypeHandle("Decimal(4,1)")),
-    FormatType(DataTypeHandle(AsList("Int32"))),
-    FormatType(DataTypeHandle(AsList("Decimal", "4", "1"))),
-    FormatType(OptionalItemType(ParseTypeHandle("Int32?"))),
-    FormatType(OptionalTypeHandle(ParseTypeHandle("Int32"))),
-    FormatType(ListItemType(ParseTypeHandle("List<Int32>"))),
-    FormatType(ListTypeHandle(ParseTypeHandle("Int32"))),
-    FormatType(StreamItemType(ParseTypeHandle("Stream<Int32>"))),
-    FormatType(StreamTypeHandle(ParseTypeHandle("Int32"))),
+    DataTypeComponents(ParseTypeHandle('Int32')),
+    DataTypeComponents(ParseTypeHandle('Decimal(4,1)')),
+    FormatType(DataTypeHandle(AsList('Int32'))),
+    FormatType(DataTypeHandle(AsList('Decimal', '4', '1'))),
+    FormatType(OptionalItemType(ParseTypeHandle('Int32?'))),
+    FormatType(OptionalTypeHandle(ParseTypeHandle('Int32'))),
+    FormatType(ListItemType(ParseTypeHandle('List<Int32>'))),
+    FormatType(ListTypeHandle(ParseTypeHandle('Int32'))),
+    FormatType(StreamItemType(ParseTypeHandle('Stream<Int32>'))),
+    FormatType(StreamTypeHandle(ParseTypeHandle('Int32'))),
     ListMap(
-        TupleTypeComponents(ParseTypeHandle("Tuple<Int32,String>")),
+        TupleTypeComponents(ParseTypeHandle('Tuple<Int32,String>')),
         ($x) -> {
             RETURN FormatType($x);
         }
@@ -37,14 +37,14 @@ SELECT
     FormatType(
         TupleTypeHandle(
             ListMap(
-                AsList("Int32", "String"), ($x) -> {
+                AsList('Int32', 'String'), ($x) -> {
                     RETURN ParseTypeHandle($x);
                 }
             )
         )
     ),
     ListMap(
-        StructTypeComponents(ParseTypeHandle("Struct<foo:Int32,bar:String>")),
+        StructTypeComponents(ParseTypeHandle('Struct<foo:Int32,bar:String>')),
         ($x) -> {
             RETURN AsTuple($x.Name, FormatType($x.Type));
         }
@@ -52,7 +52,7 @@ SELECT
     FormatType(
         StructTypeHandle(
             ListMap(
-                AsList(AsTuple("foo", "Int32"), AsTuple("bar", "String")),
+                AsList(AsTuple('foo', 'Int32'), AsTuple('bar', 'String')),
                 ($x) -> {
                     RETURN AsStruct($x.0 AS Name, ParseTypeHandle($x.1) AS Type);
                 }
@@ -60,38 +60,38 @@ SELECT
         )
     ),
     StaticMap(
-        DictTypeComponents(ParseTypeHandle("Dict<String,Int32>")),
+        DictTypeComponents(ParseTypeHandle('Dict<String,Int32>')),
         ($x) -> {
             RETURN FormatType($x);
         }
     ),
-    FormatType(DictTypeHandle(ParseTypeHandle("String"), ParseTypeHandle("Int32"))),
-    ResourceTypeTag(ParseTypeHandle("Resource<foo>")),
-    FormatType(ResourceTypeHandle("foo")),
-    $formatTagged(TaggedTypeComponents(ParseTypeHandle("Tagged<String,foo>"))),
-    FormatType(TaggedTypeHandle(ParseTypeHandle("String"), "foo")),
-    FormatType(VariantUnderlyingType(ParseTypeHandle("Variant<Int32,String>"))),
-    FormatType(VariantTypeHandle(ParseTypeHandle("Tuple<Int32,String>"))),
-    FormatType(VariantUnderlyingType(ParseTypeHandle("Variant<a:Int32,b:String>"))),
-    FormatType(VariantTypeHandle(ParseTypeHandle("Struct<a:Int32,b:String>"))),
+    FormatType(DictTypeHandle(ParseTypeHandle('String'), ParseTypeHandle('Int32'))),
+    ResourceTypeTag(ParseTypeHandle('Resource<foo>')),
+    FormatType(ResourceTypeHandle('foo')),
+    $formatTagged(TaggedTypeComponents(ParseTypeHandle('Tagged<String,foo>'))),
+    FormatType(TaggedTypeHandle(ParseTypeHandle('String'), 'foo')),
+    FormatType(VariantUnderlyingType(ParseTypeHandle('Variant<Int32,String>'))),
+    FormatType(VariantTypeHandle(ParseTypeHandle('Tuple<Int32,String>'))),
+    FormatType(VariantUnderlyingType(ParseTypeHandle('Variant<a:Int32,b:String>'))),
+    FormatType(VariantTypeHandle(ParseTypeHandle('Struct<a:Int32,b:String>'))),
     FormatType(VoidTypeHandle()),
     FormatType(NullTypeHandle()),
-    $formatCallable(CallableTypeComponents(ParseTypeHandle("(Int32,[bar:Double?{Flags:AutoMap}])->String{Payload:foo}"))),
+    $formatCallable(CallableTypeComponents(ParseTypeHandle('(Int32,[bar:Double?{Flags:AutoMap}])->String{Payload:foo}'))),
     FormatType(
         CallableTypeHandle(
-            ParseTypeHandle("String"), AsList(
-                CallableArgument(ParseTypeHandle("Int32")),
-                CallableArgument(ParseTypeHandle("Double?"), "bar", AsList("AutoMap"))
+            ParseTypeHandle('String'), AsList(
+                CallableArgument(ParseTypeHandle('Int32')),
+                CallableArgument(ParseTypeHandle('Double?'), 'bar', AsList('AutoMap'))
             )
         )
     ),
     FormatType(
         CallableTypeHandle(
-            ParseTypeHandle("String"), AsList(
-                CallableArgument(ParseTypeHandle("Int32")),
-                CallableArgument(ParseTypeHandle("Double?"), "bar", AsList("AutoMap"))
+            ParseTypeHandle('String'), AsList(
+                CallableArgument(ParseTypeHandle('Int32')),
+                CallableArgument(ParseTypeHandle('Double?'), 'bar', AsList('AutoMap'))
             ),
-            1, "foo"
+            1, 'foo'
         )
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_/formatted.sql
index b071640572..306f744a5b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_/formatted.sql
@@ -9,7 +9,7 @@ DEFINE SUBQUERY $q($name, $a) AS
         FROM
             $name
     );
-    $b = "_foo";
+    $b = '_foo';
 
     SELECT
         key || $a || $b AS key
@@ -22,7 +22,7 @@ $z = (
     SELECT
         key
     FROM
-        $q("Input", "_bar")
+        $q('Input', '_bar')
 );
 
 SELECT
@@ -32,14 +32,14 @@ SELECT
 SELECT
     key
 FROM
-    $q("Input", "_baz")
+    $q('Input', '_baz')
 ORDER BY
     key
 ;
 
 DEFINE SUBQUERY $e() AS
     SELECT
-        "hello"
+        'hello'
     ;
 END DEFINE;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_assumeorderby_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_assumeorderby_/formatted.sql
index 0ec9d1df3d..bc0682e1af 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_assumeorderby_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_assumeorderby_/formatted.sql
@@ -13,6 +13,6 @@ DEFINE SUBQUERY $sub() AS
     );
 END DEFINE;
 
-$sub2 = SubqueryAssumeOrderBy($sub, [("x", TRUE)]);
+$sub2 = SubqueryAssumeOrderBy($sub, [('x', TRUE)]);
 
 PROCESS $sub2();
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge_nested_subquery_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge_nested_subquery_/formatted.sql
index 9944a5d205..eaad73d07c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge_nested_subquery_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge_nested_subquery_/formatted.sql
@@ -4,7 +4,7 @@ USE plato;
 
 DEFINE SUBQUERY $get_tables_list($dir) AS
     SELECT
-        Unwrap($dir || "/" || CAST(TableName(Path, "yt") AS String)) AS Path,
+        Unwrap($dir || '/' || CAST(TableName(Path, 'yt') AS String)) AS Path,
     FROM
         FOLDER($dir)
     ;
@@ -20,4 +20,4 @@ DEFINE SUBQUERY $get_all_tables_list($dirs) AS
     ;
 END DEFINE;
 
-PROCESS $get_all_tables_list([""]);
+PROCESS $get_all_tables_list(['']);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge_nested_world_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge_nested_world_/formatted.sql
index 5c21800f8e..d78fda78b3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge_nested_world_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge_nested_world_/formatted.sql
@@ -9,7 +9,7 @@ DEFINE SUBQUERY $s($_i) AS
         FROM
             FOLDER('')
         WHERE
-            Path LIKE "Input%"
+            Path LIKE 'Input%'
     ;
 
     SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_orderby1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_orderby1_/formatted.sql
index aaade477b4..d7577f6720 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_orderby1_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_orderby1_/formatted.sql
@@ -13,6 +13,6 @@ DEFINE SUBQUERY $sub() AS
     );
 END DEFINE;
 
-$sub2 = SubqueryOrderBy($sub, [("x", FALSE)]);
+$sub2 = SubqueryOrderBy($sub, [('x', FALSE)]);
 
 PROCESS $sub2();
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_orderby2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_orderby2_/formatted.sql
index 50db3454c8..7f4eb1529e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_orderby2_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_orderby2_/formatted.sql
@@ -14,6 +14,6 @@ DEFINE SUBQUERY $sub() AS
     );
 END DEFINE;
 
-$sub2 = SubqueryOrderBy($sub, [("x", FALSE), ("y", TRUE)]);
+$sub2 = SubqueryOrderBy($sub, [('x', FALSE), ('y', TRUE)]);
 
 PROCESS $sub2();
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-table_content_before_from_folder_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-table_content_before_from_folder_/formatted.sql
index a3d672546c..714ca968ee 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-table_content_before_from_folder_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-table_content_before_from_folder_/formatted.sql
@@ -2,7 +2,7 @@
 /* postgres can not */
 USE plato;
 
-PRAGMA yt.EvaluationTableSizeLimit = "1";
+PRAGMA yt.EvaluationTableSizeLimit = '1';
 
 SELECT
     *
@@ -14,9 +14,9 @@ $tables = (
     SELECT
         aggregate_list(Path) AS dates
     FROM
-        folder("")
+        folder('')
     WHERE
-        Path LIKE "Input%"
+        Path LIKE 'Input%'
 );
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-avg_const_interval_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-avg_const_interval_/formatted.sql
index cdfd094396..593dbece3d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-avg_const_interval_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-avg_const_interval_/formatted.sql
@@ -5,7 +5,7 @@ PRAGMA EmitAggApply;
 $a =
     SELECT
         CurrentUtcDate() AS _date,
-        Just(Interval("P1W")) AS parsed_lag
+        Just(Interval('P1W')) AS parsed_lag
     FROM
         plato.Input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-avg_decimal_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-avg_decimal_/formatted.sql
index 2ebed035ef..8a73c522cc 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-avg_decimal_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-avg_decimal_/formatted.sql
@@ -6,9 +6,9 @@ SELECT
     avg(key)
 FROM (
     VALUES
-        (Decimal("0.1", 10, 1)),
-        (Decimal("0.2", 10, 1)),
-        (Decimal("0.3", 10, 1))
+        (Decimal('0.1', 10, 1)),
+        (Decimal('0.2', 10, 1)),
+        (Decimal('0.3', 10, 1))
 ) AS a (
     key
 );
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-avg_interval_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-avg_interval_/formatted.sql
index 740310810f..1525bf04ee 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-avg_interval_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-avg_interval_/formatted.sql
@@ -6,9 +6,9 @@ SELECT
     avg(key)
 FROM (
     VALUES
-        (Interval("P1D")),
-        (Interval("P2D")),
-        (Interval("P3D"))
+        (Interval('P1D')),
+        (Interval('P2D')),
+        (Interval('P3D'))
 ) AS a (
     key
 );
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-avg_state_type_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-avg_state_type_/formatted.sql
index 73731c2ed2..50b55a1509 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-avg_state_type_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-avg_state_type_/formatted.sql
@@ -5,11 +5,11 @@ PRAGMA EmitAggApply;
 SELECT
     formattype(typeof(avg(NULL))),
     formattype(typeof(avg(1))),
-    formattype(typeof(avg(decimal("10", 10, 1)))),
-    formattype(typeof(avg(interval("P10D")))),
+    formattype(typeof(avg(decimal('10', 10, 1)))),
+    formattype(typeof(avg(interval('P10D')))),
     formattype(typeof(avg(just(1)))),
-    formattype(typeof(avg(just(decimal("10", 10, 1))))),
-    formattype(typeof(avg(just(interval("P10D")))))
+    formattype(typeof(avg(just(decimal('10', 10, 1))))),
+    formattype(typeof(avg(just(interval('P10D')))))
 FROM (
     SELECT
         1
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_decimal_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_decimal_/formatted.sql
index 7534ef068a..43634848c6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_decimal_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_decimal_/formatted.sql
@@ -6,9 +6,9 @@ SELECT
     sum(key)
 FROM (
     VALUES
-        (CAST("1.51" AS Decimal (10, 3))),
-        (CAST("2.22" AS Decimal (10, 3))),
-        (CAST("3.49" AS Decimal (10, 3)))
+        (CAST('1.51' AS Decimal (10, 3))),
+        (CAST('2.22' AS Decimal (10, 3))),
+        (CAST('3.49' AS Decimal (10, 3)))
 ) AS a (
     key
 );
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_decimal_null_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_decimal_null_/formatted.sql
index b4b98e32cf..3fba173415 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_decimal_null_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_decimal_null_/formatted.sql
@@ -6,9 +6,9 @@ SELECT
     sum(key)
 FROM (
     VALUES
-        (CAST("1.51" AS Decimal (10, 3))),
+        (CAST('1.51' AS Decimal (10, 3))),
         (NULL),
-        (CAST("3.49" AS Decimal (10, 3)))
+        (CAST('3.49' AS Decimal (10, 3)))
 ) AS a (
     key
 );
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-avg_decimal_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-avg_decimal_/formatted.sql
index 75ac6b30b4..2e69d27164 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-avg_decimal_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-avg_decimal_/formatted.sql
@@ -6,7 +6,7 @@ $t =
     SELECT
         *
     FROM
-        AS_TABLE([<|key: 1, value: decimal("2.1", 7, 2)|>, <|key: 1, value: decimal("3.5", 7, 2)|>])
+        AS_TABLE([<|key: 1, value: decimal('2.1', 7, 2)|>, <|key: 1, value: decimal('3.5', 7, 2)|>])
 ;
 
 $p =
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_/formatted.sql
index b56291a189..09612a38e1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_/formatted.sql
@@ -1,13 +1,13 @@
 /* syntax version 1 */
 /* postgres can not */
 $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a));
-$f = AGGREGATION_FACTORY("avg");
+$f = AGGREGATION_FACTORY('avg');
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN $z.a;
                     }
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_distinct_expr_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_distinct_expr_/formatted.sql
index 5ee7ca220b..a3f34c0d2f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_distinct_expr_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_distinct_expr_/formatted.sql
@@ -1,7 +1,7 @@
 /* syntax version 1 */
 /* postgres can not */
 $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a), AsStruct(1 AS a));
-$f = AGGREGATION_FACTORY("avg");
+$f = AGGREGATION_FACTORY('avg');
 
 USE plato;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_if_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_if_/formatted.sql
index 189dab2116..a156488afc 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_if_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_if_/formatted.sql
@@ -1,13 +1,13 @@
 /* syntax version 1 */
 /* postgres can not */
 $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a));
-$f = AGGREGATION_FACTORY("avg_if");
+$f = AGGREGATION_FACTORY('avg_if');
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN AsTuple($z.a, $z.a < 2);
                     }
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitand_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitand_/formatted.sql
index 86fc3148a8..8115f12539 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitand_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitand_/formatted.sql
@@ -1,13 +1,13 @@
 /* syntax version 1 */
 /* postgres can not */
 $t = AsList(AsStruct(1u AS a), AsStruct(2u AS a));
-$f = AGGREGATION_FACTORY("bitand");
+$f = AGGREGATION_FACTORY('bitand');
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN $z.a;
                     }
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitor_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitor_/formatted.sql
index 4ee29cf056..82c6340bb6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitor_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitor_/formatted.sql
@@ -1,13 +1,13 @@
 /* syntax version 1 */
 /* postgres can not */
 $t = AsList(AsStruct(1u AS a), AsStruct(2u AS a));
-$f = AGGREGATION_FACTORY("bitor");
+$f = AGGREGATION_FACTORY('bitor');
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN $z.a;
                     }
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitxor_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitxor_/formatted.sql
index 7e54371f50..22d16ef5dd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitxor_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitxor_/formatted.sql
@@ -1,13 +1,13 @@
 /* syntax version 1 */
 /* postgres can not */
 $t = AsList(AsStruct(1u AS a), AsStruct(2u AS a));
-$f = AGGREGATION_FACTORY("bitxor");
+$f = AGGREGATION_FACTORY('bitxor');
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN $z.a;
                     }
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-booland_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-booland_/formatted.sql
index 066e5a949b..b689d5c767 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-booland_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-booland_/formatted.sql
@@ -1,13 +1,13 @@
 /* syntax version 1 */
 /* postgres can not */
 $t = AsList(AsStruct(TRUE AS a), AsStruct(FALSE AS a));
-$f = AGGREGATION_FACTORY("booland");
+$f = AGGREGATION_FACTORY('booland');
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN $z.a;
                     }
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-boolor_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-boolor_/formatted.sql
index 9985ccd861..ff9b91caf8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-boolor_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-boolor_/formatted.sql
@@ -1,13 +1,13 @@
 /* syntax version 1 */
 /* postgres can not */
 $t = AsList(AsStruct(TRUE AS a), AsStruct(FALSE AS a));
-$f = AGGREGATION_FACTORY("boolor");
+$f = AGGREGATION_FACTORY('boolor');
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN $z.a;
                     }
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bottom_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bottom_/formatted.sql
index 73292c42e6..ed50dcec03 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bottom_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bottom_/formatted.sql
@@ -11,13 +11,13 @@ $t = AsList(
     AsStruct(9 AS a)
 );
 
-$f = AGGREGATION_FACTORY("bottom", 3);
+$f = AGGREGATION_FACTORY('bottom', 3);
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"),
+                AsAtom('res'),
                 $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN $z.a;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bottom_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bottom_by_/formatted.sql
index 419ff1be0f..d16335fd4d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bottom_by_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bottom_by_/formatted.sql
@@ -8,13 +8,13 @@ $t = AsList(
     AsStruct(7 AS key, 111 AS value)
 );
 
-$f = AGGREGATION_FACTORY("bottomby", 3);
+$f = AGGREGATION_FACTORY('bottomby', 3);
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"),
+                AsAtom('res'),
                 $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN AsTuple($z.value, $z.key);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-container_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-container_/formatted.sql
index b374685cc2..adc96f75e5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-container_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-container_/formatted.sql
@@ -1,6 +1,6 @@
 /* syntax version 1 */
 /* postgres can not */
-$factory = AGGREGATION_FACTORY("sum");
+$factory = AGGREGATION_FACTORY('sum');
 
 SELECT
     ListAggregate(ListCreate(Int32), $factory)
@@ -15,10 +15,10 @@ SELECT
 ;
 
 SELECT
-    ListAggregate(Nothing(ParseType("List<Int32>?")), $factory)
+    ListAggregate(Nothing(ParseType('List<Int32>?')), $factory)
 ;
 
-$factory = AGGREGATION_FACTORY("count");
+$factory = AGGREGATION_FACTORY('count');
 
 SELECT
     ListAggregate(ListCreate(Int32), $factory)
@@ -33,16 +33,16 @@ SELECT
 ;
 
 SELECT
-    ListAggregate(Nothing(ParseType("List<Int32>?")), $factory)
+    ListAggregate(Nothing(ParseType('List<Int32>?')), $factory)
 ;
 
-$factory = AGGREGATION_FACTORY("sum");
+$factory = AGGREGATION_FACTORY('sum');
 
 SELECT
     ListSort(
         DictItems(
             DictAggregate(
-                DictCreate(ParseType("String"), ParseType("List<Int32>")),
+                DictCreate(ParseType('String'), ParseType('List<Int32>')),
                 $factory
             )
         )
@@ -54,8 +54,8 @@ SELECT
         DictItems(
             DictAggregate(
                 AsDict(
-                    AsTuple("foo", AsList(1, 3)),
-                    AsTuple("bar", AsList(2))
+                    AsTuple('foo', AsList(1, 3)),
+                    AsTuple('bar', AsList(2))
                 ), $factory
             )
         )
@@ -68,8 +68,8 @@ SELECT
             DictAggregate(
                 Just(
                     AsDict(
-                        AsTuple("foo", AsList(1, 3)),
-                        AsTuple("bar", AsList(2))
+                        AsTuple('foo', AsList(1, 3)),
+                        AsTuple('bar', AsList(2))
                     )
                 ), $factory
             )
@@ -81,20 +81,20 @@ SELECT
     ListSort(
         DictItems(
             DictAggregate(
-                Nothing(ParseType("Dict<String, List<Int32>>?")),
+                Nothing(ParseType('Dict<String, List<Int32>>?')),
                 $factory
             )
         )
     )
 ;
 
-$factory = AGGREGATION_FACTORY("count");
+$factory = AGGREGATION_FACTORY('count');
 
 SELECT
     ListSort(
         DictItems(
             DictAggregate(
-                DictCreate(ParseType("String"), ParseType("List<Int32>")),
+                DictCreate(ParseType('String'), ParseType('List<Int32>')),
                 $factory
             )
         )
@@ -106,8 +106,8 @@ SELECT
         DictItems(
             DictAggregate(
                 AsDict(
-                    AsTuple("foo", AsList(1, 3)),
-                    AsTuple("bar", AsList(2))
+                    AsTuple('foo', AsList(1, 3)),
+                    AsTuple('bar', AsList(2))
                 ), $factory
             )
         )
@@ -120,8 +120,8 @@ SELECT
             DictAggregate(
                 Just(
                     AsDict(
-                        AsTuple("foo", AsList(1, 3)),
-                        AsTuple("bar", AsList(2))
+                        AsTuple('foo', AsList(1, 3)),
+                        AsTuple('bar', AsList(2))
                     )
                 ), $factory
             )
@@ -133,7 +133,7 @@ SELECT
     ListSort(
         DictItems(
             DictAggregate(
-                Nothing(ParseType("Dict<String, List<Int32>>?")),
+                Nothing(ParseType('Dict<String, List<Int32>>?')),
                 $factory
             )
         )
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-container_empty_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-container_empty_/formatted.sql
index bb921ce06f..b6650735ca 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-container_empty_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-container_empty_/formatted.sql
@@ -1,33 +1,33 @@
 /* syntax version 1 */
 /* postgres can not */
 SELECT
-    ListAggregate([], AGGREGATION_FACTORY("sum"))
+    ListAggregate([], AGGREGATION_FACTORY('sum'))
 ;
 
 SELECT
-    ListAggregate([1, 2], AGGREGATION_FACTORY("sum"))
+    ListAggregate([1, 2], AGGREGATION_FACTORY('sum'))
 ;
 
 SELECT
-    ListAggregate(Just([1, 2]), AGGREGATION_FACTORY("sum"))
+    ListAggregate(Just([1, 2]), AGGREGATION_FACTORY('sum'))
 ;
 
 SELECT
-    ListAggregate(NULL, AGGREGATION_FACTORY("sum"))
+    ListAggregate(NULL, AGGREGATION_FACTORY('sum'))
 ;
 
 SELECT
-    DictAggregate({}, AGGREGATION_FACTORY("sum"))
+    DictAggregate({}, AGGREGATION_FACTORY('sum'))
 ;
 
 SELECT
-    DictAggregate({'a': [2, 3]}, AGGREGATION_FACTORY("sum"))
+    DictAggregate({'a': [2, 3]}, AGGREGATION_FACTORY('sum'))
 ;
 
 SELECT
-    DictAggregate(Just({'a': [2, 3]}), AGGREGATION_FACTORY("sum"))
+    DictAggregate(Just({'a': [2, 3]}), AGGREGATION_FACTORY('sum'))
 ;
 
 SELECT
-    DictAggregate(NULL, AGGREGATION_FACTORY("sum"))
+    DictAggregate(NULL, AGGREGATION_FACTORY('sum'))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-corellation_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-corellation_/formatted.sql
index c0692c417b..bd69b8baf5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-corellation_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-corellation_/formatted.sql
@@ -1,13 +1,13 @@
 /* syntax version 1 */
 /* postgres can not */
 $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a));
-$f = AGGREGATION_FACTORY("correlation");
+$f = AGGREGATION_FACTORY('correlation');
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN AsTuple($z.a, -$z.a);
                     }
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-count_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-count_/formatted.sql
index 27d76004b9..36f6b20dbc 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-count_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-count_/formatted.sql
@@ -1,13 +1,13 @@
 /* syntax version 1 */
 /* postgres can not */
 $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a));
-$f = AGGREGATION_FACTORY("count");
+$f = AGGREGATION_FACTORY('count');
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN $z.a;
                     }
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-count_if_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-count_if_/formatted.sql
index e28bdaf77b..4bbe9991a7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-count_if_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-count_if_/formatted.sql
@@ -1,13 +1,13 @@
 /* syntax version 1 */
 /* postgres can not */
 $t = AsList(AsStruct(TRUE AS a), AsStruct(FALSE AS a));
-$f = AGGREGATION_FACTORY("countif");
+$f = AGGREGATION_FACTORY('countif');
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN $z.a;
                     }
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-def_value_full_table_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-def_value_full_table_/formatted.sql
index f006127488..bf25d3d332 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-def_value_full_table_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-def_value_full_table_/formatted.sql
@@ -64,7 +64,7 @@ $cnt_deserialize = ($state) -> {
 $cnt_default = 0l;
 
 $cnt_udaf_factory = AggregationFactory(
-    "UDAF",
+    'UDAF',
     $cnt_create,
     $cnt_add,
     $cnt_merge,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-def_value_with_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-def_value_with_keys_/formatted.sql
index a18f61bd1c..c2f64146dc 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-def_value_with_keys_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-def_value_with_keys_/formatted.sql
@@ -64,7 +64,7 @@ $cnt_deserialize = ($state) -> {
 $cnt_default = 0ul;
 
 $cnt_udaf_factory = AggregationFactory(
-    "UDAF",
+    'UDAF',
     $cnt_create,
     $cnt_add,
     $cnt_merge,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-every_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-every_/formatted.sql
index 50356887af..b445da67ef 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-every_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-every_/formatted.sql
@@ -1,13 +1,13 @@
 /* syntax version 1 */
 /* postgres can not */
 $t = AsList(AsStruct(TRUE AS a), AsStruct(FALSE AS a));
-$f = AGGREGATION_FACTORY("every");
+$f = AGGREGATION_FACTORY('every');
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN $z.a;
                     }
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-flatten_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-flatten_/formatted.sql
index 474b9e586a..d10104a0cc 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-flatten_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-flatten_/formatted.sql
@@ -1,6 +1,6 @@
 /* syntax version 1 */
 /* postgres can not */
-$f = AGGREGATION_FACTORY("sum");
+$f = AGGREGATION_FACTORY('sum');
 $g = AggregateFlatten($f);
 
 SELECT
@@ -14,7 +14,7 @@ SELECT
     ListAggregate([[1, 2], ListCreate(Int32)], $g)
 ;
 
-$i = AGGREGATION_FACTORY("AGGREGATE_LIST_DISTINCT");
+$i = AGGREGATION_FACTORY('AGGREGATE_LIST_DISTINCT');
 $j = AggregateFlatten($i);
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-histogram_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-histogram_/formatted.sql
index 1ece4388fe..099f221d18 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-histogram_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-histogram_/formatted.sql
@@ -1,13 +1,13 @@
 /* syntax version 1 */
 /* postgres can not */
 $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a));
-$f = AGGREGATION_FACTORY("histogram");
+$f = AGGREGATION_FACTORY('histogram');
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN AsTuple($z.a, 1.0);
                     }
@@ -17,13 +17,13 @@ SELECT
     )
 ;
 
-$f = AGGREGATION_FACTORY("histogram", 5);
+$f = AGGREGATION_FACTORY('histogram', 5);
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN AsTuple($z.a, 1.0);
                     }
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-hll_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-hll_/formatted.sql
index 319aaa3885..3ab7cc868d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-hll_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-hll_/formatted.sql
@@ -1,13 +1,13 @@
 /* syntax version 1 */
 /* postgres can not */
 $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a));
-$f = AGGREGATION_FACTORY("hll");
+$f = AGGREGATION_FACTORY('hll');
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN $z.a;
                     }
@@ -17,13 +17,13 @@ SELECT
     )
 ;
 
-$f = AGGREGATION_FACTORY("hll", 4);
+$f = AGGREGATION_FACTORY('hll', 4);
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN $z.a;
                     }
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-linear_histogram_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-linear_histogram_/formatted.sql
index dd40eba206..b3ca5fbb0f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-linear_histogram_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-linear_histogram_/formatted.sql
@@ -1,13 +1,13 @@
 /* syntax version 1 */
 /* postgres can not */
 $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a));
-$f = AGGREGATION_FACTORY("linearhistogram");
+$f = AGGREGATION_FACTORY('linearhistogram');
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN $z.a;
                     }
@@ -17,13 +17,13 @@ SELECT
     )
 ;
 
-$f = AGGREGATION_FACTORY("linearhistogram", 10, 0.0, 1000.0);
+$f = AGGREGATION_FACTORY('linearhistogram', 10, 0.0, 1000.0);
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN $z.a;
                     }
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-list_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-list_/formatted.sql
index 7271db98e7..3e282d4cc4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-list_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-list_/formatted.sql
@@ -1,13 +1,13 @@
 /* syntax version 1 */
 /* postgres can not */
 $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a));
-$f = AGGREGATION_FACTORY("aggregate_list");
+$f = AGGREGATION_FACTORY('aggregate_list');
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN $z.a;
                     }
@@ -17,13 +17,13 @@ SELECT
     )
 ;
 
-$f = AGGREGATION_FACTORY("aggregate_list", length(CAST(Unicode::ToUpper("xx"u) AS String)));
+$f = AGGREGATION_FACTORY('aggregate_list', length(CAST(Unicode::ToUpper("xx"u) AS String)));
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN $z.a;
                     }
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-log_histogram_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-log_histogram_/formatted.sql
index 8557126f1b..de3c0eb683 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-log_histogram_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-log_histogram_/formatted.sql
@@ -1,13 +1,13 @@
 /* syntax version 1 */
 /* postgres can not */
 $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a));
-$f = AGGREGATION_FACTORY("loghistogram");
+$f = AGGREGATION_FACTORY('loghistogram');
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN $z.a;
                     }
@@ -17,13 +17,13 @@ SELECT
     )
 ;
 
-$f = AGGREGATION_FACTORY("loghistogram", 10, 0.01, 1000.0);
+$f = AGGREGATION_FACTORY('loghistogram', 10, 0.01, 1000.0);
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN $z.a;
                     }
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-logariphmic_histogram_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-logariphmic_histogram_/formatted.sql
index 118f63c5e3..18d286521d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-logariphmic_histogram_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-logariphmic_histogram_/formatted.sql
@@ -1,13 +1,13 @@
 /* syntax version 1 */
 /* postgres can not */
 $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a));
-$f = AGGREGATION_FACTORY("logarithmichistogram");
+$f = AGGREGATION_FACTORY('logarithmichistogram');
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN $z.a;
                     }
@@ -17,13 +17,13 @@ SELECT
     )
 ;
 
-$f = AGGREGATION_FACTORY("logarithmichistogram", 10, 0.01, 1000.0);
+$f = AGGREGATION_FACTORY('logarithmichistogram', 10, 0.01, 1000.0);
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN $z.a;
                     }
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-max_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-max_/formatted.sql
index 4cfa7115e5..f18a081ea5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-max_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-max_/formatted.sql
@@ -1,13 +1,13 @@
 /* syntax version 1 */
 /* postgres can not */
 $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a));
-$f = AGGREGATION_FACTORY("max");
+$f = AGGREGATION_FACTORY('max');
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN $z.a;
                     }
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-max_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-max_by_/formatted.sql
index a6025485aa..372d90f072 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-max_by_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-max_by_/formatted.sql
@@ -5,13 +5,13 @@ $t = AsList(
     AsStruct(2 AS key, 100 AS value)
 );
 
-$f = AGGREGATION_FACTORY("maxby");
+$f = AGGREGATION_FACTORY('maxby');
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"),
+                AsAtom('res'),
                 $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN AsTuple($z.value, $z.key);
@@ -22,13 +22,13 @@ SELECT
     )
 ;
 
-$f = AGGREGATION_FACTORY("maxby", 10);
+$f = AGGREGATION_FACTORY('maxby', 10);
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"),
+                AsAtom('res'),
                 $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN AsTuple($z.value, $z.key);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-median_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-median_/formatted.sql
index 78fbfda7a6..4d3f75f9dd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-median_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-median_/formatted.sql
@@ -1,13 +1,13 @@
 /* syntax version 1 */
 /* postgres can not */
 $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a));
-$f = AGGREGATION_FACTORY("median");
+$f = AGGREGATION_FACTORY('median');
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN $z.a;
                     }
@@ -17,13 +17,13 @@ SELECT
     )
 ;
 
-$f = AGGREGATION_FACTORY("percentile", 0.9);
+$f = AGGREGATION_FACTORY('percentile', 0.9);
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN $z.a;
                     }
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-min_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-min_/formatted.sql
index 1e1b7e0947..cd1cfb806e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-min_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-min_/formatted.sql
@@ -1,13 +1,13 @@
 /* syntax version 1 */
 /* postgres can not */
 $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a));
-$f = AGGREGATION_FACTORY("min");
+$f = AGGREGATION_FACTORY('min');
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN $z.a;
                     }
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-min_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-min_by_/formatted.sql
index d7cd2e133c..53987b5853 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-min_by_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-min_by_/formatted.sql
@@ -5,13 +5,13 @@ $t = AsList(
     AsStruct(2 AS key, 100 AS value)
 );
 
-$f = AGGREGATION_FACTORY("minby");
+$f = AGGREGATION_FACTORY('minby');
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"),
+                AsAtom('res'),
                 $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN AsTuple($z.value, $z.key);
@@ -22,13 +22,13 @@ SELECT
     )
 ;
 
-$f = AGGREGATION_FACTORY("minby", 10);
+$f = AGGREGATION_FACTORY('minby', 10);
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"),
+                AsAtom('res'),
                 $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN AsTuple($z.value, $z.key);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-mode_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-mode_/formatted.sql
index 01cbf3a44b..bda81d4eca 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-mode_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-mode_/formatted.sql
@@ -1,13 +1,13 @@
 /* syntax version 1 */
 /* postgres can not */
 $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a));
-$f = AGGREGATION_FACTORY("mode");
+$f = AGGREGATION_FACTORY('mode');
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN $z.a;
                     }
@@ -17,13 +17,13 @@ SELECT
     )
 ;
 
-$f = AGGREGATION_FACTORY("topfreq", 10, 20);
+$f = AGGREGATION_FACTORY('topfreq', 10, 20);
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN $z.a;
                     }
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-multi_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-multi_/formatted.sql
index ce827f9b52..83c070c682 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-multi_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-multi_/formatted.sql
@@ -14,17 +14,17 @@ $input = (
 );
 
 SELECT
-    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY("count")) AS count,
-    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY("min")) AS min,
-    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY("max")) AS max,
-    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY("sum")) AS sum,
-    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY("avg")) AS avg,
-    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY("stddev")) AS stddev,
-    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY("percentile", 0.5)) AS p50,
-    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY("aggregate_list")) AS agg_list,
-    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY("aggregate_list_distinct")) AS agg_list_distinct,
-    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY("mode")) AS mode,
-    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY("top", 3)) AS top,
+    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY('count')) AS count,
+    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY('min')) AS min,
+    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY('max')) AS max,
+    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY('sum')) AS sum,
+    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY('avg')) AS avg,
+    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY('stddev')) AS stddev,
+    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY('percentile', 0.5)) AS p50,
+    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY('aggregate_list')) AS agg_list,
+    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY('aggregate_list_distinct')) AS agg_list_distinct,
+    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY('mode')) AS mode,
+    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY('top', 3)) AS top,
 FROM
     $input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-multi_list_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-multi_list_/formatted.sql
index 8932ddcd74..82fbd30a1f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-multi_list_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-multi_list_/formatted.sql
@@ -16,14 +16,14 @@ $input =
 ;
 
 SELECT
-    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY("count")) AS count,
-    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY("min")) AS min,
-    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY("max")) AS max,
-    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY("sum")) AS sum,
-    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY("avg")) AS avg,
-    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY("stddev")) AS stddev,
-    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY("percentile", 0.5)) AS p50,
-    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY("aggregate_list")) AS agg_list
+    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY('count')) AS count,
+    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY('min')) AS min,
+    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY('max')) AS max,
+    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY('sum')) AS sum,
+    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY('avg')) AS avg,
+    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY('stddev')) AS stddev,
+    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY('percentile', 0.5)) AS p50,
+    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY('aggregate_list')) AS agg_list
 FROM
     $input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-multi_list_distinct_expr_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-multi_list_distinct_expr_/formatted.sql
index df8b214759..b50776ff1d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-multi_list_distinct_expr_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-multi_list_distinct_expr_/formatted.sql
@@ -23,12 +23,12 @@ $input =
 ;
 
 SELECT
-    MULTI_AGGREGATE_BY(DISTINCT ListExtend(nums, AsList(1, 5)), AGGREGATION_FACTORY("count")) AS count,
-    MULTI_AGGREGATE_BY(DISTINCT ListExtend(nums, AsList(1, 5)), AGGREGATION_FACTORY("min")) AS min,
-    MULTI_AGGREGATE_BY(DISTINCT ListExtend(nums, AsList(1, 5)), AGGREGATION_FACTORY("max")) AS max,
-    MULTI_AGGREGATE_BY(DISTINCT ListExtend(nums, AsList(1, 5)), AGGREGATION_FACTORY("sum")) AS sum,
-    MULTI_AGGREGATE_BY(DISTINCT ListExtend(nums, AsList(1, 5)), AGGREGATION_FACTORY("percentile", 0.5)) AS p50,
-    MULTI_AGGREGATE_BY(DISTINCT ListExtend(nums, AsList(1, 5)), AGGREGATION_FACTORY("aggregate_list")) AS agg_list
+    MULTI_AGGREGATE_BY(DISTINCT ListExtend(nums, AsList(1, 5)), AGGREGATION_FACTORY('count')) AS count,
+    MULTI_AGGREGATE_BY(DISTINCT ListExtend(nums, AsList(1, 5)), AGGREGATION_FACTORY('min')) AS min,
+    MULTI_AGGREGATE_BY(DISTINCT ListExtend(nums, AsList(1, 5)), AGGREGATION_FACTORY('max')) AS max,
+    MULTI_AGGREGATE_BY(DISTINCT ListExtend(nums, AsList(1, 5)), AGGREGATION_FACTORY('sum')) AS sum,
+    MULTI_AGGREGATE_BY(DISTINCT ListExtend(nums, AsList(1, 5)), AGGREGATION_FACTORY('percentile', 0.5)) AS p50,
+    MULTI_AGGREGATE_BY(DISTINCT ListExtend(nums, AsList(1, 5)), AGGREGATION_FACTORY('aggregate_list')) AS agg_list
 FROM
     $input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-multi_list_nulls_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-multi_list_nulls_/formatted.sql
index 2e71d1b52e..1948317905 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-multi_list_nulls_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-multi_list_nulls_/formatted.sql
@@ -8,17 +8,17 @@ $data = AsList(
 );
 
 SELECT
-    MULTI_AGGREGATE_BY(x, AggregationFactory("agg_list")),
-    MULTI_AGGREGATE_BY(x, AggregationFactory("avg")),
-    MULTI_AGGREGATE_BY(x, AggregationFactory("count")),
+    MULTI_AGGREGATE_BY(x, AggregationFactory('agg_list')),
+    MULTI_AGGREGATE_BY(x, AggregationFactory('avg')),
+    MULTI_AGGREGATE_BY(x, AggregationFactory('count')),
 FROM
     AS_TABLE($data)
 ;
 
 SELECT
-    MULTI_AGGREGATE_BY(x, AggregationFactory("agg_list")),
-    MULTI_AGGREGATE_BY(x, AggregationFactory("avg")),
-    MULTI_AGGREGATE_BY(x, AggregationFactory("count")),
+    MULTI_AGGREGATE_BY(x, AggregationFactory('agg_list')),
+    MULTI_AGGREGATE_BY(x, AggregationFactory('avg')),
+    MULTI_AGGREGATE_BY(x, AggregationFactory('count')),
 FROM (
     SELECT
         *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-multi_minmaxby_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-multi_minmaxby_/formatted.sql
index 8710c5c4af..8ae5a9a757 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-multi_minmaxby_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-multi_minmaxby_/formatted.sql
@@ -1,7 +1,7 @@
 /* syntax version 1 */
 /* postgres can not */
 SELECT
-    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY("minby"))
+    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY('minby'))
 FROM (
     SELECT
         TableRow() AS nums
@@ -10,7 +10,7 @@ FROM (
 );
 
 SELECT
-    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY("maxby", 2))
+    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY('maxby', 2))
 FROM (
     SELECT
         TableRow() AS nums
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-multi_struct_nulls_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-multi_struct_nulls_/formatted.sql
index 17133d042d..b79d1cd954 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-multi_struct_nulls_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-multi_struct_nulls_/formatted.sql
@@ -8,17 +8,17 @@ $data = AsList(
 );
 
 SELECT
-    MULTI_AGGREGATE_BY(x, AggregationFactory("agg_list")),
-    MULTI_AGGREGATE_BY(x, AggregationFactory("avg")),
-    MULTI_AGGREGATE_BY(x, AggregationFactory("count")),
+    MULTI_AGGREGATE_BY(x, AggregationFactory('agg_list')),
+    MULTI_AGGREGATE_BY(x, AggregationFactory('avg')),
+    MULTI_AGGREGATE_BY(x, AggregationFactory('count')),
 FROM
     AS_TABLE($data)
 ;
 
 SELECT
-    MULTI_AGGREGATE_BY(x, AggregationFactory("agg_list")),
-    MULTI_AGGREGATE_BY(x, AggregationFactory("avg")),
-    MULTI_AGGREGATE_BY(x, AggregationFactory("count")),
+    MULTI_AGGREGATE_BY(x, AggregationFactory('agg_list')),
+    MULTI_AGGREGATE_BY(x, AggregationFactory('avg')),
+    MULTI_AGGREGATE_BY(x, AggregationFactory('count')),
 FROM (
     SELECT
         *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-multi_tuple_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-multi_tuple_/formatted.sql
index f0591f01e3..07de57c4e4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-multi_tuple_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-multi_tuple_/formatted.sql
@@ -17,14 +17,14 @@ $input =
 ;
 
 SELECT
-    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY("count")) AS count,
-    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY("min")) AS min,
-    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY("max")) AS max,
-    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY("sum")) AS sum,
-    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY("avg")) AS avg,
-    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY("stddev")) AS stddev,
-    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY("percentile", 0.5)) AS p50,
-    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY("aggregate_list")) AS agg_list,
+    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY('count')) AS count,
+    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY('min')) AS min,
+    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY('max')) AS max,
+    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY('sum')) AS sum,
+    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY('avg')) AS avg,
+    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY('stddev')) AS stddev,
+    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY('percentile', 0.5)) AS p50,
+    MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY('aggregate_list')) AS agg_list,
 FROM
     $input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-multi_tuple_nulls_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-multi_tuple_nulls_/formatted.sql
index d90f1c416d..7cbe90cc82 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-multi_tuple_nulls_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-multi_tuple_nulls_/formatted.sql
@@ -8,17 +8,17 @@ $data = AsList(
 );
 
 SELECT
-    MULTI_AGGREGATE_BY(x, AggregationFactory("agg_list")),
-    MULTI_AGGREGATE_BY(x, AggregationFactory("avg")),
-    MULTI_AGGREGATE_BY(x, AggregationFactory("count")),
+    MULTI_AGGREGATE_BY(x, AggregationFactory('agg_list')),
+    MULTI_AGGREGATE_BY(x, AggregationFactory('avg')),
+    MULTI_AGGREGATE_BY(x, AggregationFactory('count')),
 FROM
     AS_TABLE($data)
 ;
 
 SELECT
-    MULTI_AGGREGATE_BY(x, AggregationFactory("agg_list")),
-    MULTI_AGGREGATE_BY(x, AggregationFactory("avg")),
-    MULTI_AGGREGATE_BY(x, AggregationFactory("count")),
+    MULTI_AGGREGATE_BY(x, AggregationFactory('agg_list')),
+    MULTI_AGGREGATE_BY(x, AggregationFactory('avg')),
+    MULTI_AGGREGATE_BY(x, AggregationFactory('count')),
 FROM (
     SELECT
         *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-some_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-some_/formatted.sql
index 5ebb60c719..4df116ab2f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-some_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-some_/formatted.sql
@@ -1,13 +1,13 @@
 /* syntax version 1 */
 /* postgres can not */
 $t = AsList(AsStruct(1 AS a), AsStruct(1 AS a));
-$f = AGGREGATION_FACTORY("some");
+$f = AGGREGATION_FACTORY('some');
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN $z.a;
                     }
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-stddev_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-stddev_/formatted.sql
index 30a1ec06ab..58f6769f3f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-stddev_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-stddev_/formatted.sql
@@ -1,13 +1,13 @@
 /* syntax version 1 */
 /* postgres can not */
 $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a));
-$f = AGGREGATION_FACTORY("stddev");
+$f = AGGREGATION_FACTORY('stddev');
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN $z.a;
                     }
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-sum_if_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-sum_if_/formatted.sql
index 172e50671a..dc2967475f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-sum_if_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-sum_if_/formatted.sql
@@ -1,13 +1,13 @@
 /* syntax version 1 */
 /* postgres can not */
 $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a));
-$f = AGGREGATION_FACTORY("sum_if");
+$f = AGGREGATION_FACTORY('sum_if');
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN AsTuple($z.a, $z.a > 1);
                     }
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-top_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-top_/formatted.sql
index 73886fb7c2..f192cdbf75 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-top_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-top_/formatted.sql
@@ -11,13 +11,13 @@ $t = AsList(
     AsStruct(9 AS a)
 );
 
-$f = AGGREGATION_FACTORY("top", 3);
+$f = AGGREGATION_FACTORY('top', 3);
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"),
+                AsAtom('res'),
                 $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN $z.a;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-top_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-top_by_/formatted.sql
index 9b15282860..345e237999 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-top_by_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-top_by_/formatted.sql
@@ -8,13 +8,13 @@ $t = AsList(
     AsStruct(7 AS key, 111 AS value)
 );
 
-$f = AGGREGATION_FACTORY("topby", 3);
+$f = AGGREGATION_FACTORY('topby', 3);
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"),
+                AsAtom('res'),
                 $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN AsTuple($z.value, $z.key);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-transform_input_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-transform_input_/formatted.sql
index 745768cd00..bb2cfa1f90 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-transform_input_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-transform_input_/formatted.sql
@@ -1,6 +1,6 @@
 /* syntax version 1 */
 /* postgres can not */
-$f = AGGREGATION_FACTORY("sum");
+$f = AGGREGATION_FACTORY('sum');
 $g = AggregateTransformInput($f, ($x) -> (CAST($x AS Int32)));
 $h = AggregateTransformInput($f, ($x) -> ($x * 2));
 
@@ -9,7 +9,7 @@ SELECT
 ;
 
 SELECT
-    ListAggregate(["1", "2", "3"], $g)
+    ListAggregate(['1', '2', '3'], $g)
 ;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-transform_output_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-transform_output_/formatted.sql
index f4e7ce9430..b6789d2b19 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-transform_output_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-transform_output_/formatted.sql
@@ -1,6 +1,6 @@
 /* syntax version 1 */
 /* postgres can not */
-$f = AGGREGATION_FACTORY("sum");
+$f = AGGREGATION_FACTORY('sum');
 $g = AggregateTransformOutput($f, ($x) -> (CAST($x AS String)));
 $h = AggregateTransformOutput($f, ($x) -> ($x * 2));
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_/formatted.sql
index f58c7ca2e6..dada1c6a86 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_/formatted.sql
@@ -26,14 +26,14 @@ $deserialize = ($state) -> {
 };
 
 $default = 0;
-$f = AGGREGATION_FACTORY("udaf", $create, $add, $merge, $get_result, $serialize, $deserialize, $default);
+$f = AGGREGATION_FACTORY('udaf', $create, $add, $merge, $get_result, $serialize, $deserialize, $default);
 $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a));
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN $z.a;
                     }
@@ -49,7 +49,7 @@ SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN $z.a;
                     }
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_distinct_expr_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_distinct_expr_/formatted.sql
index 8783585b5e..85269fd251 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_distinct_expr_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_distinct_expr_/formatted.sql
@@ -26,7 +26,7 @@ $deserialize = ($state) -> {
 };
 
 $default = 0;
-$f = AGGREGATION_FACTORY("udaf", $create, $add, $merge, $get_result, $serialize, $deserialize, $default);
+$f = AGGREGATION_FACTORY('udaf', $create, $add, $merge, $get_result, $serialize, $deserialize, $default);
 $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a), AsStruct(1 AS a));
 
 USE plato;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_in_udaf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_in_udaf_/formatted.sql
index 50a3b894a9..4f3bb18d46 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_in_udaf_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_in_udaf_/formatted.sql
@@ -12,7 +12,7 @@ $create_single_item_dict = ($item, $_parent) -> {
 };
 
 $count_values = AGGREGATION_FACTORY(
-    "UDAF",
+    'UDAF',
     $create_single_item_dict,
     ($dict, $item, $parent) -> {
         RETURN $merge_dicts($create_single_item_dict($item, $parent), $dict);
@@ -29,7 +29,7 @@ $add_list_to_dict = ($dict, $list, $parent) -> {
 };
 
 $count_list_values = AGGREGATION_FACTORY(
-    "UDAF",
+    'UDAF',
     $create_dict_from_list,
     $add_list_to_dict,
     $merge_dicts
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-variance_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-variance_/formatted.sql
index bcb7a12154..10c3d2ac11 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-variance_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-variance_/formatted.sql
@@ -1,13 +1,13 @@
 /* syntax version 1 */
 /* postgres can not */
 $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a));
-$f = AGGREGATION_FACTORY("variance");
+$f = AGGREGATION_FACTORY('variance');
 
 SELECT
     Yql::Aggregate(
         $t, AsTuple(), AsTuple(
             AsTuple(
-                AsAtom("res"), $f(
+                AsAtom('res'), $f(
                     ListItemType(TypeOf($t)), ($z) -> {
                         RETURN $z.a;
                     }
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_filter_pushdown_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_filter_pushdown_/formatted.sql
index 873a018862..7d7d7e8fd8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_filter_pushdown_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_filter_pushdown_/formatted.sql
@@ -14,10 +14,10 @@ FROM (
         key,
         subkey
     HAVING
-        count(*) < 100 AND subkey > "0"
+        count(*) < 100 AND subkey > '0'
 )
 WHERE
-    key > "1" AND Likely(subkey < "4")
+    key > '1' AND Likely(subkey < '4')
 ORDER BY
     key,
     subkey
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_phases_table1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_phases_table1_/formatted.sql
index 15f6991d54..edc40754fc 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_phases_table1_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_phases_table1_/formatted.sql
@@ -3,7 +3,7 @@
 USE plato;
 
 PRAGMA EmitAggApply;
-PRAGMA yt.UseAggPhases = "1";
+PRAGMA yt.UseAggPhases = '1';
 
 SELECT
     key,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_phases_table2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_phases_table2_/formatted.sql
index 44e675df71..a897f1d1b9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_phases_table2_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_phases_table2_/formatted.sql
@@ -3,7 +3,7 @@
 USE plato;
 
 PRAGMA EmitAggApply;
-PRAGMA yt.UseAggPhases = "1";
+PRAGMA yt.UseAggPhases = '1';
 
 SELECT
     key,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_phases_table3_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_phases_table3_/formatted.sql
index 20dc458047..ae8de426cc 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_phases_table3_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_phases_table3_/formatted.sql
@@ -3,7 +3,7 @@
 USE plato;
 
 PRAGMA EmitAggApply;
-PRAGMA yt.UseAggPhases = "1";
+PRAGMA yt.UseAggPhases = '1';
 
 SELECT
     key,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_by_column_lookup_in_const_dict_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_by_column_lookup_in_const_dict_/formatted.sql
index 1461d21945..80f7b2132b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_by_column_lookup_in_const_dict_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_by_column_lookup_in_const_dict_/formatted.sql
@@ -1,14 +1,14 @@
 /* syntax version 1 */
 USE plato;
 
-$dict = AsDict(("800", "foo"));
+$dict = AsDict(('800', 'foo'));
 
 SELECT
     lookup_result
 FROM
     Input
 GROUP BY
-    $dict[key] ?? "bar" AS lookup_result
+    $dict[key] ?? 'bar' AS lookup_result
 ORDER BY
     lookup_result
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_by_one_column_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_by_one_column_/formatted.sql
index 09f6f76269..cd909cba13 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_by_one_column_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_by_one_column_/formatted.sql
@@ -1,7 +1,7 @@
 /* syntax version 1 */
 SELECT
     key,
-    "WAT" AS subkey,
+    'WAT' AS subkey,
     Max(value) AS value
 FROM
     plato.Input
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_distinct_expr_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_distinct_expr_/formatted.sql
index 0670122d08..a183bb59ef 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_distinct_expr_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_distinct_expr_/formatted.sql
@@ -4,7 +4,7 @@ USE plato;
 
 SELECT
     sum(DISTINCT CAST(Unicode::ToLower(CAST(subkey AS Utf8)) AS Int32)) + sum(DISTINCT CAST(Unicode::ToUpper(CAST(subkey AS Utf8)) AS Uint64)) AS sks,
-    ListSort(aggregate_list(DISTINCT key || "_")) AS kl
+    ListSort(aggregate_list(DISTINCT key || '_')) AS kl
 FROM
     Input3
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_distinct_expr_with_groupby_expr_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_distinct_expr_with_groupby_expr_/formatted.sql
index 0e45b225c6..fd987d521b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_distinct_expr_with_groupby_expr_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_distinct_expr_with_groupby_expr_/formatted.sql
@@ -5,11 +5,11 @@ USE plato;
 SELECT
     key,
     sum(DISTINCT CAST(Unicode::ToLower(CAST(subkey AS Utf8)) AS Int32)) + sum(DISTINCT CAST(Unicode::ToUpper(CAST(subkey AS Utf8)) AS Uint64)) AS sks,
-    aggregate_list(DISTINCT key || "") AS kl
+    aggregate_list(DISTINCT key || '') AS kl
 FROM
     Input3
 GROUP BY
-    key || "foo" AS key
+    key || 'foo' AS key
 ORDER BY
     key
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_distinct_in_access_node_exprs_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_distinct_in_access_node_exprs_/formatted.sql
index ce9456f64e..2719ce0737 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_distinct_in_access_node_exprs_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_distinct_in_access_node_exprs_/formatted.sql
@@ -5,10 +5,10 @@ SELECT
     AGGREGATE_LIST(DISTINCT CAST(subkey AS Int32))[COUNT(DISTINCT CAST(subkey AS Uint64)) - 1] AS foo
 FROM
     AS_TABLE([
-        <|key: 1, subkey: "1"|>,
-        <|key: 2, subkey: "2"|>,
-        <|key: 1, subkey: "1"|>,
-        <|key: 2, subkey: "2"|>
+        <|key: 1, subkey: '1'|>,
+        <|key: 2, subkey: '2'|>,
+        <|key: 1, subkey: '1'|>,
+        <|key: 2, subkey: '2'|>
     ])
 GROUP BY
     key
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-avg_with_having_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-avg_with_having_/formatted.sql
index d2637917d4..7b40949189 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-avg_with_having_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-avg_with_having_/formatted.sql
@@ -7,7 +7,7 @@ FROM
 GROUP BY
     value
 HAVING
-    value > "foo"
+    value > 'foo'
 ORDER BY
     key
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-ensure_count_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-ensure_count_/formatted.sql
index 6817c622ac..830e46f6e8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-ensure_count_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-ensure_count_/formatted.sql
@@ -1,5 +1,5 @@
 SELECT
-    Ensure(COUNT(*), COUNT(*) > 3U, "WTF?")
+    Ensure(COUNT(*), COUNT(*) > 3U, 'WTF?')
 FROM
     plato.Input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_lookup_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_lookup_/formatted.sql
index 82a2dde418..a5d461ed8b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_lookup_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_lookup_/formatted.sql
@@ -5,7 +5,7 @@ SELECT
 FROM
     plato.Input
 GROUP BY
-    `dict`["a"]
+    `dict`['a']
 ORDER BY
     s
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_/formatted.sql
index 05caa12fd9..7749a708a3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_/formatted.sql
@@ -2,7 +2,7 @@
 /* postgres can not */
 /* ytfile can not */
 /* yt can not */
-PRAGMA dq.AnalyticsHopping = "true";
+PRAGMA dq.AnalyticsHopping = 'true';
 
 SELECT
     user,
@@ -11,6 +11,6 @@ SELECT
 FROM
     plato.Input
 GROUP BY
-    HOP (DateTime::FromSeconds(CAST(ts AS Uint32)), "PT10S", "PT10S", "PT10S"),
+    HOP (DateTime::FromSeconds(CAST(ts AS Uint32)), 'PT10S', 'PT10S', 'PT10S'),
     user
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_compact_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_compact_/formatted.sql
index 05e33c6d1f..4869d95ea0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_compact_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_compact_/formatted.sql
@@ -2,7 +2,7 @@
 /* postgres can not */
 /* ytfile can not */
 /* yt can not */
-PRAGMA dq.AnalyticsHopping = "true";
+PRAGMA dq.AnalyticsHopping = 'true';
 
 SELECT
     user,
@@ -11,6 +11,6 @@ SELECT
 FROM
     plato.Input
 GROUP COMPACT BY
-    HOP (DateTime::FromSeconds(CAST(ts AS Uint32)), "PT10S", "PT10S", "PT10S"),
+    HOP (DateTime::FromSeconds(CAST(ts AS Uint32)), 'PT10S', 'PT10S', 'PT10S'),
     user
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_distinct_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_distinct_/formatted.sql
index 9dd75397d3..e81d09e1c0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_distinct_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_distinct_/formatted.sql
@@ -5,7 +5,7 @@
 /* yt can not */
 /* dq can not */
 /* dqfile can not */
-PRAGMA dq.AnalyticsHopping = "true";
+PRAGMA dq.AnalyticsHopping = 'true';
 
 SELECT
     user,
@@ -14,6 +14,6 @@ SELECT
 FROM
     plato.Input
 GROUP BY
-    HOP (DateTime::FromSeconds(CAST(ts AS Uint32)), "PT10S", "PT10S", "PT10S"),
+    HOP (DateTime::FromSeconds(CAST(ts AS Uint32)), 'PT10S', 'PT10S', 'PT10S'),
     user
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_distinct_compact_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_distinct_compact_/formatted.sql
index 64d95c66ba..b16ad6bed4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_distinct_compact_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_distinct_compact_/formatted.sql
@@ -5,7 +5,7 @@
 /* yt can not */
 /* dq can not */
 /* dqfile can not */
-PRAGMA dq.AnalyticsHopping = "true";
+PRAGMA dq.AnalyticsHopping = 'true';
 
 SELECT
     user,
@@ -14,6 +14,6 @@ SELECT
 FROM
     plato.Input
 GROUP COMPACT BY
-    HOP (DateTime::FromSeconds(CAST(ts AS Uint32)), "PT10S", "PT10S", "PT10S"),
+    HOP (DateTime::FromSeconds(CAST(ts AS Uint32)), 'PT10S', 'PT10S', 'PT10S'),
     user
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_expr_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_expr_key_/formatted.sql
index ced7825724..d287abed7a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_expr_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_expr_key_/formatted.sql
@@ -2,7 +2,7 @@
 /* postgres can not */
 /* ytfile can not */
 /* yt can not */
-PRAGMA dq.AnalyticsHopping = "true";
+PRAGMA dq.AnalyticsHopping = 'true';
 
 SELECT
     user,
@@ -11,7 +11,7 @@ SELECT
 FROM
     plato.Input
 GROUP COMPACT BY
-    HOP (DateTime::FromSeconds(CAST(ts AS Uint32)), "PT10S", "PT10S", "PT10S"),
+    HOP (DateTime::FromSeconds(CAST(ts AS Uint32)), 'PT10S', 'PT10S', 'PT10S'),
     user,
     substring(user, 1, 1)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_list_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_list_key_/formatted.sql
index 10050f4a2d..15fda679f8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_list_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_list_key_/formatted.sql
@@ -2,7 +2,7 @@
 /* postgres can not */
 /* ytfile can not */
 /* yt can not */
-PRAGMA dq.AnalyticsHopping = "true";
+PRAGMA dq.AnalyticsHopping = 'true';
 
 SELECT
     user,
@@ -11,7 +11,7 @@ SELECT
 FROM
     plato.Input
 GROUP COMPACT BY
-    HOP (DateTime::FromSeconds(CAST(ts AS Uint32)), "PT10S", "PT10S", "PT10S"),
+    HOP (DateTime::FromSeconds(CAST(ts AS Uint32)), 'PT10S', 'PT10S', 'PT10S'),
     user,
-    AsList(user, "1")
+    AsList(user, '1')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_only_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_only_/formatted.sql
index 463eb0930b..f6651ae960 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_only_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_only_/formatted.sql
@@ -2,7 +2,7 @@
 /* postgres can not */
 /* ytfile can not */
 /* yt can not */
-PRAGMA dq.AnalyticsHopping = "true";
+PRAGMA dq.AnalyticsHopping = 'true';
 
 SELECT
     HOP_START() AS ts,
@@ -10,5 +10,5 @@ SELECT
 FROM
     plato.Input
 GROUP BY
-    HOP (DateTime::FromSeconds(CAST(ts AS Uint32)), "PT10S", "PT10S", "PT10S")
+    HOP (DateTime::FromSeconds(CAST(ts AS Uint32)), 'PT10S', 'PT10S', 'PT10S')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_only_distinct_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_only_distinct_/formatted.sql
index 885506fab9..fba29d6bbe 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_only_distinct_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_only_distinct_/formatted.sql
@@ -5,7 +5,7 @@
 /* yt can not */
 /* dq can not */
 /* dqfile can not */
-PRAGMA dq.AnalyticsHopping = "true";
+PRAGMA dq.AnalyticsHopping = 'true';
 
 SELECT
     HOP_START() AS ts,
@@ -13,5 +13,5 @@ SELECT
 FROM
     plato.Input
 GROUP BY
-    HOP (DateTime::FromSeconds(CAST(ts AS Uint32)), "PT10S", "PT10S", "PT10S")
+    HOP (DateTime::FromSeconds(CAST(ts AS Uint32)), 'PT10S', 'PT10S', 'PT10S')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_only_start_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_only_start_/formatted.sql
index 1aca8ab42b..63ca43752a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_only_start_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_only_start_/formatted.sql
@@ -2,12 +2,12 @@
 /* postgres can not */
 /* ytfile can not */
 /* yt can not */
-PRAGMA dq.AnalyticsHopping = "true";
+PRAGMA dq.AnalyticsHopping = 'true';
 
 SELECT
     HOP_START()
 FROM
     plato.Input
 GROUP BY
-    HOP (DateTime::FromSeconds(CAST(ts AS Uint32)), "PT10S", "PT10S", "PT10S")
+    HOP (DateTime::FromSeconds(CAST(ts AS Uint32)), 'PT10S', 'PT10S', 'PT10S')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_star_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_star_/formatted.sql
index a43660b131..51bca23215 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_star_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_star_/formatted.sql
@@ -2,13 +2,13 @@
 /* postgres can not */
 /* ytfile can not */
 /* yt can not */
-PRAGMA dq.AnalyticsHopping = "true";
+PRAGMA dq.AnalyticsHopping = 'true';
 
 SELECT
     *
 FROM
     plato.Input
 GROUP BY
-    HOP (DateTime::FromSeconds(CAST(ts AS Uint32)), "PT10S", "PT10S", "PT10S"),
+    HOP (DateTime::FromSeconds(CAST(ts AS Uint32)), 'PT10S', 'PT10S', 'PT10S'),
     user
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_static_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_static_/formatted.sql
index e6dcae6a5b..aaa8300deb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_static_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_static_/formatted.sql
@@ -7,18 +7,18 @@ $input =
         *
     FROM
         AS_TABLE([
-            <|"time": "2024-01-01T00:00:01Z", "user": 1|>,
-            <|"time": "2024-01-01T00:00:02Z", "user": 1|>,
-            <|"time": "2024-01-01T00:00:03Z", "user": 1|>,
-            <|"time": "2024-01-01T00:00:01Z", "user": 2|>,
-            <|"time": "2024-01-01T00:00:02Z", "user": 2|>,
-            <|"time": "2024-01-01T00:00:03Z", "user": 2|>,
-            <|"time": "2024-01-01T00:00:01Z", "user": 2|>,
-            <|"time": "2024-01-01T00:00:02Z", "user": 2|>,
-            <|"time": "2024-01-01T00:00:03Z", "user": 2|>,
-            <|"time": "2024-01-01T00:00:01Z", "user": 3|>,
-            <|"time": "2024-01-01T00:00:02Z", "user": 3|>,
-            <|"time": "2024-01-01T00:00:03Z", "user": 3|>
+            <|'time': '2024-01-01T00:00:01Z', 'user': 1|>,
+            <|'time': '2024-01-01T00:00:02Z', 'user': 1|>,
+            <|'time': '2024-01-01T00:00:03Z', 'user': 1|>,
+            <|'time': '2024-01-01T00:00:01Z', 'user': 2|>,
+            <|'time': '2024-01-01T00:00:02Z', 'user': 2|>,
+            <|'time': '2024-01-01T00:00:03Z', 'user': 2|>,
+            <|'time': '2024-01-01T00:00:01Z', 'user': 2|>,
+            <|'time': '2024-01-01T00:00:02Z', 'user': 2|>,
+            <|'time': '2024-01-01T00:00:03Z', 'user': 2|>,
+            <|'time': '2024-01-01T00:00:01Z', 'user': 3|>,
+            <|'time': '2024-01-01T00:00:02Z', 'user': 3|>,
+            <|'time': '2024-01-01T00:00:03Z', 'user': 3|>
         ])
 ;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_static_list_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_static_list_key_/formatted.sql
index 96199abd80..c715a0cff2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_static_list_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_hop_static_list_key_/formatted.sql
@@ -7,18 +7,18 @@ $input =
         *
     FROM
         AS_TABLE([
-            <|"time": "2024-01-01T00:00:01Z", "user": 1|>,
-            <|"time": "2024-01-01T00:00:02Z", "user": 1|>,
-            <|"time": "2024-01-01T00:00:03Z", "user": 1|>,
-            <|"time": "2024-01-01T00:00:01Z", "user": 2|>,
-            <|"time": "2024-01-01T00:00:02Z", "user": 2|>,
-            <|"time": "2024-01-01T00:00:03Z", "user": 2|>,
-            <|"time": "2024-01-01T00:00:01Z", "user": 2|>,
-            <|"time": "2024-01-01T00:00:02Z", "user": 2|>,
-            <|"time": "2024-01-01T00:00:03Z", "user": 2|>,
-            <|"time": "2024-01-01T00:00:01Z", "user": 3|>,
-            <|"time": "2024-01-01T00:00:02Z", "user": 3|>,
-            <|"time": "2024-01-01T00:00:03Z", "user": 3|>
+            <|'time': '2024-01-01T00:00:01Z', 'user': 1|>,
+            <|'time': '2024-01-01T00:00:02Z', 'user': 1|>,
+            <|'time': '2024-01-01T00:00:03Z', 'user': 1|>,
+            <|'time': '2024-01-01T00:00:01Z', 'user': 2|>,
+            <|'time': '2024-01-01T00:00:02Z', 'user': 2|>,
+            <|'time': '2024-01-01T00:00:03Z', 'user': 2|>,
+            <|'time': '2024-01-01T00:00:01Z', 'user': 2|>,
+            <|'time': '2024-01-01T00:00:02Z', 'user': 2|>,
+            <|'time': '2024-01-01T00:00:03Z', 'user': 2|>,
+            <|'time': '2024-01-01T00:00:01Z', 'user': 3|>,
+            <|'time': '2024-01-01T00:00:02Z', 'user': 3|>,
+            <|'time': '2024-01-01T00:00:03Z', 'user': 3|>
         ])
 ;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_ru_join_simple_fs_multiusage_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_ru_join_simple_fs_multiusage_/formatted.sql
index bcd2e1ad86..949c054a53 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_ru_join_simple_fs_multiusage_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_ru_join_simple_fs_multiusage_/formatted.sql
@@ -1,7 +1,7 @@
 /* syntax version 1 */
 /* postgres can not */
 PRAGMA sampleselect;
-PRAGMA config.flags("OptimizerFlags", "FieldSubsetEnableMultiusage");
+PRAGMA config.flags('OptimizerFlags', 'FieldSubsetEnableMultiusage');
 
 SELECT
     kk,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_extended_tuple_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_extended_tuple_/formatted.sql
index 54f78efc29..de0dafa959 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_extended_tuple_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_extended_tuple_/formatted.sql
@@ -4,7 +4,7 @@ $timeout = 60 * 30;
 $init = ($row) -> (AsTuple($row.unixtime, $row.unixtime, $row.video_content_id));
 
 $update = ($row, $state) -> {
-    $is_end_session = (($row.unixtime - $state.1) >= $timeout) OR ($row.video_content_id IS NOT NULL AND $row.video_content_id != ($state.2 ?? "-")) ?? FALSE;
+    $is_end_session = (($row.unixtime - $state.1) >= $timeout) OR ($row.video_content_id IS NOT NULL AND $row.video_content_id != ($state.2 ?? '-')) ?? FALSE;
     $new_state = AsTuple(
         IF($is_end_session, $row.unixtime, $state.0),
         $row.unixtime,
@@ -23,34 +23,34 @@ $calculate = ($row, $state) -> (
 
 $source = [
     <|
-        vsid: "v",
+        vsid: 'v',
         unixtime: 1650624253,
         video_content_id: NULL,
     |>,
     <|
-        vsid: "v",
+        vsid: 'v',
         unixtime: 1650624255,
-        video_content_id: "b",
+        video_content_id: 'b',
     |>,
     <|
-        vsid: "v",
+        vsid: 'v',
         unixtime: 1650624256,
         video_content_id: NULL,
     |>,
     <|
-        vsid: "v",
+        vsid: 'v',
         unixtime: 1650624257,
-        video_content_id: "b",
+        video_content_id: 'b',
     |>,
     <|
-        vsid: "v",
+        vsid: 'v',
         unixtime: 1650634257,
-        video_content_id: "b",
+        video_content_id: 'b',
     |>,
     <|
-        vsid: "v",
+        vsid: 'v',
         unixtime: 1650634258,
-        video_content_id: "c",
+        video_content_id: 'c',
     |>
 ];
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-library_error_in_aggregation_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-library_error_in_aggregation_fail_/formatted.sql
index 320306d94d..ced10b0efa 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-library_error_in_aggregation_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-library_error_in_aggregation_fail_/formatted.sql
@@ -16,7 +16,7 @@ FROM (
         a.key
 )
 WHERE
-    x > "aaa"
+    x > 'aaa'
 ORDER BY
     x
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-parsetype_constness_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-parsetype_constness_/formatted.sql
index 79bbe8adab..27b8a02630 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-parsetype_constness_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-parsetype_constness_/formatted.sql
@@ -1,7 +1,7 @@
 /* syntax version 1 */
 /* postgres can not */
 SELECT
-    Yson::ConvertTo("[1,2]"j, ParseType("List<Int32>")) AS x
+    Yson::ConvertTo("[1,2]"j, ParseType('List<Int32>')) AS x
 FROM
     AS_TABLE([<|key: 1|>, <|key: 2|>])
 GROUP BY
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-rollup_with_dict_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-rollup_with_dict_/formatted.sql
index 9cac24321d..c698d96853 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-rollup_with_dict_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-rollup_with_dict_/formatted.sql
@@ -10,7 +10,7 @@ SELECT
 FROM
     Input AS t
 GROUP BY
-    ROLLUP (t.`dict`["c"] AS val)
+    ROLLUP (t.`dict`['c'] AS val)
 ORDER BY
     val,
     cnt
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-yql-18511_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-yql-18511_/formatted.sql
index 3ebad78c99..be8d9932e3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-yql-18511_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-yql-18511_/formatted.sql
@@ -18,18 +18,18 @@ $data =
         user_id,
     FROM (
         SELECT
-            Date("2024-04-29") AS day,
-            "ALLO" AS mark,
-            "???" AS model,
+            Date('2024-04-29') AS day,
+            'ALLO' AS mark,
+            '???' AS model,
             5 AS user_card_cnt,
             'ACTIVE' AS status,
             999 AS user_id,
             1 AS is_proven_owner,
         UNION ALL
         SELECT
-            Date("2024-04-29") AS day,
-            "ALLO" AS mark,
-            "!!!!!!" AS model,
+            Date('2024-04-29') AS day,
+            'ALLO' AS mark,
+            '!!!!!!' AS model,
             50 AS user_card_cnt,
             'ACTIVE' AS status,
             1111 AS user_id,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-basic_columns_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-basic_columns_/formatted.sql
index 907137ed8a..660b1358d0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-basic_columns_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-basic_columns_/formatted.sql
@@ -3,7 +3,7 @@
 USE plato;
 
 SELECT
-    "key" || subkey AS "akey"
+    'key' || subkey AS 'akey'
 FROM
     Input
 ORDER BY
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-escaped_udf_name_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-escaped_udf_name_/formatted.sql
index f227229679..fac8a7ec8e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-escaped_udf_name_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-escaped_udf_name_/formatted.sql
@@ -8,7 +8,7 @@ SELECT
 FROM
     Input
 WHERE
-    "String"::Contains("key", '7')
+    'String'::Contains('key', '7')
 ORDER BY
     key
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-escaping_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-escaping_/formatted.sql
index 2fcc35f7b5..e0f9db3bf8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-escaping_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-escaping_/formatted.sql
@@ -1,7 +1,7 @@
 --!ansi_lexer
 /* syntax version 1 */
 SELECT
-    1 AS "\",
-    2 AS "foo""bar",
-    3 AS """baz"
+    1 AS '\',
+    2 AS 'foo""bar',
+    3 AS '""baz'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-inplace_yql_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-inplace_yql_/formatted.sql
index 00bc5d81b3..9de8763c83 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-inplace_yql_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-inplace_yql_/formatted.sql
@@ -1,9 +1,9 @@
 --!ansi_lexer
 /* syntax version 1 */
 /* postgres can not */
-PRAGMA warning("disable", "4510");
+PRAGMA warning('disable', '4510');
 
-$foo = "YQL"::'(lambda ''(item) (Concat (String ''"foo\''") item))';
+$foo = 'YQL'::'(lambda ''(item) (Concat (String ''"foo\''") item))';
 
 SELECT
     $foo('bar')
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-join_using_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-join_using_/formatted.sql
index c0c61a5310..8428a38b0b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-join_using_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-join_using_/formatted.sql
@@ -8,4 +8,4 @@ FROM
     Input2 AS a
 JOIN
     Input3 AS b
-USING ("key");
+USING ('key');
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-order_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-order_by_/formatted.sql
index 8574f0b49a..1300944188 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-order_by_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-order_by_/formatted.sql
@@ -3,10 +3,10 @@
 USE plato;
 
 SELECT
-    "a".*
+    'a'.*
 FROM
-    Input AS "a"
+    Input AS 'a'
 ORDER BY
-    "key",
+    'key',
     `subkey`
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-struct_access_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-struct_access_/formatted.sql
index 1b86c41947..6d72c74797 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-struct_access_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-struct_access_/formatted.sql
@@ -1,8 +1,8 @@
 --!ansi_lexer
 /* syntax version 1 */
 /* postgres can not */
-$s = <|"a": 1, b: 2, `c`: 3|>;
+$s = <|'a': 1, b: 2, `c`: 3|>;
 
 SELECT
-    $s."b"
+    $s.'b'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-bitcast_date32_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-bitcast_date32_/formatted.sql
index 004252b003..21741b511d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-bitcast_date32_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-bitcast_date32_/formatted.sql
@@ -1,19 +1,19 @@
-PRAGMA warning("disable", "4510");
+PRAGMA warning('disable', '4510');
 
 SELECT
-    BITCAST(Yql::Date32(AsAtom("1")) AS Uint8),
+    BITCAST(Yql::Date32(AsAtom('1')) AS Uint8),
     4,
-    BITCAST(Yql::Date32(AsAtom("1")) AS Int8),
+    BITCAST(Yql::Date32(AsAtom('1')) AS Int8),
     5,
-    BITCAST(Yql::Date32(AsAtom("1")) AS Uint16),
+    BITCAST(Yql::Date32(AsAtom('1')) AS Uint16),
     6,
-    BITCAST(Yql::Date32(AsAtom("1")) AS Int16),
+    BITCAST(Yql::Date32(AsAtom('1')) AS Int16),
     7,
-    BITCAST(Yql::Date32(AsAtom("1")) AS Uint32),
+    BITCAST(Yql::Date32(AsAtom('1')) AS Uint32),
     8,
-    BITCAST(Yql::Date32(AsAtom("1")) AS Int32),
+    BITCAST(Yql::Date32(AsAtom('1')) AS Int32),
     9,
-    BITCAST(Yql::Date32(AsAtom("1")) AS Uint64),
+    BITCAST(Yql::Date32(AsAtom('1')) AS Uint64),
     10,
-    BITCAST(Yql::Date32(AsAtom("1")) AS Int64)
+    BITCAST(Yql::Date32(AsAtom('1')) AS Int64)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-bitcast_datetime64_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-bitcast_datetime64_/formatted.sql
index 76bc7b0e06..a3b44ae27e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-bitcast_datetime64_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-bitcast_datetime64_/formatted.sql
@@ -1,12 +1,12 @@
-PRAGMA warning("disable", "4510");
+PRAGMA warning('disable', '4510');
 
 SELECT
-    BITCAST(Yql::Datetime64(AsAtom("1")) AS Uint8),
-    BITCAST(Yql::Datetime64(AsAtom("1")) AS Int8),
-    BITCAST(Yql::Datetime64(AsAtom("1")) AS Uint16),
-    BITCAST(Yql::Datetime64(AsAtom("1")) AS Int16),
-    BITCAST(Yql::Datetime64(AsAtom("1")) AS Uint32),
-    BITCAST(Yql::Datetime64(AsAtom("1")) AS Int32),
-    BITCAST(Yql::Datetime64(AsAtom("1")) AS Uint64),
-    BITCAST(Yql::Datetime64(AsAtom("1")) AS Int64)
+    BITCAST(Yql::Datetime64(AsAtom('1')) AS Uint8),
+    BITCAST(Yql::Datetime64(AsAtom('1')) AS Int8),
+    BITCAST(Yql::Datetime64(AsAtom('1')) AS Uint16),
+    BITCAST(Yql::Datetime64(AsAtom('1')) AS Int16),
+    BITCAST(Yql::Datetime64(AsAtom('1')) AS Uint32),
+    BITCAST(Yql::Datetime64(AsAtom('1')) AS Int32),
+    BITCAST(Yql::Datetime64(AsAtom('1')) AS Uint64),
+    BITCAST(Yql::Datetime64(AsAtom('1')) AS Int64)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-bitcast_interval64_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-bitcast_interval64_/formatted.sql
index f1068d191d..7df2b964c7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-bitcast_interval64_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-bitcast_interval64_/formatted.sql
@@ -1,12 +1,12 @@
-PRAGMA warning("disable", "4510");
+PRAGMA warning('disable', '4510');
 
 SELECT
-    BITCAST(Yql::Interval64(AsAtom("1")) AS Uint8),
-    BITCAST(Yql::Interval64(AsAtom("1")) AS Int8),
-    BITCAST(Yql::Interval64(AsAtom("1")) AS Uint16),
-    BITCAST(Yql::Interval64(AsAtom("1")) AS Int16),
-    BITCAST(Yql::Interval64(AsAtom("1")) AS Uint32),
-    BITCAST(Yql::Interval64(AsAtom("1")) AS Int32),
-    BITCAST(Yql::Interval64(AsAtom("1")) AS Uint64),
-    BITCAST(Yql::Interval64(AsAtom("1")) AS Int64)
+    BITCAST(Yql::Interval64(AsAtom('1')) AS Uint8),
+    BITCAST(Yql::Interval64(AsAtom('1')) AS Int8),
+    BITCAST(Yql::Interval64(AsAtom('1')) AS Uint16),
+    BITCAST(Yql::Interval64(AsAtom('1')) AS Int16),
+    BITCAST(Yql::Interval64(AsAtom('1')) AS Uint32),
+    BITCAST(Yql::Interval64(AsAtom('1')) AS Int32),
+    BITCAST(Yql::Interval64(AsAtom('1')) AS Uint64),
+    BITCAST(Yql::Interval64(AsAtom('1')) AS Int64)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-bitcast_timestamp64_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-bitcast_timestamp64_/formatted.sql
index d61b001199..74eb47a927 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-bitcast_timestamp64_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-bitcast_timestamp64_/formatted.sql
@@ -1,12 +1,12 @@
-PRAGMA warning("disable", "4510");
+PRAGMA warning('disable', '4510');
 
 SELECT
-    BITCAST(Yql::Timestamp64(AsAtom("1")) AS Uint8),
-    BITCAST(Yql::Timestamp64(AsAtom("1")) AS Int8),
-    BITCAST(Yql::Timestamp64(AsAtom("1")) AS Uint16),
-    BITCAST(Yql::Timestamp64(AsAtom("1")) AS Int16),
-    BITCAST(Yql::Timestamp64(AsAtom("1")) AS Uint32),
-    BITCAST(Yql::Timestamp64(AsAtom("1")) AS Int32),
-    BITCAST(Yql::Timestamp64(AsAtom("1")) AS Uint64),
-    BITCAST(Yql::Timestamp64(AsAtom("1")) AS Int64)
+    BITCAST(Yql::Timestamp64(AsAtom('1')) AS Uint8),
+    BITCAST(Yql::Timestamp64(AsAtom('1')) AS Int8),
+    BITCAST(Yql::Timestamp64(AsAtom('1')) AS Uint16),
+    BITCAST(Yql::Timestamp64(AsAtom('1')) AS Int16),
+    BITCAST(Yql::Timestamp64(AsAtom('1')) AS Uint32),
+    BITCAST(Yql::Timestamp64(AsAtom('1')) AS Int32),
+    BITCAST(Yql::Timestamp64(AsAtom('1')) AS Uint64),
+    BITCAST(Yql::Timestamp64(AsAtom('1')) AS Int64)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-compare_big_big_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-compare_big_big_/formatted.sql
index 43bb21bfa4..de29c7074d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-compare_big_big_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-compare_big_big_/formatted.sql
@@ -1,52 +1,52 @@
-PRAGMA warning("disable", "4510");
+PRAGMA warning('disable', '4510');
 
 SELECT
     3,
-    Yql::Date32(AsAtom("0")) == Yql::Date32(AsAtom("1")),
+    Yql::Date32(AsAtom('0')) == Yql::Date32(AsAtom('1')),
     4,
-    Yql::Datetime64(AsAtom("0")) == Yql::Datetime64(AsAtom("1")),
+    Yql::Datetime64(AsAtom('0')) == Yql::Datetime64(AsAtom('1')),
     5,
-    Yql::Timestamp64(AsAtom("0")) == Yql::Timestamp64(AsAtom("1")),
+    Yql::Timestamp64(AsAtom('0')) == Yql::Timestamp64(AsAtom('1')),
     6,
-    Yql::Interval64(AsAtom("0")) == Yql::Interval64(AsAtom("1")),
+    Yql::Interval64(AsAtom('0')) == Yql::Interval64(AsAtom('1')),
     7,
-    Yql::Date32(AsAtom("0")) < Yql::Date32(AsAtom("1")),
+    Yql::Date32(AsAtom('0')) < Yql::Date32(AsAtom('1')),
     8,
-    Yql::Datetime64(AsAtom("0")) < Yql::Datetime64(AsAtom("1")),
+    Yql::Datetime64(AsAtom('0')) < Yql::Datetime64(AsAtom('1')),
     9,
-    Yql::Timestamp64(AsAtom("0")) < Yql::Timestamp64(AsAtom("1")),
+    Yql::Timestamp64(AsAtom('0')) < Yql::Timestamp64(AsAtom('1')),
     10,
-    Yql::Interval64(AsAtom("0")) < Yql::Interval64(AsAtom("1")),
+    Yql::Interval64(AsAtom('0')) < Yql::Interval64(AsAtom('1')),
     11,
-    Yql::Date32(AsAtom("0")) > Yql::Date32(AsAtom("1")),
+    Yql::Date32(AsAtom('0')) > Yql::Date32(AsAtom('1')),
     12,
-    Yql::Datetime64(AsAtom("0")) > Yql::Datetime64(AsAtom("1")),
+    Yql::Datetime64(AsAtom('0')) > Yql::Datetime64(AsAtom('1')),
     13,
-    Yql::Timestamp64(AsAtom("0")) > Yql::Timestamp64(AsAtom("1")),
+    Yql::Timestamp64(AsAtom('0')) > Yql::Timestamp64(AsAtom('1')),
     14,
-    Yql::Interval64(AsAtom("0")) > Yql::Interval64(AsAtom("1")),
+    Yql::Interval64(AsAtom('0')) > Yql::Interval64(AsAtom('1')),
     15,
-    Yql::Date32(AsAtom("0")) != Yql::Date32(AsAtom("1")),
+    Yql::Date32(AsAtom('0')) != Yql::Date32(AsAtom('1')),
     16,
-    Yql::Datetime64(AsAtom("0")) != Yql::Datetime64(AsAtom("1")),
+    Yql::Datetime64(AsAtom('0')) != Yql::Datetime64(AsAtom('1')),
     17,
-    Yql::Timestamp64(AsAtom("0")) != Yql::Timestamp64(AsAtom("1")),
+    Yql::Timestamp64(AsAtom('0')) != Yql::Timestamp64(AsAtom('1')),
     18,
-    Yql::Interval64(AsAtom("0")) != Yql::Interval64(AsAtom("1")),
+    Yql::Interval64(AsAtom('0')) != Yql::Interval64(AsAtom('1')),
     19,
-    Yql::Date32(AsAtom("0")) <= Yql::Date32(AsAtom("1")),
+    Yql::Date32(AsAtom('0')) <= Yql::Date32(AsAtom('1')),
     20,
-    Yql::Datetime64(AsAtom("0")) <= Yql::Datetime64(AsAtom("1")),
+    Yql::Datetime64(AsAtom('0')) <= Yql::Datetime64(AsAtom('1')),
     21,
-    Yql::Timestamp64(AsAtom("0")) <= Yql::Timestamp64(AsAtom("1")),
+    Yql::Timestamp64(AsAtom('0')) <= Yql::Timestamp64(AsAtom('1')),
     22,
-    Yql::Interval64(AsAtom("0")) <= Yql::Interval64(AsAtom("1")),
+    Yql::Interval64(AsAtom('0')) <= Yql::Interval64(AsAtom('1')),
     23,
-    Yql::Date32(AsAtom("0")) >= Yql::Date32(AsAtom("1")),
+    Yql::Date32(AsAtom('0')) >= Yql::Date32(AsAtom('1')),
     24,
-    Yql::Datetime64(AsAtom("0")) >= Yql::Datetime64(AsAtom("1")),
+    Yql::Datetime64(AsAtom('0')) >= Yql::Datetime64(AsAtom('1')),
     25,
-    Yql::Timestamp64(AsAtom("0")) >= Yql::Timestamp64(AsAtom("1")),
+    Yql::Timestamp64(AsAtom('0')) >= Yql::Timestamp64(AsAtom('1')),
     26,
-    Yql::Interval64(AsAtom("0")) >= Yql::Interval64(AsAtom("1")),
+    Yql::Interval64(AsAtom('0')) >= Yql::Interval64(AsAtom('1')),
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-compare_big_small_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-compare_big_small_/formatted.sql
index 505dd81c55..9d2d4b4bc1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-compare_big_small_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-compare_big_small_/formatted.sql
@@ -1,124 +1,124 @@
-PRAGMA warning("disable", "4510");
+PRAGMA warning('disable', '4510');
 
 SELECT
     3,
-    Yql::Date32(AsAtom("1")) == Yql::Date(AsAtom("1")),
+    Yql::Date32(AsAtom('1')) == Yql::Date(AsAtom('1')),
     4,
-    Yql::Datetime64(AsAtom("86400")) == Yql::Date(AsAtom("1")),
+    Yql::Datetime64(AsAtom('86400')) == Yql::Date(AsAtom('1')),
     5,
-    Yql::Timestamp64(AsAtom("86400000000")) == Yql::Date(AsAtom("1")),
+    Yql::Timestamp64(AsAtom('86400000000')) == Yql::Date(AsAtom('1')),
     7,
-    Yql::Date32(AsAtom("1")) == Yql::Datetime(AsAtom("86400")),
+    Yql::Date32(AsAtom('1')) == Yql::Datetime(AsAtom('86400')),
     8,
-    Yql::Datetime64(AsAtom("86400")) == Yql::Datetime(AsAtom("86400")),
+    Yql::Datetime64(AsAtom('86400')) == Yql::Datetime(AsAtom('86400')),
     9,
-    Yql::Timestamp64(AsAtom("86400000000")) == Yql::Datetime(AsAtom("86400")),
+    Yql::Timestamp64(AsAtom('86400000000')) == Yql::Datetime(AsAtom('86400')),
     11,
-    Yql::Date32(AsAtom("1")) == Yql::Timestamp(AsAtom("86400000000")),
+    Yql::Date32(AsAtom('1')) == Yql::Timestamp(AsAtom('86400000000')),
     12,
-    Yql::Datetime64(AsAtom("86400")) == Yql::Timestamp(AsAtom("86400000000")),
+    Yql::Datetime64(AsAtom('86400')) == Yql::Timestamp(AsAtom('86400000000')),
     13,
-    Yql::Timestamp64(AsAtom("86400000000")) == Yql::Timestamp(AsAtom("86400000000")),
+    Yql::Timestamp64(AsAtom('86400000000')) == Yql::Timestamp(AsAtom('86400000000')),
     15,
-    Yql::Interval64(AsAtom("1")) == Yql::Interval(AsAtom("1")),
+    Yql::Interval64(AsAtom('1')) == Yql::Interval(AsAtom('1')),
     17,
-    Yql::Date32(AsAtom("1")) < Yql::Date(AsAtom("1")),
+    Yql::Date32(AsAtom('1')) < Yql::Date(AsAtom('1')),
     18,
-    Yql::Datetime64(AsAtom("86400")) < Yql::Date(AsAtom("1")),
+    Yql::Datetime64(AsAtom('86400')) < Yql::Date(AsAtom('1')),
     19,
-    Yql::Timestamp64(AsAtom("86400000000")) < Yql::Date(AsAtom("1")),
+    Yql::Timestamp64(AsAtom('86400000000')) < Yql::Date(AsAtom('1')),
     21,
-    Yql::Date32(AsAtom("1")) < Yql::Datetime(AsAtom("86400")),
+    Yql::Date32(AsAtom('1')) < Yql::Datetime(AsAtom('86400')),
     22,
-    Yql::Datetime64(AsAtom("86400")) < Yql::Datetime(AsAtom("86400")),
+    Yql::Datetime64(AsAtom('86400')) < Yql::Datetime(AsAtom('86400')),
     23,
-    Yql::Timestamp64(AsAtom("86400000000")) < Yql::Datetime(AsAtom("86400")),
+    Yql::Timestamp64(AsAtom('86400000000')) < Yql::Datetime(AsAtom('86400')),
     25,
-    Yql::Date32(AsAtom("1")) < Yql::Timestamp(AsAtom("86400000000")),
+    Yql::Date32(AsAtom('1')) < Yql::Timestamp(AsAtom('86400000000')),
     26,
-    Yql::Datetime64(AsAtom("86400")) < Yql::Timestamp(AsAtom("86400000000")),
+    Yql::Datetime64(AsAtom('86400')) < Yql::Timestamp(AsAtom('86400000000')),
     27,
-    Yql::Timestamp64(AsAtom("86400000000")) < Yql::Timestamp(AsAtom("86400000000")),
+    Yql::Timestamp64(AsAtom('86400000000')) < Yql::Timestamp(AsAtom('86400000000')),
     29,
-    Yql::Interval64(AsAtom("1")) < Yql::Interval(AsAtom("1")),
+    Yql::Interval64(AsAtom('1')) < Yql::Interval(AsAtom('1')),
     31,
-    Yql::Date32(AsAtom("1")) <= Yql::Date(AsAtom("1")),
+    Yql::Date32(AsAtom('1')) <= Yql::Date(AsAtom('1')),
     32,
-    Yql::Datetime64(AsAtom("86400")) <= Yql::Date(AsAtom("1")),
+    Yql::Datetime64(AsAtom('86400')) <= Yql::Date(AsAtom('1')),
     33,
-    Yql::Timestamp64(AsAtom("86400000000")) <= Yql::Date(AsAtom("1")),
+    Yql::Timestamp64(AsAtom('86400000000')) <= Yql::Date(AsAtom('1')),
     35,
-    Yql::Date32(AsAtom("1")) <= Yql::Datetime(AsAtom("86400")),
+    Yql::Date32(AsAtom('1')) <= Yql::Datetime(AsAtom('86400')),
     36,
-    Yql::Datetime64(AsAtom("86400")) <= Yql::Datetime(AsAtom("86400")),
+    Yql::Datetime64(AsAtom('86400')) <= Yql::Datetime(AsAtom('86400')),
     37,
-    Yql::Timestamp64(AsAtom("86400000000")) <= Yql::Datetime(AsAtom("86400")),
+    Yql::Timestamp64(AsAtom('86400000000')) <= Yql::Datetime(AsAtom('86400')),
     39,
-    Yql::Date32(AsAtom("1")) <= Yql::Timestamp(AsAtom("86400000000")),
+    Yql::Date32(AsAtom('1')) <= Yql::Timestamp(AsAtom('86400000000')),
     40,
-    Yql::Datetime64(AsAtom("86400")) <= Yql::Timestamp(AsAtom("86400000000")),
+    Yql::Datetime64(AsAtom('86400')) <= Yql::Timestamp(AsAtom('86400000000')),
     41,
-    Yql::Timestamp64(AsAtom("86400000000")) <= Yql::Timestamp(AsAtom("86400000000")),
+    Yql::Timestamp64(AsAtom('86400000000')) <= Yql::Timestamp(AsAtom('86400000000')),
     43,
-    Yql::Interval64(AsAtom("1")) <= Yql::Interval(AsAtom("1")),
+    Yql::Interval64(AsAtom('1')) <= Yql::Interval(AsAtom('1')),
     45,
-    Yql::Date32(AsAtom("1")) > Yql::Date(AsAtom("1")),
+    Yql::Date32(AsAtom('1')) > Yql::Date(AsAtom('1')),
     46,
-    Yql::Datetime64(AsAtom("86400")) > Yql::Date(AsAtom("1")),
+    Yql::Datetime64(AsAtom('86400')) > Yql::Date(AsAtom('1')),
     47,
-    Yql::Timestamp64(AsAtom("86400000000")) > Yql::Date(AsAtom("1")),
+    Yql::Timestamp64(AsAtom('86400000000')) > Yql::Date(AsAtom('1')),
     49,
-    Yql::Date32(AsAtom("1")) > Yql::Datetime(AsAtom("86400")),
+    Yql::Date32(AsAtom('1')) > Yql::Datetime(AsAtom('86400')),
     50,
-    Yql::Datetime64(AsAtom("86400")) > Yql::Datetime(AsAtom("86400")),
+    Yql::Datetime64(AsAtom('86400')) > Yql::Datetime(AsAtom('86400')),
     51,
-    Yql::Timestamp64(AsAtom("86400000000")) > Yql::Datetime(AsAtom("86400")),
+    Yql::Timestamp64(AsAtom('86400000000')) > Yql::Datetime(AsAtom('86400')),
     53,
-    Yql::Date32(AsAtom("1")) > Yql::Timestamp(AsAtom("86400000000")),
+    Yql::Date32(AsAtom('1')) > Yql::Timestamp(AsAtom('86400000000')),
     54,
-    Yql::Datetime64(AsAtom("86400")) > Yql::Timestamp(AsAtom("86400000000")),
+    Yql::Datetime64(AsAtom('86400')) > Yql::Timestamp(AsAtom('86400000000')),
     55,
-    Yql::Timestamp64(AsAtom("86400000000")) > Yql::Timestamp(AsAtom("86400000000")),
+    Yql::Timestamp64(AsAtom('86400000000')) > Yql::Timestamp(AsAtom('86400000000')),
     57,
-    Yql::Interval64(AsAtom("1")) > Yql::Interval(AsAtom("1")),
+    Yql::Interval64(AsAtom('1')) > Yql::Interval(AsAtom('1')),
     59,
-    Yql::Date32(AsAtom("1")) >= Yql::Date(AsAtom("1")),
+    Yql::Date32(AsAtom('1')) >= Yql::Date(AsAtom('1')),
     60,
-    Yql::Datetime64(AsAtom("86400")) >= Yql::Date(AsAtom("1")),
+    Yql::Datetime64(AsAtom('86400')) >= Yql::Date(AsAtom('1')),
     61,
-    Yql::Timestamp64(AsAtom("86400000000")) >= Yql::Date(AsAtom("1")),
+    Yql::Timestamp64(AsAtom('86400000000')) >= Yql::Date(AsAtom('1')),
     63,
-    Yql::Date32(AsAtom("1")) >= Yql::Datetime(AsAtom("86400")),
+    Yql::Date32(AsAtom('1')) >= Yql::Datetime(AsAtom('86400')),
     64,
-    Yql::Datetime64(AsAtom("86400")) >= Yql::Datetime(AsAtom("86400")),
+    Yql::Datetime64(AsAtom('86400')) >= Yql::Datetime(AsAtom('86400')),
     65,
-    Yql::Timestamp64(AsAtom("86400000000")) >= Yql::Datetime(AsAtom("86400")),
+    Yql::Timestamp64(AsAtom('86400000000')) >= Yql::Datetime(AsAtom('86400')),
     67,
-    Yql::Date32(AsAtom("1")) >= Yql::Timestamp(AsAtom("86400000000")),
+    Yql::Date32(AsAtom('1')) >= Yql::Timestamp(AsAtom('86400000000')),
     68,
-    Yql::Datetime64(AsAtom("86400")) >= Yql::Timestamp(AsAtom("86400000000")),
+    Yql::Datetime64(AsAtom('86400')) >= Yql::Timestamp(AsAtom('86400000000')),
     69,
-    Yql::Timestamp64(AsAtom("86400000000")) >= Yql::Timestamp(AsAtom("86400000000")),
+    Yql::Timestamp64(AsAtom('86400000000')) >= Yql::Timestamp(AsAtom('86400000000')),
     71,
-    Yql::Interval64(AsAtom("1")) >= Yql::Interval(AsAtom("1")),
+    Yql::Interval64(AsAtom('1')) >= Yql::Interval(AsAtom('1')),
     73,
-    Yql::Date32(AsAtom("1")) != Yql::Date(AsAtom("1")),
+    Yql::Date32(AsAtom('1')) != Yql::Date(AsAtom('1')),
     74,
-    Yql::Datetime64(AsAtom("86400")) != Yql::Date(AsAtom("1")),
+    Yql::Datetime64(AsAtom('86400')) != Yql::Date(AsAtom('1')),
     75,
-    Yql::Timestamp64(AsAtom("86400000000")) != Yql::Date(AsAtom("1")),
+    Yql::Timestamp64(AsAtom('86400000000')) != Yql::Date(AsAtom('1')),
     77,
-    Yql::Date32(AsAtom("1")) != Yql::Datetime(AsAtom("86400")),
+    Yql::Date32(AsAtom('1')) != Yql::Datetime(AsAtom('86400')),
     78,
-    Yql::Datetime64(AsAtom("86400")) != Yql::Datetime(AsAtom("86400")),
+    Yql::Datetime64(AsAtom('86400')) != Yql::Datetime(AsAtom('86400')),
     79,
-    Yql::Timestamp64(AsAtom("86400000000")) != Yql::Datetime(AsAtom("86400")),
+    Yql::Timestamp64(AsAtom('86400000000')) != Yql::Datetime(AsAtom('86400')),
     81,
-    Yql::Date32(AsAtom("1")) != Yql::Timestamp(AsAtom("86400000000")),
+    Yql::Date32(AsAtom('1')) != Yql::Timestamp(AsAtom('86400000000')),
     82,
-    Yql::Datetime64(AsAtom("86400")) != Yql::Timestamp(AsAtom("86400000000")),
+    Yql::Datetime64(AsAtom('86400')) != Yql::Timestamp(AsAtom('86400000000')),
     83,
-    Yql::Timestamp64(AsAtom("86400000000")) != Yql::Timestamp(AsAtom("86400000000")),
+    Yql::Timestamp64(AsAtom('86400000000')) != Yql::Timestamp(AsAtom('86400000000')),
     85,
-    Yql::Interval64(AsAtom("1")) != Yql::Interval(AsAtom("1"))
+    Yql::Interval64(AsAtom('1')) != Yql::Interval(AsAtom('1'))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-compare_small_big_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-compare_small_big_/formatted.sql
index f3f5288aa8..f79acceaba 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-compare_small_big_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-compare_small_big_/formatted.sql
@@ -1,124 +1,124 @@
-PRAGMA warning("disable", "4510");
+PRAGMA warning('disable', '4510');
 
 SELECT
     3,
-    Yql::Date(AsAtom("1")) == Yql::Date32(AsAtom("1")),
+    Yql::Date(AsAtom('1')) == Yql::Date32(AsAtom('1')),
     4,
-    Yql::Date(AsAtom("1")) == Yql::Datetime64(AsAtom("86400")),
+    Yql::Date(AsAtom('1')) == Yql::Datetime64(AsAtom('86400')),
     5,
-    Yql::Date(AsAtom("1")) == Yql::Timestamp64(AsAtom("86400000000")),
+    Yql::Date(AsAtom('1')) == Yql::Timestamp64(AsAtom('86400000000')),
     7,
-    Yql::Datetime(AsAtom("86400")) == Yql::Date32(AsAtom("1")),
+    Yql::Datetime(AsAtom('86400')) == Yql::Date32(AsAtom('1')),
     8,
-    Yql::Datetime(AsAtom("86400")) == Yql::Datetime64(AsAtom("86400")),
+    Yql::Datetime(AsAtom('86400')) == Yql::Datetime64(AsAtom('86400')),
     9,
-    Yql::Datetime(AsAtom("86400")) == Yql::Timestamp64(AsAtom("86400000000")),
+    Yql::Datetime(AsAtom('86400')) == Yql::Timestamp64(AsAtom('86400000000')),
     11,
-    Yql::Timestamp(AsAtom("86400000000")) == Yql::Date32(AsAtom("1")),
+    Yql::Timestamp(AsAtom('86400000000')) == Yql::Date32(AsAtom('1')),
     12,
-    Yql::Timestamp(AsAtom("86400000000")) == Yql::Datetime64(AsAtom("86400")),
+    Yql::Timestamp(AsAtom('86400000000')) == Yql::Datetime64(AsAtom('86400')),
     13,
-    Yql::Timestamp(AsAtom("86400000000")) == Yql::Timestamp64(AsAtom("86400000000")),
+    Yql::Timestamp(AsAtom('86400000000')) == Yql::Timestamp64(AsAtom('86400000000')),
     15,
-    Yql::Interval(AsAtom("1")) == Yql::Interval64(AsAtom("1")),
+    Yql::Interval(AsAtom('1')) == Yql::Interval64(AsAtom('1')),
     17,
-    Yql::Date(AsAtom("1")) < Yql::Date32(AsAtom("1")),
+    Yql::Date(AsAtom('1')) < Yql::Date32(AsAtom('1')),
     18,
-    Yql::Date(AsAtom("1")) < Yql::Datetime64(AsAtom("86400")),
+    Yql::Date(AsAtom('1')) < Yql::Datetime64(AsAtom('86400')),
     19,
-    Yql::Date(AsAtom("1")) < Yql::Timestamp64(AsAtom("86400000000")),
+    Yql::Date(AsAtom('1')) < Yql::Timestamp64(AsAtom('86400000000')),
     21,
-    Yql::Datetime(AsAtom("86400")) < Yql::Date32(AsAtom("1")),
+    Yql::Datetime(AsAtom('86400')) < Yql::Date32(AsAtom('1')),
     22,
-    Yql::Datetime(AsAtom("86400")) < Yql::Datetime64(AsAtom("86400")),
+    Yql::Datetime(AsAtom('86400')) < Yql::Datetime64(AsAtom('86400')),
     23,
-    Yql::Datetime(AsAtom("86400")) < Yql::Timestamp64(AsAtom("86400000000")),
+    Yql::Datetime(AsAtom('86400')) < Yql::Timestamp64(AsAtom('86400000000')),
     25,
-    Yql::Timestamp(AsAtom("86400000000")) < Yql::Date32(AsAtom("1")),
+    Yql::Timestamp(AsAtom('86400000000')) < Yql::Date32(AsAtom('1')),
     26,
-    Yql::Timestamp(AsAtom("86400000000")) < Yql::Datetime64(AsAtom("86400")),
+    Yql::Timestamp(AsAtom('86400000000')) < Yql::Datetime64(AsAtom('86400')),
     27,
-    Yql::Timestamp(AsAtom("86400000000")) < Yql::Timestamp64(AsAtom("86400000000")),
+    Yql::Timestamp(AsAtom('86400000000')) < Yql::Timestamp64(AsAtom('86400000000')),
     29,
-    Yql::Interval(AsAtom("1")) < Yql::Interval64(AsAtom("1")),
+    Yql::Interval(AsAtom('1')) < Yql::Interval64(AsAtom('1')),
     31,
-    Yql::Date(AsAtom("1")) <= Yql::Date32(AsAtom("1")),
+    Yql::Date(AsAtom('1')) <= Yql::Date32(AsAtom('1')),
     32,
-    Yql::Date(AsAtom("1")) <= Yql::Datetime64(AsAtom("86400")),
+    Yql::Date(AsAtom('1')) <= Yql::Datetime64(AsAtom('86400')),
     33,
-    Yql::Date(AsAtom("1")) <= Yql::Timestamp64(AsAtom("86400000000")),
+    Yql::Date(AsAtom('1')) <= Yql::Timestamp64(AsAtom('86400000000')),
     35,
-    Yql::Datetime(AsAtom("86400")) <= Yql::Date32(AsAtom("1")),
+    Yql::Datetime(AsAtom('86400')) <= Yql::Date32(AsAtom('1')),
     36,
-    Yql::Datetime(AsAtom("86400")) <= Yql::Datetime64(AsAtom("86400")),
+    Yql::Datetime(AsAtom('86400')) <= Yql::Datetime64(AsAtom('86400')),
     37,
-    Yql::Datetime(AsAtom("86400")) <= Yql::Timestamp64(AsAtom("86400000000")),
+    Yql::Datetime(AsAtom('86400')) <= Yql::Timestamp64(AsAtom('86400000000')),
     39,
-    Yql::Timestamp(AsAtom("86400000000")) <= Yql::Date32(AsAtom("1")),
+    Yql::Timestamp(AsAtom('86400000000')) <= Yql::Date32(AsAtom('1')),
     40,
-    Yql::Timestamp(AsAtom("86400000000")) <= Yql::Datetime64(AsAtom("86400")),
+    Yql::Timestamp(AsAtom('86400000000')) <= Yql::Datetime64(AsAtom('86400')),
     41,
-    Yql::Timestamp(AsAtom("86400000000")) <= Yql::Timestamp64(AsAtom("86400000000")),
+    Yql::Timestamp(AsAtom('86400000000')) <= Yql::Timestamp64(AsAtom('86400000000')),
     43,
-    Yql::Interval(AsAtom("1")) <= Yql::Interval64(AsAtom("1")),
+    Yql::Interval(AsAtom('1')) <= Yql::Interval64(AsAtom('1')),
     45,
-    Yql::Date(AsAtom("1")) > Yql::Date32(AsAtom("1")),
+    Yql::Date(AsAtom('1')) > Yql::Date32(AsAtom('1')),
     46,
-    Yql::Date(AsAtom("1")) > Yql::Datetime64(AsAtom("86400")),
+    Yql::Date(AsAtom('1')) > Yql::Datetime64(AsAtom('86400')),
     47,
-    Yql::Date(AsAtom("1")) > Yql::Timestamp64(AsAtom("86400000000")),
+    Yql::Date(AsAtom('1')) > Yql::Timestamp64(AsAtom('86400000000')),
     49,
-    Yql::Datetime(AsAtom("86400")) > Yql::Date32(AsAtom("1")),
+    Yql::Datetime(AsAtom('86400')) > Yql::Date32(AsAtom('1')),
     50,
-    Yql::Datetime(AsAtom("86400")) > Yql::Datetime64(AsAtom("86400")),
+    Yql::Datetime(AsAtom('86400')) > Yql::Datetime64(AsAtom('86400')),
     51,
-    Yql::Datetime(AsAtom("86400")) > Yql::Timestamp64(AsAtom("86400000000")),
+    Yql::Datetime(AsAtom('86400')) > Yql::Timestamp64(AsAtom('86400000000')),
     53,
-    Yql::Timestamp(AsAtom("86400000000")) > Yql::Date32(AsAtom("1")),
+    Yql::Timestamp(AsAtom('86400000000')) > Yql::Date32(AsAtom('1')),
     54,
-    Yql::Timestamp(AsAtom("86400000000")) > Yql::Datetime64(AsAtom("86400")),
+    Yql::Timestamp(AsAtom('86400000000')) > Yql::Datetime64(AsAtom('86400')),
     55,
-    Yql::Timestamp(AsAtom("86400000000")) > Yql::Timestamp64(AsAtom("86400000000")),
+    Yql::Timestamp(AsAtom('86400000000')) > Yql::Timestamp64(AsAtom('86400000000')),
     57,
-    Yql::Interval(AsAtom("1")) > Yql::Interval64(AsAtom("1")),
+    Yql::Interval(AsAtom('1')) > Yql::Interval64(AsAtom('1')),
     59,
-    Yql::Date(AsAtom("1")) >= Yql::Date32(AsAtom("1")),
+    Yql::Date(AsAtom('1')) >= Yql::Date32(AsAtom('1')),
     60,
-    Yql::Date(AsAtom("1")) >= Yql::Datetime64(AsAtom("86400")),
+    Yql::Date(AsAtom('1')) >= Yql::Datetime64(AsAtom('86400')),
     61,
-    Yql::Date(AsAtom("1")) >= Yql::Timestamp64(AsAtom("86400000000")),
+    Yql::Date(AsAtom('1')) >= Yql::Timestamp64(AsAtom('86400000000')),
     63,
-    Yql::Datetime(AsAtom("86400")) >= Yql::Date32(AsAtom("1")),
+    Yql::Datetime(AsAtom('86400')) >= Yql::Date32(AsAtom('1')),
     64,
-    Yql::Datetime(AsAtom("86400")) >= Yql::Datetime64(AsAtom("86400")),
+    Yql::Datetime(AsAtom('86400')) >= Yql::Datetime64(AsAtom('86400')),
     65,
-    Yql::Datetime(AsAtom("86400")) >= Yql::Timestamp64(AsAtom("86400000000")),
+    Yql::Datetime(AsAtom('86400')) >= Yql::Timestamp64(AsAtom('86400000000')),
     67,
-    Yql::Timestamp(AsAtom("86400000000")) >= Yql::Date32(AsAtom("1")),
+    Yql::Timestamp(AsAtom('86400000000')) >= Yql::Date32(AsAtom('1')),
     68,
-    Yql::Timestamp(AsAtom("86400000000")) >= Yql::Datetime64(AsAtom("86400")),
+    Yql::Timestamp(AsAtom('86400000000')) >= Yql::Datetime64(AsAtom('86400')),
     69,
-    Yql::Timestamp(AsAtom("86400000000")) >= Yql::Timestamp64(AsAtom("86400000000")),
+    Yql::Timestamp(AsAtom('86400000000')) >= Yql::Timestamp64(AsAtom('86400000000')),
     71,
-    Yql::Interval(AsAtom("1")) >= Yql::Interval64(AsAtom("1")),
+    Yql::Interval(AsAtom('1')) >= Yql::Interval64(AsAtom('1')),
     73,
-    Yql::Date(AsAtom("1")) != Yql::Date32(AsAtom("1")),
+    Yql::Date(AsAtom('1')) != Yql::Date32(AsAtom('1')),
     74,
-    Yql::Date(AsAtom("1")) != Yql::Datetime64(AsAtom("86400")),
+    Yql::Date(AsAtom('1')) != Yql::Datetime64(AsAtom('86400')),
     75,
-    Yql::Date(AsAtom("1")) != Yql::Timestamp64(AsAtom("86400000000")),
+    Yql::Date(AsAtom('1')) != Yql::Timestamp64(AsAtom('86400000000')),
     77,
-    Yql::Datetime(AsAtom("86400")) != Yql::Date32(AsAtom("1")),
+    Yql::Datetime(AsAtom('86400')) != Yql::Date32(AsAtom('1')),
     78,
-    Yql::Datetime(AsAtom("86400")) != Yql::Datetime64(AsAtom("86400")),
+    Yql::Datetime(AsAtom('86400')) != Yql::Datetime64(AsAtom('86400')),
     79,
-    Yql::Datetime(AsAtom("86400")) != Yql::Timestamp64(AsAtom("86400000000")),
+    Yql::Datetime(AsAtom('86400')) != Yql::Timestamp64(AsAtom('86400000000')),
     81,
-    Yql::Timestamp(AsAtom("86400000000")) != Yql::Date32(AsAtom("1")),
+    Yql::Timestamp(AsAtom('86400000000')) != Yql::Date32(AsAtom('1')),
     82,
-    Yql::Timestamp(AsAtom("86400000000")) != Yql::Datetime64(AsAtom("86400")),
+    Yql::Timestamp(AsAtom('86400000000')) != Yql::Datetime64(AsAtom('86400')),
     83,
-    Yql::Timestamp(AsAtom("86400000000")) != Yql::Timestamp64(AsAtom("86400000000")),
+    Yql::Timestamp(AsAtom('86400000000')) != Yql::Timestamp64(AsAtom('86400000000')),
     85,
-    Yql::Interval(AsAtom("1")) != Yql::Interval64(AsAtom("1"))
+    Yql::Interval(AsAtom('1')) != Yql::Interval64(AsAtom('1'))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-const_date32_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-const_date32_/formatted.sql
index 5fcf34439e..98e5f5d1a7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-const_date32_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-const_date32_/formatted.sql
@@ -1,59 +1,59 @@
 SELECT
     1,
-    date32("-144169-01-01"),
-    CAST(date32("-144169-01-01") AS string)
+    date32('-144169-01-01'),
+    CAST(date32('-144169-01-01') AS string)
 ;
 
 SELECT
     2,
-    date32("-1-1-1"),
-    CAST(date32("-1-1-1") AS string)
+    date32('-1-1-1'),
+    CAST(date32('-1-1-1') AS string)
 ;
 
 SELECT
     3,
-    date32("1-1-1"),
-    CAST(date32("1-1-1") AS string)
+    date32('1-1-1'),
+    CAST(date32('1-1-1') AS string)
 ;
 
 SELECT
     4,
-    date32("1969-12-31"),
-    CAST(date32("1969-12-31") AS string)
+    date32('1969-12-31'),
+    CAST(date32('1969-12-31') AS string)
 ;
 
 SELECT
     5,
-    date32("1970-01-01"),
-    CAST(date32("1970-01-01") AS string)
+    date32('1970-01-01'),
+    CAST(date32('1970-01-01') AS string)
 ;
 
 SELECT
     6,
-    date32("2000-04-05"),
-    CAST(date32("2000-04-05") AS string)
+    date32('2000-04-05'),
+    CAST(date32('2000-04-05') AS string)
 ;
 
 SELECT
     7,
-    date32("2100-03-01"),
-    CAST(date32("2100-03-01") AS string)
+    date32('2100-03-01'),
+    CAST(date32('2100-03-01') AS string)
 ;
 
 SELECT
     8,
-    date32("2105-12-31"),
-    CAST(date32("2105-12-31") AS string)
+    date32('2105-12-31'),
+    CAST(date32('2105-12-31') AS string)
 ;
 
 SELECT
     9,
-    date32("2106-01-01"),
-    CAST(date32("2106-01-01") AS string)
+    date32('2106-01-01'),
+    CAST(date32('2106-01-01') AS string)
 ;
 
 SELECT
     10,
-    date32("148107-12-31"),
-    CAST(date32("148107-12-31") AS string)
+    date32('148107-12-31'),
+    CAST(date32('148107-12-31') AS string)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-const_datetime64_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-const_datetime64_/formatted.sql
index 2e4c48a39d..611bd49703 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-const_datetime64_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-const_datetime64_/formatted.sql
@@ -1,74 +1,74 @@
 SELECT
-    datetime64("-144169-01-01T00:00:00-0:1"),
-    CAST(datetime64("-144169-01-01T00:00:00-0:1") AS string)
+    datetime64('-144169-01-01T00:00:00-0:1'),
+    CAST(datetime64('-144169-01-01T00:00:00-0:1') AS string)
 ;
 
 SELECT
-    datetime64("-144169-01-01T00:00:00Z"),
-    CAST(datetime64("-144169-01-01T00:00:00Z") AS string)
+    datetime64('-144169-01-01T00:00:00Z'),
+    CAST(datetime64('-144169-01-01T00:00:00Z') AS string)
 ;
 
 SELECT
-    datetime64("-1-1-1T00:00:00Z"),
-    CAST(datetime64("-1-1-1T00:00:00Z") AS string)
+    datetime64('-1-1-1T00:00:00Z'),
+    CAST(datetime64('-1-1-1T00:00:00Z') AS string)
 ;
 
 SELECT
-    datetime64("1-1-1T00:00:00Z"),
-    CAST(datetime64("1-1-1T00:00:00Z") AS string)
+    datetime64('1-1-1T00:00:00Z'),
+    CAST(datetime64('1-1-1T00:00:00Z') AS string)
 ;
 
 SELECT
-    datetime64("1969-12-31T23:59:59Z"),
-    CAST(datetime64("1969-12-31T23:59:59Z") AS string)
+    datetime64('1969-12-31T23:59:59Z'),
+    CAST(datetime64('1969-12-31T23:59:59Z') AS string)
 ;
 
 SELECT
-    datetime64("1969-12-31T23:59:59-0:1"),
-    CAST(datetime64("1969-12-31T23:59:59-0:1") AS string)
+    datetime64('1969-12-31T23:59:59-0:1'),
+    CAST(datetime64('1969-12-31T23:59:59-0:1') AS string)
 ;
 
 SELECT
-    datetime64("1970-01-01T00:00:00Z"),
-    CAST(datetime64("1970-01-01T00:00:00Z") AS string)
+    datetime64('1970-01-01T00:00:00Z'),
+    CAST(datetime64('1970-01-01T00:00:00Z') AS string)
 ;
 
 SELECT
-    datetime64("1970-1-1T0:0:1Z"),
-    CAST(datetime64("1970-1-1T0:0:1Z") AS string)
+    datetime64('1970-1-1T0:0:1Z'),
+    CAST(datetime64('1970-1-1T0:0:1Z') AS string)
 ;
 
 SELECT
-    datetime64("1970-01-01T00:00:00+0:1"),
-    CAST(datetime64("1970-01-01T00:00:00+0:1") AS string)
+    datetime64('1970-01-01T00:00:00+0:1'),
+    CAST(datetime64('1970-01-01T00:00:00+0:1') AS string)
 ;
 
 SELECT
-    datetime64("2000-04-05T00:00:00Z"),
-    CAST(datetime64("2000-04-05T00:00:00Z") AS string)
+    datetime64('2000-04-05T00:00:00Z'),
+    CAST(datetime64('2000-04-05T00:00:00Z') AS string)
 ;
 
 SELECT
-    datetime64("2100-03-01T00:00:00Z"),
-    CAST(datetime64("2100-03-01T00:00:00Z") AS string)
+    datetime64('2100-03-01T00:00:00Z'),
+    CAST(datetime64('2100-03-01T00:00:00Z') AS string)
 ;
 
 SELECT
-    datetime64("2105-12-31T00:00:00Z"),
-    CAST(datetime64("2105-12-31T00:00:00Z") AS string)
+    datetime64('2105-12-31T00:00:00Z'),
+    CAST(datetime64('2105-12-31T00:00:00Z') AS string)
 ;
 
 SELECT
-    datetime64("2106-01-01T00:00:00Z"),
-    CAST(datetime64("2106-01-01T00:00:00Z") AS string)
+    datetime64('2106-01-01T00:00:00Z'),
+    CAST(datetime64('2106-01-01T00:00:00Z') AS string)
 ;
 
 SELECT
-    datetime64("148107-12-31T23:59:59Z"),
-    CAST(datetime64("148107-12-31T23:59:59Z") AS string)
+    datetime64('148107-12-31T23:59:59Z'),
+    CAST(datetime64('148107-12-31T23:59:59Z') AS string)
 ;
 
 SELECT
-    datetime64("148107-12-31T23:59:59+0:1"),
-    CAST(datetime64("148107-12-31T23:59:59+0:1") AS string)
+    datetime64('148107-12-31T23:59:59+0:1'),
+    CAST(datetime64('148107-12-31T23:59:59+0:1') AS string)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-const_interval64_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-const_interval64_/formatted.sql
index 58b7928b5c..c7eb1b001a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-const_interval64_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-const_interval64_/formatted.sql
@@ -1,139 +1,139 @@
 SELECT
-    interval64("-P106751616DT23H59M59.999999S"),
-    CAST(interval64("-P106751616DT23H59M59.999999S") AS string)
+    interval64('-P106751616DT23H59M59.999999S'),
+    CAST(interval64('-P106751616DT23H59M59.999999S') AS string)
 ;
 
 SELECT
-    interval64("P106751616DT23H59M59.999999S"),
-    CAST(interval64("P106751616DT23H59M59.999999S") AS string)
+    interval64('P106751616DT23H59M59.999999S'),
+    CAST(interval64('P106751616DT23H59M59.999999S') AS string)
 ;
 
 SELECT
-    interval64("P106709244DT999999H999999M999999.999999S"),
-    CAST(interval64("P106709244DT999999H999999M999999.999999S") AS string)
+    interval64('P106709244DT999999H999999M999999.999999S'),
+    CAST(interval64('P106709244DT999999H999999M999999.999999S') AS string)
 ;
 
 SELECT
-    interval64("P000000000DT00H00M00.000000S"),
-    CAST(interval64("P000000000DT00H00M00.000000S") AS string)
+    interval64('P000000000DT00H00M00.000000S'),
+    CAST(interval64('P000000000DT00H00M00.000000S') AS string)
 ;
 
 SELECT
-    interval64("PT0S"),
-    CAST(interval64("PT0S") AS string)
+    interval64('PT0S'),
+    CAST(interval64('PT0S') AS string)
 ;
 
 SELECT
-    interval64("-PT0S"),
-    CAST(interval64("-PT0S") AS string)
+    interval64('-PT0S'),
+    CAST(interval64('-PT0S') AS string)
 ;
 
 SELECT
-    interval64("PT0.000001S"),
-    CAST(interval64("PT0.000001S") AS string)
+    interval64('PT0.000001S'),
+    CAST(interval64('PT0.000001S') AS string)
 ;
 
 SELECT
-    interval64("-PT0.000001S"),
-    CAST(interval64("-PT0.000001S") AS string)
+    interval64('-PT0.000001S'),
+    CAST(interval64('-PT0.000001S') AS string)
 ;
 
 SELECT
-    interval64("PT0S"),
-    CAST(interval64("PT0S") AS string)
+    interval64('PT0S'),
+    CAST(interval64('PT0S') AS string)
 ;
 
 SELECT
-    interval64("PT0M"),
-    CAST(interval64("PT0M") AS string)
+    interval64('PT0M'),
+    CAST(interval64('PT0M') AS string)
 ;
 
 SELECT
-    interval64("PT0H"),
-    CAST(interval64("PT0H") AS string)
+    interval64('PT0H'),
+    CAST(interval64('PT0H') AS string)
 ;
 
 SELECT
-    interval64("P0D"),
-    CAST(interval64("P0D") AS string)
+    interval64('P0D'),
+    CAST(interval64('P0D') AS string)
 ;
 
 SELECT
-    interval64("P0W"),
-    CAST(interval64("P0W") AS string)
+    interval64('P0W'),
+    CAST(interval64('P0W') AS string)
 ;
 
 SELECT
-    interval64("PT999999S"),
-    CAST(interval64("PT999999S") AS string)
+    interval64('PT999999S'),
+    CAST(interval64('PT999999S') AS string)
 ;
 
 SELECT
-    interval64("PT999999M"),
-    CAST(interval64("PT999999M") AS string)
+    interval64('PT999999M'),
+    CAST(interval64('PT999999M') AS string)
 ;
 
 SELECT
-    interval64("PT999999H"),
-    CAST(interval64("PT999999H") AS string)
+    interval64('PT999999H'),
+    CAST(interval64('PT999999H') AS string)
 ;
 
 SELECT
-    interval64("P106751616D"),
-    CAST(interval64("P106751616D") AS string)
+    interval64('P106751616D'),
+    CAST(interval64('P106751616D') AS string)
 ;
 
 SELECT
-    interval64("P15250230W"),
-    CAST(interval64("P15250230W") AS string)
+    interval64('P15250230W'),
+    CAST(interval64('P15250230W') AS string)
 ;
 
 SELECT
-    interval64("PT1S"),
-    CAST(interval64("PT1S") AS string)
+    interval64('PT1S'),
+    CAST(interval64('PT1S') AS string)
 ;
 
 SELECT
-    interval64("PT1M"),
-    CAST(interval64("PT1M") AS string)
+    interval64('PT1M'),
+    CAST(interval64('PT1M') AS string)
 ;
 
 SELECT
-    interval64("PT1H"),
-    CAST(interval64("PT1H") AS string)
+    interval64('PT1H'),
+    CAST(interval64('PT1H') AS string)
 ;
 
 SELECT
-    interval64("P1D"),
-    CAST(interval64("P1D") AS string)
+    interval64('P1D'),
+    CAST(interval64('P1D') AS string)
 ;
 
 SELECT
-    interval64("P1W"),
-    CAST(interval64("P1W") AS string)
+    interval64('P1W'),
+    CAST(interval64('P1W') AS string)
 ;
 
 SELECT
-    interval64("-PT1S"),
-    CAST(interval64("-PT1S") AS string)
+    interval64('-PT1S'),
+    CAST(interval64('-PT1S') AS string)
 ;
 
 SELECT
-    interval64("-PT1M"),
-    CAST(interval64("-PT1M") AS string)
+    interval64('-PT1M'),
+    CAST(interval64('-PT1M') AS string)
 ;
 
 SELECT
-    interval64("-PT1H"),
-    CAST(interval64("-PT1H") AS string)
+    interval64('-PT1H'),
+    CAST(interval64('-PT1H') AS string)
 ;
 
 SELECT
-    interval64("-P1D"),
-    CAST(interval64("-P1D") AS string)
+    interval64('-P1D'),
+    CAST(interval64('-P1D') AS string)
 ;
 
 SELECT
-    interval64("-P1W"),
-    CAST(interval64("-P1W") AS string)
+    interval64('-P1W'),
+    CAST(interval64('-P1W') AS string)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-const_timestamp64_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-const_timestamp64_/formatted.sql
index c235fbc978..7ec4385034 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-const_timestamp64_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-const_timestamp64_/formatted.sql
@@ -2,119 +2,119 @@
 -- with microseconds
 --
 SELECT
-    timestamp64("-144169-01-01T00:00:00.000000-0:1"),
-    CAST(timestamp64("-144169-01-01T00:00:00.000000-0:1") AS string)
+    timestamp64('-144169-01-01T00:00:00.000000-0:1'),
+    CAST(timestamp64('-144169-01-01T00:00:00.000000-0:1') AS string)
 ;
 
 SELECT
-    timestamp64("-144169-01-01T00:00:00.000000Z"),
-    CAST(timestamp64("-144169-01-01T00:00:00.000000Z") AS string)
+    timestamp64('-144169-01-01T00:00:00.000000Z'),
+    CAST(timestamp64('-144169-01-01T00:00:00.000000Z') AS string)
 ;
 
 SELECT
-    timestamp64("1969-12-31T23:59:59.999999Z"),
-    CAST(timestamp64("1969-12-31T23:59:59.999999Z") AS string)
+    timestamp64('1969-12-31T23:59:59.999999Z'),
+    CAST(timestamp64('1969-12-31T23:59:59.999999Z') AS string)
 ;
 
 SELECT
-    timestamp64("1969-12-31T23:59:59.999999-0:1"),
-    CAST(timestamp64("1969-12-31T23:59:59.999999-0:1") AS string)
+    timestamp64('1969-12-31T23:59:59.999999-0:1'),
+    CAST(timestamp64('1969-12-31T23:59:59.999999-0:1') AS string)
 ;
 
 SELECT
-    timestamp64("1970-1-1T0:0:0.0Z"),
-    CAST(timestamp64("1970-1-1T0:0:0.0Z") AS string)
+    timestamp64('1970-1-1T0:0:0.0Z'),
+    CAST(timestamp64('1970-1-1T0:0:0.0Z') AS string)
 ;
 
 SELECT
-    timestamp64("1970-01-01T00:00:00.000001Z"),
-    CAST(timestamp64("1970-01-01T00:00:00.000001Z") AS string)
+    timestamp64('1970-01-01T00:00:00.000001Z'),
+    CAST(timestamp64('1970-01-01T00:00:00.000001Z') AS string)
 ;
 
 SELECT
-    timestamp64("1970-01-01T00:00:00.000001+0:1"),
-    CAST(timestamp64("1970-01-01T00:00:00.000001+0:1") AS string)
+    timestamp64('1970-01-01T00:00:00.000001+0:1'),
+    CAST(timestamp64('1970-01-01T00:00:00.000001+0:1') AS string)
 ;
 
 SELECT
-    timestamp64("148107-12-31T23:59:59.999999Z"),
-    CAST(timestamp64("148107-12-31T23:59:59.999999Z") AS string)
+    timestamp64('148107-12-31T23:59:59.999999Z'),
+    CAST(timestamp64('148107-12-31T23:59:59.999999Z') AS string)
 ;
 
 SELECT
-    timestamp64("148107-12-31T23:59:59.999999+0:1"),
-    CAST(timestamp64("148107-12-31T23:59:59.999999+0:1") AS string)
+    timestamp64('148107-12-31T23:59:59.999999+0:1'),
+    CAST(timestamp64('148107-12-31T23:59:59.999999+0:1') AS string)
 ;
 
 --
 -- without microseconds (like in datetime64)
 --
 SELECT
-    timestamp64("-144169-01-01T00:00:00-0:1"),
-    CAST(timestamp64("-144169-01-01T00:00:00-0:1") AS string)
+    timestamp64('-144169-01-01T00:00:00-0:1'),
+    CAST(timestamp64('-144169-01-01T00:00:00-0:1') AS string)
 ;
 
 SELECT
-    timestamp64("-144169-01-01T00:00:00Z"),
-    CAST(timestamp64("-144169-01-01T00:00:00Z") AS string)
+    timestamp64('-144169-01-01T00:00:00Z'),
+    CAST(timestamp64('-144169-01-01T00:00:00Z') AS string)
 ;
 
 SELECT
-    timestamp64("-1-1-1T00:00:00Z"),
-    CAST(timestamp64("-1-1-1T00:00:00Z") AS string)
+    timestamp64('-1-1-1T00:00:00Z'),
+    CAST(timestamp64('-1-1-1T00:00:00Z') AS string)
 ;
 
 SELECT
-    timestamp64("1-1-1T00:00:00Z"),
-    CAST(timestamp64("1-1-1T00:00:00Z") AS string)
+    timestamp64('1-1-1T00:00:00Z'),
+    CAST(timestamp64('1-1-1T00:00:00Z') AS string)
 ;
 
 SELECT
-    timestamp64("1969-12-31T00:00:00Z"),
-    CAST(timestamp64("1969-12-31T00:00:00Z") AS string)
+    timestamp64('1969-12-31T00:00:00Z'),
+    CAST(timestamp64('1969-12-31T00:00:00Z') AS string)
 ;
 
 SELECT
-    timestamp64("1969-12-31T23:59:59-0:1"),
-    CAST(timestamp64("1969-12-31T23:59:59-0:1") AS string)
+    timestamp64('1969-12-31T23:59:59-0:1'),
+    CAST(timestamp64('1969-12-31T23:59:59-0:1') AS string)
 ;
 
 SELECT
-    timestamp64("1970-01-01T00:00:00Z"),
-    CAST(timestamp64("1970-01-01T00:00:00Z") AS string)
+    timestamp64('1970-01-01T00:00:00Z'),
+    CAST(timestamp64('1970-01-01T00:00:00Z') AS string)
 ;
 
 SELECT
-    timestamp64("1970-01-01T00:00:00+0:1"),
-    CAST(timestamp64("1970-01-01T00:00:00+0:1") AS string)
+    timestamp64('1970-01-01T00:00:00+0:1'),
+    CAST(timestamp64('1970-01-01T00:00:00+0:1') AS string)
 ;
 
 SELECT
-    timestamp64("2000-04-05T00:00:00Z"),
-    CAST(timestamp64("2000-04-05T00:00:00Z") AS string)
+    timestamp64('2000-04-05T00:00:00Z'),
+    CAST(timestamp64('2000-04-05T00:00:00Z') AS string)
 ;
 
 SELECT
-    timestamp64("2100-03-01T00:00:00Z"),
-    CAST(timestamp64("2100-03-01T00:00:00Z") AS string)
+    timestamp64('2100-03-01T00:00:00Z'),
+    CAST(timestamp64('2100-03-01T00:00:00Z') AS string)
 ;
 
 SELECT
-    timestamp64("2105-12-31T00:00:00Z"),
-    CAST(timestamp64("2105-12-31T00:00:00Z") AS string)
+    timestamp64('2105-12-31T00:00:00Z'),
+    CAST(timestamp64('2105-12-31T00:00:00Z') AS string)
 ;
 
 SELECT
-    timestamp64("2106-01-01T00:00:00Z"),
-    CAST(timestamp64("2106-01-01T00:00:00Z") AS string)
+    timestamp64('2106-01-01T00:00:00Z'),
+    CAST(timestamp64('2106-01-01T00:00:00Z') AS string)
 ;
 
 SELECT
-    timestamp64("148107-12-31T23:59:59Z"),
-    CAST(timestamp64("148107-12-31T23:59:59Z") AS string)
+    timestamp64('148107-12-31T23:59:59Z'),
+    CAST(timestamp64('148107-12-31T23:59:59Z') AS string)
 ;
 
 SELECT
-    timestamp64("148107-12-31T23:59:59+0:1"),
-    CAST(timestamp64("148107-12-31T23:59:59+0:1") AS string)
+    timestamp64('148107-12-31T23:59:59+0:1'),
+    CAST(timestamp64('148107-12-31T23:59:59+0:1') AS string)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-input_date32_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-input_date32_/formatted.sql
index c63f08b39a..48ac7404d0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-input_date32_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-input_date32_/formatted.sql
@@ -1,89 +1,89 @@
 SELECT
     1,
-    CAST("-144170-12-31" AS date32),
-    CAST(CAST("-144170-12-31" AS date32) AS string)
+    CAST('-144170-12-31' AS date32),
+    CAST(CAST('-144170-12-31' AS date32) AS string)
 ;
 
 SELECT
     2,
-    CAST("-144169-01-01" AS date32),
-    CAST(CAST("-144169-01-01" AS date32) AS string)
+    CAST('-144169-01-01' AS date32),
+    CAST(CAST('-144169-01-01' AS date32) AS string)
 ;
 
 SELECT
     3,
-    CAST("-1-1-1" AS date32),
-    CAST(CAST("-1-1-1" AS date32) AS string)
+    CAST('-1-1-1' AS date32),
+    CAST(CAST('-1-1-1' AS date32) AS string)
 ;
 
 SELECT
     4,
-    CAST("0-1-1" AS date32),
-    CAST(CAST("0-1-1" AS date32) AS string)
+    CAST('0-1-1' AS date32),
+    CAST(CAST('0-1-1' AS date32) AS string)
 ;
 
 SELECT
     5,
-    CAST("1-1-1" AS date32),
-    CAST(CAST("1-1-1" AS date32) AS string)
+    CAST('1-1-1' AS date32),
+    CAST(CAST('1-1-1' AS date32) AS string)
 ;
 
 SELECT
     6,
-    CAST("1-02-29" AS date32),
-    CAST(CAST("1-02-29" AS date32) AS string)
+    CAST('1-02-29' AS date32),
+    CAST(CAST('1-02-29' AS date32) AS string)
 ;
 
 SELECT
     7,
-    CAST("1969-12-31" AS date32),
-    CAST(CAST("1969-12-31" AS date32) AS string)
+    CAST('1969-12-31' AS date32),
+    CAST(CAST('1969-12-31' AS date32) AS string)
 ;
 
 SELECT
     8,
-    CAST("1970-01-01" AS date32),
-    CAST(CAST("1970-01-01" AS date32) AS string)
+    CAST('1970-01-01' AS date32),
+    CAST(CAST('1970-01-01' AS date32) AS string)
 ;
 
 SELECT
     9,
-    CAST("2000-04-05" AS date32),
-    CAST(CAST("2000-04-05" AS date32) AS string)
+    CAST('2000-04-05' AS date32),
+    CAST(CAST('2000-04-05' AS date32) AS string)
 ;
 
 SELECT
     10,
-    CAST("2100-02-29" AS date32),
-    CAST(CAST("2100-02-29" AS date32) AS string)
+    CAST('2100-02-29' AS date32),
+    CAST(CAST('2100-02-29' AS date32) AS string)
 ;
 
 SELECT
     11,
-    CAST("2100-03-01" AS date32),
-    CAST(CAST("2100-03-01" AS date32) AS string)
+    CAST('2100-03-01' AS date32),
+    CAST(CAST('2100-03-01' AS date32) AS string)
 ;
 
 SELECT
     12,
-    CAST("2105-12-31" AS date32),
-    CAST(CAST("2105-12-31" AS date32) AS string)
+    CAST('2105-12-31' AS date32),
+    CAST(CAST('2105-12-31' AS date32) AS string)
 ;
 
 SELECT
     13,
-    CAST("2106-01-01" AS date32),
-    CAST(CAST("2106-01-01" AS date32) AS string)
+    CAST('2106-01-01' AS date32),
+    CAST(CAST('2106-01-01' AS date32) AS string)
 ;
 
 SELECT
     14,
-    CAST("148107-12-31" AS date32),
-    CAST(CAST("148107-12-31" AS date32) AS string)
+    CAST('148107-12-31' AS date32),
+    CAST(CAST('148107-12-31' AS date32) AS string)
 ;
 
 SELECT
     15,
-    CAST("148108-01-01" AS date32),
-    CAST(CAST("148108-01-01" AS date32) AS string)
+    CAST('148108-01-01' AS date32),
+    CAST(CAST('148108-01-01' AS date32) AS string)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-input_datetime64_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-input_datetime64_/formatted.sql
index 534661899d..4217acbf73 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-input_datetime64_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-input_datetime64_/formatted.sql
@@ -1,119 +1,119 @@
 SELECT
-    CAST("-144170-12-31T23:59:59Z" AS timestamp64),
-    CAST(CAST("-144170-12-31T23:59:59Z" AS timestamp64) AS string)
+    CAST('-144170-12-31T23:59:59Z' AS timestamp64),
+    CAST(CAST('-144170-12-31T23:59:59Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("-144170-12-31T23:59:59-0:1" AS timestamp64),
-    CAST(CAST("-144170-12-31T23:59:59-0:1" AS timestamp64) AS string)
+    CAST('-144170-12-31T23:59:59-0:1' AS timestamp64),
+    CAST(CAST('-144170-12-31T23:59:59-0:1' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("-144169-01-01T00:00:00+0:1" AS timestamp64),
-    CAST(CAST("-144169-01-01T00:00:00+0:1" AS timestamp64) AS string)
+    CAST('-144169-01-01T00:00:00+0:1' AS timestamp64),
+    CAST(CAST('-144169-01-01T00:00:00+0:1' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("-144169-01-01T00:00:00-0:1" AS timestamp64),
-    CAST(CAST("-144169-01-01T00:00:00-0:1" AS timestamp64) AS string)
+    CAST('-144169-01-01T00:00:00-0:1' AS timestamp64),
+    CAST(CAST('-144169-01-01T00:00:00-0:1' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("-144169-01-01T00:00:00Z" AS timestamp64),
-    CAST(CAST("-144169-01-01T00:00:00Z" AS timestamp64) AS string)
+    CAST('-144169-01-01T00:00:00Z' AS timestamp64),
+    CAST(CAST('-144169-01-01T00:00:00Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("-1-1-1T00:00:00Z" AS timestamp64),
-    CAST(CAST("-1-1-1T00:00:00Z" AS timestamp64) AS string)
+    CAST('-1-1-1T00:00:00Z' AS timestamp64),
+    CAST(CAST('-1-1-1T00:00:00Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("0-1-1T00:00:00Z" AS timestamp64),
-    CAST(CAST("0-1-1T00:00:00Z" AS timestamp64) AS string)
+    CAST('0-1-1T00:00:00Z' AS timestamp64),
+    CAST(CAST('0-1-1T00:00:00Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("1-1-1T00:00:00Z" AS timestamp64),
-    CAST(CAST("1-1-1T00:00:00Z" AS timestamp64) AS string)
+    CAST('1-1-1T00:00:00Z' AS timestamp64),
+    CAST(CAST('1-1-1T00:00:00Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("1-02-29T00:00:00Z" AS timestamp64),
-    CAST(CAST("1-02-29T00:00:00Z" AS timestamp64) AS string)
+    CAST('1-02-29T00:00:00Z' AS timestamp64),
+    CAST(CAST('1-02-29T00:00:00Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("1969-12-31T00:00:00Z" AS timestamp64),
-    CAST(CAST("1969-12-31T00:00:00Z" AS timestamp64) AS string)
+    CAST('1969-12-31T00:00:00Z' AS timestamp64),
+    CAST(CAST('1969-12-31T00:00:00Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("1969-12-31T23:59:59-0:1" AS timestamp64),
-    CAST(CAST("1969-12-31T23:59:59-0:1" AS timestamp64) AS string)
+    CAST('1969-12-31T23:59:59-0:1' AS timestamp64),
+    CAST(CAST('1969-12-31T23:59:59-0:1' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("1970-01-01T00:00:00Z" AS timestamp64),
-    CAST(CAST("1970-01-01T00:00:00Z" AS timestamp64) AS string)
+    CAST('1970-01-01T00:00:00Z' AS timestamp64),
+    CAST(CAST('1970-01-01T00:00:00Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("1970-01-01T00:00:00+0:1" AS timestamp64),
-    CAST(CAST("1970-01-01T00:00:00+0:1" AS timestamp64) AS string)
+    CAST('1970-01-01T00:00:00+0:1' AS timestamp64),
+    CAST(CAST('1970-01-01T00:00:00+0:1' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("2000-04-05T00:00:00Z" AS timestamp64),
-    CAST(CAST("2000-04-05T00:00:00Z" AS timestamp64) AS string)
+    CAST('2000-04-05T00:00:00Z' AS timestamp64),
+    CAST(CAST('2000-04-05T00:00:00Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("2100-02-29T00:00:00Z" AS timestamp64),
-    CAST(CAST("2100-02-29T00:00:00Z" AS timestamp64) AS string)
+    CAST('2100-02-29T00:00:00Z' AS timestamp64),
+    CAST(CAST('2100-02-29T00:00:00Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("2100-03-01T00:00:00Z" AS timestamp64),
-    CAST(CAST("2100-03-01T00:00:00Z" AS timestamp64) AS string)
+    CAST('2100-03-01T00:00:00Z' AS timestamp64),
+    CAST(CAST('2100-03-01T00:00:00Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("2105-12-31T00:00:00Z" AS timestamp64),
-    CAST(CAST("2105-12-31T00:00:00Z" AS timestamp64) AS string)
+    CAST('2105-12-31T00:00:00Z' AS timestamp64),
+    CAST(CAST('2105-12-31T00:00:00Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("2106-01-01T00:00:00Z" AS timestamp64),
-    CAST(CAST("2106-01-01T00:00:00Z" AS timestamp64) AS string)
+    CAST('2106-01-01T00:00:00Z' AS timestamp64),
+    CAST(CAST('2106-01-01T00:00:00Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("148107-12-31T23:59:59Z" AS timestamp64),
-    CAST(CAST("148107-12-31T23:59:59Z" AS timestamp64) AS string)
+    CAST('148107-12-31T23:59:59Z' AS timestamp64),
+    CAST(CAST('148107-12-31T23:59:59Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("148107-12-31T23:59:59-0:1" AS timestamp64),
-    CAST(CAST("148107-12-31T23:59:59-0:1" AS timestamp64) AS string)
+    CAST('148107-12-31T23:59:59-0:1' AS timestamp64),
+    CAST(CAST('148107-12-31T23:59:59-0:1' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("148107-12-31T23:59:59+0:1" AS timestamp64),
-    CAST(CAST("148107-12-31T23:59:59+0:1" AS timestamp64) AS string)
+    CAST('148107-12-31T23:59:59+0:1' AS timestamp64),
+    CAST(CAST('148107-12-31T23:59:59+0:1' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("148108-01-01T00:00:00-0:1" AS timestamp64),
-    CAST(CAST("148108-01-01T00:00:00-0:1" AS timestamp64) AS string)
+    CAST('148108-01-01T00:00:00-0:1' AS timestamp64),
+    CAST(CAST('148108-01-01T00:00:00-0:1' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("148108-01-01T00:00:00+0:1" AS timestamp64),
-    CAST(CAST("148108-01-01T00:00:00+0:1" AS timestamp64) AS string)
+    CAST('148108-01-01T00:00:00+0:1' AS timestamp64),
+    CAST(CAST('148108-01-01T00:00:00+0:1' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("148108-01-01T00:00:00Z" AS timestamp64),
-    CAST(CAST("148108-01-01T00:00:00Z" AS timestamp64) AS string)
+    CAST('148108-01-01T00:00:00Z' AS timestamp64),
+    CAST(CAST('148108-01-01T00:00:00Z' AS timestamp64) AS string)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-input_interval64_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-input_interval64_/formatted.sql
index db9b478e72..fd9bb1ad40 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-input_interval64_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-input_interval64_/formatted.sql
@@ -1,179 +1,179 @@
 SELECT
-    CAST("-P106751616DT23H59M59.999999S" AS interval64),
-    CAST(CAST("-P106751616DT23H59M59.999999S" AS interval64) AS string)
+    CAST('-P106751616DT23H59M59.999999S' AS interval64),
+    CAST(CAST('-P106751616DT23H59M59.999999S' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("P106751616DT23H59M59.999999S" AS interval64),
-    CAST(CAST("P106751616DT23H59M59.999999S" AS interval64) AS string)
+    CAST('P106751616DT23H59M59.999999S' AS interval64),
+    CAST(CAST('P106751616DT23H59M59.999999S' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("-P106751616DT23H59M60S" AS interval64),
-    CAST(CAST("-P106751616DT23H59M60S" AS interval64) AS string)
+    CAST('-P106751616DT23H59M60S' AS interval64),
+    CAST(CAST('-P106751616DT23H59M60S' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("P106751616DT23H59M60S" AS interval64),
-    CAST(CAST("P106751616DT23H59M60S" AS interval64) AS string)
+    CAST('P106751616DT23H59M60S' AS interval64),
+    CAST(CAST('P106751616DT23H59M60S' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("P000000000DT00H00M00.000000S" AS interval64),
-    CAST(CAST("P000000000DT00H00M00.000000S" AS interval64) AS string)
+    CAST('P000000000DT00H00M00.000000S' AS interval64),
+    CAST(CAST('P000000000DT00H00M00.000000S' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("PT0S" AS interval64),
-    CAST(CAST("PT0S" AS interval64) AS string)
+    CAST('PT0S' AS interval64),
+    CAST(CAST('PT0S' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("-PT0S" AS interval64),
-    CAST(CAST("-PT0S" AS interval64) AS string)
+    CAST('-PT0S' AS interval64),
+    CAST(CAST('-PT0S' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("PT0.000001S" AS interval64),
-    CAST(CAST("PT0.000001S" AS interval64) AS string)
+    CAST('PT0.000001S' AS interval64),
+    CAST(CAST('PT0.000001S' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("-PT0.000001S" AS interval64),
-    CAST(CAST("-PT0.000001S" AS interval64) AS string)
+    CAST('-PT0.000001S' AS interval64),
+    CAST(CAST('-PT0.000001S' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("PT0S" AS interval64),
-    CAST(CAST("PT0S" AS interval64) AS string)
+    CAST('PT0S' AS interval64),
+    CAST(CAST('PT0S' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("PT0M" AS interval64),
-    CAST(CAST("PT0M" AS interval64) AS string)
+    CAST('PT0M' AS interval64),
+    CAST(CAST('PT0M' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("PT0H" AS interval64),
-    CAST(CAST("PT0H" AS interval64) AS string)
+    CAST('PT0H' AS interval64),
+    CAST(CAST('PT0H' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("P0D" AS interval64),
-    CAST(CAST("P0D" AS interval64) AS string)
+    CAST('P0D' AS interval64),
+    CAST(CAST('P0D' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("P0W" AS interval64),
-    CAST(CAST("P0W" AS interval64) AS string)
+    CAST('P0W' AS interval64),
+    CAST(CAST('P0W' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("PT999999S" AS interval64),
-    CAST(CAST("PT999999S" AS interval64) AS string)
+    CAST('PT999999S' AS interval64),
+    CAST(CAST('PT999999S' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("PT999999M" AS interval64),
-    CAST(CAST("PT999999M" AS interval64) AS string)
+    CAST('PT999999M' AS interval64),
+    CAST(CAST('PT999999M' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("PT999999H" AS interval64),
-    CAST(CAST("PT999999H" AS interval64) AS string)
+    CAST('PT999999H' AS interval64),
+    CAST(CAST('PT999999H' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("P106751616D" AS interval64),
-    CAST(CAST("P106751616D" AS interval64) AS string)
+    CAST('P106751616D' AS interval64),
+    CAST(CAST('P106751616D' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("P106751617D" AS interval64),
-    CAST(CAST("P106751617D" AS interval64) AS string)
+    CAST('P106751617D' AS interval64),
+    CAST(CAST('P106751617D' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("P15250230W" AS interval64),
-    CAST(CAST("P15250230W" AS interval64) AS string)
+    CAST('P15250230W' AS interval64),
+    CAST(CAST('P15250230W' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("P15250231W" AS interval64),
-    CAST(CAST("P15250231W" AS interval64) AS string)
+    CAST('P15250231W' AS interval64),
+    CAST(CAST('P15250231W' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("PT0000000S" AS interval64),
-    CAST(CAST("PT0000000S" AS interval64) AS string)
+    CAST('PT0000000S' AS interval64),
+    CAST(CAST('PT0000000S' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("PT0000000M" AS interval64),
-    CAST(CAST("PT0000000M" AS interval64) AS string)
+    CAST('PT0000000M' AS interval64),
+    CAST(CAST('PT0000000M' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("PT0000000H" AS interval64),
-    CAST(CAST("PT0000000H" AS interval64) AS string)
+    CAST('PT0000000H' AS interval64),
+    CAST(CAST('PT0000000H' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("P0000000000D" AS interval64),
-    CAST(CAST("P0000000000D" AS interval64) AS string)
+    CAST('P0000000000D' AS interval64),
+    CAST(CAST('P0000000000D' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("P0000000000W" AS interval64),
-    CAST(CAST("P0000000000W" AS interval64) AS string)
+    CAST('P0000000000W' AS interval64),
+    CAST(CAST('P0000000000W' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("PT1S" AS interval64),
-    CAST(CAST("PT1S" AS interval64) AS string)
+    CAST('PT1S' AS interval64),
+    CAST(CAST('PT1S' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("PT1M" AS interval64),
-    CAST(CAST("PT1M" AS interval64) AS string)
+    CAST('PT1M' AS interval64),
+    CAST(CAST('PT1M' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("PT1H" AS interval64),
-    CAST(CAST("PT1H" AS interval64) AS string)
+    CAST('PT1H' AS interval64),
+    CAST(CAST('PT1H' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("P1D" AS interval64),
-    CAST(CAST("P1D" AS interval64) AS string)
+    CAST('P1D' AS interval64),
+    CAST(CAST('P1D' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("P1W" AS interval64),
-    CAST(CAST("P1W" AS interval64) AS string)
+    CAST('P1W' AS interval64),
+    CAST(CAST('P1W' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("-PT1S" AS interval64),
-    CAST(CAST("-PT1S" AS interval64) AS string)
+    CAST('-PT1S' AS interval64),
+    CAST(CAST('-PT1S' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("-PT1M" AS interval64),
-    CAST(CAST("-PT1M" AS interval64) AS string)
+    CAST('-PT1M' AS interval64),
+    CAST(CAST('-PT1M' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("-PT1H" AS interval64),
-    CAST(CAST("-PT1H" AS interval64) AS string)
+    CAST('-PT1H' AS interval64),
+    CAST(CAST('-PT1H' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("-P1D" AS interval64),
-    CAST(CAST("-P1D" AS interval64) AS string)
+    CAST('-P1D' AS interval64),
+    CAST(CAST('-P1D' AS interval64) AS string)
 ;
 
 SELECT
-    CAST("-P1W" AS interval64),
-    CAST(CAST("-P1W" AS interval64) AS string)
+    CAST('-P1W' AS interval64),
+    CAST(CAST('-P1W' AS interval64) AS string)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-input_timestamp64_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-input_timestamp64_/formatted.sql
index 5e3dd038bf..422033a66f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-input_timestamp64_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-input_timestamp64_/formatted.sql
@@ -2,244 +2,244 @@
 -- with microseconds
 --
 SELECT
-    CAST("-144170-12-31T23:59:59.999999Z" AS timestamp64),
-    CAST(CAST("-144170-12-31T23:59:59.999999Z" AS timestamp64) AS string)
+    CAST('-144170-12-31T23:59:59.999999Z' AS timestamp64),
+    CAST(CAST('-144170-12-31T23:59:59.999999Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("-144170-12-31T23:59:59.999999-0:1" AS timestamp64),
-    CAST(CAST("-144170-12-31T23:59:59.999999-0:1" AS timestamp64) AS string)
+    CAST('-144170-12-31T23:59:59.999999-0:1' AS timestamp64),
+    CAST(CAST('-144170-12-31T23:59:59.999999-0:1' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("-144169-01-01T00:00:00.000001+0:1" AS timestamp64),
-    CAST(CAST("-144169-01-01T00:00:00.000001+0:1" AS timestamp64) AS string)
+    CAST('-144169-01-01T00:00:00.000001+0:1' AS timestamp64),
+    CAST(CAST('-144169-01-01T00:00:00.000001+0:1' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("-144169-01-01T00:00:00.000001-0:1" AS timestamp64),
-    CAST(CAST("-144169-01-01T00:00:00.000001-0:1" AS timestamp64) AS string)
+    CAST('-144169-01-01T00:00:00.000001-0:1' AS timestamp64),
+    CAST(CAST('-144169-01-01T00:00:00.000001-0:1' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("-144169-01-01T00:00:00.000001Z" AS timestamp64),
-    CAST(CAST("-144169-01-01T00:00:00.000001Z" AS timestamp64) AS string)
+    CAST('-144169-01-01T00:00:00.000001Z' AS timestamp64),
+    CAST(CAST('-144169-01-01T00:00:00.000001Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("-1-1-1T00:00:00.000001Z" AS timestamp64),
-    CAST(CAST("-1-1-1T00:00:00.000001Z" AS timestamp64) AS string)
+    CAST('-1-1-1T00:00:00.000001Z' AS timestamp64),
+    CAST(CAST('-1-1-1T00:00:00.000001Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("0-1-1T00:00:00.000001Z" AS timestamp64),
-    CAST(CAST("0-1-1T00:00:00.000001Z" AS timestamp64) AS string)
+    CAST('0-1-1T00:00:00.000001Z' AS timestamp64),
+    CAST(CAST('0-1-1T00:00:00.000001Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("1-1-1T00:00:00.000001Z" AS timestamp64),
-    CAST(CAST("1-1-1T00:00:00.000001Z" AS timestamp64) AS string)
+    CAST('1-1-1T00:00:00.000001Z' AS timestamp64),
+    CAST(CAST('1-1-1T00:00:00.000001Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("1-02-29T00:00:00.000001Z" AS timestamp64),
-    CAST(CAST("1-02-29T00:00:00.000001Z" AS timestamp64) AS string)
+    CAST('1-02-29T00:00:00.000001Z' AS timestamp64),
+    CAST(CAST('1-02-29T00:00:00.000001Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("1969-12-31T00:00:00.000001Z" AS timestamp64),
-    CAST(CAST("1969-12-31T00:00:00.000001Z" AS timestamp64) AS string)
+    CAST('1969-12-31T00:00:00.000001Z' AS timestamp64),
+    CAST(CAST('1969-12-31T00:00:00.000001Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("1969-12-31T23:59:59.999999-0:1" AS timestamp64),
-    CAST(CAST("1969-12-31T23:59:59.999999-0:1" AS timestamp64) AS string)
+    CAST('1969-12-31T23:59:59.999999-0:1' AS timestamp64),
+    CAST(CAST('1969-12-31T23:59:59.999999-0:1' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("1970-01-01T00:00:00.000001Z" AS timestamp64),
-    CAST(CAST("1970-01-01T00:00:00.000001Z" AS timestamp64) AS string)
+    CAST('1970-01-01T00:00:00.000001Z' AS timestamp64),
+    CAST(CAST('1970-01-01T00:00:00.000001Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("1970-01-01T00:00:00.000001+0:1" AS timestamp64),
-    CAST(CAST("1970-01-01T00:00:00.000001+0:1" AS timestamp64) AS string)
+    CAST('1970-01-01T00:00:00.000001+0:1' AS timestamp64),
+    CAST(CAST('1970-01-01T00:00:00.000001+0:1' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("2000-04-05T00:00:00.000001Z" AS timestamp64),
-    CAST(CAST("2000-04-05T00:00:00.000001Z" AS timestamp64) AS string)
+    CAST('2000-04-05T00:00:00.000001Z' AS timestamp64),
+    CAST(CAST('2000-04-05T00:00:00.000001Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("2100-02-29T00:00:00.000001Z" AS timestamp64),
-    CAST(CAST("2100-02-29T00:00:00.000001Z" AS timestamp64) AS string)
+    CAST('2100-02-29T00:00:00.000001Z' AS timestamp64),
+    CAST(CAST('2100-02-29T00:00:00.000001Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("2100-03-01T00:00:00.000001Z" AS timestamp64),
-    CAST(CAST("2100-03-01T00:00:00.000001Z" AS timestamp64) AS string)
+    CAST('2100-03-01T00:00:00.000001Z' AS timestamp64),
+    CAST(CAST('2100-03-01T00:00:00.000001Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("2105-12-31T00:00:00.000001Z" AS timestamp64),
-    CAST(CAST("2105-12-31T00:00:00.000001Z" AS timestamp64) AS string)
+    CAST('2105-12-31T00:00:00.000001Z' AS timestamp64),
+    CAST(CAST('2105-12-31T00:00:00.000001Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("2106-01-01T00:00:00.000001Z" AS timestamp64),
-    CAST(CAST("2106-01-01T00:00:00.000001Z" AS timestamp64) AS string)
+    CAST('2106-01-01T00:00:00.000001Z' AS timestamp64),
+    CAST(CAST('2106-01-01T00:00:00.000001Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("148107-12-31T23:59:59.999999Z" AS timestamp64),
-    CAST(CAST("148107-12-31T23:59:59.999999Z" AS timestamp64) AS string)
+    CAST('148107-12-31T23:59:59.999999Z' AS timestamp64),
+    CAST(CAST('148107-12-31T23:59:59.999999Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("148107-12-31T23:59:59.999999-0:1" AS timestamp64),
-    CAST(CAST("148107-12-31T23:59:59.999999-0:1" AS timestamp64) AS string)
+    CAST('148107-12-31T23:59:59.999999-0:1' AS timestamp64),
+    CAST(CAST('148107-12-31T23:59:59.999999-0:1' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("148107-12-31T23:59:59.999999+0:1" AS timestamp64),
-    CAST(CAST("148107-12-31T23:59:59.999999+0:1" AS timestamp64) AS string)
+    CAST('148107-12-31T23:59:59.999999+0:1' AS timestamp64),
+    CAST(CAST('148107-12-31T23:59:59.999999+0:1' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("148108-01-01T00:00:00.000001-0:1" AS timestamp64),
-    CAST(CAST("148108-01-01T00:00:00.000001-0:1" AS timestamp64) AS string)
+    CAST('148108-01-01T00:00:00.000001-0:1' AS timestamp64),
+    CAST(CAST('148108-01-01T00:00:00.000001-0:1' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("148108-01-01T00:00:00.000001+0:1" AS timestamp64),
-    CAST(CAST("148108-01-01T00:00:00.000001+0:1" AS timestamp64) AS string)
+    CAST('148108-01-01T00:00:00.000001+0:1' AS timestamp64),
+    CAST(CAST('148108-01-01T00:00:00.000001+0:1' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("148108-01-01T00:00:00.000001Z" AS timestamp64),
-    CAST(CAST("148108-01-01T00:00:00.000001Z" AS timestamp64) AS string)
+    CAST('148108-01-01T00:00:00.000001Z' AS timestamp64),
+    CAST(CAST('148108-01-01T00:00:00.000001Z' AS timestamp64) AS string)
 ;
 
 --
 -- without microseconds (like in timestamp64)
 --
 SELECT
-    CAST("-144170-12-31T23:59:59Z" AS timestamp64),
-    CAST(CAST("-144170-12-31T23:59:59Z" AS timestamp64) AS string)
+    CAST('-144170-12-31T23:59:59Z' AS timestamp64),
+    CAST(CAST('-144170-12-31T23:59:59Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("-144170-12-31T23:59:59-0:1" AS timestamp64),
-    CAST(CAST("-144170-12-31T23:59:59-0:1" AS timestamp64) AS string)
+    CAST('-144170-12-31T23:59:59-0:1' AS timestamp64),
+    CAST(CAST('-144170-12-31T23:59:59-0:1' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("-144169-01-01T00:00:00+0:1" AS timestamp64),
-    CAST(CAST("-144169-01-01T00:00:00+0:1" AS timestamp64) AS string)
+    CAST('-144169-01-01T00:00:00+0:1' AS timestamp64),
+    CAST(CAST('-144169-01-01T00:00:00+0:1' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("-144169-01-01T00:00:00-0:1" AS timestamp64),
-    CAST(CAST("-144169-01-01T00:00:00-0:1" AS timestamp64) AS string)
+    CAST('-144169-01-01T00:00:00-0:1' AS timestamp64),
+    CAST(CAST('-144169-01-01T00:00:00-0:1' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("-144169-01-01T00:00:00Z" AS timestamp64),
-    CAST(CAST("-144169-01-01T00:00:00Z" AS timestamp64) AS string)
+    CAST('-144169-01-01T00:00:00Z' AS timestamp64),
+    CAST(CAST('-144169-01-01T00:00:00Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("-1-1-1T00:00:00Z" AS timestamp64),
-    CAST(CAST("-1-1-1T00:00:00Z" AS timestamp64) AS string)
+    CAST('-1-1-1T00:00:00Z' AS timestamp64),
+    CAST(CAST('-1-1-1T00:00:00Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("0-1-1T00:00:00Z" AS timestamp64),
-    CAST(CAST("0-1-1T00:00:00Z" AS timestamp64) AS string)
+    CAST('0-1-1T00:00:00Z' AS timestamp64),
+    CAST(CAST('0-1-1T00:00:00Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("1-1-1T00:00:00Z" AS timestamp64),
-    CAST(CAST("1-1-1T00:00:00Z" AS timestamp64) AS string)
+    CAST('1-1-1T00:00:00Z' AS timestamp64),
+    CAST(CAST('1-1-1T00:00:00Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("1-02-29T00:00:00Z" AS timestamp64),
-    CAST(CAST("1-02-29T00:00:00Z" AS timestamp64) AS string)
+    CAST('1-02-29T00:00:00Z' AS timestamp64),
+    CAST(CAST('1-02-29T00:00:00Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("1969-12-31T00:00:00Z" AS timestamp64),
-    CAST(CAST("1969-12-31T00:00:00Z" AS timestamp64) AS string)
+    CAST('1969-12-31T00:00:00Z' AS timestamp64),
+    CAST(CAST('1969-12-31T00:00:00Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("1969-12-31T23:59:59-0:1" AS timestamp64),
-    CAST(CAST("1969-12-31T23:59:59-0:1" AS timestamp64) AS string)
+    CAST('1969-12-31T23:59:59-0:1' AS timestamp64),
+    CAST(CAST('1969-12-31T23:59:59-0:1' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("1970-01-01T00:00:00Z" AS timestamp64),
-    CAST(CAST("1970-01-01T00:00:00Z" AS timestamp64) AS string)
+    CAST('1970-01-01T00:00:00Z' AS timestamp64),
+    CAST(CAST('1970-01-01T00:00:00Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("1970-01-01T00:00:00+0:1" AS timestamp64),
-    CAST(CAST("1970-01-01T00:00:00+0:1" AS timestamp64) AS string)
+    CAST('1970-01-01T00:00:00+0:1' AS timestamp64),
+    CAST(CAST('1970-01-01T00:00:00+0:1' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("2000-04-05T00:00:00Z" AS timestamp64),
-    CAST(CAST("2000-04-05T00:00:00Z" AS timestamp64) AS string)
+    CAST('2000-04-05T00:00:00Z' AS timestamp64),
+    CAST(CAST('2000-04-05T00:00:00Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("2100-02-29T00:00:00Z" AS timestamp64),
-    CAST(CAST("2100-02-29T00:00:00Z" AS timestamp64) AS string)
+    CAST('2100-02-29T00:00:00Z' AS timestamp64),
+    CAST(CAST('2100-02-29T00:00:00Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("2100-03-01T00:00:00Z" AS timestamp64),
-    CAST(CAST("2100-03-01T00:00:00Z" AS timestamp64) AS string)
+    CAST('2100-03-01T00:00:00Z' AS timestamp64),
+    CAST(CAST('2100-03-01T00:00:00Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("2105-12-31T00:00:00Z" AS timestamp64),
-    CAST(CAST("2105-12-31T00:00:00Z" AS timestamp64) AS string)
+    CAST('2105-12-31T00:00:00Z' AS timestamp64),
+    CAST(CAST('2105-12-31T00:00:00Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("2106-01-01T00:00:00Z" AS timestamp64),
-    CAST(CAST("2106-01-01T00:00:00Z" AS timestamp64) AS string)
+    CAST('2106-01-01T00:00:00Z' AS timestamp64),
+    CAST(CAST('2106-01-01T00:00:00Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("148107-12-31T23:59:59Z" AS timestamp64),
-    CAST(CAST("148107-12-31T23:59:59Z" AS timestamp64) AS string)
+    CAST('148107-12-31T23:59:59Z' AS timestamp64),
+    CAST(CAST('148107-12-31T23:59:59Z' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("148107-12-31T23:59:59-0:1" AS timestamp64),
-    CAST(CAST("148107-12-31T23:59:59-0:1" AS timestamp64) AS string)
+    CAST('148107-12-31T23:59:59-0:1' AS timestamp64),
+    CAST(CAST('148107-12-31T23:59:59-0:1' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("148107-12-31T23:59:59+0:1" AS timestamp64),
-    CAST(CAST("148107-12-31T23:59:59+0:1" AS timestamp64) AS string)
+    CAST('148107-12-31T23:59:59+0:1' AS timestamp64),
+    CAST(CAST('148107-12-31T23:59:59+0:1' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("148108-01-01T00:00:00-0:1" AS timestamp64),
-    CAST(CAST("148108-01-01T00:00:00-0:1" AS timestamp64) AS string)
+    CAST('148108-01-01T00:00:00-0:1' AS timestamp64),
+    CAST(CAST('148108-01-01T00:00:00-0:1' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("148108-01-01T00:00:00+0:1" AS timestamp64),
-    CAST(CAST("148108-01-01T00:00:00+0:1" AS timestamp64) AS string)
+    CAST('148108-01-01T00:00:00+0:1' AS timestamp64),
+    CAST(CAST('148108-01-01T00:00:00+0:1' AS timestamp64) AS string)
 ;
 
 SELECT
-    CAST("148108-01-01T00:00:00Z" AS timestamp64),
-    CAST(CAST("148108-01-01T00:00:00Z" AS timestamp64) AS string)
+    CAST('148108-01-01T00:00:00Z' AS timestamp64),
+    CAST(CAST('148108-01-01T00:00:00Z' AS timestamp64) AS string)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-int_literals_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-int_literals_/formatted.sql
index c6bbadfa8c..7a8fff02a2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-int_literals_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-int_literals_/formatted.sql
@@ -1,28 +1,28 @@
-PRAGMA warning("disable", "4510");
+PRAGMA warning('disable', '4510');
 
 SELECT
     3,
-    Yql::Date32(AsAtom("0")),
+    Yql::Date32(AsAtom('0')),
     4,
-    Yql::Datetime64(AsAtom("0")),
+    Yql::Datetime64(AsAtom('0')),
     5,
-    Yql::Timestamp64(AsAtom("0")),
+    Yql::Timestamp64(AsAtom('0')),
     6,
-    Yql::Interval64(AsAtom("0")),
+    Yql::Interval64(AsAtom('0')),
     7,
-    Yql::Date32(AsAtom("-53375809")),
+    Yql::Date32(AsAtom('-53375809')),
     8,
-    Yql::Date32(AsAtom("53375807")),
+    Yql::Date32(AsAtom('53375807')),
     9,
-    Yql::Datetime64(AsAtom("-4611669897600")),
+    Yql::Datetime64(AsAtom('-4611669897600')),
     10,
-    Yql::Datetime64(AsAtom("4611669811199")),
+    Yql::Datetime64(AsAtom('4611669811199')),
     11,
-    Yql::Timestamp64(AsAtom("-4611669897600000000")),
+    Yql::Timestamp64(AsAtom('-4611669897600000000')),
     12,
-    Yql::Timestamp64(AsAtom("4611669811199999999")),
+    Yql::Timestamp64(AsAtom('4611669811199999999')),
     13,
-    Yql::Interval64(AsAtom("-9223339708799999999")),
+    Yql::Interval64(AsAtom('-9223339708799999999')),
     14,
-    Yql::Interval64(AsAtom("9223339708799999999"))
+    Yql::Interval64(AsAtom('9223339708799999999'))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-misc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-misc_/formatted.sql
index 7e31836d8b..c98a0c0263 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-misc_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-misc_/formatted.sql
@@ -1,4 +1,4 @@
-PRAGMA warning("disable", "4510");
+PRAGMA warning('disable', '4510');
 
 $date32_min = unwrap(CAST(-53375809 AS date32));
 $date32_max = unwrap(CAST(53375807 AS date32));
@@ -11,33 +11,33 @@ $interval64_max = unwrap(CAST(9223339708799999999 AS interval64));
 
 SELECT
     1,
-    ListFromRange(date32("1969-12-30"), date32("1970-1-5")),
+    ListFromRange(date32('1969-12-30'), date32('1970-1-5')),
     2,
-    ListFromRange(date32("1970-1-3"), date32("1969-12-30")),
+    ListFromRange(date32('1970-1-3'), date32('1969-12-30')),
     3,
-    ListFromRange(date32("1969-12-30"), date32("1970-1-5"), interval("P2D")),
+    ListFromRange(date32('1969-12-30'), date32('1970-1-5'), interval('P2D')),
     4,
-    ListFromRange(date32("1969-12-30"), date32("1970-1-5"), interval64("P2D")),
+    ListFromRange(date32('1969-12-30'), date32('1970-1-5'), interval64('P2D')),
     5,
-    ListFromRange(date32("1970-1-5"), date32("1969-12-30")),
+    ListFromRange(date32('1970-1-5'), date32('1969-12-30')),
     6,
-    ListFromRange(date32("1970-1-5"), date32("1969-12-30"), interval("P2D")),
+    ListFromRange(date32('1970-1-5'), date32('1969-12-30'), interval('P2D')),
     7,
-    ListFromRange(date32("1970-1-5"), date32("1969-12-29"), interval("-P2D")),
+    ListFromRange(date32('1970-1-5'), date32('1969-12-29'), interval('-P2D')),
     8,
-    ListFromRange(datetime64("1969-12-31T23:59:57Z"), datetime64("1970-1-1T0:0:3Z")),
+    ListFromRange(datetime64('1969-12-31T23:59:57Z'), datetime64('1970-1-1T0:0:3Z')),
     9,
-    ListFromRange(datetime64("1969-12-31T23:59:57Z"), datetime64("1970-1-1T0:0:3Z"), interval("PT2S")),
+    ListFromRange(datetime64('1969-12-31T23:59:57Z'), datetime64('1970-1-1T0:0:3Z'), interval('PT2S')),
     10,
-    ListFromRange(datetime64("1969-12-31T23:59:57Z"), datetime64("1970-1-1T0:0:3Z"), interval64("PT2S")),
+    ListFromRange(datetime64('1969-12-31T23:59:57Z'), datetime64('1970-1-1T0:0:3Z'), interval64('PT2S')),
     11,
-    ListFromRange(timestamp64("1969-12-31T23:59:57Z"), timestamp64("1970-1-1T0:0:3Z"), interval("PT2.5S")),
+    ListFromRange(timestamp64('1969-12-31T23:59:57Z'), timestamp64('1970-1-1T0:0:3Z'), interval('PT2.5S')),
     12,
-    ListFromRange($date32_min, $date32_max, interval64("P53375808D")),
+    ListFromRange($date32_min, $date32_max, interval64('P53375808D')),
     13,
-    ListFromRange($datetime64_min, $datetime64_max, interval64("P53375808D")),
+    ListFromRange($datetime64_min, $datetime64_max, interval64('P53375808D')),
     14,
-    ListFromRange($timestamp64_min, $timestamp64_max, interval64("P53375808D")),
+    ListFromRange($timestamp64_min, $timestamp64_max, interval64('P53375808D')),
     15,
-    ListFromRange($interval64_min, $interval64_max, interval64("P53375808D"))
+    ListFromRange($interval64_min, $interval64_max, interval64('P53375808D'))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-presort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-presort_/formatted.sql
index 5589dba8bc..66f0aca73a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-presort_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-presort_/formatted.sql
@@ -1,17 +1,17 @@
-PRAGMA warning("disable", "4510");
+PRAGMA warning('disable', '4510');
 
-$wa1 = Date32("1900-01-01");
-$wd1 = Datetime64("1900-01-01T02:03:04Z");
-$wt1 = Timestamp64("1900-01-01T02:03:04.567891Z");
-$waz1 = TzDate32("1900-01-01,Europe/Moscow");
-$wdz1 = TzDatetime64("1900-01-01T02:03:04,Europe/Moscow");
-$wtz1 = TzTimestamp64("1900-01-01T02:03:04.567891,Europe/Moscow");
-$wa2 = Date32("1901-01-01");
-$wd2 = Datetime64("1901-01-01T02:03:04Z");
-$wt2 = Timestamp64("1901-01-01T02:03:04.567891Z");
-$waz2 = TzDate32("1901-01-01,Europe/Moscow");
-$wdz2 = TzDatetime64("1901-01-01T02:03:04,Europe/Moscow");
-$wtz2 = TzTimestamp64("1901-01-01T02:03:04.567891,Europe/Moscow");
+$wa1 = Date32('1900-01-01');
+$wd1 = Datetime64('1900-01-01T02:03:04Z');
+$wt1 = Timestamp64('1900-01-01T02:03:04.567891Z');
+$waz1 = TzDate32('1900-01-01,Europe/Moscow');
+$wdz1 = TzDatetime64('1900-01-01T02:03:04,Europe/Moscow');
+$wtz1 = TzTimestamp64('1900-01-01T02:03:04.567891,Europe/Moscow');
+$wa2 = Date32('1901-01-01');
+$wd2 = Datetime64('1901-01-01T02:03:04Z');
+$wt2 = Timestamp64('1901-01-01T02:03:04.567891Z');
+$waz2 = TzDate32('1901-01-01,Europe/Moscow');
+$wdz2 = TzDatetime64('1901-01-01T02:03:04,Europe/Moscow');
+$wtz2 = TzTimestamp64('1901-01-01T02:03:04.567891,Europe/Moscow');
 
 SELECT
     CAST(ListSortDesc([(Yql::Ascending($wa1), $wa1), (Yql::Ascending($wa2), $wa2)]) AS List<Tuple<String, String>>),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-round_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-round_/formatted.sql
index 1325db32c0..bb13e51600 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-round_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-round_/formatted.sql
@@ -1,4 +1,4 @@
-PRAGMA warning("disable", "4510");
+PRAGMA warning('disable', '4510');
 
 $date_max_value = 49673l;
 $date_max = unwrap(CAST($date_max_value - 1 AS date));
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tz_bytes_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tz_bytes_/formatted.sql
index c9ed62fd63..8ddc3a8731 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tz_bytes_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tz_bytes_/formatted.sql
@@ -1,25 +1,25 @@
 /* postgres can not */
 /* syntax version 1 */
 SELECT
-    ToBytes(TzDate32("1901-01-01,Europe/Moscow"))
+    ToBytes(TzDate32('1901-01-01,Europe/Moscow'))
 ;
 
 SELECT
-    CAST(FromBytes(ToBytes(TzDate32("1901-01-01,Europe/Moscow")), TzDate32) AS string)
+    CAST(FromBytes(ToBytes(TzDate32('1901-01-01,Europe/Moscow')), TzDate32) AS string)
 ;
 
 SELECT
-    ToBytes(TzDatetime64("1901-01-01T01:02:03,Europe/Moscow"))
+    ToBytes(TzDatetime64('1901-01-01T01:02:03,Europe/Moscow'))
 ;
 
 SELECT
-    CAST(FromBytes(ToBytes(TzDatetime64("1901-01-01T01:02:03,Europe/Moscow")), TzDatetime64) AS string)
+    CAST(FromBytes(ToBytes(TzDatetime64('1901-01-01T01:02:03,Europe/Moscow')), TzDatetime64) AS string)
 ;
 
 SELECT
-    ToBytes(TzTimestamp64("1901-01-01T01:02:03.456789,Europe/Moscow"))
+    ToBytes(TzTimestamp64('1901-01-01T01:02:03.456789,Europe/Moscow'))
 ;
 
 SELECT
-    CAST(FromBytes(ToBytes(TzTimestamp64("1901-01-01T01:02:03.456789,Europe/Moscow")), TzTimestamp64) AS string)
+    CAST(FromBytes(ToBytes(TzTimestamp64('1901-01-01T01:02:03.456789,Europe/Moscow')), TzTimestamp64) AS string)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tz_table_fill_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tz_table_fill_/formatted.sql
index 9d8fb34840..0911e648ea 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tz_table_fill_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tz_table_fill_/formatted.sql
@@ -1,8 +1,8 @@
 USE plato;
 
-$waz = TzDate32("1900-01-01,Europe/Moscow");
-$wdz = TzDatetime64("1900-01-01T02:03:04,Europe/Moscow");
-$wtz = TzTimestamp64("1900-01-01T02:03:04.567891,Europe/Moscow");
+$waz = TzDate32('1900-01-01,Europe/Moscow');
+$wdz = TzDatetime64('1900-01-01T02:03:04,Europe/Moscow');
+$wtz = TzTimestamp64('1900-01-01T02:03:04.567891,Europe/Moscow');
 
 INSERT INTO Output
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tzcasts_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tzcasts_/formatted.sql
index 10afcb9aaf..e6984e345d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tzcasts_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tzcasts_/formatted.sql
@@ -1,14 +1,14 @@
 SELECT
-    CAST(TzDate32("1900-01-01,Europe/Moscow") AS String),
-    CAST("1900-01-01,Europe/Moscow" AS TzDate32),
-    CAST(TzDatetime64("1900-01-01T01:02:03,Europe/Moscow") AS String),
-    CAST("1900-01-01T01:02:03,Europe/Moscow" AS TzDatetime64),
-    CAST(TzTimestamp64("1900-01-01T01:02:03.456789,Europe/Moscow") AS String),
-    CAST("1900-01-01T01:02:03.456789,Europe/Moscow" AS TzTimestamp64),
-    AddTimezone(Date32("1900-01-01"), "Europe/Moscow"),
-    AddTimezone(Datetime64("1900-01-01T01:02:03Z"), "Europe/Moscow"),
-    AddTimezone(Timestamp64("1900-01-01T01:02:03.456789Z"), "Europe/Moscow"),
-    CAST(RemoveTimezone(TzDate32("1900-01-02,Europe/Moscow")) AS String),
-    CAST(RemoveTimezone(TzDatetime64("1900-01-01T03:32:20,Europe/Moscow")) AS String),
-    CAST(RemoveTimezone(TzTimestamp64("1900-01-01T03:32:20.456789,Europe/Moscow")) AS String)
+    CAST(TzDate32('1900-01-01,Europe/Moscow') AS String),
+    CAST('1900-01-01,Europe/Moscow' AS TzDate32),
+    CAST(TzDatetime64('1900-01-01T01:02:03,Europe/Moscow') AS String),
+    CAST('1900-01-01T01:02:03,Europe/Moscow' AS TzDatetime64),
+    CAST(TzTimestamp64('1900-01-01T01:02:03.456789,Europe/Moscow') AS String),
+    CAST('1900-01-01T01:02:03.456789,Europe/Moscow' AS TzTimestamp64),
+    AddTimezone(Date32('1900-01-01'), 'Europe/Moscow'),
+    AddTimezone(Datetime64('1900-01-01T01:02:03Z'), 'Europe/Moscow'),
+    AddTimezone(Timestamp64('1900-01-01T01:02:03.456789Z'), 'Europe/Moscow'),
+    CAST(RemoveTimezone(TzDate32('1900-01-02,Europe/Moscow')) AS String),
+    CAST(RemoveTimezone(TzDatetime64('1900-01-01T03:32:20,Europe/Moscow')) AS String),
+    CAST(RemoveTimezone(TzTimestamp64('1900-01-01T03:32:20.456789,Europe/Moscow')) AS String)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tznumliterals_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tznumliterals_/formatted.sql
index 94c1d756f8..60a749c653 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tznumliterals_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tznumliterals_/formatted.sql
@@ -1,4 +1,4 @@
-PRAGMA warning("disable", "4510");
+PRAGMA warning('disable', '4510');
 
 SELECT
     CAST(Yql::Date32(AsAtom('-53375809')) AS string),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tzstrliterals_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tzstrliterals_/formatted.sql
index d106fe9d62..1c3238d98c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tzstrliterals_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tzstrliterals_/formatted.sql
@@ -1,50 +1,50 @@
 SELECT
-    CAST(Date32("-144169-01-01") AS string),
-    TzDate32("-144169-01-01,UTC"),
-    TzDate32("-144169-01-02,Europe/Moscow"),
-    TzDate32("-144169-01-01,America/Los_Angeles"),
-    CAST(Date32("148107-12-31") AS string),
-    TzDate32("148107-12-31,UTC"),
-    TzDate32("148108-01-01,Europe/Moscow"),
-    TzDate32("148107-12-31,America/Los_Angeles"),
-    CAST(Date32("1-01-01") AS string),
-    TzDate32("1-01-01,UTC"),
-    TzDate32("1-01-02,Europe/Moscow"),
-    CAST(Date32("-1-12-31") AS string),
-    TzDate32("-1-12-31,UTC"),
-    TzDate32("1-01-01,Europe/Moscow")
+    CAST(Date32('-144169-01-01') AS string),
+    TzDate32('-144169-01-01,UTC'),
+    TzDate32('-144169-01-02,Europe/Moscow'),
+    TzDate32('-144169-01-01,America/Los_Angeles'),
+    CAST(Date32('148107-12-31') AS string),
+    TzDate32('148107-12-31,UTC'),
+    TzDate32('148108-01-01,Europe/Moscow'),
+    TzDate32('148107-12-31,America/Los_Angeles'),
+    CAST(Date32('1-01-01') AS string),
+    TzDate32('1-01-01,UTC'),
+    TzDate32('1-01-02,Europe/Moscow'),
+    CAST(Date32('-1-12-31') AS string),
+    TzDate32('-1-12-31,UTC'),
+    TzDate32('1-01-01,Europe/Moscow')
 ;
 
 SELECT
-    CAST(Datetime64("-144169-01-01T00:00:00Z") AS string),
-    TzDatetime64("-144169-01-01T00:00:00,UTC"),
-    TzDatetime64("-144169-01-01T02:30:17,Europe/Moscow"),
-    TzDatetime64("-144170-12-31T16:07:02,America/Los_Angeles"),
-    CAST(Datetime64("148107-12-31T23:59:59Z") AS string),
-    TzDatetime64("148107-12-31T23:59:59,UTC"),
-    TzDatetime64("148108-01-01T02:59:59,Europe/Moscow"),
-    TzDatetime64("148107-12-31T15:59:59,America/Los_Angeles"),
-    CAST(Datetime64("1-01-01T00:00:00Z") AS string),
-    TzDatetime64("1-01-01T00:00:00,UTC"),
-    TzDatetime64("1-01-01T02:30:17,Europe/Moscow"),
-    CAST(Datetime64("-1-12-31T23:59:59Z") AS string),
-    TzDatetime64("-1-12-31T23:59:59,UTC"),
-    TzDatetime64("1-01-01T02:30:16,Europe/Moscow")
+    CAST(Datetime64('-144169-01-01T00:00:00Z') AS string),
+    TzDatetime64('-144169-01-01T00:00:00,UTC'),
+    TzDatetime64('-144169-01-01T02:30:17,Europe/Moscow'),
+    TzDatetime64('-144170-12-31T16:07:02,America/Los_Angeles'),
+    CAST(Datetime64('148107-12-31T23:59:59Z') AS string),
+    TzDatetime64('148107-12-31T23:59:59,UTC'),
+    TzDatetime64('148108-01-01T02:59:59,Europe/Moscow'),
+    TzDatetime64('148107-12-31T15:59:59,America/Los_Angeles'),
+    CAST(Datetime64('1-01-01T00:00:00Z') AS string),
+    TzDatetime64('1-01-01T00:00:00,UTC'),
+    TzDatetime64('1-01-01T02:30:17,Europe/Moscow'),
+    CAST(Datetime64('-1-12-31T23:59:59Z') AS string),
+    TzDatetime64('-1-12-31T23:59:59,UTC'),
+    TzDatetime64('1-01-01T02:30:16,Europe/Moscow')
 ;
 
 SELECT
-    CAST(Timestamp64("-144169-01-01T00:00:00Z") AS string),
-    TzTimestamp64("-144169-01-01T00:00:00,UTC"),
-    TzTimestamp64("-144169-01-01T02:30:17,Europe/Moscow"),
-    TzTimestamp64("-144170-12-31T16:07:02,America/Los_Angeles"),
-    CAST(Timestamp64("148107-12-31T23:59:59.999999Z") AS string),
-    TzTimestamp64("148107-12-31T23:59:59.999999,UTC"),
-    TzTimestamp64("148108-01-01T02:59:59.999999,Europe/Moscow"),
-    TzTimestamp64("148107-12-31T15:59:59.999999,America/Los_Angeles"),
-    CAST(Timestamp64("1-01-01T00:00:00Z") AS string),
-    TzTimestamp64("1-01-01T00:00:00,UTC"),
-    TzTimestamp64("1-01-01T02:30:17,Europe/Moscow"),
-    CAST(Timestamp64("-1-12-31T23:59:59.999999Z") AS string),
-    TzTimestamp64("-1-12-31T23:59:59.999999,UTC"),
-    TzTimestamp64("1-01-01T02:30:16.999999,Europe/Moscow")
+    CAST(Timestamp64('-144169-01-01T00:00:00Z') AS string),
+    TzTimestamp64('-144169-01-01T00:00:00,UTC'),
+    TzTimestamp64('-144169-01-01T02:30:17,Europe/Moscow'),
+    TzTimestamp64('-144170-12-31T16:07:02,America/Los_Angeles'),
+    CAST(Timestamp64('148107-12-31T23:59:59.999999Z') AS string),
+    TzTimestamp64('148107-12-31T23:59:59.999999,UTC'),
+    TzTimestamp64('148108-01-01T02:59:59.999999,Europe/Moscow'),
+    TzTimestamp64('148107-12-31T15:59:59.999999,America/Los_Angeles'),
+    CAST(Timestamp64('1-01-01T00:00:00Z') AS string),
+    TzTimestamp64('1-01-01T00:00:00,UTC'),
+    TzTimestamp64('1-01-01T02:30:17,Europe/Moscow'),
+    CAST(Timestamp64('-1-12-31T23:59:59.999999Z') AS string),
+    TzTimestamp64('-1-12-31T23:59:59.999999,UTC'),
+    TzTimestamp64('1-01-01T02:30:16.999999,Europe/Moscow')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-anon_table_binding_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-anon_table_binding_/formatted.sql
index 7c27b89f79..0887cc3c59 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-anon_table_binding_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-anon_table_binding_/formatted.sql
@@ -2,7 +2,7 @@
 /* postgres can not */
 USE plato;
 
-$c = "cccc";
+$c = 'cccc';
 
 INSERT INTO @$c
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-compact_named_subq_actions_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-compact_named_subq_actions_/formatted.sql
index 1f93fb4109..bd36f9aa59 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-compact_named_subq_actions_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-compact_named_subq_actions_/formatted.sql
@@ -40,14 +40,14 @@ FROM
 SELECT
     *
 FROM
-    $sub2($sub1, "aaa")
+    $sub2($sub1, 'aaa')
 ;
 
 DEFINE ACTION $hello_world($sub, $name, $suffix?) AS
-    $name = $name ?? ($suffix ?? "world");
+    $name = $name ?? ($suffix ?? 'world');
 
     SELECT
-        "Hello, " || $name || "!"
+        'Hello, ' || $name || '!'
     FROM
         $sub()
     ;
@@ -62,9 +62,9 @@ DO
 ;
 
 DO
-    $hello_world($sub1, NULL, "John")
+    $hello_world($sub1, NULL, 'John')
 ;
 
 DO
-    $hello_world($sub1, NULL, "Earth")
+    $hello_world($sub1, NULL, 'Earth')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-compact_named_with_subq_contexts_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-compact_named_with_subq_contexts_/formatted.sql
index 27af67ab72..c01cb4fc18 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-compact_named_with_subq_contexts_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-compact_named_with_subq_contexts_/formatted.sql
@@ -3,7 +3,7 @@ PRAGMA CompactNamedExprs;
 
 $a = (
     SELECT
-        CAST(Unicode::ToUpper("o"u) AS String) || "utpu"
+        CAST(Unicode::ToUpper("o"u) AS String) || 'utpu'
 );
 
 $b = $a || CAST(Unicode::ToLower("T"u) AS String);
@@ -23,7 +23,7 @@ FROM
 ;
 
 SELECT
-    "Outpu" IN $a
+    'Outpu' IN $a
 ;
 
 DEFINE SUBQUERY $sub() AS
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-drop_binding_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-drop_binding_/formatted.sql
index 21aadccfd6..2b63555d16 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-drop_binding_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-drop_binding_/formatted.sql
@@ -3,6 +3,6 @@
 /* kikimr can not - can't drop non-existent table */
 USE plato;
 
-$a = "Output";
+$a = 'Output';
 
 DROP TABLE $a;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-insert_binding_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-insert_binding_/formatted.sql
index f2e5349905..649781087f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-insert_binding_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-insert_binding_/formatted.sql
@@ -2,7 +2,7 @@
 /* postgres can not */
 USE plato;
 
-$a = "Output";
+$a = 'Output';
 
 INSERT INTO $a
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_concat_binding_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_concat_binding_/formatted.sql
index 26b8de1a03..ef6a248fff 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_concat_binding_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_concat_binding_/formatted.sql
@@ -1,6 +1,6 @@
 /* syntax version 1 */
 /* postgres can not */
-$a = "Input";
+$a = 'Input';
 
 SELECT
     count(*)
@@ -10,7 +10,7 @@ FROM
 
 USE plato;
 
-$a = "Input";
+$a = 'Input';
 
 SELECT
     count(*)
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_concat_strict_binding_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_concat_strict_binding_/formatted.sql
index 1441899c77..812e5db0ce 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_concat_strict_binding_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_concat_strict_binding_/formatted.sql
@@ -1,6 +1,6 @@
 /* syntax version 1 */
 /* postgres can not */
-$a = "Input";
+$a = 'Input';
 
 SELECT
     count(*)
@@ -10,7 +10,7 @@ FROM
 
 USE plato;
 
-$a = "Input";
+$a = 'Input';
 
 SELECT
     count(*)
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_filter_binding_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_filter_binding_/formatted.sql
index 0525e585bd..4450f5b3a0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_filter_binding_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_filter_binding_/formatted.sql
@@ -1,14 +1,14 @@
 /* syntax version 1 */
 /* postgres can not */
 /* kikimr can not - range not supported */
-$a = "";
+$a = '';
 
 $b = ($_item) -> {
     RETURN TRUE;
 };
 
-$c = "";
-$d = "";
+$c = '';
+$d = '';
 
 SELECT
     count(*)
@@ -16,14 +16,14 @@ FROM
     plato.filter($a, $b, $c, $d)
 ;
 
-$a = "";
+$a = '';
 
 $b = ($_item) -> {
     RETURN TRUE;
 };
 
-$c = "";
-$d = "raw";
+$c = '';
+$d = 'raw';
 
 SELECT
     count(*)
@@ -37,8 +37,8 @@ $b = ($_item) -> {
     RETURN TRUE;
 };
 
-$c = "";
-$d = "";
+$c = '';
+$d = '';
 
 SELECT
     count(*)
@@ -46,14 +46,14 @@ FROM
     filter($a, $b, $c, $d)
 ;
 
-$a = "";
+$a = '';
 
 $b = ($_item) -> {
     RETURN TRUE;
 };
 
-$c = "";
-$d = "raw";
+$c = '';
+$d = 'raw';
 
 SELECT
     count(*)
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_filter_strict_binding_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_filter_strict_binding_/formatted.sql
index d8923894f6..5f1859d808 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_filter_strict_binding_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_filter_strict_binding_/formatted.sql
@@ -1,14 +1,14 @@
 /* syntax version 1 */
 /* postgres can not */
 /* kikimr can not - range not supported */
-$a = "";
+$a = '';
 
 $b = ($_item) -> {
     RETURN TRUE;
 };
 
-$c = "";
-$d = "";
+$c = '';
+$d = '';
 
 SELECT
     count(*)
@@ -16,14 +16,14 @@ FROM
     plato.filter_strict($a, $b, $c, $d)
 ;
 
-$a = "";
+$a = '';
 
 $b = ($_item) -> {
     RETURN TRUE;
 };
 
-$c = "";
-$d = "raw";
+$c = '';
+$d = 'raw';
 
 SELECT
     count(*)
@@ -33,14 +33,14 @@ FROM
 
 USE plato;
 
-$a = "";
+$a = '';
 
 $b = ($_item) -> {
     RETURN TRUE;
 };
 
-$c = "";
-$d = "";
+$c = '';
+$d = '';
 
 SELECT
     count(*)
@@ -48,14 +48,14 @@ FROM
     filter_strict($a, $b, $c, $d)
 ;
 
-$a = "";
+$a = '';
 
 $b = ($_item) -> {
     RETURN TRUE;
 };
 
-$c = "";
-$d = "raw";
+$c = '';
+$d = 'raw';
 
 SELECT
     count(*)
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_from_binding_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_from_binding_/formatted.sql
index 98d8560cec..080199621f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_from_binding_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_from_binding_/formatted.sql
@@ -2,7 +2,7 @@
 /* postgres can not */
 USE plato;
 
-$x = "Input";
+$x = 'Input';
 
 SELECT
     count(*)
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_from_binding_inferscheme_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_from_binding_inferscheme_/formatted.sql
index 25374bc24a..91539196e6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_from_binding_inferscheme_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_from_binding_inferscheme_/formatted.sql
@@ -5,7 +5,7 @@ PRAGMA yt.InferSchema;
 /* postgres can not */
 USE plato;
 
-$x = "Input";
+$x = 'Input';
 
 SELECT
     count(*)
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_range_binding_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_range_binding_/formatted.sql
index 59a095e9c2..75c17b15b9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_range_binding_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_range_binding_/formatted.sql
@@ -1,11 +1,11 @@
 /* syntax version 1 */
 /* postgres can not */
 /* kikimr can not - range not supported */
-$a = "";
-$b = "Input";
-$c = "Input";
-$d = "";
-$e = "";
+$a = '';
+$b = 'Input';
+$c = 'Input';
+$d = '';
+$e = '';
 
 SELECT
     count(*)
@@ -13,11 +13,11 @@ FROM
     plato.range($a, $b, $c, $d, $e)
 ;
 
-$a = "";
-$b = "Inp";
-$c = "Input1";
-$d = "";
-$e = "raw";
+$a = '';
+$b = 'Inp';
+$c = 'Input1';
+$d = '';
+$e = 'raw';
 
 SELECT
     count(*)
@@ -25,11 +25,11 @@ FROM
     plato.range($a, $b, $c, $d, $e)
 ;
 
-$a = "";
-$b = "Inp";
-$c = "Input2";
-$d = "";
-$e = "";
+$a = '';
+$b = 'Inp';
+$c = 'Input2';
+$d = '';
+$e = '';
 
 SELECT
     count(*)
@@ -39,11 +39,11 @@ FROM
 
 USE plato;
 
-$a = "";
-$b = "Input";
-$c = "Input";
-$d = "";
-$e = "";
+$a = '';
+$b = 'Input';
+$c = 'Input';
+$d = '';
+$e = '';
 
 SELECT
     count(*)
@@ -51,11 +51,11 @@ FROM
     range($a, $b, $c, $d, $e)
 ;
 
-$a = "";
-$b = "Inp";
-$c = "Input1";
-$d = "";
-$e = "raw";
+$a = '';
+$b = 'Inp';
+$c = 'Input1';
+$d = '';
+$e = 'raw';
 
 SELECT
     count(*)
@@ -63,11 +63,11 @@ FROM
     range($a, $b, $c, $d, $e)
 ;
 
-$a = "";
-$b = "Inp";
-$c = "Input2";
-$d = "";
-$e = "";
+$a = '';
+$b = 'Inp';
+$c = 'Input2';
+$d = '';
+$e = '';
 
 SELECT
     count(*)
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_range_strict_binding_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_range_strict_binding_/formatted.sql
index adbc661cf3..de8dedabd6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_range_strict_binding_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_range_strict_binding_/formatted.sql
@@ -1,11 +1,11 @@
 /* syntax version 1 */
 /* postgres can not */
 /* kikimr can not - range_strict not supported */
-$a = "";
-$b = "Input";
-$c = "Input";
-$d = "";
-$e = "";
+$a = '';
+$b = 'Input';
+$c = 'Input';
+$d = '';
+$e = '';
 
 SELECT
     count(*)
@@ -13,11 +13,11 @@ FROM
     plato.range_strict($a, $b, $c, $d, $e)
 ;
 
-$a = "";
-$b = "Inp";
-$c = "Input1";
-$d = "";
-$e = "raw";
+$a = '';
+$b = 'Inp';
+$c = 'Input1';
+$d = '';
+$e = 'raw';
 
 SELECT
     count(*)
@@ -25,11 +25,11 @@ FROM
     plato.range_strict($a, $b, $c, $d, $e)
 ;
 
-$a = "";
-$b = "Inp";
-$c = "Input2";
-$d = "";
-$e = "";
+$a = '';
+$b = 'Inp';
+$c = 'Input2';
+$d = '';
+$e = '';
 
 SELECT
     count(*)
@@ -39,11 +39,11 @@ FROM
 
 USE plato;
 
-$a = "";
-$b = "Input";
-$c = "Input";
-$d = "";
-$e = "";
+$a = '';
+$b = 'Input';
+$c = 'Input';
+$d = '';
+$e = '';
 
 SELECT
     count(*)
@@ -51,11 +51,11 @@ FROM
     range_strict($a, $b, $c, $d, $e)
 ;
 
-$a = "";
-$b = "Inp";
-$c = "Input1";
-$d = "";
-$e = "raw";
+$a = '';
+$b = 'Inp';
+$c = 'Input1';
+$d = '';
+$e = 'raw';
 
 SELECT
     count(*)
@@ -63,11 +63,11 @@ FROM
     range_strict($a, $b, $c, $d, $e)
 ;
 
-$a = "";
-$b = "Inp";
-$c = "Input2";
-$d = "";
-$e = "";
+$a = '';
+$b = 'Inp';
+$c = 'Input2';
+$d = '';
+$e = '';
 
 SELECT
     count(*)
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_regexp_binding_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_regexp_binding_/formatted.sql
index 26d91a86ad..4fb4b851ca 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_regexp_binding_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_regexp_binding_/formatted.sql
@@ -1,10 +1,10 @@
 /* syntax version 1 */
 /* postgres can not */
 /* kikimr can not - range not supported */
-$a = "";
-$b = "Input";
-$c = "";
-$d = "";
+$a = '';
+$b = 'Input';
+$c = '';
+$d = '';
 
 SELECT
     count(*)
@@ -14,10 +14,10 @@ FROM
 
 USE plato;
 
-$a = "";
-$b = "Input";
-$c = "";
-$d = "";
+$a = '';
+$b = 'Input';
+$c = '';
+$d = '';
 
 SELECT
     count(*)
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_regexp_strict_binding_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_regexp_strict_binding_/formatted.sql
index c8ca222dc2..e7f28da79f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_regexp_strict_binding_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_regexp_strict_binding_/formatted.sql
@@ -1,10 +1,10 @@
 /* syntax version 1 */
 /* postgres can not */
 /* kikimr can not - range not supported */
-$a = "";
-$b = "Input";
-$c = "";
-$d = "";
+$a = '';
+$b = 'Input';
+$c = '';
+$d = '';
 
 SELECT
     count(*)
@@ -14,10 +14,10 @@ FROM
 
 USE plato;
 
-$a = "";
-$b = "Input";
-$c = "";
-$d = "";
+$a = '';
+$b = 'Input';
+$c = '';
+$d = '';
 
 SELECT
     count(*)
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-tie_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-tie_/formatted.sql
index 719e02913f..ca9c8d70f8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-tie_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-tie_/formatted.sql
@@ -1,6 +1,6 @@
 /* syntax version 1 */
 /* postgres can not */
-$a, $b, $c = AsTuple(1, 5u, "test");
+$a, $b, $c = AsTuple(1, 5u, 'test');
 
 SELECT
     $a,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-tie_bad_count_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-tie_bad_count_fail_/formatted.sql
index bb73127a17..9a70d1da72 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-tie_bad_count_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-tie_bad_count_fail_/formatted.sql
@@ -1,7 +1,7 @@
 /* syntax version 1 */
 /* postgres can not */
 /* custom error:Expected tuple type of size: 2, but got: 3*/
-$i, $j = AsTuple(1, 5u, "test");
+$i, $j = AsTuple(1, 5u, 'test');
 
 SELECT
     $i,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-tie_scalar_context_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-tie_scalar_context_/formatted.sql
index 9112def280..e9c8fbbc43 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-tie_scalar_context_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-tie_scalar_context_/formatted.sql
@@ -9,10 +9,10 @@ $ids = (
         AGGREGATE_LIST(id)
     FROM (
         SELECT
-            "1" AS id
+            '1' AS id
         UNION ALL
         SELECT
-            "2" AS id
+            '2' AS id
     )
 );
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-block_input_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-block_input_/formatted.sql
index 734adaa1f8..f87652a9af 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-block_input_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-block_input_/formatted.sql
@@ -5,11 +5,11 @@ PRAGMA yt.JobBlockInput;
 SELECT
     key,
     subkey,
-    "value: " || value AS value,
+    'value: ' || value AS value,
 FROM
     Input
 WHERE
-    key < "100"
+    key < '100'
 ORDER BY
     key
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-coalesce_complex_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-coalesce_complex_/formatted.sql
index 82d8aca00a..9e9c00e25d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-coalesce_complex_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-coalesce_complex_/formatted.sql
@@ -1,9 +1,9 @@
 USE plato;
 
 $strings = [
-    <|key: Just(Just("foo")), subkey: Just("bar"), value: 1|>,
-    <|key: Just(Nothing(String?)), subkey: Just("two"), value: 2|>,
-    <|key: Nothing(String??), subkey: Just("three"), value: 3|>,
+    <|key: Just(Just('foo')), subkey: Just('bar'), value: 1|>,
+    <|key: Just(Nothing(String?)), subkey: Just('two'), value: 2|>,
+    <|key: Nothing(String??), subkey: Just('three'), value: 3|>,
     <|key: Nothing(String??), subkey: Nothing(String?), value: 4|>,
 ];
 
@@ -33,7 +33,7 @@ COMMIT;
 SELECT
     value,
     key ?? subkey,
-    subkey ?? "xxx",
+    subkey ?? 'xxx',
 FROM
     @strings
 ORDER BY
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_decimal_max_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_decimal_max_/formatted.sql
index a32ee411ca..3fc80ca8dd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_decimal_max_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_decimal_max_/formatted.sql
@@ -5,8 +5,8 @@ SELECT
     avg(x)
 FROM (
     VALUES
-        (Decimal("99999999999999999999999999999999999", 35, 0)),
-        (Decimal("1", 35, 0))
+        (Decimal('99999999999999999999999999999999999', 35, 0)),
+        (Decimal('1', 35, 0))
 ) AS a (
     x
 );
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_pg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_pg_/formatted.sql
index 0d98aa2dc8..3c8c329f72 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_pg_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_pg_/formatted.sql
@@ -1,6 +1,6 @@
 USE plato;
 
-PRAGMA yt.UsePartitionsByKeysForFinalAgg = "false";
+PRAGMA yt.UsePartitionsByKeysForFinalAgg = 'false';
 
 SELECT
     Pg::count(),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_pg_filter_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_pg_filter_/formatted.sql
index ebccf3ad28..7a9cd73693 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_pg_filter_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_pg_filter_/formatted.sql
@@ -1,6 +1,6 @@
 USE plato;
 
-PRAGMA yt.UsePartitionsByKeysForFinalAgg = "false";
+PRAGMA yt.UsePartitionsByKeysForFinalAgg = 'false';
 
 SELECT
     Pg::count(),
@@ -14,5 +14,5 @@ SELECT
 FROM
     Input
 WHERE
-    d == "aaa"
+    d == 'aaa'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_hashed_pg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_hashed_pg_/formatted.sql
index fa195a5876..332d353d8f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_hashed_pg_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_hashed_pg_/formatted.sql
@@ -1,6 +1,6 @@
 USE plato;
 
-PRAGMA yt.UsePartitionsByKeysForFinalAgg = "false";
+PRAGMA yt.UsePartitionsByKeysForFinalAgg = 'false';
 
 SELECT
     Pg::count(),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_add_interval_scalar_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_add_interval_scalar_/formatted.sql
index 56e0c99310..73bcd8f439 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_add_interval_scalar_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_add_interval_scalar_/formatted.sql
@@ -1,61 +1,61 @@
 USE plato;
 
-PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
+PRAGMA yt.DisableOptimizers = 'OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps';
 
 SELECT
-    Date("2000-01-01") + ni,
-    Date("2000-01-01") + wi,
-    TzDate("2000-01-01,Europe/Moscow") + ni,
-    TzDate("2000-01-01,Europe/Moscow") + wi,
-    Datetime("2000-01-01T03:04:05Z") + ni,
-    Datetime("2000-01-01T03:04:05Z") + wi,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") + ni,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") + wi,
-    Timestamp("2000-01-01T03:04:05.678912Z") + ni,
-    Timestamp("2000-01-01T03:04:05.678912Z") + wi,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") + ni,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") + wi,
-    Date32("1900-01-01") + ni,
-    Date32("1900-01-01") + wi,
-    Datetime64("1900-01-01T03:04:05Z") + ni,
-    Datetime64("1900-01-01T03:04:05Z") + wi,
-    Timestamp64("1900-01-01T03:04:05.678912Z") + ni,
-    Timestamp64("1900-01-01T03:04:05.678912Z") + wi,
-    TzDate32("1900-01-01,Europe/Moscow") + ni,
-    TzDate32("1900-01-01,Europe/Moscow") + wi,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") + ni,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") + wi,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") + ni,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") + wi
+    Date('2000-01-01') + ni,
+    Date('2000-01-01') + wi,
+    TzDate('2000-01-01,Europe/Moscow') + ni,
+    TzDate('2000-01-01,Europe/Moscow') + wi,
+    Datetime('2000-01-01T03:04:05Z') + ni,
+    Datetime('2000-01-01T03:04:05Z') + wi,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') + ni,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') + wi,
+    Timestamp('2000-01-01T03:04:05.678912Z') + ni,
+    Timestamp('2000-01-01T03:04:05.678912Z') + wi,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') + ni,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') + wi,
+    Date32('1900-01-01') + ni,
+    Date32('1900-01-01') + wi,
+    Datetime64('1900-01-01T03:04:05Z') + ni,
+    Datetime64('1900-01-01T03:04:05Z') + wi,
+    Timestamp64('1900-01-01T03:04:05.678912Z') + ni,
+    Timestamp64('1900-01-01T03:04:05.678912Z') + wi,
+    TzDate32('1900-01-01,Europe/Moscow') + ni,
+    TzDate32('1900-01-01,Europe/Moscow') + wi,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') + ni,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') + wi,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') + ni,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') + wi
 FROM
     Dates
 ;
 
 SELECT
-    na + Interval("P1D"),
-    na + Interval64("P1D"),
-    naz + Interval("P1D"),
-    naz + Interval64("P1D"),
-    nd + Interval("P1D"),
-    nd + Interval64("P1D"),
-    ndz + Interval("P1D"),
-    ndz + Interval64("P1D"),
-    nt + Interval("P1D"),
-    nt + Interval64("P1D"),
-    ntz + Interval("P1D"),
-    ntz + Interval64("P1D"),
-    wa + Interval("P1D"),
-    wa + Interval64("P1D"),
-    wd + Interval("P1D"),
-    wd + Interval64("P1D"),
-    wt + Interval("P1D"),
-    wt + Interval64("P1D"),
-    waz + Interval("P1D"),
-    waz + Interval64("P1D"),
-    wdz + Interval("P1D"),
-    wdz + Interval64("P1D"),
-    wtz + Interval("P1D"),
-    wtz + Interval64("P1D")
+    na + Interval('P1D'),
+    na + Interval64('P1D'),
+    naz + Interval('P1D'),
+    naz + Interval64('P1D'),
+    nd + Interval('P1D'),
+    nd + Interval64('P1D'),
+    ndz + Interval('P1D'),
+    ndz + Interval64('P1D'),
+    nt + Interval('P1D'),
+    nt + Interval64('P1D'),
+    ntz + Interval('P1D'),
+    ntz + Interval64('P1D'),
+    wa + Interval('P1D'),
+    wa + Interval64('P1D'),
+    wd + Interval('P1D'),
+    wd + Interval64('P1D'),
+    wt + Interval('P1D'),
+    wt + Interval64('P1D'),
+    waz + Interval('P1D'),
+    waz + Interval64('P1D'),
+    wdz + Interval('P1D'),
+    wdz + Interval64('P1D'),
+    wtz + Interval('P1D'),
+    wtz + Interval64('P1D')
 FROM
     Dates
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_equals_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_equals_/formatted.sql
index 4cd7428291..4170de965f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_equals_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_equals_/formatted.sql
@@ -1,6 +1,6 @@
 USE plato;
 
-PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
+PRAGMA yt.DisableOptimizers = 'OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps';
 
 SELECT
     a.na == b.na,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_equals_scalar_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_equals_scalar_/formatted.sql
index fb5e65d167..23ba6b7802 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_equals_scalar_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_equals_scalar_/formatted.sql
@@ -1,319 +1,319 @@
 USE plato;
 
-PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
+PRAGMA yt.DisableOptimizers = 'OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps';
 
 SELECT
-    Date("2000-01-01") == na,
-    Date("2000-01-01") == naz,
-    Date("2000-01-01") == nd,
-    Date("2000-01-01") == ndz,
-    Date("2000-01-01") == nt,
-    Date("2000-01-01") == ntz,
-    Date("2000-01-01") == wa,
-    Date("2000-01-01") == wd,
-    Date("2000-01-01") == wt,
-    Date("2000-01-01") == waz,
-    Date("2000-01-01") == wdz,
-    Date("2000-01-01") == wtz,
-    TzDate("2000-01-01,Europe/Moscow") == na,
-    TzDate("2000-01-01,Europe/Moscow") == naz,
-    TzDate("2000-01-01,Europe/Moscow") == nd,
-    TzDate("2000-01-01,Europe/Moscow") == ndz,
-    TzDate("2000-01-01,Europe/Moscow") == nt,
-    TzDate("2000-01-01,Europe/Moscow") == ntz,
-    TzDate("2000-01-01,Europe/Moscow") == wa,
-    TzDate("2000-01-01,Europe/Moscow") == wd,
-    TzDate("2000-01-01,Europe/Moscow") == wt,
-    TzDate("2000-01-01,Europe/Moscow") == waz,
-    TzDate("2000-01-01,Europe/Moscow") == wdz,
-    TzDate("2000-01-01,Europe/Moscow") == wtz,
-    Datetime("2000-01-01T03:04:05Z") == na,
-    Datetime("2000-01-01T03:04:05Z") == naz,
-    Datetime("2000-01-01T03:04:05Z") == nd,
-    Datetime("2000-01-01T03:04:05Z") == ndz,
-    Datetime("2000-01-01T03:04:05Z") == nt,
-    Datetime("2000-01-01T03:04:05Z") == ntz,
-    Datetime("2000-01-01T03:04:05Z") == wa,
-    Datetime("2000-01-01T03:04:05Z") == wd,
-    Datetime("2000-01-01T03:04:05Z") == wt,
-    Datetime("2000-01-01T03:04:05Z") == waz,
-    Datetime("2000-01-01T03:04:05Z") == wdz,
-    Datetime("2000-01-01T03:04:05Z") == wtz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") == na,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") == naz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") == nd,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") == ndz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") == nt,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") == ntz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") == wa,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") == wd,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") == wt,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") == waz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") == wdz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") == wtz,
-    Timestamp("2000-01-01T03:04:05.678912Z") == na,
-    Timestamp("2000-01-01T03:04:05.678912Z") == naz,
-    Timestamp("2000-01-01T03:04:05.678912Z") == nd,
-    Timestamp("2000-01-01T03:04:05.678912Z") == ndz,
-    Timestamp("2000-01-01T03:04:05.678912Z") == nt,
-    Timestamp("2000-01-01T03:04:05.678912Z") == ntz,
-    Timestamp("2000-01-01T03:04:05.678912Z") == wa,
-    Timestamp("2000-01-01T03:04:05.678912Z") == wd,
-    Timestamp("2000-01-01T03:04:05.678912Z") == wt,
-    Timestamp("2000-01-01T03:04:05.678912Z") == waz,
-    Timestamp("2000-01-01T03:04:05.678912Z") == wdz,
-    Timestamp("2000-01-01T03:04:05.678912Z") == wtz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") == na,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") == naz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") == nd,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") == ndz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") == nt,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") == ntz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") == wa,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") == wd,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") == wt,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") == waz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") == wdz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") == wtz
+    Date('2000-01-01') == na,
+    Date('2000-01-01') == naz,
+    Date('2000-01-01') == nd,
+    Date('2000-01-01') == ndz,
+    Date('2000-01-01') == nt,
+    Date('2000-01-01') == ntz,
+    Date('2000-01-01') == wa,
+    Date('2000-01-01') == wd,
+    Date('2000-01-01') == wt,
+    Date('2000-01-01') == waz,
+    Date('2000-01-01') == wdz,
+    Date('2000-01-01') == wtz,
+    TzDate('2000-01-01,Europe/Moscow') == na,
+    TzDate('2000-01-01,Europe/Moscow') == naz,
+    TzDate('2000-01-01,Europe/Moscow') == nd,
+    TzDate('2000-01-01,Europe/Moscow') == ndz,
+    TzDate('2000-01-01,Europe/Moscow') == nt,
+    TzDate('2000-01-01,Europe/Moscow') == ntz,
+    TzDate('2000-01-01,Europe/Moscow') == wa,
+    TzDate('2000-01-01,Europe/Moscow') == wd,
+    TzDate('2000-01-01,Europe/Moscow') == wt,
+    TzDate('2000-01-01,Europe/Moscow') == waz,
+    TzDate('2000-01-01,Europe/Moscow') == wdz,
+    TzDate('2000-01-01,Europe/Moscow') == wtz,
+    Datetime('2000-01-01T03:04:05Z') == na,
+    Datetime('2000-01-01T03:04:05Z') == naz,
+    Datetime('2000-01-01T03:04:05Z') == nd,
+    Datetime('2000-01-01T03:04:05Z') == ndz,
+    Datetime('2000-01-01T03:04:05Z') == nt,
+    Datetime('2000-01-01T03:04:05Z') == ntz,
+    Datetime('2000-01-01T03:04:05Z') == wa,
+    Datetime('2000-01-01T03:04:05Z') == wd,
+    Datetime('2000-01-01T03:04:05Z') == wt,
+    Datetime('2000-01-01T03:04:05Z') == waz,
+    Datetime('2000-01-01T03:04:05Z') == wdz,
+    Datetime('2000-01-01T03:04:05Z') == wtz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') == na,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') == naz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') == nd,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') == ndz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') == nt,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') == ntz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') == wa,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') == wd,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') == wt,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') == waz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') == wdz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') == wtz,
+    Timestamp('2000-01-01T03:04:05.678912Z') == na,
+    Timestamp('2000-01-01T03:04:05.678912Z') == naz,
+    Timestamp('2000-01-01T03:04:05.678912Z') == nd,
+    Timestamp('2000-01-01T03:04:05.678912Z') == ndz,
+    Timestamp('2000-01-01T03:04:05.678912Z') == nt,
+    Timestamp('2000-01-01T03:04:05.678912Z') == ntz,
+    Timestamp('2000-01-01T03:04:05.678912Z') == wa,
+    Timestamp('2000-01-01T03:04:05.678912Z') == wd,
+    Timestamp('2000-01-01T03:04:05.678912Z') == wt,
+    Timestamp('2000-01-01T03:04:05.678912Z') == waz,
+    Timestamp('2000-01-01T03:04:05.678912Z') == wdz,
+    Timestamp('2000-01-01T03:04:05.678912Z') == wtz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') == na,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') == naz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') == nd,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') == ndz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') == nt,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') == ntz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') == wa,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') == wd,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') == wt,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') == waz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') == wdz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') == wtz
 FROM
     Dates
 ;
 
 SELECT
-    Date32("1900-01-01") == na,
-    Date32("1900-01-01") == naz,
-    Date32("1900-01-01") == nd,
-    Date32("1900-01-01") == ndz,
-    Date32("1900-01-01") == nt,
-    Date32("1900-01-01") == ntz,
-    Date32("1900-01-01") == wa,
-    Date32("1900-01-01") == wd,
-    Date32("1900-01-01") == wt,
-    Date32("1900-01-01") == waz,
-    Date32("1900-01-01") == wdz,
-    Date32("1900-01-01") == wtz,
-    Datetime64("1900-01-01T03:04:05Z") == na,
-    Datetime64("1900-01-01T03:04:05Z") == naz,
-    Datetime64("1900-01-01T03:04:05Z") == nd,
-    Datetime64("1900-01-01T03:04:05Z") == ndz,
-    Datetime64("1900-01-01T03:04:05Z") == nt,
-    Datetime64("1900-01-01T03:04:05Z") == ntz,
-    Datetime64("1900-01-01T03:04:05Z") == wa,
-    Datetime64("1900-01-01T03:04:05Z") == wd,
-    Datetime64("1900-01-01T03:04:05Z") == wt,
-    Datetime64("1900-01-01T03:04:05Z") == waz,
-    Datetime64("1900-01-01T03:04:05Z") == wdz,
-    Datetime64("1900-01-01T03:04:05Z") == wtz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") == na,
-    Timestamp64("1900-01-01T03:04:05.678912Z") == naz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") == nd,
-    Timestamp64("1900-01-01T03:04:05.678912Z") == ndz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") == nt,
-    Timestamp64("1900-01-01T03:04:05.678912Z") == ntz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") == wa,
-    Timestamp64("1900-01-01T03:04:05.678912Z") == wd,
-    Timestamp64("1900-01-01T03:04:05.678912Z") == wt,
-    Timestamp64("1900-01-01T03:04:05.678912Z") == waz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") == wdz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") == wtz,
-    TzDate32("1900-01-01,Europe/Moscow") == na,
-    TzDate32("1900-01-01,Europe/Moscow") == naz,
-    TzDate32("1900-01-01,Europe/Moscow") == nd,
-    TzDate32("1900-01-01,Europe/Moscow") == ndz,
-    TzDate32("1900-01-01,Europe/Moscow") == nt,
-    TzDate32("1900-01-01,Europe/Moscow") == ntz,
-    TzDate32("1900-01-01,Europe/Moscow") == wa,
-    TzDate32("1900-01-01,Europe/Moscow") == wd,
-    TzDate32("1900-01-01,Europe/Moscow") == wt,
-    TzDate32("1900-01-01,Europe/Moscow") == waz,
-    TzDate32("1900-01-01,Europe/Moscow") == wdz,
-    TzDate32("1900-01-01,Europe/Moscow") == wtz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") == na,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") == naz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") == nd,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") == ndz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") == nt,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") == ntz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") == wa,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") == wd,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") == wt,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") == waz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") == wdz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") == wtz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") == na,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") == naz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") == nd,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") == ndz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") == nt,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") == ntz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") == wa,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") == wd,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") == wt,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") == waz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") == wdz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") == wtz,
-    Interval("P1D") == ni,
-    Interval("P1D") == wi,
-    Interval64("P1D") == ni,
-    Interval64("P1D") == wi,
+    Date32('1900-01-01') == na,
+    Date32('1900-01-01') == naz,
+    Date32('1900-01-01') == nd,
+    Date32('1900-01-01') == ndz,
+    Date32('1900-01-01') == nt,
+    Date32('1900-01-01') == ntz,
+    Date32('1900-01-01') == wa,
+    Date32('1900-01-01') == wd,
+    Date32('1900-01-01') == wt,
+    Date32('1900-01-01') == waz,
+    Date32('1900-01-01') == wdz,
+    Date32('1900-01-01') == wtz,
+    Datetime64('1900-01-01T03:04:05Z') == na,
+    Datetime64('1900-01-01T03:04:05Z') == naz,
+    Datetime64('1900-01-01T03:04:05Z') == nd,
+    Datetime64('1900-01-01T03:04:05Z') == ndz,
+    Datetime64('1900-01-01T03:04:05Z') == nt,
+    Datetime64('1900-01-01T03:04:05Z') == ntz,
+    Datetime64('1900-01-01T03:04:05Z') == wa,
+    Datetime64('1900-01-01T03:04:05Z') == wd,
+    Datetime64('1900-01-01T03:04:05Z') == wt,
+    Datetime64('1900-01-01T03:04:05Z') == waz,
+    Datetime64('1900-01-01T03:04:05Z') == wdz,
+    Datetime64('1900-01-01T03:04:05Z') == wtz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') == na,
+    Timestamp64('1900-01-01T03:04:05.678912Z') == naz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') == nd,
+    Timestamp64('1900-01-01T03:04:05.678912Z') == ndz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') == nt,
+    Timestamp64('1900-01-01T03:04:05.678912Z') == ntz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') == wa,
+    Timestamp64('1900-01-01T03:04:05.678912Z') == wd,
+    Timestamp64('1900-01-01T03:04:05.678912Z') == wt,
+    Timestamp64('1900-01-01T03:04:05.678912Z') == waz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') == wdz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') == wtz,
+    TzDate32('1900-01-01,Europe/Moscow') == na,
+    TzDate32('1900-01-01,Europe/Moscow') == naz,
+    TzDate32('1900-01-01,Europe/Moscow') == nd,
+    TzDate32('1900-01-01,Europe/Moscow') == ndz,
+    TzDate32('1900-01-01,Europe/Moscow') == nt,
+    TzDate32('1900-01-01,Europe/Moscow') == ntz,
+    TzDate32('1900-01-01,Europe/Moscow') == wa,
+    TzDate32('1900-01-01,Europe/Moscow') == wd,
+    TzDate32('1900-01-01,Europe/Moscow') == wt,
+    TzDate32('1900-01-01,Europe/Moscow') == waz,
+    TzDate32('1900-01-01,Europe/Moscow') == wdz,
+    TzDate32('1900-01-01,Europe/Moscow') == wtz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') == na,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') == naz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') == nd,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') == ndz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') == nt,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') == ntz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') == wa,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') == wd,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') == wt,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') == waz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') == wdz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') == wtz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') == na,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') == naz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') == nd,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') == ndz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') == nt,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') == ntz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') == wa,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') == wd,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') == wt,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') == waz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') == wdz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') == wtz,
+    Interval('P1D') == ni,
+    Interval('P1D') == wi,
+    Interval64('P1D') == ni,
+    Interval64('P1D') == wi,
 FROM
     Dates
 ;
 
 SELECT
-    na == Date("2000-01-01"),
-    naz == Date("2000-01-01"),
-    nd == Date("2000-01-01"),
-    ndz == Date("2000-01-01"),
-    nt == Date("2000-01-01"),
-    ntz == Date("2000-01-01"),
-    wa == Date("2000-01-01"),
-    wd == Date("2000-01-01"),
-    wt == Date("2000-01-01"),
-    waz == Date("2000-01-01"),
-    wdz == Date("2000-01-01"),
-    wtz == Date("2000-01-01"),
-    na == TzDate("2000-01-01,Europe/Moscow"),
-    naz == TzDate("2000-01-01,Europe/Moscow"),
-    nd == TzDate("2000-01-01,Europe/Moscow"),
-    ndz == TzDate("2000-01-01,Europe/Moscow"),
-    nt == TzDate("2000-01-01,Europe/Moscow"),
-    ntz == TzDate("2000-01-01,Europe/Moscow"),
-    wa == TzDate("2000-01-01,Europe/Moscow"),
-    wd == TzDate("2000-01-01,Europe/Moscow"),
-    wt == TzDate("2000-01-01,Europe/Moscow"),
-    waz == TzDate("2000-01-01,Europe/Moscow"),
-    wdz == TzDate("2000-01-01,Europe/Moscow"),
-    wtz == TzDate("2000-01-01,Europe/Moscow"),
-    na == Datetime("2000-01-01T03:04:05Z"),
-    naz == Datetime("2000-01-01T03:04:05Z"),
-    nd == Datetime("2000-01-01T03:04:05Z"),
-    ndz == Datetime("2000-01-01T03:04:05Z"),
-    nt == Datetime("2000-01-01T03:04:05Z"),
-    ntz == Datetime("2000-01-01T03:04:05Z"),
-    wa == Datetime("2000-01-01T03:04:05Z"),
-    wd == Datetime("2000-01-01T03:04:05Z"),
-    wt == Datetime("2000-01-01T03:04:05Z"),
-    waz == Datetime("2000-01-01T03:04:05Z"),
-    wdz == Datetime("2000-01-01T03:04:05Z"),
-    wtz == Datetime("2000-01-01T03:04:05Z"),
-    na == TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    naz == TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    nd == TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    ndz == TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    nt == TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    ntz == TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wa == TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wd == TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wt == TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    waz == TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wdz == TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wtz == TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    na == Timestamp("2000-01-01T03:04:05.678912Z"),
-    naz == Timestamp("2000-01-01T03:04:05.678912Z"),
-    nd == Timestamp("2000-01-01T03:04:05.678912Z"),
-    ndz == Timestamp("2000-01-01T03:04:05.678912Z"),
-    nt == Timestamp("2000-01-01T03:04:05.678912Z"),
-    ntz == Timestamp("2000-01-01T03:04:05.678912Z"),
-    wa == Timestamp("2000-01-01T03:04:05.678912Z"),
-    wd == Timestamp("2000-01-01T03:04:05.678912Z"),
-    wt == Timestamp("2000-01-01T03:04:05.678912Z"),
-    waz == Timestamp("2000-01-01T03:04:05.678912Z"),
-    wdz == Timestamp("2000-01-01T03:04:05.678912Z"),
-    wtz == Timestamp("2000-01-01T03:04:05.678912Z"),
-    na == TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    naz == TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    nd == TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    ndz == TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    nt == TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    ntz == TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wa == TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wd == TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wt == TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    waz == TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wdz == TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wtz == TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow")
+    na == Date('2000-01-01'),
+    naz == Date('2000-01-01'),
+    nd == Date('2000-01-01'),
+    ndz == Date('2000-01-01'),
+    nt == Date('2000-01-01'),
+    ntz == Date('2000-01-01'),
+    wa == Date('2000-01-01'),
+    wd == Date('2000-01-01'),
+    wt == Date('2000-01-01'),
+    waz == Date('2000-01-01'),
+    wdz == Date('2000-01-01'),
+    wtz == Date('2000-01-01'),
+    na == TzDate('2000-01-01,Europe/Moscow'),
+    naz == TzDate('2000-01-01,Europe/Moscow'),
+    nd == TzDate('2000-01-01,Europe/Moscow'),
+    ndz == TzDate('2000-01-01,Europe/Moscow'),
+    nt == TzDate('2000-01-01,Europe/Moscow'),
+    ntz == TzDate('2000-01-01,Europe/Moscow'),
+    wa == TzDate('2000-01-01,Europe/Moscow'),
+    wd == TzDate('2000-01-01,Europe/Moscow'),
+    wt == TzDate('2000-01-01,Europe/Moscow'),
+    waz == TzDate('2000-01-01,Europe/Moscow'),
+    wdz == TzDate('2000-01-01,Europe/Moscow'),
+    wtz == TzDate('2000-01-01,Europe/Moscow'),
+    na == Datetime('2000-01-01T03:04:05Z'),
+    naz == Datetime('2000-01-01T03:04:05Z'),
+    nd == Datetime('2000-01-01T03:04:05Z'),
+    ndz == Datetime('2000-01-01T03:04:05Z'),
+    nt == Datetime('2000-01-01T03:04:05Z'),
+    ntz == Datetime('2000-01-01T03:04:05Z'),
+    wa == Datetime('2000-01-01T03:04:05Z'),
+    wd == Datetime('2000-01-01T03:04:05Z'),
+    wt == Datetime('2000-01-01T03:04:05Z'),
+    waz == Datetime('2000-01-01T03:04:05Z'),
+    wdz == Datetime('2000-01-01T03:04:05Z'),
+    wtz == Datetime('2000-01-01T03:04:05Z'),
+    na == TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    naz == TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    nd == TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    ndz == TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    nt == TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    ntz == TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wa == TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wd == TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wt == TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    waz == TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wdz == TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wtz == TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    na == Timestamp('2000-01-01T03:04:05.678912Z'),
+    naz == Timestamp('2000-01-01T03:04:05.678912Z'),
+    nd == Timestamp('2000-01-01T03:04:05.678912Z'),
+    ndz == Timestamp('2000-01-01T03:04:05.678912Z'),
+    nt == Timestamp('2000-01-01T03:04:05.678912Z'),
+    ntz == Timestamp('2000-01-01T03:04:05.678912Z'),
+    wa == Timestamp('2000-01-01T03:04:05.678912Z'),
+    wd == Timestamp('2000-01-01T03:04:05.678912Z'),
+    wt == Timestamp('2000-01-01T03:04:05.678912Z'),
+    waz == Timestamp('2000-01-01T03:04:05.678912Z'),
+    wdz == Timestamp('2000-01-01T03:04:05.678912Z'),
+    wtz == Timestamp('2000-01-01T03:04:05.678912Z'),
+    na == TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    naz == TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    nd == TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    ndz == TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    nt == TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    ntz == TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wa == TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wd == TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wt == TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    waz == TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wdz == TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wtz == TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow')
 FROM
     Dates
 ;
 
 SELECT
-    na == Date32("1900-01-01"),
-    naz == Date32("1900-01-01"),
-    nd == Date32("1900-01-01"),
-    ndz == Date32("1900-01-01"),
-    nt == Date32("1900-01-01"),
-    ntz == Date32("1900-01-01"),
-    wa == Date32("1900-01-01"),
-    wd == Date32("1900-01-01"),
-    wt == Date32("1900-01-01"),
-    waz == Date32("1900-01-01"),
-    wdz == Date32("1900-01-01"),
-    wtz == Date32("1900-01-01"),
-    na == Datetime64("1900-01-01T03:04:05Z"),
-    naz == Datetime64("1900-01-01T03:04:05Z"),
-    nd == Datetime64("1900-01-01T03:04:05Z"),
-    ndz == Datetime64("1900-01-01T03:04:05Z"),
-    nt == Datetime64("1900-01-01T03:04:05Z"),
-    ntz == Datetime64("1900-01-01T03:04:05Z"),
-    wa == Datetime64("1900-01-01T03:04:05Z"),
-    wd == Datetime64("1900-01-01T03:04:05Z"),
-    wt == Datetime64("1900-01-01T03:04:05Z"),
-    waz == Datetime64("1900-01-01T03:04:05Z"),
-    wdz == Datetime64("1900-01-01T03:04:05Z"),
-    wtz == Datetime64("1900-01-01T03:04:05Z"),
-    na == Timestamp64("1900-01-01T03:04:05.678912Z"),
-    naz == Timestamp64("1900-01-01T03:04:05.678912Z"),
-    nd == Timestamp64("1900-01-01T03:04:05.678912Z"),
-    ndz == Timestamp64("1900-01-01T03:04:05.678912Z"),
-    nt == Timestamp64("1900-01-01T03:04:05.678912Z"),
-    ntz == Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wa == Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wd == Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wt == Timestamp64("1900-01-01T03:04:05.678912Z"),
-    waz == Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wdz == Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wtz == Timestamp64("1900-01-01T03:04:05.678912Z"),
-    na == TzDate32("1900-01-01,Europe/Moscow"),
-    naz == TzDate32("1900-01-01,Europe/Moscow"),
-    nd == TzDate32("1900-01-01,Europe/Moscow"),
-    ndz == TzDate32("1900-01-01,Europe/Moscow"),
-    nt == TzDate32("1900-01-01,Europe/Moscow"),
-    ntz == TzDate32("1900-01-01,Europe/Moscow"),
-    wa == TzDate32("1900-01-01,Europe/Moscow"),
-    wd == TzDate32("1900-01-01,Europe/Moscow"),
-    wt == TzDate32("1900-01-01,Europe/Moscow"),
-    waz == TzDate32("1900-01-01,Europe/Moscow"),
-    wdz == TzDate32("1900-01-01,Europe/Moscow"),
-    wtz == TzDate32("1900-01-01,Europe/Moscow"),
-    na == TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    naz == TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    nd == TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    ndz == TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    nt == TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    ntz == TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wa == TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wd == TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wt == TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    waz == TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wdz == TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wtz == TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    na == TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    naz == TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    nd == TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    ndz == TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    nt == TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    ntz == TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wa == TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wd == TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wt == TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    waz == TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wdz == TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wtz == TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    ni == Interval("P1D"),
-    wi == Interval("P1D"),
-    ni == Interval64("P1D"),
-    wi == Interval64("P1D"),
+    na == Date32('1900-01-01'),
+    naz == Date32('1900-01-01'),
+    nd == Date32('1900-01-01'),
+    ndz == Date32('1900-01-01'),
+    nt == Date32('1900-01-01'),
+    ntz == Date32('1900-01-01'),
+    wa == Date32('1900-01-01'),
+    wd == Date32('1900-01-01'),
+    wt == Date32('1900-01-01'),
+    waz == Date32('1900-01-01'),
+    wdz == Date32('1900-01-01'),
+    wtz == Date32('1900-01-01'),
+    na == Datetime64('1900-01-01T03:04:05Z'),
+    naz == Datetime64('1900-01-01T03:04:05Z'),
+    nd == Datetime64('1900-01-01T03:04:05Z'),
+    ndz == Datetime64('1900-01-01T03:04:05Z'),
+    nt == Datetime64('1900-01-01T03:04:05Z'),
+    ntz == Datetime64('1900-01-01T03:04:05Z'),
+    wa == Datetime64('1900-01-01T03:04:05Z'),
+    wd == Datetime64('1900-01-01T03:04:05Z'),
+    wt == Datetime64('1900-01-01T03:04:05Z'),
+    waz == Datetime64('1900-01-01T03:04:05Z'),
+    wdz == Datetime64('1900-01-01T03:04:05Z'),
+    wtz == Datetime64('1900-01-01T03:04:05Z'),
+    na == Timestamp64('1900-01-01T03:04:05.678912Z'),
+    naz == Timestamp64('1900-01-01T03:04:05.678912Z'),
+    nd == Timestamp64('1900-01-01T03:04:05.678912Z'),
+    ndz == Timestamp64('1900-01-01T03:04:05.678912Z'),
+    nt == Timestamp64('1900-01-01T03:04:05.678912Z'),
+    ntz == Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wa == Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wd == Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wt == Timestamp64('1900-01-01T03:04:05.678912Z'),
+    waz == Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wdz == Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wtz == Timestamp64('1900-01-01T03:04:05.678912Z'),
+    na == TzDate32('1900-01-01,Europe/Moscow'),
+    naz == TzDate32('1900-01-01,Europe/Moscow'),
+    nd == TzDate32('1900-01-01,Europe/Moscow'),
+    ndz == TzDate32('1900-01-01,Europe/Moscow'),
+    nt == TzDate32('1900-01-01,Europe/Moscow'),
+    ntz == TzDate32('1900-01-01,Europe/Moscow'),
+    wa == TzDate32('1900-01-01,Europe/Moscow'),
+    wd == TzDate32('1900-01-01,Europe/Moscow'),
+    wt == TzDate32('1900-01-01,Europe/Moscow'),
+    waz == TzDate32('1900-01-01,Europe/Moscow'),
+    wdz == TzDate32('1900-01-01,Europe/Moscow'),
+    wtz == TzDate32('1900-01-01,Europe/Moscow'),
+    na == TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    naz == TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    nd == TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    ndz == TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    nt == TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    ntz == TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wa == TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wd == TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wt == TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    waz == TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wdz == TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wtz == TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    na == TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    naz == TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    nd == TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    ndz == TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    nt == TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    ntz == TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wa == TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wd == TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wt == TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    waz == TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wdz == TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wtz == TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    ni == Interval('P1D'),
+    wi == Interval('P1D'),
+    ni == Interval64('P1D'),
+    wi == Interval64('P1D'),
 FROM
     Dates
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_/formatted.sql
index d213b36c11..29c81e9057 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_/formatted.sql
@@ -1,6 +1,6 @@
 USE plato;
 
-PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
+PRAGMA yt.DisableOptimizers = 'OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps';
 
 SELECT
     a.na > b.na,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_or_equal_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_or_equal_/formatted.sql
index 2524f4db9c..9e644be3fd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_or_equal_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_or_equal_/formatted.sql
@@ -1,6 +1,6 @@
 USE plato;
 
-PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
+PRAGMA yt.DisableOptimizers = 'OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps';
 
 SELECT
     a.na >= b.na,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_or_equal_scalar_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_or_equal_scalar_/formatted.sql
index bee5d330a8..dc9e8db1a3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_or_equal_scalar_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_or_equal_scalar_/formatted.sql
@@ -1,319 +1,319 @@
 USE plato;
 
-PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
+PRAGMA yt.DisableOptimizers = 'OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps';
 
 SELECT
-    Date("2000-01-01") >= na,
-    Date("2000-01-01") >= naz,
-    Date("2000-01-01") >= nd,
-    Date("2000-01-01") >= ndz,
-    Date("2000-01-01") >= nt,
-    Date("2000-01-01") >= ntz,
-    Date("2000-01-01") >= wa,
-    Date("2000-01-01") >= wd,
-    Date("2000-01-01") >= wt,
-    Date("2000-01-01") >= waz,
-    Date("2000-01-01") >= wdz,
-    Date("2000-01-01") >= wtz,
-    TzDate("2000-01-01,Europe/Moscow") >= na,
-    TzDate("2000-01-01,Europe/Moscow") >= naz,
-    TzDate("2000-01-01,Europe/Moscow") >= nd,
-    TzDate("2000-01-01,Europe/Moscow") >= ndz,
-    TzDate("2000-01-01,Europe/Moscow") >= nt,
-    TzDate("2000-01-01,Europe/Moscow") >= ntz,
-    TzDate("2000-01-01,Europe/Moscow") >= wa,
-    TzDate("2000-01-01,Europe/Moscow") >= wd,
-    TzDate("2000-01-01,Europe/Moscow") >= wt,
-    TzDate("2000-01-01,Europe/Moscow") >= waz,
-    TzDate("2000-01-01,Europe/Moscow") >= wdz,
-    TzDate("2000-01-01,Europe/Moscow") >= wtz,
-    Datetime("2000-01-01T03:04:05Z") >= na,
-    Datetime("2000-01-01T03:04:05Z") >= naz,
-    Datetime("2000-01-01T03:04:05Z") >= nd,
-    Datetime("2000-01-01T03:04:05Z") >= ndz,
-    Datetime("2000-01-01T03:04:05Z") >= nt,
-    Datetime("2000-01-01T03:04:05Z") >= ntz,
-    Datetime("2000-01-01T03:04:05Z") >= wa,
-    Datetime("2000-01-01T03:04:05Z") >= wd,
-    Datetime("2000-01-01T03:04:05Z") >= wt,
-    Datetime("2000-01-01T03:04:05Z") >= waz,
-    Datetime("2000-01-01T03:04:05Z") >= wdz,
-    Datetime("2000-01-01T03:04:05Z") >= wtz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") >= na,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") >= naz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") >= nd,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") >= ndz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") >= nt,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") >= ntz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") >= wa,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") >= wd,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") >= wt,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") >= waz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") >= wdz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") >= wtz,
-    Timestamp("2000-01-01T03:04:05.678912Z") >= na,
-    Timestamp("2000-01-01T03:04:05.678912Z") >= naz,
-    Timestamp("2000-01-01T03:04:05.678912Z") >= nd,
-    Timestamp("2000-01-01T03:04:05.678912Z") >= ndz,
-    Timestamp("2000-01-01T03:04:05.678912Z") >= nt,
-    Timestamp("2000-01-01T03:04:05.678912Z") >= ntz,
-    Timestamp("2000-01-01T03:04:05.678912Z") >= wa,
-    Timestamp("2000-01-01T03:04:05.678912Z") >= wd,
-    Timestamp("2000-01-01T03:04:05.678912Z") >= wt,
-    Timestamp("2000-01-01T03:04:05.678912Z") >= waz,
-    Timestamp("2000-01-01T03:04:05.678912Z") >= wdz,
-    Timestamp("2000-01-01T03:04:05.678912Z") >= wtz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") >= na,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") >= naz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") >= nd,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") >= ndz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") >= nt,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") >= ntz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") >= wa,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") >= wd,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") >= wt,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") >= waz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") >= wdz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") >= wtz
+    Date('2000-01-01') >= na,
+    Date('2000-01-01') >= naz,
+    Date('2000-01-01') >= nd,
+    Date('2000-01-01') >= ndz,
+    Date('2000-01-01') >= nt,
+    Date('2000-01-01') >= ntz,
+    Date('2000-01-01') >= wa,
+    Date('2000-01-01') >= wd,
+    Date('2000-01-01') >= wt,
+    Date('2000-01-01') >= waz,
+    Date('2000-01-01') >= wdz,
+    Date('2000-01-01') >= wtz,
+    TzDate('2000-01-01,Europe/Moscow') >= na,
+    TzDate('2000-01-01,Europe/Moscow') >= naz,
+    TzDate('2000-01-01,Europe/Moscow') >= nd,
+    TzDate('2000-01-01,Europe/Moscow') >= ndz,
+    TzDate('2000-01-01,Europe/Moscow') >= nt,
+    TzDate('2000-01-01,Europe/Moscow') >= ntz,
+    TzDate('2000-01-01,Europe/Moscow') >= wa,
+    TzDate('2000-01-01,Europe/Moscow') >= wd,
+    TzDate('2000-01-01,Europe/Moscow') >= wt,
+    TzDate('2000-01-01,Europe/Moscow') >= waz,
+    TzDate('2000-01-01,Europe/Moscow') >= wdz,
+    TzDate('2000-01-01,Europe/Moscow') >= wtz,
+    Datetime('2000-01-01T03:04:05Z') >= na,
+    Datetime('2000-01-01T03:04:05Z') >= naz,
+    Datetime('2000-01-01T03:04:05Z') >= nd,
+    Datetime('2000-01-01T03:04:05Z') >= ndz,
+    Datetime('2000-01-01T03:04:05Z') >= nt,
+    Datetime('2000-01-01T03:04:05Z') >= ntz,
+    Datetime('2000-01-01T03:04:05Z') >= wa,
+    Datetime('2000-01-01T03:04:05Z') >= wd,
+    Datetime('2000-01-01T03:04:05Z') >= wt,
+    Datetime('2000-01-01T03:04:05Z') >= waz,
+    Datetime('2000-01-01T03:04:05Z') >= wdz,
+    Datetime('2000-01-01T03:04:05Z') >= wtz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') >= na,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') >= naz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') >= nd,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') >= ndz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') >= nt,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') >= ntz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') >= wa,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') >= wd,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') >= wt,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') >= waz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') >= wdz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') >= wtz,
+    Timestamp('2000-01-01T03:04:05.678912Z') >= na,
+    Timestamp('2000-01-01T03:04:05.678912Z') >= naz,
+    Timestamp('2000-01-01T03:04:05.678912Z') >= nd,
+    Timestamp('2000-01-01T03:04:05.678912Z') >= ndz,
+    Timestamp('2000-01-01T03:04:05.678912Z') >= nt,
+    Timestamp('2000-01-01T03:04:05.678912Z') >= ntz,
+    Timestamp('2000-01-01T03:04:05.678912Z') >= wa,
+    Timestamp('2000-01-01T03:04:05.678912Z') >= wd,
+    Timestamp('2000-01-01T03:04:05.678912Z') >= wt,
+    Timestamp('2000-01-01T03:04:05.678912Z') >= waz,
+    Timestamp('2000-01-01T03:04:05.678912Z') >= wdz,
+    Timestamp('2000-01-01T03:04:05.678912Z') >= wtz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') >= na,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') >= naz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') >= nd,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') >= ndz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') >= nt,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') >= ntz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') >= wa,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') >= wd,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') >= wt,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') >= waz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') >= wdz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') >= wtz
 FROM
     Dates
 ;
 
 SELECT
-    Date32("1900-01-01") >= na,
-    Date32("1900-01-01") >= naz,
-    Date32("1900-01-01") >= nd,
-    Date32("1900-01-01") >= ndz,
-    Date32("1900-01-01") >= nt,
-    Date32("1900-01-01") >= ntz,
-    Date32("1900-01-01") >= wa,
-    Date32("1900-01-01") >= wd,
-    Date32("1900-01-01") >= wt,
-    Date32("1900-01-01") >= waz,
-    Date32("1900-01-01") >= wdz,
-    Date32("1900-01-01") >= wtz,
-    Datetime64("1900-01-01T03:04:05Z") >= na,
-    Datetime64("1900-01-01T03:04:05Z") >= naz,
-    Datetime64("1900-01-01T03:04:05Z") >= nd,
-    Datetime64("1900-01-01T03:04:05Z") >= ndz,
-    Datetime64("1900-01-01T03:04:05Z") >= nt,
-    Datetime64("1900-01-01T03:04:05Z") >= ntz,
-    Datetime64("1900-01-01T03:04:05Z") >= wa,
-    Datetime64("1900-01-01T03:04:05Z") >= wd,
-    Datetime64("1900-01-01T03:04:05Z") >= wt,
-    Datetime64("1900-01-01T03:04:05Z") >= waz,
-    Datetime64("1900-01-01T03:04:05Z") >= wdz,
-    Datetime64("1900-01-01T03:04:05Z") >= wtz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") >= na,
-    Timestamp64("1900-01-01T03:04:05.678912Z") >= naz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") >= nd,
-    Timestamp64("1900-01-01T03:04:05.678912Z") >= ndz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") >= nt,
-    Timestamp64("1900-01-01T03:04:05.678912Z") >= ntz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") >= wa,
-    Timestamp64("1900-01-01T03:04:05.678912Z") >= wd,
-    Timestamp64("1900-01-01T03:04:05.678912Z") >= wt,
-    Timestamp64("1900-01-01T03:04:05.678912Z") >= waz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") >= wdz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") >= wtz,
-    TzDate32("1900-01-01,Europe/Moscow") >= na,
-    TzDate32("1900-01-01,Europe/Moscow") >= naz,
-    TzDate32("1900-01-01,Europe/Moscow") >= nd,
-    TzDate32("1900-01-01,Europe/Moscow") >= ndz,
-    TzDate32("1900-01-01,Europe/Moscow") >= nt,
-    TzDate32("1900-01-01,Europe/Moscow") >= ntz,
-    TzDate32("1900-01-01,Europe/Moscow") >= wa,
-    TzDate32("1900-01-01,Europe/Moscow") >= wd,
-    TzDate32("1900-01-01,Europe/Moscow") >= wt,
-    TzDate32("1900-01-01,Europe/Moscow") >= waz,
-    TzDate32("1900-01-01,Europe/Moscow") >= wdz,
-    TzDate32("1900-01-01,Europe/Moscow") >= wtz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") >= na,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") >= naz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") >= nd,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") >= ndz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") >= nt,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") >= ntz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") >= wa,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") >= wd,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") >= wt,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") >= waz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") >= wdz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") >= wtz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") >= na,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") >= naz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") >= nd,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") >= ndz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") >= nt,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") >= ntz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") >= wa,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") >= wd,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") >= wt,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") >= waz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") >= wdz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") >= wtz,
-    Interval("P1D") >= ni,
-    Interval("P1D") >= wi,
-    Interval64("P1D") >= ni,
-    Interval64("P1D") >= wi,
+    Date32('1900-01-01') >= na,
+    Date32('1900-01-01') >= naz,
+    Date32('1900-01-01') >= nd,
+    Date32('1900-01-01') >= ndz,
+    Date32('1900-01-01') >= nt,
+    Date32('1900-01-01') >= ntz,
+    Date32('1900-01-01') >= wa,
+    Date32('1900-01-01') >= wd,
+    Date32('1900-01-01') >= wt,
+    Date32('1900-01-01') >= waz,
+    Date32('1900-01-01') >= wdz,
+    Date32('1900-01-01') >= wtz,
+    Datetime64('1900-01-01T03:04:05Z') >= na,
+    Datetime64('1900-01-01T03:04:05Z') >= naz,
+    Datetime64('1900-01-01T03:04:05Z') >= nd,
+    Datetime64('1900-01-01T03:04:05Z') >= ndz,
+    Datetime64('1900-01-01T03:04:05Z') >= nt,
+    Datetime64('1900-01-01T03:04:05Z') >= ntz,
+    Datetime64('1900-01-01T03:04:05Z') >= wa,
+    Datetime64('1900-01-01T03:04:05Z') >= wd,
+    Datetime64('1900-01-01T03:04:05Z') >= wt,
+    Datetime64('1900-01-01T03:04:05Z') >= waz,
+    Datetime64('1900-01-01T03:04:05Z') >= wdz,
+    Datetime64('1900-01-01T03:04:05Z') >= wtz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') >= na,
+    Timestamp64('1900-01-01T03:04:05.678912Z') >= naz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') >= nd,
+    Timestamp64('1900-01-01T03:04:05.678912Z') >= ndz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') >= nt,
+    Timestamp64('1900-01-01T03:04:05.678912Z') >= ntz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') >= wa,
+    Timestamp64('1900-01-01T03:04:05.678912Z') >= wd,
+    Timestamp64('1900-01-01T03:04:05.678912Z') >= wt,
+    Timestamp64('1900-01-01T03:04:05.678912Z') >= waz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') >= wdz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') >= wtz,
+    TzDate32('1900-01-01,Europe/Moscow') >= na,
+    TzDate32('1900-01-01,Europe/Moscow') >= naz,
+    TzDate32('1900-01-01,Europe/Moscow') >= nd,
+    TzDate32('1900-01-01,Europe/Moscow') >= ndz,
+    TzDate32('1900-01-01,Europe/Moscow') >= nt,
+    TzDate32('1900-01-01,Europe/Moscow') >= ntz,
+    TzDate32('1900-01-01,Europe/Moscow') >= wa,
+    TzDate32('1900-01-01,Europe/Moscow') >= wd,
+    TzDate32('1900-01-01,Europe/Moscow') >= wt,
+    TzDate32('1900-01-01,Europe/Moscow') >= waz,
+    TzDate32('1900-01-01,Europe/Moscow') >= wdz,
+    TzDate32('1900-01-01,Europe/Moscow') >= wtz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') >= na,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') >= naz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') >= nd,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') >= ndz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') >= nt,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') >= ntz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') >= wa,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') >= wd,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') >= wt,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') >= waz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') >= wdz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') >= wtz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') >= na,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') >= naz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') >= nd,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') >= ndz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') >= nt,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') >= ntz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') >= wa,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') >= wd,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') >= wt,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') >= waz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') >= wdz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') >= wtz,
+    Interval('P1D') >= ni,
+    Interval('P1D') >= wi,
+    Interval64('P1D') >= ni,
+    Interval64('P1D') >= wi,
 FROM
     Dates
 ;
 
 SELECT
-    na >= Date("2000-01-01"),
-    naz >= Date("2000-01-01"),
-    nd >= Date("2000-01-01"),
-    ndz >= Date("2000-01-01"),
-    nt >= Date("2000-01-01"),
-    ntz >= Date("2000-01-01"),
-    wa >= Date("2000-01-01"),
-    wd >= Date("2000-01-01"),
-    wt >= Date("2000-01-01"),
-    waz >= Date("2000-01-01"),
-    wdz >= Date("2000-01-01"),
-    wtz >= Date("2000-01-01"),
-    na >= TzDate("2000-01-01,Europe/Moscow"),
-    naz >= TzDate("2000-01-01,Europe/Moscow"),
-    nd >= TzDate("2000-01-01,Europe/Moscow"),
-    ndz >= TzDate("2000-01-01,Europe/Moscow"),
-    nt >= TzDate("2000-01-01,Europe/Moscow"),
-    ntz >= TzDate("2000-01-01,Europe/Moscow"),
-    wa >= TzDate("2000-01-01,Europe/Moscow"),
-    wd >= TzDate("2000-01-01,Europe/Moscow"),
-    wt >= TzDate("2000-01-01,Europe/Moscow"),
-    waz >= TzDate("2000-01-01,Europe/Moscow"),
-    wdz >= TzDate("2000-01-01,Europe/Moscow"),
-    wtz >= TzDate("2000-01-01,Europe/Moscow"),
-    na >= Datetime("2000-01-01T03:04:05Z"),
-    naz >= Datetime("2000-01-01T03:04:05Z"),
-    nd >= Datetime("2000-01-01T03:04:05Z"),
-    ndz >= Datetime("2000-01-01T03:04:05Z"),
-    nt >= Datetime("2000-01-01T03:04:05Z"),
-    ntz >= Datetime("2000-01-01T03:04:05Z"),
-    wa >= Datetime("2000-01-01T03:04:05Z"),
-    wd >= Datetime("2000-01-01T03:04:05Z"),
-    wt >= Datetime("2000-01-01T03:04:05Z"),
-    waz >= Datetime("2000-01-01T03:04:05Z"),
-    wdz >= Datetime("2000-01-01T03:04:05Z"),
-    wtz >= Datetime("2000-01-01T03:04:05Z"),
-    na >= TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    naz >= TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    nd >= TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    ndz >= TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    nt >= TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    ntz >= TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wa >= TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wd >= TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wt >= TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    waz >= TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wdz >= TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wtz >= TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    na >= Timestamp("2000-01-01T03:04:05.678912Z"),
-    naz >= Timestamp("2000-01-01T03:04:05.678912Z"),
-    nd >= Timestamp("2000-01-01T03:04:05.678912Z"),
-    ndz >= Timestamp("2000-01-01T03:04:05.678912Z"),
-    nt >= Timestamp("2000-01-01T03:04:05.678912Z"),
-    ntz >= Timestamp("2000-01-01T03:04:05.678912Z"),
-    wa >= Timestamp("2000-01-01T03:04:05.678912Z"),
-    wd >= Timestamp("2000-01-01T03:04:05.678912Z"),
-    wt >= Timestamp("2000-01-01T03:04:05.678912Z"),
-    waz >= Timestamp("2000-01-01T03:04:05.678912Z"),
-    wdz >= Timestamp("2000-01-01T03:04:05.678912Z"),
-    wtz >= Timestamp("2000-01-01T03:04:05.678912Z"),
-    na >= TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    naz >= TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    nd >= TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    ndz >= TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    nt >= TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    ntz >= TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wa >= TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wd >= TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wt >= TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    waz >= TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wdz >= TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wtz >= TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow")
+    na >= Date('2000-01-01'),
+    naz >= Date('2000-01-01'),
+    nd >= Date('2000-01-01'),
+    ndz >= Date('2000-01-01'),
+    nt >= Date('2000-01-01'),
+    ntz >= Date('2000-01-01'),
+    wa >= Date('2000-01-01'),
+    wd >= Date('2000-01-01'),
+    wt >= Date('2000-01-01'),
+    waz >= Date('2000-01-01'),
+    wdz >= Date('2000-01-01'),
+    wtz >= Date('2000-01-01'),
+    na >= TzDate('2000-01-01,Europe/Moscow'),
+    naz >= TzDate('2000-01-01,Europe/Moscow'),
+    nd >= TzDate('2000-01-01,Europe/Moscow'),
+    ndz >= TzDate('2000-01-01,Europe/Moscow'),
+    nt >= TzDate('2000-01-01,Europe/Moscow'),
+    ntz >= TzDate('2000-01-01,Europe/Moscow'),
+    wa >= TzDate('2000-01-01,Europe/Moscow'),
+    wd >= TzDate('2000-01-01,Europe/Moscow'),
+    wt >= TzDate('2000-01-01,Europe/Moscow'),
+    waz >= TzDate('2000-01-01,Europe/Moscow'),
+    wdz >= TzDate('2000-01-01,Europe/Moscow'),
+    wtz >= TzDate('2000-01-01,Europe/Moscow'),
+    na >= Datetime('2000-01-01T03:04:05Z'),
+    naz >= Datetime('2000-01-01T03:04:05Z'),
+    nd >= Datetime('2000-01-01T03:04:05Z'),
+    ndz >= Datetime('2000-01-01T03:04:05Z'),
+    nt >= Datetime('2000-01-01T03:04:05Z'),
+    ntz >= Datetime('2000-01-01T03:04:05Z'),
+    wa >= Datetime('2000-01-01T03:04:05Z'),
+    wd >= Datetime('2000-01-01T03:04:05Z'),
+    wt >= Datetime('2000-01-01T03:04:05Z'),
+    waz >= Datetime('2000-01-01T03:04:05Z'),
+    wdz >= Datetime('2000-01-01T03:04:05Z'),
+    wtz >= Datetime('2000-01-01T03:04:05Z'),
+    na >= TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    naz >= TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    nd >= TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    ndz >= TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    nt >= TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    ntz >= TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wa >= TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wd >= TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wt >= TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    waz >= TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wdz >= TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wtz >= TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    na >= Timestamp('2000-01-01T03:04:05.678912Z'),
+    naz >= Timestamp('2000-01-01T03:04:05.678912Z'),
+    nd >= Timestamp('2000-01-01T03:04:05.678912Z'),
+    ndz >= Timestamp('2000-01-01T03:04:05.678912Z'),
+    nt >= Timestamp('2000-01-01T03:04:05.678912Z'),
+    ntz >= Timestamp('2000-01-01T03:04:05.678912Z'),
+    wa >= Timestamp('2000-01-01T03:04:05.678912Z'),
+    wd >= Timestamp('2000-01-01T03:04:05.678912Z'),
+    wt >= Timestamp('2000-01-01T03:04:05.678912Z'),
+    waz >= Timestamp('2000-01-01T03:04:05.678912Z'),
+    wdz >= Timestamp('2000-01-01T03:04:05.678912Z'),
+    wtz >= Timestamp('2000-01-01T03:04:05.678912Z'),
+    na >= TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    naz >= TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    nd >= TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    ndz >= TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    nt >= TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    ntz >= TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wa >= TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wd >= TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wt >= TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    waz >= TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wdz >= TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wtz >= TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow')
 FROM
     Dates
 ;
 
 SELECT
-    na >= Date32("1900-01-01"),
-    naz >= Date32("1900-01-01"),
-    nd >= Date32("1900-01-01"),
-    ndz >= Date32("1900-01-01"),
-    nt >= Date32("1900-01-01"),
-    ntz >= Date32("1900-01-01"),
-    wa >= Date32("1900-01-01"),
-    wd >= Date32("1900-01-01"),
-    wt >= Date32("1900-01-01"),
-    waz >= Date32("1900-01-01"),
-    wdz >= Date32("1900-01-01"),
-    wtz >= Date32("1900-01-01"),
-    na >= Datetime64("1900-01-01T03:04:05Z"),
-    naz >= Datetime64("1900-01-01T03:04:05Z"),
-    nd >= Datetime64("1900-01-01T03:04:05Z"),
-    ndz >= Datetime64("1900-01-01T03:04:05Z"),
-    nt >= Datetime64("1900-01-01T03:04:05Z"),
-    ntz >= Datetime64("1900-01-01T03:04:05Z"),
-    wa >= Datetime64("1900-01-01T03:04:05Z"),
-    wd >= Datetime64("1900-01-01T03:04:05Z"),
-    wt >= Datetime64("1900-01-01T03:04:05Z"),
-    waz >= Datetime64("1900-01-01T03:04:05Z"),
-    wdz >= Datetime64("1900-01-01T03:04:05Z"),
-    wtz >= Datetime64("1900-01-01T03:04:05Z"),
-    na >= Timestamp64("1900-01-01T03:04:05.678912Z"),
-    naz >= Timestamp64("1900-01-01T03:04:05.678912Z"),
-    nd >= Timestamp64("1900-01-01T03:04:05.678912Z"),
-    ndz >= Timestamp64("1900-01-01T03:04:05.678912Z"),
-    nt >= Timestamp64("1900-01-01T03:04:05.678912Z"),
-    ntz >= Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wa >= Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wd >= Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wt >= Timestamp64("1900-01-01T03:04:05.678912Z"),
-    waz >= Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wdz >= Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wtz >= Timestamp64("1900-01-01T03:04:05.678912Z"),
-    na >= TzDate32("1900-01-01,Europe/Moscow"),
-    naz >= TzDate32("1900-01-01,Europe/Moscow"),
-    nd >= TzDate32("1900-01-01,Europe/Moscow"),
-    ndz >= TzDate32("1900-01-01,Europe/Moscow"),
-    nt >= TzDate32("1900-01-01,Europe/Moscow"),
-    ntz >= TzDate32("1900-01-01,Europe/Moscow"),
-    wa >= TzDate32("1900-01-01,Europe/Moscow"),
-    wd >= TzDate32("1900-01-01,Europe/Moscow"),
-    wt >= TzDate32("1900-01-01,Europe/Moscow"),
-    waz >= TzDate32("1900-01-01,Europe/Moscow"),
-    wdz >= TzDate32("1900-01-01,Europe/Moscow"),
-    wtz >= TzDate32("1900-01-01,Europe/Moscow"),
-    na >= TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    naz >= TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    nd >= TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    ndz >= TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    nt >= TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    ntz >= TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wa >= TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wd >= TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wt >= TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    waz >= TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wdz >= TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wtz >= TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    na >= TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    naz >= TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    nd >= TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    ndz >= TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    nt >= TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    ntz >= TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wa >= TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wd >= TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wt >= TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    waz >= TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wdz >= TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wtz >= TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    ni >= Interval("P1D"),
-    wi >= Interval("P1D"),
-    ni >= Interval64("P1D"),
-    wi >= Interval64("P1D"),
+    na >= Date32('1900-01-01'),
+    naz >= Date32('1900-01-01'),
+    nd >= Date32('1900-01-01'),
+    ndz >= Date32('1900-01-01'),
+    nt >= Date32('1900-01-01'),
+    ntz >= Date32('1900-01-01'),
+    wa >= Date32('1900-01-01'),
+    wd >= Date32('1900-01-01'),
+    wt >= Date32('1900-01-01'),
+    waz >= Date32('1900-01-01'),
+    wdz >= Date32('1900-01-01'),
+    wtz >= Date32('1900-01-01'),
+    na >= Datetime64('1900-01-01T03:04:05Z'),
+    naz >= Datetime64('1900-01-01T03:04:05Z'),
+    nd >= Datetime64('1900-01-01T03:04:05Z'),
+    ndz >= Datetime64('1900-01-01T03:04:05Z'),
+    nt >= Datetime64('1900-01-01T03:04:05Z'),
+    ntz >= Datetime64('1900-01-01T03:04:05Z'),
+    wa >= Datetime64('1900-01-01T03:04:05Z'),
+    wd >= Datetime64('1900-01-01T03:04:05Z'),
+    wt >= Datetime64('1900-01-01T03:04:05Z'),
+    waz >= Datetime64('1900-01-01T03:04:05Z'),
+    wdz >= Datetime64('1900-01-01T03:04:05Z'),
+    wtz >= Datetime64('1900-01-01T03:04:05Z'),
+    na >= Timestamp64('1900-01-01T03:04:05.678912Z'),
+    naz >= Timestamp64('1900-01-01T03:04:05.678912Z'),
+    nd >= Timestamp64('1900-01-01T03:04:05.678912Z'),
+    ndz >= Timestamp64('1900-01-01T03:04:05.678912Z'),
+    nt >= Timestamp64('1900-01-01T03:04:05.678912Z'),
+    ntz >= Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wa >= Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wd >= Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wt >= Timestamp64('1900-01-01T03:04:05.678912Z'),
+    waz >= Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wdz >= Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wtz >= Timestamp64('1900-01-01T03:04:05.678912Z'),
+    na >= TzDate32('1900-01-01,Europe/Moscow'),
+    naz >= TzDate32('1900-01-01,Europe/Moscow'),
+    nd >= TzDate32('1900-01-01,Europe/Moscow'),
+    ndz >= TzDate32('1900-01-01,Europe/Moscow'),
+    nt >= TzDate32('1900-01-01,Europe/Moscow'),
+    ntz >= TzDate32('1900-01-01,Europe/Moscow'),
+    wa >= TzDate32('1900-01-01,Europe/Moscow'),
+    wd >= TzDate32('1900-01-01,Europe/Moscow'),
+    wt >= TzDate32('1900-01-01,Europe/Moscow'),
+    waz >= TzDate32('1900-01-01,Europe/Moscow'),
+    wdz >= TzDate32('1900-01-01,Europe/Moscow'),
+    wtz >= TzDate32('1900-01-01,Europe/Moscow'),
+    na >= TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    naz >= TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    nd >= TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    ndz >= TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    nt >= TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    ntz >= TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wa >= TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wd >= TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wt >= TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    waz >= TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wdz >= TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wtz >= TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    na >= TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    naz >= TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    nd >= TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    ndz >= TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    nt >= TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    ntz >= TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wa >= TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wd >= TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wt >= TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    waz >= TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wdz >= TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wtz >= TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    ni >= Interval('P1D'),
+    wi >= Interval('P1D'),
+    ni >= Interval64('P1D'),
+    wi >= Interval64('P1D'),
 FROM
     Dates
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_scalar_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_scalar_/formatted.sql
index 228b2a3565..b8154abf9c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_scalar_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_scalar_/formatted.sql
@@ -1,319 +1,319 @@
 USE plato;
 
-PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
+PRAGMA yt.DisableOptimizers = 'OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps';
 
 SELECT
-    Date("2000-01-01") > na,
-    Date("2000-01-01") > naz,
-    Date("2000-01-01") > nd,
-    Date("2000-01-01") > ndz,
-    Date("2000-01-01") > nt,
-    Date("2000-01-01") > ntz,
-    Date("2000-01-01") > wa,
-    Date("2000-01-01") > wd,
-    Date("2000-01-01") > wt,
-    Date("2000-01-01") > waz,
-    Date("2000-01-01") > wdz,
-    Date("2000-01-01") > wtz,
-    TzDate("2000-01-01,Europe/Moscow") > na,
-    TzDate("2000-01-01,Europe/Moscow") > naz,
-    TzDate("2000-01-01,Europe/Moscow") > nd,
-    TzDate("2000-01-01,Europe/Moscow") > ndz,
-    TzDate("2000-01-01,Europe/Moscow") > nt,
-    TzDate("2000-01-01,Europe/Moscow") > ntz,
-    TzDate("2000-01-01,Europe/Moscow") > wa,
-    TzDate("2000-01-01,Europe/Moscow") > wd,
-    TzDate("2000-01-01,Europe/Moscow") > wt,
-    TzDate("2000-01-01,Europe/Moscow") > waz,
-    TzDate("2000-01-01,Europe/Moscow") > wdz,
-    TzDate("2000-01-01,Europe/Moscow") > wtz,
-    Datetime("2000-01-01T03:04:05Z") > na,
-    Datetime("2000-01-01T03:04:05Z") > naz,
-    Datetime("2000-01-01T03:04:05Z") > nd,
-    Datetime("2000-01-01T03:04:05Z") > ndz,
-    Datetime("2000-01-01T03:04:05Z") > nt,
-    Datetime("2000-01-01T03:04:05Z") > ntz,
-    Datetime("2000-01-01T03:04:05Z") > wa,
-    Datetime("2000-01-01T03:04:05Z") > wd,
-    Datetime("2000-01-01T03:04:05Z") > wt,
-    Datetime("2000-01-01T03:04:05Z") > waz,
-    Datetime("2000-01-01T03:04:05Z") > wdz,
-    Datetime("2000-01-01T03:04:05Z") > wtz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") > na,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") > naz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") > nd,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") > ndz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") > nt,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") > ntz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") > wa,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") > wd,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") > wt,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") > waz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") > wdz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") > wtz,
-    Timestamp("2000-01-01T03:04:05.678912Z") > na,
-    Timestamp("2000-01-01T03:04:05.678912Z") > naz,
-    Timestamp("2000-01-01T03:04:05.678912Z") > nd,
-    Timestamp("2000-01-01T03:04:05.678912Z") > ndz,
-    Timestamp("2000-01-01T03:04:05.678912Z") > nt,
-    Timestamp("2000-01-01T03:04:05.678912Z") > ntz,
-    Timestamp("2000-01-01T03:04:05.678912Z") > wa,
-    Timestamp("2000-01-01T03:04:05.678912Z") > wd,
-    Timestamp("2000-01-01T03:04:05.678912Z") > wt,
-    Timestamp("2000-01-01T03:04:05.678912Z") > waz,
-    Timestamp("2000-01-01T03:04:05.678912Z") > wdz,
-    Timestamp("2000-01-01T03:04:05.678912Z") > wtz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") > na,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") > naz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") > nd,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") > ndz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") > nt,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") > ntz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") > wa,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") > wd,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") > wt,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") > waz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") > wdz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") > wtz
+    Date('2000-01-01') > na,
+    Date('2000-01-01') > naz,
+    Date('2000-01-01') > nd,
+    Date('2000-01-01') > ndz,
+    Date('2000-01-01') > nt,
+    Date('2000-01-01') > ntz,
+    Date('2000-01-01') > wa,
+    Date('2000-01-01') > wd,
+    Date('2000-01-01') > wt,
+    Date('2000-01-01') > waz,
+    Date('2000-01-01') > wdz,
+    Date('2000-01-01') > wtz,
+    TzDate('2000-01-01,Europe/Moscow') > na,
+    TzDate('2000-01-01,Europe/Moscow') > naz,
+    TzDate('2000-01-01,Europe/Moscow') > nd,
+    TzDate('2000-01-01,Europe/Moscow') > ndz,
+    TzDate('2000-01-01,Europe/Moscow') > nt,
+    TzDate('2000-01-01,Europe/Moscow') > ntz,
+    TzDate('2000-01-01,Europe/Moscow') > wa,
+    TzDate('2000-01-01,Europe/Moscow') > wd,
+    TzDate('2000-01-01,Europe/Moscow') > wt,
+    TzDate('2000-01-01,Europe/Moscow') > waz,
+    TzDate('2000-01-01,Europe/Moscow') > wdz,
+    TzDate('2000-01-01,Europe/Moscow') > wtz,
+    Datetime('2000-01-01T03:04:05Z') > na,
+    Datetime('2000-01-01T03:04:05Z') > naz,
+    Datetime('2000-01-01T03:04:05Z') > nd,
+    Datetime('2000-01-01T03:04:05Z') > ndz,
+    Datetime('2000-01-01T03:04:05Z') > nt,
+    Datetime('2000-01-01T03:04:05Z') > ntz,
+    Datetime('2000-01-01T03:04:05Z') > wa,
+    Datetime('2000-01-01T03:04:05Z') > wd,
+    Datetime('2000-01-01T03:04:05Z') > wt,
+    Datetime('2000-01-01T03:04:05Z') > waz,
+    Datetime('2000-01-01T03:04:05Z') > wdz,
+    Datetime('2000-01-01T03:04:05Z') > wtz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') > na,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') > naz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') > nd,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') > ndz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') > nt,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') > ntz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') > wa,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') > wd,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') > wt,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') > waz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') > wdz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') > wtz,
+    Timestamp('2000-01-01T03:04:05.678912Z') > na,
+    Timestamp('2000-01-01T03:04:05.678912Z') > naz,
+    Timestamp('2000-01-01T03:04:05.678912Z') > nd,
+    Timestamp('2000-01-01T03:04:05.678912Z') > ndz,
+    Timestamp('2000-01-01T03:04:05.678912Z') > nt,
+    Timestamp('2000-01-01T03:04:05.678912Z') > ntz,
+    Timestamp('2000-01-01T03:04:05.678912Z') > wa,
+    Timestamp('2000-01-01T03:04:05.678912Z') > wd,
+    Timestamp('2000-01-01T03:04:05.678912Z') > wt,
+    Timestamp('2000-01-01T03:04:05.678912Z') > waz,
+    Timestamp('2000-01-01T03:04:05.678912Z') > wdz,
+    Timestamp('2000-01-01T03:04:05.678912Z') > wtz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') > na,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') > naz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') > nd,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') > ndz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') > nt,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') > ntz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') > wa,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') > wd,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') > wt,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') > waz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') > wdz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') > wtz
 FROM
     Dates
 ;
 
 SELECT
-    Date32("1900-01-01") > na,
-    Date32("1900-01-01") > naz,
-    Date32("1900-01-01") > nd,
-    Date32("1900-01-01") > ndz,
-    Date32("1900-01-01") > nt,
-    Date32("1900-01-01") > ntz,
-    Date32("1900-01-01") > wa,
-    Date32("1900-01-01") > wd,
-    Date32("1900-01-01") > wt,
-    Date32("1900-01-01") > waz,
-    Date32("1900-01-01") > wdz,
-    Date32("1900-01-01") > wtz,
-    Datetime64("1900-01-01T03:04:05Z") > na,
-    Datetime64("1900-01-01T03:04:05Z") > naz,
-    Datetime64("1900-01-01T03:04:05Z") > nd,
-    Datetime64("1900-01-01T03:04:05Z") > ndz,
-    Datetime64("1900-01-01T03:04:05Z") > nt,
-    Datetime64("1900-01-01T03:04:05Z") > ntz,
-    Datetime64("1900-01-01T03:04:05Z") > wa,
-    Datetime64("1900-01-01T03:04:05Z") > wd,
-    Datetime64("1900-01-01T03:04:05Z") > wt,
-    Datetime64("1900-01-01T03:04:05Z") > waz,
-    Datetime64("1900-01-01T03:04:05Z") > wdz,
-    Datetime64("1900-01-01T03:04:05Z") > wtz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") > na,
-    Timestamp64("1900-01-01T03:04:05.678912Z") > naz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") > nd,
-    Timestamp64("1900-01-01T03:04:05.678912Z") > ndz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") > nt,
-    Timestamp64("1900-01-01T03:04:05.678912Z") > ntz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") > wa,
-    Timestamp64("1900-01-01T03:04:05.678912Z") > wd,
-    Timestamp64("1900-01-01T03:04:05.678912Z") > wt,
-    Timestamp64("1900-01-01T03:04:05.678912Z") > waz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") > wdz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") > wtz,
-    TzDate32("1900-01-01,Europe/Moscow") > na,
-    TzDate32("1900-01-01,Europe/Moscow") > naz,
-    TzDate32("1900-01-01,Europe/Moscow") > nd,
-    TzDate32("1900-01-01,Europe/Moscow") > ndz,
-    TzDate32("1900-01-01,Europe/Moscow") > nt,
-    TzDate32("1900-01-01,Europe/Moscow") > ntz,
-    TzDate32("1900-01-01,Europe/Moscow") > wa,
-    TzDate32("1900-01-01,Europe/Moscow") > wd,
-    TzDate32("1900-01-01,Europe/Moscow") > wt,
-    TzDate32("1900-01-01,Europe/Moscow") > waz,
-    TzDate32("1900-01-01,Europe/Moscow") > wdz,
-    TzDate32("1900-01-01,Europe/Moscow") > wtz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") > na,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") > naz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") > nd,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") > ndz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") > nt,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") > ntz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") > wa,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") > wd,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") > wt,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") > waz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") > wdz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") > wtz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") > na,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") > naz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") > nd,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") > ndz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") > nt,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") > ntz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") > wa,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") > wd,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") > wt,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") > waz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") > wdz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") > wtz,
-    Interval("P1D") > ni,
-    Interval("P1D") > wi,
-    Interval64("P1D") > ni,
-    Interval64("P1D") > wi,
+    Date32('1900-01-01') > na,
+    Date32('1900-01-01') > naz,
+    Date32('1900-01-01') > nd,
+    Date32('1900-01-01') > ndz,
+    Date32('1900-01-01') > nt,
+    Date32('1900-01-01') > ntz,
+    Date32('1900-01-01') > wa,
+    Date32('1900-01-01') > wd,
+    Date32('1900-01-01') > wt,
+    Date32('1900-01-01') > waz,
+    Date32('1900-01-01') > wdz,
+    Date32('1900-01-01') > wtz,
+    Datetime64('1900-01-01T03:04:05Z') > na,
+    Datetime64('1900-01-01T03:04:05Z') > naz,
+    Datetime64('1900-01-01T03:04:05Z') > nd,
+    Datetime64('1900-01-01T03:04:05Z') > ndz,
+    Datetime64('1900-01-01T03:04:05Z') > nt,
+    Datetime64('1900-01-01T03:04:05Z') > ntz,
+    Datetime64('1900-01-01T03:04:05Z') > wa,
+    Datetime64('1900-01-01T03:04:05Z') > wd,
+    Datetime64('1900-01-01T03:04:05Z') > wt,
+    Datetime64('1900-01-01T03:04:05Z') > waz,
+    Datetime64('1900-01-01T03:04:05Z') > wdz,
+    Datetime64('1900-01-01T03:04:05Z') > wtz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') > na,
+    Timestamp64('1900-01-01T03:04:05.678912Z') > naz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') > nd,
+    Timestamp64('1900-01-01T03:04:05.678912Z') > ndz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') > nt,
+    Timestamp64('1900-01-01T03:04:05.678912Z') > ntz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') > wa,
+    Timestamp64('1900-01-01T03:04:05.678912Z') > wd,
+    Timestamp64('1900-01-01T03:04:05.678912Z') > wt,
+    Timestamp64('1900-01-01T03:04:05.678912Z') > waz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') > wdz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') > wtz,
+    TzDate32('1900-01-01,Europe/Moscow') > na,
+    TzDate32('1900-01-01,Europe/Moscow') > naz,
+    TzDate32('1900-01-01,Europe/Moscow') > nd,
+    TzDate32('1900-01-01,Europe/Moscow') > ndz,
+    TzDate32('1900-01-01,Europe/Moscow') > nt,
+    TzDate32('1900-01-01,Europe/Moscow') > ntz,
+    TzDate32('1900-01-01,Europe/Moscow') > wa,
+    TzDate32('1900-01-01,Europe/Moscow') > wd,
+    TzDate32('1900-01-01,Europe/Moscow') > wt,
+    TzDate32('1900-01-01,Europe/Moscow') > waz,
+    TzDate32('1900-01-01,Europe/Moscow') > wdz,
+    TzDate32('1900-01-01,Europe/Moscow') > wtz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') > na,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') > naz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') > nd,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') > ndz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') > nt,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') > ntz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') > wa,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') > wd,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') > wt,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') > waz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') > wdz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') > wtz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') > na,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') > naz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') > nd,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') > ndz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') > nt,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') > ntz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') > wa,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') > wd,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') > wt,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') > waz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') > wdz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') > wtz,
+    Interval('P1D') > ni,
+    Interval('P1D') > wi,
+    Interval64('P1D') > ni,
+    Interval64('P1D') > wi,
 FROM
     Dates
 ;
 
 SELECT
-    na > Date("2000-01-01"),
-    naz > Date("2000-01-01"),
-    nd > Date("2000-01-01"),
-    ndz > Date("2000-01-01"),
-    nt > Date("2000-01-01"),
-    ntz > Date("2000-01-01"),
-    wa > Date("2000-01-01"),
-    wd > Date("2000-01-01"),
-    wt > Date("2000-01-01"),
-    waz > Date("2000-01-01"),
-    wdz > Date("2000-01-01"),
-    wtz > Date("2000-01-01"),
-    na > TzDate("2000-01-01,Europe/Moscow"),
-    naz > TzDate("2000-01-01,Europe/Moscow"),
-    nd > TzDate("2000-01-01,Europe/Moscow"),
-    ndz > TzDate("2000-01-01,Europe/Moscow"),
-    nt > TzDate("2000-01-01,Europe/Moscow"),
-    ntz > TzDate("2000-01-01,Europe/Moscow"),
-    wa > TzDate("2000-01-01,Europe/Moscow"),
-    wd > TzDate("2000-01-01,Europe/Moscow"),
-    wt > TzDate("2000-01-01,Europe/Moscow"),
-    waz > TzDate("2000-01-01,Europe/Moscow"),
-    wdz > TzDate("2000-01-01,Europe/Moscow"),
-    wtz > TzDate("2000-01-01,Europe/Moscow"),
-    na > Datetime("2000-01-01T03:04:05Z"),
-    naz > Datetime("2000-01-01T03:04:05Z"),
-    nd > Datetime("2000-01-01T03:04:05Z"),
-    ndz > Datetime("2000-01-01T03:04:05Z"),
-    nt > Datetime("2000-01-01T03:04:05Z"),
-    ntz > Datetime("2000-01-01T03:04:05Z"),
-    wa > Datetime("2000-01-01T03:04:05Z"),
-    wd > Datetime("2000-01-01T03:04:05Z"),
-    wt > Datetime("2000-01-01T03:04:05Z"),
-    waz > Datetime("2000-01-01T03:04:05Z"),
-    wdz > Datetime("2000-01-01T03:04:05Z"),
-    wtz > Datetime("2000-01-01T03:04:05Z"),
-    na > TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    naz > TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    nd > TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    ndz > TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    nt > TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    ntz > TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wa > TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wd > TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wt > TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    waz > TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wdz > TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wtz > TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    na > Timestamp("2000-01-01T03:04:05.678912Z"),
-    naz > Timestamp("2000-01-01T03:04:05.678912Z"),
-    nd > Timestamp("2000-01-01T03:04:05.678912Z"),
-    ndz > Timestamp("2000-01-01T03:04:05.678912Z"),
-    nt > Timestamp("2000-01-01T03:04:05.678912Z"),
-    ntz > Timestamp("2000-01-01T03:04:05.678912Z"),
-    wa > Timestamp("2000-01-01T03:04:05.678912Z"),
-    wd > Timestamp("2000-01-01T03:04:05.678912Z"),
-    wt > Timestamp("2000-01-01T03:04:05.678912Z"),
-    waz > Timestamp("2000-01-01T03:04:05.678912Z"),
-    wdz > Timestamp("2000-01-01T03:04:05.678912Z"),
-    wtz > Timestamp("2000-01-01T03:04:05.678912Z"),
-    na > TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    naz > TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    nd > TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    ndz > TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    nt > TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    ntz > TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wa > TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wd > TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wt > TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    waz > TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wdz > TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wtz > TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow")
+    na > Date('2000-01-01'),
+    naz > Date('2000-01-01'),
+    nd > Date('2000-01-01'),
+    ndz > Date('2000-01-01'),
+    nt > Date('2000-01-01'),
+    ntz > Date('2000-01-01'),
+    wa > Date('2000-01-01'),
+    wd > Date('2000-01-01'),
+    wt > Date('2000-01-01'),
+    waz > Date('2000-01-01'),
+    wdz > Date('2000-01-01'),
+    wtz > Date('2000-01-01'),
+    na > TzDate('2000-01-01,Europe/Moscow'),
+    naz > TzDate('2000-01-01,Europe/Moscow'),
+    nd > TzDate('2000-01-01,Europe/Moscow'),
+    ndz > TzDate('2000-01-01,Europe/Moscow'),
+    nt > TzDate('2000-01-01,Europe/Moscow'),
+    ntz > TzDate('2000-01-01,Europe/Moscow'),
+    wa > TzDate('2000-01-01,Europe/Moscow'),
+    wd > TzDate('2000-01-01,Europe/Moscow'),
+    wt > TzDate('2000-01-01,Europe/Moscow'),
+    waz > TzDate('2000-01-01,Europe/Moscow'),
+    wdz > TzDate('2000-01-01,Europe/Moscow'),
+    wtz > TzDate('2000-01-01,Europe/Moscow'),
+    na > Datetime('2000-01-01T03:04:05Z'),
+    naz > Datetime('2000-01-01T03:04:05Z'),
+    nd > Datetime('2000-01-01T03:04:05Z'),
+    ndz > Datetime('2000-01-01T03:04:05Z'),
+    nt > Datetime('2000-01-01T03:04:05Z'),
+    ntz > Datetime('2000-01-01T03:04:05Z'),
+    wa > Datetime('2000-01-01T03:04:05Z'),
+    wd > Datetime('2000-01-01T03:04:05Z'),
+    wt > Datetime('2000-01-01T03:04:05Z'),
+    waz > Datetime('2000-01-01T03:04:05Z'),
+    wdz > Datetime('2000-01-01T03:04:05Z'),
+    wtz > Datetime('2000-01-01T03:04:05Z'),
+    na > TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    naz > TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    nd > TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    ndz > TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    nt > TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    ntz > TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wa > TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wd > TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wt > TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    waz > TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wdz > TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wtz > TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    na > Timestamp('2000-01-01T03:04:05.678912Z'),
+    naz > Timestamp('2000-01-01T03:04:05.678912Z'),
+    nd > Timestamp('2000-01-01T03:04:05.678912Z'),
+    ndz > Timestamp('2000-01-01T03:04:05.678912Z'),
+    nt > Timestamp('2000-01-01T03:04:05.678912Z'),
+    ntz > Timestamp('2000-01-01T03:04:05.678912Z'),
+    wa > Timestamp('2000-01-01T03:04:05.678912Z'),
+    wd > Timestamp('2000-01-01T03:04:05.678912Z'),
+    wt > Timestamp('2000-01-01T03:04:05.678912Z'),
+    waz > Timestamp('2000-01-01T03:04:05.678912Z'),
+    wdz > Timestamp('2000-01-01T03:04:05.678912Z'),
+    wtz > Timestamp('2000-01-01T03:04:05.678912Z'),
+    na > TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    naz > TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    nd > TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    ndz > TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    nt > TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    ntz > TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wa > TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wd > TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wt > TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    waz > TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wdz > TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wtz > TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow')
 FROM
     Dates
 ;
 
 SELECT
-    na > Date32("1900-01-01"),
-    naz > Date32("1900-01-01"),
-    nd > Date32("1900-01-01"),
-    ndz > Date32("1900-01-01"),
-    nt > Date32("1900-01-01"),
-    ntz > Date32("1900-01-01"),
-    wa > Date32("1900-01-01"),
-    wd > Date32("1900-01-01"),
-    wt > Date32("1900-01-01"),
-    waz > Date32("1900-01-01"),
-    wdz > Date32("1900-01-01"),
-    wtz > Date32("1900-01-01"),
-    na > Datetime64("1900-01-01T03:04:05Z"),
-    naz > Datetime64("1900-01-01T03:04:05Z"),
-    nd > Datetime64("1900-01-01T03:04:05Z"),
-    ndz > Datetime64("1900-01-01T03:04:05Z"),
-    nt > Datetime64("1900-01-01T03:04:05Z"),
-    ntz > Datetime64("1900-01-01T03:04:05Z"),
-    wa > Datetime64("1900-01-01T03:04:05Z"),
-    wd > Datetime64("1900-01-01T03:04:05Z"),
-    wt > Datetime64("1900-01-01T03:04:05Z"),
-    waz > Datetime64("1900-01-01T03:04:05Z"),
-    wdz > Datetime64("1900-01-01T03:04:05Z"),
-    wtz > Datetime64("1900-01-01T03:04:05Z"),
-    na > Timestamp64("1900-01-01T03:04:05.678912Z"),
-    naz > Timestamp64("1900-01-01T03:04:05.678912Z"),
-    nd > Timestamp64("1900-01-01T03:04:05.678912Z"),
-    ndz > Timestamp64("1900-01-01T03:04:05.678912Z"),
-    nt > Timestamp64("1900-01-01T03:04:05.678912Z"),
-    ntz > Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wa > Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wd > Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wt > Timestamp64("1900-01-01T03:04:05.678912Z"),
-    waz > Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wdz > Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wtz > Timestamp64("1900-01-01T03:04:05.678912Z"),
-    na > TzDate32("1900-01-01,Europe/Moscow"),
-    naz > TzDate32("1900-01-01,Europe/Moscow"),
-    nd > TzDate32("1900-01-01,Europe/Moscow"),
-    ndz > TzDate32("1900-01-01,Europe/Moscow"),
-    nt > TzDate32("1900-01-01,Europe/Moscow"),
-    ntz > TzDate32("1900-01-01,Europe/Moscow"),
-    wa > TzDate32("1900-01-01,Europe/Moscow"),
-    wd > TzDate32("1900-01-01,Europe/Moscow"),
-    wt > TzDate32("1900-01-01,Europe/Moscow"),
-    waz > TzDate32("1900-01-01,Europe/Moscow"),
-    wdz > TzDate32("1900-01-01,Europe/Moscow"),
-    wtz > TzDate32("1900-01-01,Europe/Moscow"),
-    na > TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    naz > TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    nd > TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    ndz > TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    nt > TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    ntz > TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wa > TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wd > TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wt > TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    waz > TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wdz > TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wtz > TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    na > TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    naz > TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    nd > TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    ndz > TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    nt > TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    ntz > TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wa > TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wd > TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wt > TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    waz > TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wdz > TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wtz > TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    ni > Interval("P1D"),
-    wi > Interval("P1D"),
-    ni > Interval64("P1D"),
-    wi > Interval64("P1D"),
+    na > Date32('1900-01-01'),
+    naz > Date32('1900-01-01'),
+    nd > Date32('1900-01-01'),
+    ndz > Date32('1900-01-01'),
+    nt > Date32('1900-01-01'),
+    ntz > Date32('1900-01-01'),
+    wa > Date32('1900-01-01'),
+    wd > Date32('1900-01-01'),
+    wt > Date32('1900-01-01'),
+    waz > Date32('1900-01-01'),
+    wdz > Date32('1900-01-01'),
+    wtz > Date32('1900-01-01'),
+    na > Datetime64('1900-01-01T03:04:05Z'),
+    naz > Datetime64('1900-01-01T03:04:05Z'),
+    nd > Datetime64('1900-01-01T03:04:05Z'),
+    ndz > Datetime64('1900-01-01T03:04:05Z'),
+    nt > Datetime64('1900-01-01T03:04:05Z'),
+    ntz > Datetime64('1900-01-01T03:04:05Z'),
+    wa > Datetime64('1900-01-01T03:04:05Z'),
+    wd > Datetime64('1900-01-01T03:04:05Z'),
+    wt > Datetime64('1900-01-01T03:04:05Z'),
+    waz > Datetime64('1900-01-01T03:04:05Z'),
+    wdz > Datetime64('1900-01-01T03:04:05Z'),
+    wtz > Datetime64('1900-01-01T03:04:05Z'),
+    na > Timestamp64('1900-01-01T03:04:05.678912Z'),
+    naz > Timestamp64('1900-01-01T03:04:05.678912Z'),
+    nd > Timestamp64('1900-01-01T03:04:05.678912Z'),
+    ndz > Timestamp64('1900-01-01T03:04:05.678912Z'),
+    nt > Timestamp64('1900-01-01T03:04:05.678912Z'),
+    ntz > Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wa > Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wd > Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wt > Timestamp64('1900-01-01T03:04:05.678912Z'),
+    waz > Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wdz > Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wtz > Timestamp64('1900-01-01T03:04:05.678912Z'),
+    na > TzDate32('1900-01-01,Europe/Moscow'),
+    naz > TzDate32('1900-01-01,Europe/Moscow'),
+    nd > TzDate32('1900-01-01,Europe/Moscow'),
+    ndz > TzDate32('1900-01-01,Europe/Moscow'),
+    nt > TzDate32('1900-01-01,Europe/Moscow'),
+    ntz > TzDate32('1900-01-01,Europe/Moscow'),
+    wa > TzDate32('1900-01-01,Europe/Moscow'),
+    wd > TzDate32('1900-01-01,Europe/Moscow'),
+    wt > TzDate32('1900-01-01,Europe/Moscow'),
+    waz > TzDate32('1900-01-01,Europe/Moscow'),
+    wdz > TzDate32('1900-01-01,Europe/Moscow'),
+    wtz > TzDate32('1900-01-01,Europe/Moscow'),
+    na > TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    naz > TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    nd > TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    ndz > TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    nt > TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    ntz > TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wa > TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wd > TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wt > TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    waz > TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wdz > TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wtz > TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    na > TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    naz > TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    nd > TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    ndz > TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    nt > TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    ntz > TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wa > TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wd > TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wt > TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    waz > TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wdz > TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wtz > TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    ni > Interval('P1D'),
+    wi > Interval('P1D'),
+    ni > Interval64('P1D'),
+    wi > Interval64('P1D'),
 FROM
     Dates
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_group_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_group_by_/formatted.sql
index f3354176f2..089f07e095 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_group_by_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_group_by_/formatted.sql
@@ -1,7 +1,7 @@
 USE plato;
 
 PRAGMA yt.UseNativeDescSort;
-PRAGMA yt.UsePartitionsByKeysForFinalAgg = "false";
+PRAGMA yt.UsePartitionsByKeysForFinalAgg = 'false';
 
 SELECT
     count(*),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_/formatted.sql
index 640d23ce86..33e303d2e2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_/formatted.sql
@@ -1,6 +1,6 @@
 USE plato;
 
-PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
+PRAGMA yt.DisableOptimizers = 'OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps';
 
 SELECT
     a.na < b.na,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_or_equal_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_or_equal_/formatted.sql
index 1ca25354b5..d9725f1c20 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_or_equal_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_or_equal_/formatted.sql
@@ -1,6 +1,6 @@
 USE plato;
 
-PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
+PRAGMA yt.DisableOptimizers = 'OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps';
 
 SELECT
     a.na <= b.na,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_or_equal_scalar_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_or_equal_scalar_/formatted.sql
index 9fbeab708e..847e420c24 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_or_equal_scalar_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_or_equal_scalar_/formatted.sql
@@ -1,319 +1,319 @@
 USE plato;
 
-PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
+PRAGMA yt.DisableOptimizers = 'OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps';
 
 SELECT
-    Date("2000-01-01") <= na,
-    Date("2000-01-01") <= naz,
-    Date("2000-01-01") <= nd,
-    Date("2000-01-01") <= ndz,
-    Date("2000-01-01") <= nt,
-    Date("2000-01-01") <= ntz,
-    Date("2000-01-01") <= wa,
-    Date("2000-01-01") <= wd,
-    Date("2000-01-01") <= wt,
-    Date("2000-01-01") <= waz,
-    Date("2000-01-01") <= wdz,
-    Date("2000-01-01") <= wtz,
-    TzDate("2000-01-01,Europe/Moscow") <= na,
-    TzDate("2000-01-01,Europe/Moscow") <= naz,
-    TzDate("2000-01-01,Europe/Moscow") <= nd,
-    TzDate("2000-01-01,Europe/Moscow") <= ndz,
-    TzDate("2000-01-01,Europe/Moscow") <= nt,
-    TzDate("2000-01-01,Europe/Moscow") <= ntz,
-    TzDate("2000-01-01,Europe/Moscow") <= wa,
-    TzDate("2000-01-01,Europe/Moscow") <= wd,
-    TzDate("2000-01-01,Europe/Moscow") <= wt,
-    TzDate("2000-01-01,Europe/Moscow") <= waz,
-    TzDate("2000-01-01,Europe/Moscow") <= wdz,
-    TzDate("2000-01-01,Europe/Moscow") <= wtz,
-    Datetime("2000-01-01T03:04:05Z") <= na,
-    Datetime("2000-01-01T03:04:05Z") <= naz,
-    Datetime("2000-01-01T03:04:05Z") <= nd,
-    Datetime("2000-01-01T03:04:05Z") <= ndz,
-    Datetime("2000-01-01T03:04:05Z") <= nt,
-    Datetime("2000-01-01T03:04:05Z") <= ntz,
-    Datetime("2000-01-01T03:04:05Z") <= wa,
-    Datetime("2000-01-01T03:04:05Z") <= wd,
-    Datetime("2000-01-01T03:04:05Z") <= wt,
-    Datetime("2000-01-01T03:04:05Z") <= waz,
-    Datetime("2000-01-01T03:04:05Z") <= wdz,
-    Datetime("2000-01-01T03:04:05Z") <= wtz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") <= na,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") <= naz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") <= nd,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") <= ndz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") <= nt,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") <= ntz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") <= wa,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") <= wd,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") <= wt,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") <= waz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") <= wdz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") <= wtz,
-    Timestamp("2000-01-01T03:04:05.678912Z") <= na,
-    Timestamp("2000-01-01T03:04:05.678912Z") <= naz,
-    Timestamp("2000-01-01T03:04:05.678912Z") <= nd,
-    Timestamp("2000-01-01T03:04:05.678912Z") <= ndz,
-    Timestamp("2000-01-01T03:04:05.678912Z") <= nt,
-    Timestamp("2000-01-01T03:04:05.678912Z") <= ntz,
-    Timestamp("2000-01-01T03:04:05.678912Z") <= wa,
-    Timestamp("2000-01-01T03:04:05.678912Z") <= wd,
-    Timestamp("2000-01-01T03:04:05.678912Z") <= wt,
-    Timestamp("2000-01-01T03:04:05.678912Z") <= waz,
-    Timestamp("2000-01-01T03:04:05.678912Z") <= wdz,
-    Timestamp("2000-01-01T03:04:05.678912Z") <= wtz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") <= na,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") <= naz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") <= nd,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") <= ndz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") <= nt,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") <= ntz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") <= wa,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") <= wd,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") <= wt,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") <= waz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") <= wdz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") <= wtz
+    Date('2000-01-01') <= na,
+    Date('2000-01-01') <= naz,
+    Date('2000-01-01') <= nd,
+    Date('2000-01-01') <= ndz,
+    Date('2000-01-01') <= nt,
+    Date('2000-01-01') <= ntz,
+    Date('2000-01-01') <= wa,
+    Date('2000-01-01') <= wd,
+    Date('2000-01-01') <= wt,
+    Date('2000-01-01') <= waz,
+    Date('2000-01-01') <= wdz,
+    Date('2000-01-01') <= wtz,
+    TzDate('2000-01-01,Europe/Moscow') <= na,
+    TzDate('2000-01-01,Europe/Moscow') <= naz,
+    TzDate('2000-01-01,Europe/Moscow') <= nd,
+    TzDate('2000-01-01,Europe/Moscow') <= ndz,
+    TzDate('2000-01-01,Europe/Moscow') <= nt,
+    TzDate('2000-01-01,Europe/Moscow') <= ntz,
+    TzDate('2000-01-01,Europe/Moscow') <= wa,
+    TzDate('2000-01-01,Europe/Moscow') <= wd,
+    TzDate('2000-01-01,Europe/Moscow') <= wt,
+    TzDate('2000-01-01,Europe/Moscow') <= waz,
+    TzDate('2000-01-01,Europe/Moscow') <= wdz,
+    TzDate('2000-01-01,Europe/Moscow') <= wtz,
+    Datetime('2000-01-01T03:04:05Z') <= na,
+    Datetime('2000-01-01T03:04:05Z') <= naz,
+    Datetime('2000-01-01T03:04:05Z') <= nd,
+    Datetime('2000-01-01T03:04:05Z') <= ndz,
+    Datetime('2000-01-01T03:04:05Z') <= nt,
+    Datetime('2000-01-01T03:04:05Z') <= ntz,
+    Datetime('2000-01-01T03:04:05Z') <= wa,
+    Datetime('2000-01-01T03:04:05Z') <= wd,
+    Datetime('2000-01-01T03:04:05Z') <= wt,
+    Datetime('2000-01-01T03:04:05Z') <= waz,
+    Datetime('2000-01-01T03:04:05Z') <= wdz,
+    Datetime('2000-01-01T03:04:05Z') <= wtz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') <= na,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') <= naz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') <= nd,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') <= ndz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') <= nt,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') <= ntz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') <= wa,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') <= wd,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') <= wt,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') <= waz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') <= wdz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') <= wtz,
+    Timestamp('2000-01-01T03:04:05.678912Z') <= na,
+    Timestamp('2000-01-01T03:04:05.678912Z') <= naz,
+    Timestamp('2000-01-01T03:04:05.678912Z') <= nd,
+    Timestamp('2000-01-01T03:04:05.678912Z') <= ndz,
+    Timestamp('2000-01-01T03:04:05.678912Z') <= nt,
+    Timestamp('2000-01-01T03:04:05.678912Z') <= ntz,
+    Timestamp('2000-01-01T03:04:05.678912Z') <= wa,
+    Timestamp('2000-01-01T03:04:05.678912Z') <= wd,
+    Timestamp('2000-01-01T03:04:05.678912Z') <= wt,
+    Timestamp('2000-01-01T03:04:05.678912Z') <= waz,
+    Timestamp('2000-01-01T03:04:05.678912Z') <= wdz,
+    Timestamp('2000-01-01T03:04:05.678912Z') <= wtz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') <= na,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') <= naz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') <= nd,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') <= ndz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') <= nt,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') <= ntz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') <= wa,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') <= wd,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') <= wt,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') <= waz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') <= wdz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') <= wtz
 FROM
     Dates
 ;
 
 SELECT
-    Date32("1900-01-01") <= na,
-    Date32("1900-01-01") <= naz,
-    Date32("1900-01-01") <= nd,
-    Date32("1900-01-01") <= ndz,
-    Date32("1900-01-01") <= nt,
-    Date32("1900-01-01") <= ntz,
-    Date32("1900-01-01") <= wa,
-    Date32("1900-01-01") <= wd,
-    Date32("1900-01-01") <= wt,
-    Date32("1900-01-01") <= waz,
-    Date32("1900-01-01") <= wdz,
-    Date32("1900-01-01") <= wtz,
-    Datetime64("1900-01-01T03:04:05Z") <= na,
-    Datetime64("1900-01-01T03:04:05Z") <= naz,
-    Datetime64("1900-01-01T03:04:05Z") <= nd,
-    Datetime64("1900-01-01T03:04:05Z") <= ndz,
-    Datetime64("1900-01-01T03:04:05Z") <= nt,
-    Datetime64("1900-01-01T03:04:05Z") <= ntz,
-    Datetime64("1900-01-01T03:04:05Z") <= wa,
-    Datetime64("1900-01-01T03:04:05Z") <= wd,
-    Datetime64("1900-01-01T03:04:05Z") <= wt,
-    Datetime64("1900-01-01T03:04:05Z") <= waz,
-    Datetime64("1900-01-01T03:04:05Z") <= wdz,
-    Datetime64("1900-01-01T03:04:05Z") <= wtz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") <= na,
-    Timestamp64("1900-01-01T03:04:05.678912Z") <= naz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") <= nd,
-    Timestamp64("1900-01-01T03:04:05.678912Z") <= ndz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") <= nt,
-    Timestamp64("1900-01-01T03:04:05.678912Z") <= ntz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") <= wa,
-    Timestamp64("1900-01-01T03:04:05.678912Z") <= wd,
-    Timestamp64("1900-01-01T03:04:05.678912Z") <= wt,
-    Timestamp64("1900-01-01T03:04:05.678912Z") <= waz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") <= wdz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") <= wtz,
-    TzDate32("1900-01-01,Europe/Moscow") <= na,
-    TzDate32("1900-01-01,Europe/Moscow") <= naz,
-    TzDate32("1900-01-01,Europe/Moscow") <= nd,
-    TzDate32("1900-01-01,Europe/Moscow") <= ndz,
-    TzDate32("1900-01-01,Europe/Moscow") <= nt,
-    TzDate32("1900-01-01,Europe/Moscow") <= ntz,
-    TzDate32("1900-01-01,Europe/Moscow") <= wa,
-    TzDate32("1900-01-01,Europe/Moscow") <= wd,
-    TzDate32("1900-01-01,Europe/Moscow") <= wt,
-    TzDate32("1900-01-01,Europe/Moscow") <= waz,
-    TzDate32("1900-01-01,Europe/Moscow") <= wdz,
-    TzDate32("1900-01-01,Europe/Moscow") <= wtz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") <= na,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") <= naz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") <= nd,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") <= ndz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") <= nt,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") <= ntz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") <= wa,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") <= wd,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") <= wt,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") <= waz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") <= wdz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") <= wtz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") <= na,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") <= naz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") <= nd,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") <= ndz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") <= nt,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") <= ntz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") <= wa,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") <= wd,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") <= wt,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") <= waz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") <= wdz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") <= wtz,
-    Interval("P1D") <= ni,
-    Interval("P1D") <= wi,
-    Interval64("P1D") <= ni,
-    Interval64("P1D") <= wi,
+    Date32('1900-01-01') <= na,
+    Date32('1900-01-01') <= naz,
+    Date32('1900-01-01') <= nd,
+    Date32('1900-01-01') <= ndz,
+    Date32('1900-01-01') <= nt,
+    Date32('1900-01-01') <= ntz,
+    Date32('1900-01-01') <= wa,
+    Date32('1900-01-01') <= wd,
+    Date32('1900-01-01') <= wt,
+    Date32('1900-01-01') <= waz,
+    Date32('1900-01-01') <= wdz,
+    Date32('1900-01-01') <= wtz,
+    Datetime64('1900-01-01T03:04:05Z') <= na,
+    Datetime64('1900-01-01T03:04:05Z') <= naz,
+    Datetime64('1900-01-01T03:04:05Z') <= nd,
+    Datetime64('1900-01-01T03:04:05Z') <= ndz,
+    Datetime64('1900-01-01T03:04:05Z') <= nt,
+    Datetime64('1900-01-01T03:04:05Z') <= ntz,
+    Datetime64('1900-01-01T03:04:05Z') <= wa,
+    Datetime64('1900-01-01T03:04:05Z') <= wd,
+    Datetime64('1900-01-01T03:04:05Z') <= wt,
+    Datetime64('1900-01-01T03:04:05Z') <= waz,
+    Datetime64('1900-01-01T03:04:05Z') <= wdz,
+    Datetime64('1900-01-01T03:04:05Z') <= wtz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') <= na,
+    Timestamp64('1900-01-01T03:04:05.678912Z') <= naz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') <= nd,
+    Timestamp64('1900-01-01T03:04:05.678912Z') <= ndz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') <= nt,
+    Timestamp64('1900-01-01T03:04:05.678912Z') <= ntz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') <= wa,
+    Timestamp64('1900-01-01T03:04:05.678912Z') <= wd,
+    Timestamp64('1900-01-01T03:04:05.678912Z') <= wt,
+    Timestamp64('1900-01-01T03:04:05.678912Z') <= waz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') <= wdz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') <= wtz,
+    TzDate32('1900-01-01,Europe/Moscow') <= na,
+    TzDate32('1900-01-01,Europe/Moscow') <= naz,
+    TzDate32('1900-01-01,Europe/Moscow') <= nd,
+    TzDate32('1900-01-01,Europe/Moscow') <= ndz,
+    TzDate32('1900-01-01,Europe/Moscow') <= nt,
+    TzDate32('1900-01-01,Europe/Moscow') <= ntz,
+    TzDate32('1900-01-01,Europe/Moscow') <= wa,
+    TzDate32('1900-01-01,Europe/Moscow') <= wd,
+    TzDate32('1900-01-01,Europe/Moscow') <= wt,
+    TzDate32('1900-01-01,Europe/Moscow') <= waz,
+    TzDate32('1900-01-01,Europe/Moscow') <= wdz,
+    TzDate32('1900-01-01,Europe/Moscow') <= wtz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') <= na,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') <= naz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') <= nd,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') <= ndz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') <= nt,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') <= ntz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') <= wa,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') <= wd,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') <= wt,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') <= waz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') <= wdz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') <= wtz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') <= na,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') <= naz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') <= nd,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') <= ndz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') <= nt,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') <= ntz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') <= wa,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') <= wd,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') <= wt,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') <= waz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') <= wdz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') <= wtz,
+    Interval('P1D') <= ni,
+    Interval('P1D') <= wi,
+    Interval64('P1D') <= ni,
+    Interval64('P1D') <= wi,
 FROM
     Dates
 ;
 
 SELECT
-    na <= Date("2000-01-01"),
-    naz <= Date("2000-01-01"),
-    nd <= Date("2000-01-01"),
-    ndz <= Date("2000-01-01"),
-    nt <= Date("2000-01-01"),
-    ntz <= Date("2000-01-01"),
-    wa <= Date("2000-01-01"),
-    wd <= Date("2000-01-01"),
-    wt <= Date("2000-01-01"),
-    waz <= Date("2000-01-01"),
-    wdz <= Date("2000-01-01"),
-    wtz <= Date("2000-01-01"),
-    na <= TzDate("2000-01-01,Europe/Moscow"),
-    naz <= TzDate("2000-01-01,Europe/Moscow"),
-    nd <= TzDate("2000-01-01,Europe/Moscow"),
-    ndz <= TzDate("2000-01-01,Europe/Moscow"),
-    nt <= TzDate("2000-01-01,Europe/Moscow"),
-    ntz <= TzDate("2000-01-01,Europe/Moscow"),
-    wa <= TzDate("2000-01-01,Europe/Moscow"),
-    wd <= TzDate("2000-01-01,Europe/Moscow"),
-    wt <= TzDate("2000-01-01,Europe/Moscow"),
-    waz <= TzDate("2000-01-01,Europe/Moscow"),
-    wdz <= TzDate("2000-01-01,Europe/Moscow"),
-    wtz <= TzDate("2000-01-01,Europe/Moscow"),
-    na <= Datetime("2000-01-01T03:04:05Z"),
-    naz <= Datetime("2000-01-01T03:04:05Z"),
-    nd <= Datetime("2000-01-01T03:04:05Z"),
-    ndz <= Datetime("2000-01-01T03:04:05Z"),
-    nt <= Datetime("2000-01-01T03:04:05Z"),
-    ntz <= Datetime("2000-01-01T03:04:05Z"),
-    wa <= Datetime("2000-01-01T03:04:05Z"),
-    wd <= Datetime("2000-01-01T03:04:05Z"),
-    wt <= Datetime("2000-01-01T03:04:05Z"),
-    waz <= Datetime("2000-01-01T03:04:05Z"),
-    wdz <= Datetime("2000-01-01T03:04:05Z"),
-    wtz <= Datetime("2000-01-01T03:04:05Z"),
-    na <= TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    naz <= TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    nd <= TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    ndz <= TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    nt <= TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    ntz <= TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wa <= TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wd <= TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wt <= TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    waz <= TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wdz <= TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wtz <= TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    na <= Timestamp("2000-01-01T03:04:05.678912Z"),
-    naz <= Timestamp("2000-01-01T03:04:05.678912Z"),
-    nd <= Timestamp("2000-01-01T03:04:05.678912Z"),
-    ndz <= Timestamp("2000-01-01T03:04:05.678912Z"),
-    nt <= Timestamp("2000-01-01T03:04:05.678912Z"),
-    ntz <= Timestamp("2000-01-01T03:04:05.678912Z"),
-    wa <= Timestamp("2000-01-01T03:04:05.678912Z"),
-    wd <= Timestamp("2000-01-01T03:04:05.678912Z"),
-    wt <= Timestamp("2000-01-01T03:04:05.678912Z"),
-    waz <= Timestamp("2000-01-01T03:04:05.678912Z"),
-    wdz <= Timestamp("2000-01-01T03:04:05.678912Z"),
-    wtz <= Timestamp("2000-01-01T03:04:05.678912Z"),
-    na <= TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    naz <= TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    nd <= TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    ndz <= TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    nt <= TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    ntz <= TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wa <= TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wd <= TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wt <= TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    waz <= TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wdz <= TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wtz <= TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow")
+    na <= Date('2000-01-01'),
+    naz <= Date('2000-01-01'),
+    nd <= Date('2000-01-01'),
+    ndz <= Date('2000-01-01'),
+    nt <= Date('2000-01-01'),
+    ntz <= Date('2000-01-01'),
+    wa <= Date('2000-01-01'),
+    wd <= Date('2000-01-01'),
+    wt <= Date('2000-01-01'),
+    waz <= Date('2000-01-01'),
+    wdz <= Date('2000-01-01'),
+    wtz <= Date('2000-01-01'),
+    na <= TzDate('2000-01-01,Europe/Moscow'),
+    naz <= TzDate('2000-01-01,Europe/Moscow'),
+    nd <= TzDate('2000-01-01,Europe/Moscow'),
+    ndz <= TzDate('2000-01-01,Europe/Moscow'),
+    nt <= TzDate('2000-01-01,Europe/Moscow'),
+    ntz <= TzDate('2000-01-01,Europe/Moscow'),
+    wa <= TzDate('2000-01-01,Europe/Moscow'),
+    wd <= TzDate('2000-01-01,Europe/Moscow'),
+    wt <= TzDate('2000-01-01,Europe/Moscow'),
+    waz <= TzDate('2000-01-01,Europe/Moscow'),
+    wdz <= TzDate('2000-01-01,Europe/Moscow'),
+    wtz <= TzDate('2000-01-01,Europe/Moscow'),
+    na <= Datetime('2000-01-01T03:04:05Z'),
+    naz <= Datetime('2000-01-01T03:04:05Z'),
+    nd <= Datetime('2000-01-01T03:04:05Z'),
+    ndz <= Datetime('2000-01-01T03:04:05Z'),
+    nt <= Datetime('2000-01-01T03:04:05Z'),
+    ntz <= Datetime('2000-01-01T03:04:05Z'),
+    wa <= Datetime('2000-01-01T03:04:05Z'),
+    wd <= Datetime('2000-01-01T03:04:05Z'),
+    wt <= Datetime('2000-01-01T03:04:05Z'),
+    waz <= Datetime('2000-01-01T03:04:05Z'),
+    wdz <= Datetime('2000-01-01T03:04:05Z'),
+    wtz <= Datetime('2000-01-01T03:04:05Z'),
+    na <= TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    naz <= TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    nd <= TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    ndz <= TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    nt <= TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    ntz <= TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wa <= TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wd <= TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wt <= TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    waz <= TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wdz <= TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wtz <= TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    na <= Timestamp('2000-01-01T03:04:05.678912Z'),
+    naz <= Timestamp('2000-01-01T03:04:05.678912Z'),
+    nd <= Timestamp('2000-01-01T03:04:05.678912Z'),
+    ndz <= Timestamp('2000-01-01T03:04:05.678912Z'),
+    nt <= Timestamp('2000-01-01T03:04:05.678912Z'),
+    ntz <= Timestamp('2000-01-01T03:04:05.678912Z'),
+    wa <= Timestamp('2000-01-01T03:04:05.678912Z'),
+    wd <= Timestamp('2000-01-01T03:04:05.678912Z'),
+    wt <= Timestamp('2000-01-01T03:04:05.678912Z'),
+    waz <= Timestamp('2000-01-01T03:04:05.678912Z'),
+    wdz <= Timestamp('2000-01-01T03:04:05.678912Z'),
+    wtz <= Timestamp('2000-01-01T03:04:05.678912Z'),
+    na <= TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    naz <= TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    nd <= TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    ndz <= TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    nt <= TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    ntz <= TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wa <= TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wd <= TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wt <= TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    waz <= TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wdz <= TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wtz <= TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow')
 FROM
     Dates
 ;
 
 SELECT
-    na <= Date32("1900-01-01"),
-    naz <= Date32("1900-01-01"),
-    nd <= Date32("1900-01-01"),
-    ndz <= Date32("1900-01-01"),
-    nt <= Date32("1900-01-01"),
-    ntz <= Date32("1900-01-01"),
-    wa <= Date32("1900-01-01"),
-    wd <= Date32("1900-01-01"),
-    wt <= Date32("1900-01-01"),
-    waz <= Date32("1900-01-01"),
-    wdz <= Date32("1900-01-01"),
-    wtz <= Date32("1900-01-01"),
-    na <= Datetime64("1900-01-01T03:04:05Z"),
-    naz <= Datetime64("1900-01-01T03:04:05Z"),
-    nd <= Datetime64("1900-01-01T03:04:05Z"),
-    ndz <= Datetime64("1900-01-01T03:04:05Z"),
-    nt <= Datetime64("1900-01-01T03:04:05Z"),
-    ntz <= Datetime64("1900-01-01T03:04:05Z"),
-    wa <= Datetime64("1900-01-01T03:04:05Z"),
-    wd <= Datetime64("1900-01-01T03:04:05Z"),
-    wt <= Datetime64("1900-01-01T03:04:05Z"),
-    waz <= Datetime64("1900-01-01T03:04:05Z"),
-    wdz <= Datetime64("1900-01-01T03:04:05Z"),
-    wtz <= Datetime64("1900-01-01T03:04:05Z"),
-    na <= Timestamp64("1900-01-01T03:04:05.678912Z"),
-    naz <= Timestamp64("1900-01-01T03:04:05.678912Z"),
-    nd <= Timestamp64("1900-01-01T03:04:05.678912Z"),
-    ndz <= Timestamp64("1900-01-01T03:04:05.678912Z"),
-    nt <= Timestamp64("1900-01-01T03:04:05.678912Z"),
-    ntz <= Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wa <= Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wd <= Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wt <= Timestamp64("1900-01-01T03:04:05.678912Z"),
-    waz <= Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wdz <= Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wtz <= Timestamp64("1900-01-01T03:04:05.678912Z"),
-    na <= TzDate32("1900-01-01,Europe/Moscow"),
-    naz <= TzDate32("1900-01-01,Europe/Moscow"),
-    nd <= TzDate32("1900-01-01,Europe/Moscow"),
-    ndz <= TzDate32("1900-01-01,Europe/Moscow"),
-    nt <= TzDate32("1900-01-01,Europe/Moscow"),
-    ntz <= TzDate32("1900-01-01,Europe/Moscow"),
-    wa <= TzDate32("1900-01-01,Europe/Moscow"),
-    wd <= TzDate32("1900-01-01,Europe/Moscow"),
-    wt <= TzDate32("1900-01-01,Europe/Moscow"),
-    waz <= TzDate32("1900-01-01,Europe/Moscow"),
-    wdz <= TzDate32("1900-01-01,Europe/Moscow"),
-    wtz <= TzDate32("1900-01-01,Europe/Moscow"),
-    na <= TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    naz <= TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    nd <= TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    ndz <= TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    nt <= TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    ntz <= TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wa <= TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wd <= TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wt <= TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    waz <= TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wdz <= TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wtz <= TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    na <= TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    naz <= TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    nd <= TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    ndz <= TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    nt <= TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    ntz <= TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wa <= TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wd <= TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wt <= TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    waz <= TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wdz <= TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wtz <= TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    ni <= Interval("P1D"),
-    wi <= Interval("P1D"),
-    ni <= Interval64("P1D"),
-    wi <= Interval64("P1D"),
+    na <= Date32('1900-01-01'),
+    naz <= Date32('1900-01-01'),
+    nd <= Date32('1900-01-01'),
+    ndz <= Date32('1900-01-01'),
+    nt <= Date32('1900-01-01'),
+    ntz <= Date32('1900-01-01'),
+    wa <= Date32('1900-01-01'),
+    wd <= Date32('1900-01-01'),
+    wt <= Date32('1900-01-01'),
+    waz <= Date32('1900-01-01'),
+    wdz <= Date32('1900-01-01'),
+    wtz <= Date32('1900-01-01'),
+    na <= Datetime64('1900-01-01T03:04:05Z'),
+    naz <= Datetime64('1900-01-01T03:04:05Z'),
+    nd <= Datetime64('1900-01-01T03:04:05Z'),
+    ndz <= Datetime64('1900-01-01T03:04:05Z'),
+    nt <= Datetime64('1900-01-01T03:04:05Z'),
+    ntz <= Datetime64('1900-01-01T03:04:05Z'),
+    wa <= Datetime64('1900-01-01T03:04:05Z'),
+    wd <= Datetime64('1900-01-01T03:04:05Z'),
+    wt <= Datetime64('1900-01-01T03:04:05Z'),
+    waz <= Datetime64('1900-01-01T03:04:05Z'),
+    wdz <= Datetime64('1900-01-01T03:04:05Z'),
+    wtz <= Datetime64('1900-01-01T03:04:05Z'),
+    na <= Timestamp64('1900-01-01T03:04:05.678912Z'),
+    naz <= Timestamp64('1900-01-01T03:04:05.678912Z'),
+    nd <= Timestamp64('1900-01-01T03:04:05.678912Z'),
+    ndz <= Timestamp64('1900-01-01T03:04:05.678912Z'),
+    nt <= Timestamp64('1900-01-01T03:04:05.678912Z'),
+    ntz <= Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wa <= Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wd <= Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wt <= Timestamp64('1900-01-01T03:04:05.678912Z'),
+    waz <= Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wdz <= Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wtz <= Timestamp64('1900-01-01T03:04:05.678912Z'),
+    na <= TzDate32('1900-01-01,Europe/Moscow'),
+    naz <= TzDate32('1900-01-01,Europe/Moscow'),
+    nd <= TzDate32('1900-01-01,Europe/Moscow'),
+    ndz <= TzDate32('1900-01-01,Europe/Moscow'),
+    nt <= TzDate32('1900-01-01,Europe/Moscow'),
+    ntz <= TzDate32('1900-01-01,Europe/Moscow'),
+    wa <= TzDate32('1900-01-01,Europe/Moscow'),
+    wd <= TzDate32('1900-01-01,Europe/Moscow'),
+    wt <= TzDate32('1900-01-01,Europe/Moscow'),
+    waz <= TzDate32('1900-01-01,Europe/Moscow'),
+    wdz <= TzDate32('1900-01-01,Europe/Moscow'),
+    wtz <= TzDate32('1900-01-01,Europe/Moscow'),
+    na <= TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    naz <= TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    nd <= TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    ndz <= TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    nt <= TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    ntz <= TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wa <= TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wd <= TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wt <= TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    waz <= TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wdz <= TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wtz <= TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    na <= TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    naz <= TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    nd <= TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    ndz <= TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    nt <= TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    ntz <= TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wa <= TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wd <= TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wt <= TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    waz <= TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wdz <= TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wtz <= TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    ni <= Interval('P1D'),
+    wi <= Interval('P1D'),
+    ni <= Interval64('P1D'),
+    wi <= Interval64('P1D'),
 FROM
     Dates
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_scalar_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_scalar_/formatted.sql
index d3d767e866..64c48f86be 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_scalar_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_scalar_/formatted.sql
@@ -1,319 +1,319 @@
 USE plato;
 
-PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
+PRAGMA yt.DisableOptimizers = 'OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps';
 
 SELECT
-    Date("2000-01-01") < na,
-    Date("2000-01-01") < naz,
-    Date("2000-01-01") < nd,
-    Date("2000-01-01") < ndz,
-    Date("2000-01-01") < nt,
-    Date("2000-01-01") < ntz,
-    Date("2000-01-01") < wa,
-    Date("2000-01-01") < wd,
-    Date("2000-01-01") < wt,
-    Date("2000-01-01") < waz,
-    Date("2000-01-01") < wdz,
-    Date("2000-01-01") < wtz,
-    TzDate("2000-01-01,Europe/Moscow") < na,
-    TzDate("2000-01-01,Europe/Moscow") < naz,
-    TzDate("2000-01-01,Europe/Moscow") < nd,
-    TzDate("2000-01-01,Europe/Moscow") < ndz,
-    TzDate("2000-01-01,Europe/Moscow") < nt,
-    TzDate("2000-01-01,Europe/Moscow") < ntz,
-    TzDate("2000-01-01,Europe/Moscow") < wa,
-    TzDate("2000-01-01,Europe/Moscow") < wd,
-    TzDate("2000-01-01,Europe/Moscow") < wt,
-    TzDate("2000-01-01,Europe/Moscow") < waz,
-    TzDate("2000-01-01,Europe/Moscow") < wdz,
-    TzDate("2000-01-01,Europe/Moscow") < wtz,
-    Datetime("2000-01-01T03:04:05Z") < na,
-    Datetime("2000-01-01T03:04:05Z") < naz,
-    Datetime("2000-01-01T03:04:05Z") < nd,
-    Datetime("2000-01-01T03:04:05Z") < ndz,
-    Datetime("2000-01-01T03:04:05Z") < nt,
-    Datetime("2000-01-01T03:04:05Z") < ntz,
-    Datetime("2000-01-01T03:04:05Z") < wa,
-    Datetime("2000-01-01T03:04:05Z") < wd,
-    Datetime("2000-01-01T03:04:05Z") < wt,
-    Datetime("2000-01-01T03:04:05Z") < waz,
-    Datetime("2000-01-01T03:04:05Z") < wdz,
-    Datetime("2000-01-01T03:04:05Z") < wtz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") < na,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") < naz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") < nd,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") < ndz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") < nt,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") < ntz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") < wa,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") < wd,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") < wt,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") < waz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") < wdz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") < wtz,
-    Timestamp("2000-01-01T03:04:05.678912Z") < na,
-    Timestamp("2000-01-01T03:04:05.678912Z") < naz,
-    Timestamp("2000-01-01T03:04:05.678912Z") < nd,
-    Timestamp("2000-01-01T03:04:05.678912Z") < ndz,
-    Timestamp("2000-01-01T03:04:05.678912Z") < nt,
-    Timestamp("2000-01-01T03:04:05.678912Z") < ntz,
-    Timestamp("2000-01-01T03:04:05.678912Z") < wa,
-    Timestamp("2000-01-01T03:04:05.678912Z") < wd,
-    Timestamp("2000-01-01T03:04:05.678912Z") < wt,
-    Timestamp("2000-01-01T03:04:05.678912Z") < waz,
-    Timestamp("2000-01-01T03:04:05.678912Z") < wdz,
-    Timestamp("2000-01-01T03:04:05.678912Z") < wtz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") < na,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") < naz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") < nd,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") < ndz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") < nt,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") < ntz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") < wa,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") < wd,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") < wt,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") < waz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") < wdz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") < wtz
+    Date('2000-01-01') < na,
+    Date('2000-01-01') < naz,
+    Date('2000-01-01') < nd,
+    Date('2000-01-01') < ndz,
+    Date('2000-01-01') < nt,
+    Date('2000-01-01') < ntz,
+    Date('2000-01-01') < wa,
+    Date('2000-01-01') < wd,
+    Date('2000-01-01') < wt,
+    Date('2000-01-01') < waz,
+    Date('2000-01-01') < wdz,
+    Date('2000-01-01') < wtz,
+    TzDate('2000-01-01,Europe/Moscow') < na,
+    TzDate('2000-01-01,Europe/Moscow') < naz,
+    TzDate('2000-01-01,Europe/Moscow') < nd,
+    TzDate('2000-01-01,Europe/Moscow') < ndz,
+    TzDate('2000-01-01,Europe/Moscow') < nt,
+    TzDate('2000-01-01,Europe/Moscow') < ntz,
+    TzDate('2000-01-01,Europe/Moscow') < wa,
+    TzDate('2000-01-01,Europe/Moscow') < wd,
+    TzDate('2000-01-01,Europe/Moscow') < wt,
+    TzDate('2000-01-01,Europe/Moscow') < waz,
+    TzDate('2000-01-01,Europe/Moscow') < wdz,
+    TzDate('2000-01-01,Europe/Moscow') < wtz,
+    Datetime('2000-01-01T03:04:05Z') < na,
+    Datetime('2000-01-01T03:04:05Z') < naz,
+    Datetime('2000-01-01T03:04:05Z') < nd,
+    Datetime('2000-01-01T03:04:05Z') < ndz,
+    Datetime('2000-01-01T03:04:05Z') < nt,
+    Datetime('2000-01-01T03:04:05Z') < ntz,
+    Datetime('2000-01-01T03:04:05Z') < wa,
+    Datetime('2000-01-01T03:04:05Z') < wd,
+    Datetime('2000-01-01T03:04:05Z') < wt,
+    Datetime('2000-01-01T03:04:05Z') < waz,
+    Datetime('2000-01-01T03:04:05Z') < wdz,
+    Datetime('2000-01-01T03:04:05Z') < wtz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') < na,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') < naz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') < nd,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') < ndz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') < nt,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') < ntz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') < wa,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') < wd,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') < wt,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') < waz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') < wdz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') < wtz,
+    Timestamp('2000-01-01T03:04:05.678912Z') < na,
+    Timestamp('2000-01-01T03:04:05.678912Z') < naz,
+    Timestamp('2000-01-01T03:04:05.678912Z') < nd,
+    Timestamp('2000-01-01T03:04:05.678912Z') < ndz,
+    Timestamp('2000-01-01T03:04:05.678912Z') < nt,
+    Timestamp('2000-01-01T03:04:05.678912Z') < ntz,
+    Timestamp('2000-01-01T03:04:05.678912Z') < wa,
+    Timestamp('2000-01-01T03:04:05.678912Z') < wd,
+    Timestamp('2000-01-01T03:04:05.678912Z') < wt,
+    Timestamp('2000-01-01T03:04:05.678912Z') < waz,
+    Timestamp('2000-01-01T03:04:05.678912Z') < wdz,
+    Timestamp('2000-01-01T03:04:05.678912Z') < wtz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') < na,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') < naz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') < nd,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') < ndz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') < nt,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') < ntz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') < wa,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') < wd,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') < wt,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') < waz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') < wdz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') < wtz
 FROM
     Dates
 ;
 
 SELECT
-    Date32("1900-01-01") < na,
-    Date32("1900-01-01") < naz,
-    Date32("1900-01-01") < nd,
-    Date32("1900-01-01") < ndz,
-    Date32("1900-01-01") < nt,
-    Date32("1900-01-01") < ntz,
-    Date32("1900-01-01") < wa,
-    Date32("1900-01-01") < wd,
-    Date32("1900-01-01") < wt,
-    Date32("1900-01-01") < waz,
-    Date32("1900-01-01") < wdz,
-    Date32("1900-01-01") < wtz,
-    Datetime64("1900-01-01T03:04:05Z") < na,
-    Datetime64("1900-01-01T03:04:05Z") < naz,
-    Datetime64("1900-01-01T03:04:05Z") < nd,
-    Datetime64("1900-01-01T03:04:05Z") < ndz,
-    Datetime64("1900-01-01T03:04:05Z") < nt,
-    Datetime64("1900-01-01T03:04:05Z") < ntz,
-    Datetime64("1900-01-01T03:04:05Z") < wa,
-    Datetime64("1900-01-01T03:04:05Z") < wd,
-    Datetime64("1900-01-01T03:04:05Z") < wt,
-    Datetime64("1900-01-01T03:04:05Z") < waz,
-    Datetime64("1900-01-01T03:04:05Z") < wdz,
-    Datetime64("1900-01-01T03:04:05Z") < wtz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") < na,
-    Timestamp64("1900-01-01T03:04:05.678912Z") < naz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") < nd,
-    Timestamp64("1900-01-01T03:04:05.678912Z") < ndz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") < nt,
-    Timestamp64("1900-01-01T03:04:05.678912Z") < ntz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") < wa,
-    Timestamp64("1900-01-01T03:04:05.678912Z") < wd,
-    Timestamp64("1900-01-01T03:04:05.678912Z") < wt,
-    Timestamp64("1900-01-01T03:04:05.678912Z") < waz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") < wdz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") < wtz,
-    TzDate32("1900-01-01,Europe/Moscow") < na,
-    TzDate32("1900-01-01,Europe/Moscow") < naz,
-    TzDate32("1900-01-01,Europe/Moscow") < nd,
-    TzDate32("1900-01-01,Europe/Moscow") < ndz,
-    TzDate32("1900-01-01,Europe/Moscow") < nt,
-    TzDate32("1900-01-01,Europe/Moscow") < ntz,
-    TzDate32("1900-01-01,Europe/Moscow") < wa,
-    TzDate32("1900-01-01,Europe/Moscow") < wd,
-    TzDate32("1900-01-01,Europe/Moscow") < wt,
-    TzDate32("1900-01-01,Europe/Moscow") < waz,
-    TzDate32("1900-01-01,Europe/Moscow") < wdz,
-    TzDate32("1900-01-01,Europe/Moscow") < wtz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") < na,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") < naz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") < nd,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") < ndz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") < nt,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") < ntz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") < wa,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") < wd,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") < wt,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") < waz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") < wdz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") < wtz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") < na,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") < naz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") < nd,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") < ndz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") < nt,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") < ntz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") < wa,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") < wd,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") < wt,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") < waz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") < wdz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") < wtz,
-    Interval("P1D") < ni,
-    Interval("P1D") < wi,
-    Interval64("P1D") < ni,
-    Interval64("P1D") < wi,
+    Date32('1900-01-01') < na,
+    Date32('1900-01-01') < naz,
+    Date32('1900-01-01') < nd,
+    Date32('1900-01-01') < ndz,
+    Date32('1900-01-01') < nt,
+    Date32('1900-01-01') < ntz,
+    Date32('1900-01-01') < wa,
+    Date32('1900-01-01') < wd,
+    Date32('1900-01-01') < wt,
+    Date32('1900-01-01') < waz,
+    Date32('1900-01-01') < wdz,
+    Date32('1900-01-01') < wtz,
+    Datetime64('1900-01-01T03:04:05Z') < na,
+    Datetime64('1900-01-01T03:04:05Z') < naz,
+    Datetime64('1900-01-01T03:04:05Z') < nd,
+    Datetime64('1900-01-01T03:04:05Z') < ndz,
+    Datetime64('1900-01-01T03:04:05Z') < nt,
+    Datetime64('1900-01-01T03:04:05Z') < ntz,
+    Datetime64('1900-01-01T03:04:05Z') < wa,
+    Datetime64('1900-01-01T03:04:05Z') < wd,
+    Datetime64('1900-01-01T03:04:05Z') < wt,
+    Datetime64('1900-01-01T03:04:05Z') < waz,
+    Datetime64('1900-01-01T03:04:05Z') < wdz,
+    Datetime64('1900-01-01T03:04:05Z') < wtz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') < na,
+    Timestamp64('1900-01-01T03:04:05.678912Z') < naz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') < nd,
+    Timestamp64('1900-01-01T03:04:05.678912Z') < ndz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') < nt,
+    Timestamp64('1900-01-01T03:04:05.678912Z') < ntz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') < wa,
+    Timestamp64('1900-01-01T03:04:05.678912Z') < wd,
+    Timestamp64('1900-01-01T03:04:05.678912Z') < wt,
+    Timestamp64('1900-01-01T03:04:05.678912Z') < waz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') < wdz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') < wtz,
+    TzDate32('1900-01-01,Europe/Moscow') < na,
+    TzDate32('1900-01-01,Europe/Moscow') < naz,
+    TzDate32('1900-01-01,Europe/Moscow') < nd,
+    TzDate32('1900-01-01,Europe/Moscow') < ndz,
+    TzDate32('1900-01-01,Europe/Moscow') < nt,
+    TzDate32('1900-01-01,Europe/Moscow') < ntz,
+    TzDate32('1900-01-01,Europe/Moscow') < wa,
+    TzDate32('1900-01-01,Europe/Moscow') < wd,
+    TzDate32('1900-01-01,Europe/Moscow') < wt,
+    TzDate32('1900-01-01,Europe/Moscow') < waz,
+    TzDate32('1900-01-01,Europe/Moscow') < wdz,
+    TzDate32('1900-01-01,Europe/Moscow') < wtz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') < na,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') < naz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') < nd,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') < ndz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') < nt,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') < ntz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') < wa,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') < wd,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') < wt,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') < waz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') < wdz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') < wtz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') < na,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') < naz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') < nd,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') < ndz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') < nt,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') < ntz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') < wa,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') < wd,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') < wt,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') < waz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') < wdz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') < wtz,
+    Interval('P1D') < ni,
+    Interval('P1D') < wi,
+    Interval64('P1D') < ni,
+    Interval64('P1D') < wi,
 FROM
     Dates
 ;
 
 SELECT
-    na < Date("2000-01-01"),
-    naz < Date("2000-01-01"),
-    nd < Date("2000-01-01"),
-    ndz < Date("2000-01-01"),
-    nt < Date("2000-01-01"),
-    ntz < Date("2000-01-01"),
-    wa < Date("2000-01-01"),
-    wd < Date("2000-01-01"),
-    wt < Date("2000-01-01"),
-    waz < Date("2000-01-01"),
-    wdz < Date("2000-01-01"),
-    wtz < Date("2000-01-01"),
-    na < TzDate("2000-01-01,Europe/Moscow"),
-    naz < TzDate("2000-01-01,Europe/Moscow"),
-    nd < TzDate("2000-01-01,Europe/Moscow"),
-    ndz < TzDate("2000-01-01,Europe/Moscow"),
-    nt < TzDate("2000-01-01,Europe/Moscow"),
-    ntz < TzDate("2000-01-01,Europe/Moscow"),
-    wa < TzDate("2000-01-01,Europe/Moscow"),
-    wd < TzDate("2000-01-01,Europe/Moscow"),
-    wt < TzDate("2000-01-01,Europe/Moscow"),
-    waz < TzDate("2000-01-01,Europe/Moscow"),
-    wdz < TzDate("2000-01-01,Europe/Moscow"),
-    wtz < TzDate("2000-01-01,Europe/Moscow"),
-    na < Datetime("2000-01-01T03:04:05Z"),
-    naz < Datetime("2000-01-01T03:04:05Z"),
-    nd < Datetime("2000-01-01T03:04:05Z"),
-    ndz < Datetime("2000-01-01T03:04:05Z"),
-    nt < Datetime("2000-01-01T03:04:05Z"),
-    ntz < Datetime("2000-01-01T03:04:05Z"),
-    wa < Datetime("2000-01-01T03:04:05Z"),
-    wd < Datetime("2000-01-01T03:04:05Z"),
-    wt < Datetime("2000-01-01T03:04:05Z"),
-    waz < Datetime("2000-01-01T03:04:05Z"),
-    wdz < Datetime("2000-01-01T03:04:05Z"),
-    wtz < Datetime("2000-01-01T03:04:05Z"),
-    na < TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    naz < TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    nd < TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    ndz < TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    nt < TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    ntz < TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wa < TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wd < TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wt < TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    waz < TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wdz < TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wtz < TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    na < Timestamp("2000-01-01T03:04:05.678912Z"),
-    naz < Timestamp("2000-01-01T03:04:05.678912Z"),
-    nd < Timestamp("2000-01-01T03:04:05.678912Z"),
-    ndz < Timestamp("2000-01-01T03:04:05.678912Z"),
-    nt < Timestamp("2000-01-01T03:04:05.678912Z"),
-    ntz < Timestamp("2000-01-01T03:04:05.678912Z"),
-    wa < Timestamp("2000-01-01T03:04:05.678912Z"),
-    wd < Timestamp("2000-01-01T03:04:05.678912Z"),
-    wt < Timestamp("2000-01-01T03:04:05.678912Z"),
-    waz < Timestamp("2000-01-01T03:04:05.678912Z"),
-    wdz < Timestamp("2000-01-01T03:04:05.678912Z"),
-    wtz < Timestamp("2000-01-01T03:04:05.678912Z"),
-    na < TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    naz < TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    nd < TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    ndz < TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    nt < TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    ntz < TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wa < TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wd < TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wt < TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    waz < TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wdz < TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wtz < TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow")
+    na < Date('2000-01-01'),
+    naz < Date('2000-01-01'),
+    nd < Date('2000-01-01'),
+    ndz < Date('2000-01-01'),
+    nt < Date('2000-01-01'),
+    ntz < Date('2000-01-01'),
+    wa < Date('2000-01-01'),
+    wd < Date('2000-01-01'),
+    wt < Date('2000-01-01'),
+    waz < Date('2000-01-01'),
+    wdz < Date('2000-01-01'),
+    wtz < Date('2000-01-01'),
+    na < TzDate('2000-01-01,Europe/Moscow'),
+    naz < TzDate('2000-01-01,Europe/Moscow'),
+    nd < TzDate('2000-01-01,Europe/Moscow'),
+    ndz < TzDate('2000-01-01,Europe/Moscow'),
+    nt < TzDate('2000-01-01,Europe/Moscow'),
+    ntz < TzDate('2000-01-01,Europe/Moscow'),
+    wa < TzDate('2000-01-01,Europe/Moscow'),
+    wd < TzDate('2000-01-01,Europe/Moscow'),
+    wt < TzDate('2000-01-01,Europe/Moscow'),
+    waz < TzDate('2000-01-01,Europe/Moscow'),
+    wdz < TzDate('2000-01-01,Europe/Moscow'),
+    wtz < TzDate('2000-01-01,Europe/Moscow'),
+    na < Datetime('2000-01-01T03:04:05Z'),
+    naz < Datetime('2000-01-01T03:04:05Z'),
+    nd < Datetime('2000-01-01T03:04:05Z'),
+    ndz < Datetime('2000-01-01T03:04:05Z'),
+    nt < Datetime('2000-01-01T03:04:05Z'),
+    ntz < Datetime('2000-01-01T03:04:05Z'),
+    wa < Datetime('2000-01-01T03:04:05Z'),
+    wd < Datetime('2000-01-01T03:04:05Z'),
+    wt < Datetime('2000-01-01T03:04:05Z'),
+    waz < Datetime('2000-01-01T03:04:05Z'),
+    wdz < Datetime('2000-01-01T03:04:05Z'),
+    wtz < Datetime('2000-01-01T03:04:05Z'),
+    na < TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    naz < TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    nd < TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    ndz < TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    nt < TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    ntz < TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wa < TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wd < TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wt < TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    waz < TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wdz < TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wtz < TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    na < Timestamp('2000-01-01T03:04:05.678912Z'),
+    naz < Timestamp('2000-01-01T03:04:05.678912Z'),
+    nd < Timestamp('2000-01-01T03:04:05.678912Z'),
+    ndz < Timestamp('2000-01-01T03:04:05.678912Z'),
+    nt < Timestamp('2000-01-01T03:04:05.678912Z'),
+    ntz < Timestamp('2000-01-01T03:04:05.678912Z'),
+    wa < Timestamp('2000-01-01T03:04:05.678912Z'),
+    wd < Timestamp('2000-01-01T03:04:05.678912Z'),
+    wt < Timestamp('2000-01-01T03:04:05.678912Z'),
+    waz < Timestamp('2000-01-01T03:04:05.678912Z'),
+    wdz < Timestamp('2000-01-01T03:04:05.678912Z'),
+    wtz < Timestamp('2000-01-01T03:04:05.678912Z'),
+    na < TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    naz < TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    nd < TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    ndz < TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    nt < TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    ntz < TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wa < TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wd < TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wt < TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    waz < TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wdz < TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wtz < TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow')
 FROM
     Dates
 ;
 
 SELECT
-    na < Date32("1900-01-01"),
-    naz < Date32("1900-01-01"),
-    nd < Date32("1900-01-01"),
-    ndz < Date32("1900-01-01"),
-    nt < Date32("1900-01-01"),
-    ntz < Date32("1900-01-01"),
-    wa < Date32("1900-01-01"),
-    wd < Date32("1900-01-01"),
-    wt < Date32("1900-01-01"),
-    waz < Date32("1900-01-01"),
-    wdz < Date32("1900-01-01"),
-    wtz < Date32("1900-01-01"),
-    na < Datetime64("1900-01-01T03:04:05Z"),
-    naz < Datetime64("1900-01-01T03:04:05Z"),
-    nd < Datetime64("1900-01-01T03:04:05Z"),
-    ndz < Datetime64("1900-01-01T03:04:05Z"),
-    nt < Datetime64("1900-01-01T03:04:05Z"),
-    ntz < Datetime64("1900-01-01T03:04:05Z"),
-    wa < Datetime64("1900-01-01T03:04:05Z"),
-    wd < Datetime64("1900-01-01T03:04:05Z"),
-    wt < Datetime64("1900-01-01T03:04:05Z"),
-    waz < Datetime64("1900-01-01T03:04:05Z"),
-    wdz < Datetime64("1900-01-01T03:04:05Z"),
-    wtz < Datetime64("1900-01-01T03:04:05Z"),
-    na < Timestamp64("1900-01-01T03:04:05.678912Z"),
-    naz < Timestamp64("1900-01-01T03:04:05.678912Z"),
-    nd < Timestamp64("1900-01-01T03:04:05.678912Z"),
-    ndz < Timestamp64("1900-01-01T03:04:05.678912Z"),
-    nt < Timestamp64("1900-01-01T03:04:05.678912Z"),
-    ntz < Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wa < Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wd < Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wt < Timestamp64("1900-01-01T03:04:05.678912Z"),
-    waz < Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wdz < Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wtz < Timestamp64("1900-01-01T03:04:05.678912Z"),
-    na < TzDate32("1900-01-01,Europe/Moscow"),
-    naz < TzDate32("1900-01-01,Europe/Moscow"),
-    nd < TzDate32("1900-01-01,Europe/Moscow"),
-    ndz < TzDate32("1900-01-01,Europe/Moscow"),
-    nt < TzDate32("1900-01-01,Europe/Moscow"),
-    ntz < TzDate32("1900-01-01,Europe/Moscow"),
-    wa < TzDate32("1900-01-01,Europe/Moscow"),
-    wd < TzDate32("1900-01-01,Europe/Moscow"),
-    wt < TzDate32("1900-01-01,Europe/Moscow"),
-    waz < TzDate32("1900-01-01,Europe/Moscow"),
-    wdz < TzDate32("1900-01-01,Europe/Moscow"),
-    wtz < TzDate32("1900-01-01,Europe/Moscow"),
-    na < TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    naz < TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    nd < TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    ndz < TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    nt < TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    ntz < TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wa < TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wd < TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wt < TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    waz < TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wdz < TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wtz < TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    na < TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    naz < TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    nd < TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    ndz < TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    nt < TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    ntz < TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wa < TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wd < TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wt < TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    waz < TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wdz < TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wtz < TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    ni < Interval("P1D"),
-    wi < Interval("P1D"),
-    ni < Interval64("P1D"),
-    wi < Interval64("P1D"),
+    na < Date32('1900-01-01'),
+    naz < Date32('1900-01-01'),
+    nd < Date32('1900-01-01'),
+    ndz < Date32('1900-01-01'),
+    nt < Date32('1900-01-01'),
+    ntz < Date32('1900-01-01'),
+    wa < Date32('1900-01-01'),
+    wd < Date32('1900-01-01'),
+    wt < Date32('1900-01-01'),
+    waz < Date32('1900-01-01'),
+    wdz < Date32('1900-01-01'),
+    wtz < Date32('1900-01-01'),
+    na < Datetime64('1900-01-01T03:04:05Z'),
+    naz < Datetime64('1900-01-01T03:04:05Z'),
+    nd < Datetime64('1900-01-01T03:04:05Z'),
+    ndz < Datetime64('1900-01-01T03:04:05Z'),
+    nt < Datetime64('1900-01-01T03:04:05Z'),
+    ntz < Datetime64('1900-01-01T03:04:05Z'),
+    wa < Datetime64('1900-01-01T03:04:05Z'),
+    wd < Datetime64('1900-01-01T03:04:05Z'),
+    wt < Datetime64('1900-01-01T03:04:05Z'),
+    waz < Datetime64('1900-01-01T03:04:05Z'),
+    wdz < Datetime64('1900-01-01T03:04:05Z'),
+    wtz < Datetime64('1900-01-01T03:04:05Z'),
+    na < Timestamp64('1900-01-01T03:04:05.678912Z'),
+    naz < Timestamp64('1900-01-01T03:04:05.678912Z'),
+    nd < Timestamp64('1900-01-01T03:04:05.678912Z'),
+    ndz < Timestamp64('1900-01-01T03:04:05.678912Z'),
+    nt < Timestamp64('1900-01-01T03:04:05.678912Z'),
+    ntz < Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wa < Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wd < Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wt < Timestamp64('1900-01-01T03:04:05.678912Z'),
+    waz < Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wdz < Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wtz < Timestamp64('1900-01-01T03:04:05.678912Z'),
+    na < TzDate32('1900-01-01,Europe/Moscow'),
+    naz < TzDate32('1900-01-01,Europe/Moscow'),
+    nd < TzDate32('1900-01-01,Europe/Moscow'),
+    ndz < TzDate32('1900-01-01,Europe/Moscow'),
+    nt < TzDate32('1900-01-01,Europe/Moscow'),
+    ntz < TzDate32('1900-01-01,Europe/Moscow'),
+    wa < TzDate32('1900-01-01,Europe/Moscow'),
+    wd < TzDate32('1900-01-01,Europe/Moscow'),
+    wt < TzDate32('1900-01-01,Europe/Moscow'),
+    waz < TzDate32('1900-01-01,Europe/Moscow'),
+    wdz < TzDate32('1900-01-01,Europe/Moscow'),
+    wtz < TzDate32('1900-01-01,Europe/Moscow'),
+    na < TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    naz < TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    nd < TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    ndz < TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    nt < TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    ntz < TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wa < TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wd < TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wt < TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    waz < TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wdz < TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wtz < TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    na < TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    naz < TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    nd < TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    ndz < TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    nt < TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    ntz < TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wa < TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wd < TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wt < TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    waz < TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wdz < TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wtz < TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    ni < Interval('P1D'),
+    wi < Interval('P1D'),
+    ni < Interval64('P1D'),
+    wi < Interval64('P1D'),
 FROM
     Dates
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_not_equals_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_not_equals_/formatted.sql
index afaf15c2ad..ac38eda2ac 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_not_equals_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_not_equals_/formatted.sql
@@ -1,6 +1,6 @@
 USE plato;
 
-PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
+PRAGMA yt.DisableOptimizers = 'OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps';
 
 SELECT
     a.na != b.na,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_not_equals_scalar_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_not_equals_scalar_/formatted.sql
index 0b753f8c1d..df391a1455 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_not_equals_scalar_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_not_equals_scalar_/formatted.sql
@@ -1,319 +1,319 @@
 USE plato;
 
-PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
+PRAGMA yt.DisableOptimizers = 'OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps';
 
 SELECT
-    Date("2000-01-01") != na,
-    Date("2000-01-01") != naz,
-    Date("2000-01-01") != nd,
-    Date("2000-01-01") != ndz,
-    Date("2000-01-01") != nt,
-    Date("2000-01-01") != ntz,
-    Date("2000-01-01") != wa,
-    Date("2000-01-01") != wd,
-    Date("2000-01-01") != wt,
-    Date("2000-01-01") != waz,
-    Date("2000-01-01") != wdz,
-    Date("2000-01-01") != wtz,
-    TzDate("2000-01-01,Europe/Moscow") != na,
-    TzDate("2000-01-01,Europe/Moscow") != naz,
-    TzDate("2000-01-01,Europe/Moscow") != nd,
-    TzDate("2000-01-01,Europe/Moscow") != ndz,
-    TzDate("2000-01-01,Europe/Moscow") != nt,
-    TzDate("2000-01-01,Europe/Moscow") != ntz,
-    TzDate("2000-01-01,Europe/Moscow") != wa,
-    TzDate("2000-01-01,Europe/Moscow") != wd,
-    TzDate("2000-01-01,Europe/Moscow") != wt,
-    TzDate("2000-01-01,Europe/Moscow") != waz,
-    TzDate("2000-01-01,Europe/Moscow") != wdz,
-    TzDate("2000-01-01,Europe/Moscow") != wtz,
-    Datetime("2000-01-01T03:04:05Z") != na,
-    Datetime("2000-01-01T03:04:05Z") != naz,
-    Datetime("2000-01-01T03:04:05Z") != nd,
-    Datetime("2000-01-01T03:04:05Z") != ndz,
-    Datetime("2000-01-01T03:04:05Z") != nt,
-    Datetime("2000-01-01T03:04:05Z") != ntz,
-    Datetime("2000-01-01T03:04:05Z") != wa,
-    Datetime("2000-01-01T03:04:05Z") != wd,
-    Datetime("2000-01-01T03:04:05Z") != wt,
-    Datetime("2000-01-01T03:04:05Z") != waz,
-    Datetime("2000-01-01T03:04:05Z") != wdz,
-    Datetime("2000-01-01T03:04:05Z") != wtz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") != na,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") != naz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") != nd,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") != ndz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") != nt,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") != ntz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") != wa,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") != wd,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") != wt,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") != waz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") != wdz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") != wtz,
-    Timestamp("2000-01-01T03:04:05.678912Z") != na,
-    Timestamp("2000-01-01T03:04:05.678912Z") != naz,
-    Timestamp("2000-01-01T03:04:05.678912Z") != nd,
-    Timestamp("2000-01-01T03:04:05.678912Z") != ndz,
-    Timestamp("2000-01-01T03:04:05.678912Z") != nt,
-    Timestamp("2000-01-01T03:04:05.678912Z") != ntz,
-    Timestamp("2000-01-01T03:04:05.678912Z") != wa,
-    Timestamp("2000-01-01T03:04:05.678912Z") != wd,
-    Timestamp("2000-01-01T03:04:05.678912Z") != wt,
-    Timestamp("2000-01-01T03:04:05.678912Z") != waz,
-    Timestamp("2000-01-01T03:04:05.678912Z") != wdz,
-    Timestamp("2000-01-01T03:04:05.678912Z") != wtz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") != na,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") != naz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") != nd,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") != ndz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") != nt,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") != ntz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") != wa,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") != wd,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") != wt,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") != waz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") != wdz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") != wtz
+    Date('2000-01-01') != na,
+    Date('2000-01-01') != naz,
+    Date('2000-01-01') != nd,
+    Date('2000-01-01') != ndz,
+    Date('2000-01-01') != nt,
+    Date('2000-01-01') != ntz,
+    Date('2000-01-01') != wa,
+    Date('2000-01-01') != wd,
+    Date('2000-01-01') != wt,
+    Date('2000-01-01') != waz,
+    Date('2000-01-01') != wdz,
+    Date('2000-01-01') != wtz,
+    TzDate('2000-01-01,Europe/Moscow') != na,
+    TzDate('2000-01-01,Europe/Moscow') != naz,
+    TzDate('2000-01-01,Europe/Moscow') != nd,
+    TzDate('2000-01-01,Europe/Moscow') != ndz,
+    TzDate('2000-01-01,Europe/Moscow') != nt,
+    TzDate('2000-01-01,Europe/Moscow') != ntz,
+    TzDate('2000-01-01,Europe/Moscow') != wa,
+    TzDate('2000-01-01,Europe/Moscow') != wd,
+    TzDate('2000-01-01,Europe/Moscow') != wt,
+    TzDate('2000-01-01,Europe/Moscow') != waz,
+    TzDate('2000-01-01,Europe/Moscow') != wdz,
+    TzDate('2000-01-01,Europe/Moscow') != wtz,
+    Datetime('2000-01-01T03:04:05Z') != na,
+    Datetime('2000-01-01T03:04:05Z') != naz,
+    Datetime('2000-01-01T03:04:05Z') != nd,
+    Datetime('2000-01-01T03:04:05Z') != ndz,
+    Datetime('2000-01-01T03:04:05Z') != nt,
+    Datetime('2000-01-01T03:04:05Z') != ntz,
+    Datetime('2000-01-01T03:04:05Z') != wa,
+    Datetime('2000-01-01T03:04:05Z') != wd,
+    Datetime('2000-01-01T03:04:05Z') != wt,
+    Datetime('2000-01-01T03:04:05Z') != waz,
+    Datetime('2000-01-01T03:04:05Z') != wdz,
+    Datetime('2000-01-01T03:04:05Z') != wtz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') != na,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') != naz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') != nd,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') != ndz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') != nt,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') != ntz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') != wa,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') != wd,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') != wt,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') != waz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') != wdz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') != wtz,
+    Timestamp('2000-01-01T03:04:05.678912Z') != na,
+    Timestamp('2000-01-01T03:04:05.678912Z') != naz,
+    Timestamp('2000-01-01T03:04:05.678912Z') != nd,
+    Timestamp('2000-01-01T03:04:05.678912Z') != ndz,
+    Timestamp('2000-01-01T03:04:05.678912Z') != nt,
+    Timestamp('2000-01-01T03:04:05.678912Z') != ntz,
+    Timestamp('2000-01-01T03:04:05.678912Z') != wa,
+    Timestamp('2000-01-01T03:04:05.678912Z') != wd,
+    Timestamp('2000-01-01T03:04:05.678912Z') != wt,
+    Timestamp('2000-01-01T03:04:05.678912Z') != waz,
+    Timestamp('2000-01-01T03:04:05.678912Z') != wdz,
+    Timestamp('2000-01-01T03:04:05.678912Z') != wtz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') != na,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') != naz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') != nd,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') != ndz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') != nt,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') != ntz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') != wa,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') != wd,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') != wt,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') != waz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') != wdz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') != wtz
 FROM
     Dates
 ;
 
 SELECT
-    Date32("1900-01-01") != na,
-    Date32("1900-01-01") != naz,
-    Date32("1900-01-01") != nd,
-    Date32("1900-01-01") != ndz,
-    Date32("1900-01-01") != nt,
-    Date32("1900-01-01") != ntz,
-    Date32("1900-01-01") != wa,
-    Date32("1900-01-01") != wd,
-    Date32("1900-01-01") != wt,
-    Date32("1900-01-01") != waz,
-    Date32("1900-01-01") != wdz,
-    Date32("1900-01-01") != wtz,
-    Datetime64("1900-01-01T03:04:05Z") != na,
-    Datetime64("1900-01-01T03:04:05Z") != naz,
-    Datetime64("1900-01-01T03:04:05Z") != nd,
-    Datetime64("1900-01-01T03:04:05Z") != ndz,
-    Datetime64("1900-01-01T03:04:05Z") != nt,
-    Datetime64("1900-01-01T03:04:05Z") != ntz,
-    Datetime64("1900-01-01T03:04:05Z") != wa,
-    Datetime64("1900-01-01T03:04:05Z") != wd,
-    Datetime64("1900-01-01T03:04:05Z") != wt,
-    Datetime64("1900-01-01T03:04:05Z") != waz,
-    Datetime64("1900-01-01T03:04:05Z") != wdz,
-    Datetime64("1900-01-01T03:04:05Z") != wtz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") != na,
-    Timestamp64("1900-01-01T03:04:05.678912Z") != naz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") != nd,
-    Timestamp64("1900-01-01T03:04:05.678912Z") != ndz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") != nt,
-    Timestamp64("1900-01-01T03:04:05.678912Z") != ntz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") != wa,
-    Timestamp64("1900-01-01T03:04:05.678912Z") != wd,
-    Timestamp64("1900-01-01T03:04:05.678912Z") != wt,
-    Timestamp64("1900-01-01T03:04:05.678912Z") != waz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") != wdz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") != wtz,
-    TzDate32("1900-01-01,Europe/Moscow") != na,
-    TzDate32("1900-01-01,Europe/Moscow") != naz,
-    TzDate32("1900-01-01,Europe/Moscow") != nd,
-    TzDate32("1900-01-01,Europe/Moscow") != ndz,
-    TzDate32("1900-01-01,Europe/Moscow") != nt,
-    TzDate32("1900-01-01,Europe/Moscow") != ntz,
-    TzDate32("1900-01-01,Europe/Moscow") != wa,
-    TzDate32("1900-01-01,Europe/Moscow") != wd,
-    TzDate32("1900-01-01,Europe/Moscow") != wt,
-    TzDate32("1900-01-01,Europe/Moscow") != waz,
-    TzDate32("1900-01-01,Europe/Moscow") != wdz,
-    TzDate32("1900-01-01,Europe/Moscow") != wtz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") != na,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") != naz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") != nd,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") != ndz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") != nt,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") != ntz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") != wa,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") != wd,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") != wt,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") != waz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") != wdz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") != wtz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") != na,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") != naz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") != nd,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") != ndz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") != nt,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") != ntz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") != wa,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") != wd,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") != wt,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") != waz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") != wdz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") != wtz,
-    Interval("P1D") != ni,
-    Interval("P1D") != wi,
-    Interval64("P1D") != ni,
-    Interval64("P1D") != wi,
+    Date32('1900-01-01') != na,
+    Date32('1900-01-01') != naz,
+    Date32('1900-01-01') != nd,
+    Date32('1900-01-01') != ndz,
+    Date32('1900-01-01') != nt,
+    Date32('1900-01-01') != ntz,
+    Date32('1900-01-01') != wa,
+    Date32('1900-01-01') != wd,
+    Date32('1900-01-01') != wt,
+    Date32('1900-01-01') != waz,
+    Date32('1900-01-01') != wdz,
+    Date32('1900-01-01') != wtz,
+    Datetime64('1900-01-01T03:04:05Z') != na,
+    Datetime64('1900-01-01T03:04:05Z') != naz,
+    Datetime64('1900-01-01T03:04:05Z') != nd,
+    Datetime64('1900-01-01T03:04:05Z') != ndz,
+    Datetime64('1900-01-01T03:04:05Z') != nt,
+    Datetime64('1900-01-01T03:04:05Z') != ntz,
+    Datetime64('1900-01-01T03:04:05Z') != wa,
+    Datetime64('1900-01-01T03:04:05Z') != wd,
+    Datetime64('1900-01-01T03:04:05Z') != wt,
+    Datetime64('1900-01-01T03:04:05Z') != waz,
+    Datetime64('1900-01-01T03:04:05Z') != wdz,
+    Datetime64('1900-01-01T03:04:05Z') != wtz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') != na,
+    Timestamp64('1900-01-01T03:04:05.678912Z') != naz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') != nd,
+    Timestamp64('1900-01-01T03:04:05.678912Z') != ndz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') != nt,
+    Timestamp64('1900-01-01T03:04:05.678912Z') != ntz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') != wa,
+    Timestamp64('1900-01-01T03:04:05.678912Z') != wd,
+    Timestamp64('1900-01-01T03:04:05.678912Z') != wt,
+    Timestamp64('1900-01-01T03:04:05.678912Z') != waz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') != wdz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') != wtz,
+    TzDate32('1900-01-01,Europe/Moscow') != na,
+    TzDate32('1900-01-01,Europe/Moscow') != naz,
+    TzDate32('1900-01-01,Europe/Moscow') != nd,
+    TzDate32('1900-01-01,Europe/Moscow') != ndz,
+    TzDate32('1900-01-01,Europe/Moscow') != nt,
+    TzDate32('1900-01-01,Europe/Moscow') != ntz,
+    TzDate32('1900-01-01,Europe/Moscow') != wa,
+    TzDate32('1900-01-01,Europe/Moscow') != wd,
+    TzDate32('1900-01-01,Europe/Moscow') != wt,
+    TzDate32('1900-01-01,Europe/Moscow') != waz,
+    TzDate32('1900-01-01,Europe/Moscow') != wdz,
+    TzDate32('1900-01-01,Europe/Moscow') != wtz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') != na,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') != naz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') != nd,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') != ndz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') != nt,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') != ntz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') != wa,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') != wd,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') != wt,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') != waz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') != wdz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') != wtz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') != na,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') != naz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') != nd,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') != ndz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') != nt,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') != ntz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') != wa,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') != wd,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') != wt,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') != waz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') != wdz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') != wtz,
+    Interval('P1D') != ni,
+    Interval('P1D') != wi,
+    Interval64('P1D') != ni,
+    Interval64('P1D') != wi,
 FROM
     Dates
 ;
 
 SELECT
-    na != Date("2000-01-01"),
-    naz != Date("2000-01-01"),
-    nd != Date("2000-01-01"),
-    ndz != Date("2000-01-01"),
-    nt != Date("2000-01-01"),
-    ntz != Date("2000-01-01"),
-    wa != Date("2000-01-01"),
-    wd != Date("2000-01-01"),
-    wt != Date("2000-01-01"),
-    waz != Date("2000-01-01"),
-    wdz != Date("2000-01-01"),
-    wtz != Date("2000-01-01"),
-    na != TzDate("2000-01-01,Europe/Moscow"),
-    naz != TzDate("2000-01-01,Europe/Moscow"),
-    nd != TzDate("2000-01-01,Europe/Moscow"),
-    ndz != TzDate("2000-01-01,Europe/Moscow"),
-    nt != TzDate("2000-01-01,Europe/Moscow"),
-    ntz != TzDate("2000-01-01,Europe/Moscow"),
-    wa != TzDate("2000-01-01,Europe/Moscow"),
-    wd != TzDate("2000-01-01,Europe/Moscow"),
-    wt != TzDate("2000-01-01,Europe/Moscow"),
-    waz != TzDate("2000-01-01,Europe/Moscow"),
-    wdz != TzDate("2000-01-01,Europe/Moscow"),
-    wtz != TzDate("2000-01-01,Europe/Moscow"),
-    na != Datetime("2000-01-01T03:04:05Z"),
-    naz != Datetime("2000-01-01T03:04:05Z"),
-    nd != Datetime("2000-01-01T03:04:05Z"),
-    ndz != Datetime("2000-01-01T03:04:05Z"),
-    nt != Datetime("2000-01-01T03:04:05Z"),
-    ntz != Datetime("2000-01-01T03:04:05Z"),
-    wa != Datetime("2000-01-01T03:04:05Z"),
-    wd != Datetime("2000-01-01T03:04:05Z"),
-    wt != Datetime("2000-01-01T03:04:05Z"),
-    waz != Datetime("2000-01-01T03:04:05Z"),
-    wdz != Datetime("2000-01-01T03:04:05Z"),
-    wtz != Datetime("2000-01-01T03:04:05Z"),
-    na != TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    naz != TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    nd != TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    ndz != TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    nt != TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    ntz != TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wa != TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wd != TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wt != TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    waz != TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wdz != TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wtz != TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    na != Timestamp("2000-01-01T03:04:05.678912Z"),
-    naz != Timestamp("2000-01-01T03:04:05.678912Z"),
-    nd != Timestamp("2000-01-01T03:04:05.678912Z"),
-    ndz != Timestamp("2000-01-01T03:04:05.678912Z"),
-    nt != Timestamp("2000-01-01T03:04:05.678912Z"),
-    ntz != Timestamp("2000-01-01T03:04:05.678912Z"),
-    wa != Timestamp("2000-01-01T03:04:05.678912Z"),
-    wd != Timestamp("2000-01-01T03:04:05.678912Z"),
-    wt != Timestamp("2000-01-01T03:04:05.678912Z"),
-    waz != Timestamp("2000-01-01T03:04:05.678912Z"),
-    wdz != Timestamp("2000-01-01T03:04:05.678912Z"),
-    wtz != Timestamp("2000-01-01T03:04:05.678912Z"),
-    na != TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    naz != TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    nd != TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    ndz != TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    nt != TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    ntz != TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wa != TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wd != TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wt != TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    waz != TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wdz != TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wtz != TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow")
+    na != Date('2000-01-01'),
+    naz != Date('2000-01-01'),
+    nd != Date('2000-01-01'),
+    ndz != Date('2000-01-01'),
+    nt != Date('2000-01-01'),
+    ntz != Date('2000-01-01'),
+    wa != Date('2000-01-01'),
+    wd != Date('2000-01-01'),
+    wt != Date('2000-01-01'),
+    waz != Date('2000-01-01'),
+    wdz != Date('2000-01-01'),
+    wtz != Date('2000-01-01'),
+    na != TzDate('2000-01-01,Europe/Moscow'),
+    naz != TzDate('2000-01-01,Europe/Moscow'),
+    nd != TzDate('2000-01-01,Europe/Moscow'),
+    ndz != TzDate('2000-01-01,Europe/Moscow'),
+    nt != TzDate('2000-01-01,Europe/Moscow'),
+    ntz != TzDate('2000-01-01,Europe/Moscow'),
+    wa != TzDate('2000-01-01,Europe/Moscow'),
+    wd != TzDate('2000-01-01,Europe/Moscow'),
+    wt != TzDate('2000-01-01,Europe/Moscow'),
+    waz != TzDate('2000-01-01,Europe/Moscow'),
+    wdz != TzDate('2000-01-01,Europe/Moscow'),
+    wtz != TzDate('2000-01-01,Europe/Moscow'),
+    na != Datetime('2000-01-01T03:04:05Z'),
+    naz != Datetime('2000-01-01T03:04:05Z'),
+    nd != Datetime('2000-01-01T03:04:05Z'),
+    ndz != Datetime('2000-01-01T03:04:05Z'),
+    nt != Datetime('2000-01-01T03:04:05Z'),
+    ntz != Datetime('2000-01-01T03:04:05Z'),
+    wa != Datetime('2000-01-01T03:04:05Z'),
+    wd != Datetime('2000-01-01T03:04:05Z'),
+    wt != Datetime('2000-01-01T03:04:05Z'),
+    waz != Datetime('2000-01-01T03:04:05Z'),
+    wdz != Datetime('2000-01-01T03:04:05Z'),
+    wtz != Datetime('2000-01-01T03:04:05Z'),
+    na != TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    naz != TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    nd != TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    ndz != TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    nt != TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    ntz != TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wa != TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wd != TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wt != TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    waz != TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wdz != TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wtz != TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    na != Timestamp('2000-01-01T03:04:05.678912Z'),
+    naz != Timestamp('2000-01-01T03:04:05.678912Z'),
+    nd != Timestamp('2000-01-01T03:04:05.678912Z'),
+    ndz != Timestamp('2000-01-01T03:04:05.678912Z'),
+    nt != Timestamp('2000-01-01T03:04:05.678912Z'),
+    ntz != Timestamp('2000-01-01T03:04:05.678912Z'),
+    wa != Timestamp('2000-01-01T03:04:05.678912Z'),
+    wd != Timestamp('2000-01-01T03:04:05.678912Z'),
+    wt != Timestamp('2000-01-01T03:04:05.678912Z'),
+    waz != Timestamp('2000-01-01T03:04:05.678912Z'),
+    wdz != Timestamp('2000-01-01T03:04:05.678912Z'),
+    wtz != Timestamp('2000-01-01T03:04:05.678912Z'),
+    na != TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    naz != TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    nd != TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    ndz != TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    nt != TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    ntz != TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wa != TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wd != TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wt != TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    waz != TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wdz != TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wtz != TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow')
 FROM
     Dates
 ;
 
 SELECT
-    na != Date32("1900-01-01"),
-    naz != Date32("1900-01-01"),
-    nd != Date32("1900-01-01"),
-    ndz != Date32("1900-01-01"),
-    nt != Date32("1900-01-01"),
-    ntz != Date32("1900-01-01"),
-    wa != Date32("1900-01-01"),
-    wd != Date32("1900-01-01"),
-    wt != Date32("1900-01-01"),
-    waz != Date32("1900-01-01"),
-    wdz != Date32("1900-01-01"),
-    wtz != Date32("1900-01-01"),
-    na != Datetime64("1900-01-01T03:04:05Z"),
-    naz != Datetime64("1900-01-01T03:04:05Z"),
-    nd != Datetime64("1900-01-01T03:04:05Z"),
-    ndz != Datetime64("1900-01-01T03:04:05Z"),
-    nt != Datetime64("1900-01-01T03:04:05Z"),
-    ntz != Datetime64("1900-01-01T03:04:05Z"),
-    wa != Datetime64("1900-01-01T03:04:05Z"),
-    wd != Datetime64("1900-01-01T03:04:05Z"),
-    wt != Datetime64("1900-01-01T03:04:05Z"),
-    waz != Datetime64("1900-01-01T03:04:05Z"),
-    wdz != Datetime64("1900-01-01T03:04:05Z"),
-    wtz != Datetime64("1900-01-01T03:04:05Z"),
-    na != Timestamp64("1900-01-01T03:04:05.678912Z"),
-    naz != Timestamp64("1900-01-01T03:04:05.678912Z"),
-    nd != Timestamp64("1900-01-01T03:04:05.678912Z"),
-    ndz != Timestamp64("1900-01-01T03:04:05.678912Z"),
-    nt != Timestamp64("1900-01-01T03:04:05.678912Z"),
-    ntz != Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wa != Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wd != Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wt != Timestamp64("1900-01-01T03:04:05.678912Z"),
-    waz != Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wdz != Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wtz != Timestamp64("1900-01-01T03:04:05.678912Z"),
-    na != TzDate32("1900-01-01,Europe/Moscow"),
-    naz != TzDate32("1900-01-01,Europe/Moscow"),
-    nd != TzDate32("1900-01-01,Europe/Moscow"),
-    ndz != TzDate32("1900-01-01,Europe/Moscow"),
-    nt != TzDate32("1900-01-01,Europe/Moscow"),
-    ntz != TzDate32("1900-01-01,Europe/Moscow"),
-    wa != TzDate32("1900-01-01,Europe/Moscow"),
-    wd != TzDate32("1900-01-01,Europe/Moscow"),
-    wt != TzDate32("1900-01-01,Europe/Moscow"),
-    waz != TzDate32("1900-01-01,Europe/Moscow"),
-    wdz != TzDate32("1900-01-01,Europe/Moscow"),
-    wtz != TzDate32("1900-01-01,Europe/Moscow"),
-    na != TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    naz != TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    nd != TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    ndz != TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    nt != TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    ntz != TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wa != TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wd != TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wt != TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    waz != TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wdz != TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wtz != TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    na != TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    naz != TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    nd != TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    ndz != TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    nt != TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    ntz != TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wa != TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wd != TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wt != TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    waz != TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wdz != TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wtz != TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    ni != Interval("P1D"),
-    wi != Interval("P1D"),
-    ni != Interval64("P1D"),
-    wi != Interval64("P1D"),
+    na != Date32('1900-01-01'),
+    naz != Date32('1900-01-01'),
+    nd != Date32('1900-01-01'),
+    ndz != Date32('1900-01-01'),
+    nt != Date32('1900-01-01'),
+    ntz != Date32('1900-01-01'),
+    wa != Date32('1900-01-01'),
+    wd != Date32('1900-01-01'),
+    wt != Date32('1900-01-01'),
+    waz != Date32('1900-01-01'),
+    wdz != Date32('1900-01-01'),
+    wtz != Date32('1900-01-01'),
+    na != Datetime64('1900-01-01T03:04:05Z'),
+    naz != Datetime64('1900-01-01T03:04:05Z'),
+    nd != Datetime64('1900-01-01T03:04:05Z'),
+    ndz != Datetime64('1900-01-01T03:04:05Z'),
+    nt != Datetime64('1900-01-01T03:04:05Z'),
+    ntz != Datetime64('1900-01-01T03:04:05Z'),
+    wa != Datetime64('1900-01-01T03:04:05Z'),
+    wd != Datetime64('1900-01-01T03:04:05Z'),
+    wt != Datetime64('1900-01-01T03:04:05Z'),
+    waz != Datetime64('1900-01-01T03:04:05Z'),
+    wdz != Datetime64('1900-01-01T03:04:05Z'),
+    wtz != Datetime64('1900-01-01T03:04:05Z'),
+    na != Timestamp64('1900-01-01T03:04:05.678912Z'),
+    naz != Timestamp64('1900-01-01T03:04:05.678912Z'),
+    nd != Timestamp64('1900-01-01T03:04:05.678912Z'),
+    ndz != Timestamp64('1900-01-01T03:04:05.678912Z'),
+    nt != Timestamp64('1900-01-01T03:04:05.678912Z'),
+    ntz != Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wa != Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wd != Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wt != Timestamp64('1900-01-01T03:04:05.678912Z'),
+    waz != Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wdz != Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wtz != Timestamp64('1900-01-01T03:04:05.678912Z'),
+    na != TzDate32('1900-01-01,Europe/Moscow'),
+    naz != TzDate32('1900-01-01,Europe/Moscow'),
+    nd != TzDate32('1900-01-01,Europe/Moscow'),
+    ndz != TzDate32('1900-01-01,Europe/Moscow'),
+    nt != TzDate32('1900-01-01,Europe/Moscow'),
+    ntz != TzDate32('1900-01-01,Europe/Moscow'),
+    wa != TzDate32('1900-01-01,Europe/Moscow'),
+    wd != TzDate32('1900-01-01,Europe/Moscow'),
+    wt != TzDate32('1900-01-01,Europe/Moscow'),
+    waz != TzDate32('1900-01-01,Europe/Moscow'),
+    wdz != TzDate32('1900-01-01,Europe/Moscow'),
+    wtz != TzDate32('1900-01-01,Europe/Moscow'),
+    na != TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    naz != TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    nd != TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    ndz != TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    nt != TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    ntz != TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wa != TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wd != TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wt != TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    waz != TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wdz != TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wtz != TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    na != TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    naz != TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    nd != TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    ndz != TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    nt != TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    ntz != TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wa != TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wd != TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wt != TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    waz != TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wdz != TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wtz != TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    ni != Interval('P1D'),
+    wi != Interval('P1D'),
+    ni != Interval64('P1D'),
+    wi != Interval64('P1D'),
 FROM
     Dates
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_sub_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_sub_/formatted.sql
index 9d6cbb76db..4b82d148e0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_sub_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_sub_/formatted.sql
@@ -1,6 +1,6 @@
 USE plato;
 
-PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
+PRAGMA yt.DisableOptimizers = 'OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps';
 
 SELECT
     a.na - b.na,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_sub_interval_scalar_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_sub_interval_scalar_/formatted.sql
index dbe11b343d..3bb45938f2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_sub_interval_scalar_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_sub_interval_scalar_/formatted.sql
@@ -1,61 +1,61 @@
 USE plato;
 
-PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
+PRAGMA yt.DisableOptimizers = 'OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps';
 
 SELECT
-    Date("2000-01-01") - ni,
-    Date("2000-01-01") - wi,
-    TzDate("2000-01-01,Europe/Moscow") - ni,
-    TzDate("2000-01-01,Europe/Moscow") - wi,
-    Datetime("2000-01-01T03:04:05Z") - ni,
-    Datetime("2000-01-01T03:04:05Z") - wi,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") - ni,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") - wi,
-    Timestamp("2000-01-01T03:04:05.678912Z") - ni,
-    Timestamp("2000-01-01T03:04:05.678912Z") - wi,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") - ni,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") - wi,
-    Date32("1900-01-01") - ni,
-    Date32("1900-01-01") - wi,
-    Datetime64("1900-01-01T03:04:05Z") - ni,
-    Datetime64("1900-01-01T03:04:05Z") - wi,
-    Timestamp64("1900-01-01T03:04:05.678912Z") - ni,
-    Timestamp64("1900-01-01T03:04:05.678912Z") - wi,
-    TzDate32("1900-01-01,Europe/Moscow") - ni,
-    TzDate32("1900-01-01,Europe/Moscow") - wi,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") - ni,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") - wi,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") - ni,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") - wi
+    Date('2000-01-01') - ni,
+    Date('2000-01-01') - wi,
+    TzDate('2000-01-01,Europe/Moscow') - ni,
+    TzDate('2000-01-01,Europe/Moscow') - wi,
+    Datetime('2000-01-01T03:04:05Z') - ni,
+    Datetime('2000-01-01T03:04:05Z') - wi,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') - ni,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') - wi,
+    Timestamp('2000-01-01T03:04:05.678912Z') - ni,
+    Timestamp('2000-01-01T03:04:05.678912Z') - wi,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') - ni,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') - wi,
+    Date32('1900-01-01') - ni,
+    Date32('1900-01-01') - wi,
+    Datetime64('1900-01-01T03:04:05Z') - ni,
+    Datetime64('1900-01-01T03:04:05Z') - wi,
+    Timestamp64('1900-01-01T03:04:05.678912Z') - ni,
+    Timestamp64('1900-01-01T03:04:05.678912Z') - wi,
+    TzDate32('1900-01-01,Europe/Moscow') - ni,
+    TzDate32('1900-01-01,Europe/Moscow') - wi,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') - ni,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') - wi,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') - ni,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') - wi
 FROM
     Dates
 ;
 
 SELECT
-    na - Interval("P1D"),
-    na - Interval64("P1D"),
-    naz - Interval("P1D"),
-    naz - Interval64("P1D"),
-    nd - Interval("P1D"),
-    nd - Interval64("P1D"),
-    ndz - Interval("P1D"),
-    ndz - Interval64("P1D"),
-    nt - Interval("P1D"),
-    nt - Interval64("P1D"),
-    ntz - Interval("P1D"),
-    ntz - Interval64("P1D"),
-    wa - Interval("P1D"),
-    wa - Interval64("P1D"),
-    wd - Interval("P1D"),
-    wd - Interval64("P1D"),
-    wt - Interval("P1D"),
-    wt - Interval64("P1D"),
-    waz - Interval("P1D"),
-    waz - Interval64("P1D"),
-    wdz - Interval("P1D"),
-    wdz - Interval64("P1D"),
-    wtz - Interval("P1D"),
-    wtz - Interval64("P1D")
+    na - Interval('P1D'),
+    na - Interval64('P1D'),
+    naz - Interval('P1D'),
+    naz - Interval64('P1D'),
+    nd - Interval('P1D'),
+    nd - Interval64('P1D'),
+    ndz - Interval('P1D'),
+    ndz - Interval64('P1D'),
+    nt - Interval('P1D'),
+    nt - Interval64('P1D'),
+    ntz - Interval('P1D'),
+    ntz - Interval64('P1D'),
+    wa - Interval('P1D'),
+    wa - Interval64('P1D'),
+    wd - Interval('P1D'),
+    wd - Interval64('P1D'),
+    wt - Interval('P1D'),
+    wt - Interval64('P1D'),
+    waz - Interval('P1D'),
+    waz - Interval64('P1D'),
+    wdz - Interval('P1D'),
+    wdz - Interval64('P1D'),
+    wtz - Interval('P1D'),
+    wtz - Interval64('P1D')
 FROM
     Dates
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_sub_scalar_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_sub_scalar_/formatted.sql
index dbe46f0292..543dda5178 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_sub_scalar_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_sub_scalar_/formatted.sql
@@ -1,311 +1,311 @@
 USE plato;
 
-PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
+PRAGMA yt.DisableOptimizers = 'OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps';
 
 SELECT
-    Date("2000-01-01") - na,
-    Date("2000-01-01") - naz,
-    Date("2000-01-01") - nd,
-    Date("2000-01-01") - ndz,
-    Date("2000-01-01") - nt,
-    Date("2000-01-01") - ntz,
-    Date("2000-01-01") - wa,
-    Date("2000-01-01") - wd,
-    Date("2000-01-01") - wt,
-    Date("2000-01-01") - waz,
-    Date("2000-01-01") - wdz,
-    Date("2000-01-01") - wtz,
-    TzDate("2000-01-01,Europe/Moscow") - na,
-    TzDate("2000-01-01,Europe/Moscow") - naz,
-    TzDate("2000-01-01,Europe/Moscow") - nd,
-    TzDate("2000-01-01,Europe/Moscow") - ndz,
-    TzDate("2000-01-01,Europe/Moscow") - nt,
-    TzDate("2000-01-01,Europe/Moscow") - ntz,
-    TzDate("2000-01-01,Europe/Moscow") - wa,
-    TzDate("2000-01-01,Europe/Moscow") - wd,
-    TzDate("2000-01-01,Europe/Moscow") - wt,
-    TzDate("2000-01-01,Europe/Moscow") - waz,
-    TzDate("2000-01-01,Europe/Moscow") - wdz,
-    TzDate("2000-01-01,Europe/Moscow") - wtz,
-    Datetime("2000-01-01T03:04:05Z") - na,
-    Datetime("2000-01-01T03:04:05Z") - naz,
-    Datetime("2000-01-01T03:04:05Z") - nd,
-    Datetime("2000-01-01T03:04:05Z") - ndz,
-    Datetime("2000-01-01T03:04:05Z") - nt,
-    Datetime("2000-01-01T03:04:05Z") - ntz,
-    Datetime("2000-01-01T03:04:05Z") - wa,
-    Datetime("2000-01-01T03:04:05Z") - wd,
-    Datetime("2000-01-01T03:04:05Z") - wt,
-    Datetime("2000-01-01T03:04:05Z") - waz,
-    Datetime("2000-01-01T03:04:05Z") - wdz,
-    Datetime("2000-01-01T03:04:05Z") - wtz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") - na,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") - naz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") - nd,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") - ndz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") - nt,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") - ntz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") - wa,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") - wd,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") - wt,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") - waz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") - wdz,
-    TzDatetime("2000-01-01T03:04:05,Europe/Moscow") - wtz,
-    Timestamp("2000-01-01T03:04:05.678912Z") - na,
-    Timestamp("2000-01-01T03:04:05.678912Z") - naz,
-    Timestamp("2000-01-01T03:04:05.678912Z") - nd,
-    Timestamp("2000-01-01T03:04:05.678912Z") - ndz,
-    Timestamp("2000-01-01T03:04:05.678912Z") - nt,
-    Timestamp("2000-01-01T03:04:05.678912Z") - ntz,
-    Timestamp("2000-01-01T03:04:05.678912Z") - wa,
-    Timestamp("2000-01-01T03:04:05.678912Z") - wd,
-    Timestamp("2000-01-01T03:04:05.678912Z") - wt,
-    Timestamp("2000-01-01T03:04:05.678912Z") - waz,
-    Timestamp("2000-01-01T03:04:05.678912Z") - wdz,
-    Timestamp("2000-01-01T03:04:05.678912Z") - wtz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") - na,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") - naz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") - nd,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") - ndz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") - nt,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") - ntz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") - wa,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") - wd,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") - wt,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") - waz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") - wdz,
-    TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow") - wtz,
+    Date('2000-01-01') - na,
+    Date('2000-01-01') - naz,
+    Date('2000-01-01') - nd,
+    Date('2000-01-01') - ndz,
+    Date('2000-01-01') - nt,
+    Date('2000-01-01') - ntz,
+    Date('2000-01-01') - wa,
+    Date('2000-01-01') - wd,
+    Date('2000-01-01') - wt,
+    Date('2000-01-01') - waz,
+    Date('2000-01-01') - wdz,
+    Date('2000-01-01') - wtz,
+    TzDate('2000-01-01,Europe/Moscow') - na,
+    TzDate('2000-01-01,Europe/Moscow') - naz,
+    TzDate('2000-01-01,Europe/Moscow') - nd,
+    TzDate('2000-01-01,Europe/Moscow') - ndz,
+    TzDate('2000-01-01,Europe/Moscow') - nt,
+    TzDate('2000-01-01,Europe/Moscow') - ntz,
+    TzDate('2000-01-01,Europe/Moscow') - wa,
+    TzDate('2000-01-01,Europe/Moscow') - wd,
+    TzDate('2000-01-01,Europe/Moscow') - wt,
+    TzDate('2000-01-01,Europe/Moscow') - waz,
+    TzDate('2000-01-01,Europe/Moscow') - wdz,
+    TzDate('2000-01-01,Europe/Moscow') - wtz,
+    Datetime('2000-01-01T03:04:05Z') - na,
+    Datetime('2000-01-01T03:04:05Z') - naz,
+    Datetime('2000-01-01T03:04:05Z') - nd,
+    Datetime('2000-01-01T03:04:05Z') - ndz,
+    Datetime('2000-01-01T03:04:05Z') - nt,
+    Datetime('2000-01-01T03:04:05Z') - ntz,
+    Datetime('2000-01-01T03:04:05Z') - wa,
+    Datetime('2000-01-01T03:04:05Z') - wd,
+    Datetime('2000-01-01T03:04:05Z') - wt,
+    Datetime('2000-01-01T03:04:05Z') - waz,
+    Datetime('2000-01-01T03:04:05Z') - wdz,
+    Datetime('2000-01-01T03:04:05Z') - wtz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') - na,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') - naz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') - nd,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') - ndz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') - nt,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') - ntz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') - wa,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') - wd,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') - wt,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') - waz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') - wdz,
+    TzDatetime('2000-01-01T03:04:05,Europe/Moscow') - wtz,
+    Timestamp('2000-01-01T03:04:05.678912Z') - na,
+    Timestamp('2000-01-01T03:04:05.678912Z') - naz,
+    Timestamp('2000-01-01T03:04:05.678912Z') - nd,
+    Timestamp('2000-01-01T03:04:05.678912Z') - ndz,
+    Timestamp('2000-01-01T03:04:05.678912Z') - nt,
+    Timestamp('2000-01-01T03:04:05.678912Z') - ntz,
+    Timestamp('2000-01-01T03:04:05.678912Z') - wa,
+    Timestamp('2000-01-01T03:04:05.678912Z') - wd,
+    Timestamp('2000-01-01T03:04:05.678912Z') - wt,
+    Timestamp('2000-01-01T03:04:05.678912Z') - waz,
+    Timestamp('2000-01-01T03:04:05.678912Z') - wdz,
+    Timestamp('2000-01-01T03:04:05.678912Z') - wtz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') - na,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') - naz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') - nd,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') - ndz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') - nt,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') - ntz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') - wa,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') - wd,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') - wt,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') - waz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') - wdz,
+    TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow') - wtz,
 FROM
     Dates
 ;
 
 SELECT
-    Date32("1900-01-01") - na,
-    Date32("1900-01-01") - naz,
-    Date32("1900-01-01") - nd,
-    Date32("1900-01-01") - ndz,
-    Date32("1900-01-01") - nt,
-    Date32("1900-01-01") - ntz,
-    Date32("1900-01-01") - wa,
-    Date32("1900-01-01") - wd,
-    Date32("1900-01-01") - wt,
-    Date32("1900-01-01") - waz,
-    Date32("1900-01-01") - wdz,
-    Date32("1900-01-01") - wtz,
-    Datetime64("1900-01-01T03:04:05Z") - na,
-    Datetime64("1900-01-01T03:04:05Z") - naz,
-    Datetime64("1900-01-01T03:04:05Z") - nd,
-    Datetime64("1900-01-01T03:04:05Z") - ndz,
-    Datetime64("1900-01-01T03:04:05Z") - nt,
-    Datetime64("1900-01-01T03:04:05Z") - ntz,
-    Datetime64("1900-01-01T03:04:05Z") - wa,
-    Datetime64("1900-01-01T03:04:05Z") - wd,
-    Datetime64("1900-01-01T03:04:05Z") - wt,
-    Datetime64("1900-01-01T03:04:05Z") - waz,
-    Datetime64("1900-01-01T03:04:05Z") - wdz,
-    Datetime64("1900-01-01T03:04:05Z") - wtz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") - na,
-    Timestamp64("1900-01-01T03:04:05.678912Z") - naz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") - nd,
-    Timestamp64("1900-01-01T03:04:05.678912Z") - ndz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") - nt,
-    Timestamp64("1900-01-01T03:04:05.678912Z") - ntz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") - wa,
-    Timestamp64("1900-01-01T03:04:05.678912Z") - wd,
-    Timestamp64("1900-01-01T03:04:05.678912Z") - wt,
-    Timestamp64("1900-01-01T03:04:05.678912Z") - waz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") - wdz,
-    Timestamp64("1900-01-01T03:04:05.678912Z") - wtz,
-    TzDate32("1900-01-01,Europe/Moscow") - na,
-    TzDate32("1900-01-01,Europe/Moscow") - naz,
-    TzDate32("1900-01-01,Europe/Moscow") - nd,
-    TzDate32("1900-01-01,Europe/Moscow") - ndz,
-    TzDate32("1900-01-01,Europe/Moscow") - nt,
-    TzDate32("1900-01-01,Europe/Moscow") - ntz,
-    TzDate32("1900-01-01,Europe/Moscow") - wa,
-    TzDate32("1900-01-01,Europe/Moscow") - wd,
-    TzDate32("1900-01-01,Europe/Moscow") - wt,
-    TzDate32("1900-01-01,Europe/Moscow") - waz,
-    TzDate32("1900-01-01,Europe/Moscow") - wdz,
-    TzDate32("1900-01-01,Europe/Moscow") - wtz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") - na,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") - naz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") - nd,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") - ndz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") - nt,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") - ntz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") - wa,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") - wd,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") - wt,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") - waz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") - wdz,
-    TzDatetime64("1900-01-01T03:04:05,Europe/Moscow") - wtz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") - na,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") - naz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") - nd,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") - ndz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") - nt,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") - ntz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") - wa,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") - wd,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") - wt,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") - waz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") - wdz,
-    TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow") - wtz
+    Date32('1900-01-01') - na,
+    Date32('1900-01-01') - naz,
+    Date32('1900-01-01') - nd,
+    Date32('1900-01-01') - ndz,
+    Date32('1900-01-01') - nt,
+    Date32('1900-01-01') - ntz,
+    Date32('1900-01-01') - wa,
+    Date32('1900-01-01') - wd,
+    Date32('1900-01-01') - wt,
+    Date32('1900-01-01') - waz,
+    Date32('1900-01-01') - wdz,
+    Date32('1900-01-01') - wtz,
+    Datetime64('1900-01-01T03:04:05Z') - na,
+    Datetime64('1900-01-01T03:04:05Z') - naz,
+    Datetime64('1900-01-01T03:04:05Z') - nd,
+    Datetime64('1900-01-01T03:04:05Z') - ndz,
+    Datetime64('1900-01-01T03:04:05Z') - nt,
+    Datetime64('1900-01-01T03:04:05Z') - ntz,
+    Datetime64('1900-01-01T03:04:05Z') - wa,
+    Datetime64('1900-01-01T03:04:05Z') - wd,
+    Datetime64('1900-01-01T03:04:05Z') - wt,
+    Datetime64('1900-01-01T03:04:05Z') - waz,
+    Datetime64('1900-01-01T03:04:05Z') - wdz,
+    Datetime64('1900-01-01T03:04:05Z') - wtz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') - na,
+    Timestamp64('1900-01-01T03:04:05.678912Z') - naz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') - nd,
+    Timestamp64('1900-01-01T03:04:05.678912Z') - ndz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') - nt,
+    Timestamp64('1900-01-01T03:04:05.678912Z') - ntz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') - wa,
+    Timestamp64('1900-01-01T03:04:05.678912Z') - wd,
+    Timestamp64('1900-01-01T03:04:05.678912Z') - wt,
+    Timestamp64('1900-01-01T03:04:05.678912Z') - waz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') - wdz,
+    Timestamp64('1900-01-01T03:04:05.678912Z') - wtz,
+    TzDate32('1900-01-01,Europe/Moscow') - na,
+    TzDate32('1900-01-01,Europe/Moscow') - naz,
+    TzDate32('1900-01-01,Europe/Moscow') - nd,
+    TzDate32('1900-01-01,Europe/Moscow') - ndz,
+    TzDate32('1900-01-01,Europe/Moscow') - nt,
+    TzDate32('1900-01-01,Europe/Moscow') - ntz,
+    TzDate32('1900-01-01,Europe/Moscow') - wa,
+    TzDate32('1900-01-01,Europe/Moscow') - wd,
+    TzDate32('1900-01-01,Europe/Moscow') - wt,
+    TzDate32('1900-01-01,Europe/Moscow') - waz,
+    TzDate32('1900-01-01,Europe/Moscow') - wdz,
+    TzDate32('1900-01-01,Europe/Moscow') - wtz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') - na,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') - naz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') - nd,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') - ndz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') - nt,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') - ntz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') - wa,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') - wd,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') - wt,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') - waz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') - wdz,
+    TzDatetime64('1900-01-01T03:04:05,Europe/Moscow') - wtz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') - na,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') - naz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') - nd,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') - ndz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') - nt,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') - ntz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') - wa,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') - wd,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') - wt,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') - waz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') - wdz,
+    TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow') - wtz
 FROM
     Dates
 ;
 
 SELECT
-    na - Date("2000-01-01"),
-    naz - Date("2000-01-01"),
-    nd - Date("2000-01-01"),
-    ndz - Date("2000-01-01"),
-    nt - Date("2000-01-01"),
-    ntz - Date("2000-01-01"),
-    wa - Date("2000-01-01"),
-    wd - Date("2000-01-01"),
-    wt - Date("2000-01-01"),
-    waz - Date("2000-01-01"),
-    wdz - Date("2000-01-01"),
-    wtz - Date("2000-01-01"),
-    na - TzDate("2000-01-01,Europe/Moscow"),
-    naz - TzDate("2000-01-01,Europe/Moscow"),
-    nd - TzDate("2000-01-01,Europe/Moscow"),
-    ndz - TzDate("2000-01-01,Europe/Moscow"),
-    nt - TzDate("2000-01-01,Europe/Moscow"),
-    ntz - TzDate("2000-01-01,Europe/Moscow"),
-    wa - TzDate("2000-01-01,Europe/Moscow"),
-    wd - TzDate("2000-01-01,Europe/Moscow"),
-    wt - TzDate("2000-01-01,Europe/Moscow"),
-    waz - TzDate("2000-01-01,Europe/Moscow"),
-    wdz - TzDate("2000-01-01,Europe/Moscow"),
-    wtz - TzDate("2000-01-01,Europe/Moscow"),
-    na - Datetime("2000-01-01T03:04:05Z"),
-    naz - Datetime("2000-01-01T03:04:05Z"),
-    nd - Datetime("2000-01-01T03:04:05Z"),
-    ndz - Datetime("2000-01-01T03:04:05Z"),
-    nt - Datetime("2000-01-01T03:04:05Z"),
-    ntz - Datetime("2000-01-01T03:04:05Z"),
-    wa - Datetime("2000-01-01T03:04:05Z"),
-    wd - Datetime("2000-01-01T03:04:05Z"),
-    wt - Datetime("2000-01-01T03:04:05Z"),
-    waz - Datetime("2000-01-01T03:04:05Z"),
-    wdz - Datetime("2000-01-01T03:04:05Z"),
-    wtz - Datetime("2000-01-01T03:04:05Z"),
-    na - TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    naz - TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    nd - TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    ndz - TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    nt - TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    ntz - TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wa - TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wd - TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wt - TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    waz - TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wdz - TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wtz - TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    na - Timestamp("2000-01-01T03:04:05.678912Z"),
-    naz - Timestamp("2000-01-01T03:04:05.678912Z"),
-    nd - Timestamp("2000-01-01T03:04:05.678912Z"),
-    ndz - Timestamp("2000-01-01T03:04:05.678912Z"),
-    nt - Timestamp("2000-01-01T03:04:05.678912Z"),
-    ntz - Timestamp("2000-01-01T03:04:05.678912Z"),
-    wa - Timestamp("2000-01-01T03:04:05.678912Z"),
-    wd - Timestamp("2000-01-01T03:04:05.678912Z"),
-    wt - Timestamp("2000-01-01T03:04:05.678912Z"),
-    waz - Timestamp("2000-01-01T03:04:05.678912Z"),
-    wdz - Timestamp("2000-01-01T03:04:05.678912Z"),
-    wtz - Timestamp("2000-01-01T03:04:05.678912Z"),
-    na - TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    naz - TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    nd - TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    ndz - TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    nt - TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    ntz - TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wa - TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wd - TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wt - TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    waz - TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wdz - TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wtz - TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
+    na - Date('2000-01-01'),
+    naz - Date('2000-01-01'),
+    nd - Date('2000-01-01'),
+    ndz - Date('2000-01-01'),
+    nt - Date('2000-01-01'),
+    ntz - Date('2000-01-01'),
+    wa - Date('2000-01-01'),
+    wd - Date('2000-01-01'),
+    wt - Date('2000-01-01'),
+    waz - Date('2000-01-01'),
+    wdz - Date('2000-01-01'),
+    wtz - Date('2000-01-01'),
+    na - TzDate('2000-01-01,Europe/Moscow'),
+    naz - TzDate('2000-01-01,Europe/Moscow'),
+    nd - TzDate('2000-01-01,Europe/Moscow'),
+    ndz - TzDate('2000-01-01,Europe/Moscow'),
+    nt - TzDate('2000-01-01,Europe/Moscow'),
+    ntz - TzDate('2000-01-01,Europe/Moscow'),
+    wa - TzDate('2000-01-01,Europe/Moscow'),
+    wd - TzDate('2000-01-01,Europe/Moscow'),
+    wt - TzDate('2000-01-01,Europe/Moscow'),
+    waz - TzDate('2000-01-01,Europe/Moscow'),
+    wdz - TzDate('2000-01-01,Europe/Moscow'),
+    wtz - TzDate('2000-01-01,Europe/Moscow'),
+    na - Datetime('2000-01-01T03:04:05Z'),
+    naz - Datetime('2000-01-01T03:04:05Z'),
+    nd - Datetime('2000-01-01T03:04:05Z'),
+    ndz - Datetime('2000-01-01T03:04:05Z'),
+    nt - Datetime('2000-01-01T03:04:05Z'),
+    ntz - Datetime('2000-01-01T03:04:05Z'),
+    wa - Datetime('2000-01-01T03:04:05Z'),
+    wd - Datetime('2000-01-01T03:04:05Z'),
+    wt - Datetime('2000-01-01T03:04:05Z'),
+    waz - Datetime('2000-01-01T03:04:05Z'),
+    wdz - Datetime('2000-01-01T03:04:05Z'),
+    wtz - Datetime('2000-01-01T03:04:05Z'),
+    na - TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    naz - TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    nd - TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    ndz - TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    nt - TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    ntz - TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wa - TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wd - TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wt - TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    waz - TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wdz - TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wtz - TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    na - Timestamp('2000-01-01T03:04:05.678912Z'),
+    naz - Timestamp('2000-01-01T03:04:05.678912Z'),
+    nd - Timestamp('2000-01-01T03:04:05.678912Z'),
+    ndz - Timestamp('2000-01-01T03:04:05.678912Z'),
+    nt - Timestamp('2000-01-01T03:04:05.678912Z'),
+    ntz - Timestamp('2000-01-01T03:04:05.678912Z'),
+    wa - Timestamp('2000-01-01T03:04:05.678912Z'),
+    wd - Timestamp('2000-01-01T03:04:05.678912Z'),
+    wt - Timestamp('2000-01-01T03:04:05.678912Z'),
+    waz - Timestamp('2000-01-01T03:04:05.678912Z'),
+    wdz - Timestamp('2000-01-01T03:04:05.678912Z'),
+    wtz - Timestamp('2000-01-01T03:04:05.678912Z'),
+    na - TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    naz - TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    nd - TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    ndz - TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    nt - TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    ntz - TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wa - TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wd - TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wt - TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    waz - TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wdz - TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wtz - TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
 FROM
     Dates
 ;
 
 SELECT
-    na - Date32("1900-01-01"),
-    naz - Date32("1900-01-01"),
-    nd - Date32("1900-01-01"),
-    ndz - Date32("1900-01-01"),
-    nt - Date32("1900-01-01"),
-    ntz - Date32("1900-01-01"),
-    wa - Date32("1900-01-01"),
-    wd - Date32("1900-01-01"),
-    wt - Date32("1900-01-01"),
-    waz - Date32("1900-01-01"),
-    wdz - Date32("1900-01-01"),
-    wtz - Date32("1900-01-01"),
-    na - Datetime64("1900-01-01T03:04:05Z"),
-    naz - Datetime64("1900-01-01T03:04:05Z"),
-    nd - Datetime64("1900-01-01T03:04:05Z"),
-    ndz - Datetime64("1900-01-01T03:04:05Z"),
-    nt - Datetime64("1900-01-01T03:04:05Z"),
-    ntz - Datetime64("1900-01-01T03:04:05Z"),
-    wa - Datetime64("1900-01-01T03:04:05Z"),
-    wd - Datetime64("1900-01-01T03:04:05Z"),
-    wt - Datetime64("1900-01-01T03:04:05Z"),
-    waz - Datetime64("1900-01-01T03:04:05Z"),
-    wdz - Datetime64("1900-01-01T03:04:05Z"),
-    wtz - Datetime64("1900-01-01T03:04:05Z"),
-    na - Timestamp64("1900-01-01T03:04:05.678912Z"),
-    naz - Timestamp64("1900-01-01T03:04:05.678912Z"),
-    nd - Timestamp64("1900-01-01T03:04:05.678912Z"),
-    ndz - Timestamp64("1900-01-01T03:04:05.678912Z"),
-    nt - Timestamp64("1900-01-01T03:04:05.678912Z"),
-    ntz - Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wa - Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wd - Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wt - Timestamp64("1900-01-01T03:04:05.678912Z"),
-    waz - Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wdz - Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wtz - Timestamp64("1900-01-01T03:04:05.678912Z"),
-    na - TzDate32("1900-01-01,Europe/Moscow"),
-    naz - TzDate32("1900-01-01,Europe/Moscow"),
-    nd - TzDate32("1900-01-01,Europe/Moscow"),
-    ndz - TzDate32("1900-01-01,Europe/Moscow"),
-    nt - TzDate32("1900-01-01,Europe/Moscow"),
-    ntz - TzDate32("1900-01-01,Europe/Moscow"),
-    wa - TzDate32("1900-01-01,Europe/Moscow"),
-    wd - TzDate32("1900-01-01,Europe/Moscow"),
-    wt - TzDate32("1900-01-01,Europe/Moscow"),
-    waz - TzDate32("1900-01-01,Europe/Moscow"),
-    wdz - TzDate32("1900-01-01,Europe/Moscow"),
-    wtz - TzDate32("1900-01-01,Europe/Moscow"),
-    na - TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    naz - TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    nd - TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    ndz - TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    nt - TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    ntz - TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wa - TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wd - TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wt - TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    waz - TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wdz - TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wtz - TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    na - TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    naz - TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    nd - TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    ndz - TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    nt - TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    ntz - TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wa - TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wd - TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wt - TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    waz - TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wdz - TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wtz - TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow")
+    na - Date32('1900-01-01'),
+    naz - Date32('1900-01-01'),
+    nd - Date32('1900-01-01'),
+    ndz - Date32('1900-01-01'),
+    nt - Date32('1900-01-01'),
+    ntz - Date32('1900-01-01'),
+    wa - Date32('1900-01-01'),
+    wd - Date32('1900-01-01'),
+    wt - Date32('1900-01-01'),
+    waz - Date32('1900-01-01'),
+    wdz - Date32('1900-01-01'),
+    wtz - Date32('1900-01-01'),
+    na - Datetime64('1900-01-01T03:04:05Z'),
+    naz - Datetime64('1900-01-01T03:04:05Z'),
+    nd - Datetime64('1900-01-01T03:04:05Z'),
+    ndz - Datetime64('1900-01-01T03:04:05Z'),
+    nt - Datetime64('1900-01-01T03:04:05Z'),
+    ntz - Datetime64('1900-01-01T03:04:05Z'),
+    wa - Datetime64('1900-01-01T03:04:05Z'),
+    wd - Datetime64('1900-01-01T03:04:05Z'),
+    wt - Datetime64('1900-01-01T03:04:05Z'),
+    waz - Datetime64('1900-01-01T03:04:05Z'),
+    wdz - Datetime64('1900-01-01T03:04:05Z'),
+    wtz - Datetime64('1900-01-01T03:04:05Z'),
+    na - Timestamp64('1900-01-01T03:04:05.678912Z'),
+    naz - Timestamp64('1900-01-01T03:04:05.678912Z'),
+    nd - Timestamp64('1900-01-01T03:04:05.678912Z'),
+    ndz - Timestamp64('1900-01-01T03:04:05.678912Z'),
+    nt - Timestamp64('1900-01-01T03:04:05.678912Z'),
+    ntz - Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wa - Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wd - Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wt - Timestamp64('1900-01-01T03:04:05.678912Z'),
+    waz - Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wdz - Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wtz - Timestamp64('1900-01-01T03:04:05.678912Z'),
+    na - TzDate32('1900-01-01,Europe/Moscow'),
+    naz - TzDate32('1900-01-01,Europe/Moscow'),
+    nd - TzDate32('1900-01-01,Europe/Moscow'),
+    ndz - TzDate32('1900-01-01,Europe/Moscow'),
+    nt - TzDate32('1900-01-01,Europe/Moscow'),
+    ntz - TzDate32('1900-01-01,Europe/Moscow'),
+    wa - TzDate32('1900-01-01,Europe/Moscow'),
+    wd - TzDate32('1900-01-01,Europe/Moscow'),
+    wt - TzDate32('1900-01-01,Europe/Moscow'),
+    waz - TzDate32('1900-01-01,Europe/Moscow'),
+    wdz - TzDate32('1900-01-01,Europe/Moscow'),
+    wtz - TzDate32('1900-01-01,Europe/Moscow'),
+    na - TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    naz - TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    nd - TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    ndz - TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    nt - TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    ntz - TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wa - TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wd - TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wt - TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    waz - TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wdz - TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wtz - TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    na - TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    naz - TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    nd - TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    ndz - TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    nt - TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    ntz - TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wa - TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wd - TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wt - TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    waz - TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wdz - TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wtz - TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow')
 FROM
     Dates
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-decimal_avg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-decimal_avg_/formatted.sql
index 4c0ca6a673..135813cde3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-decimal_avg_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-decimal_avg_/formatted.sql
@@ -3,8 +3,8 @@ USE plato;
 SELECT
     avg(cs_ext_list_price),
     avg(cs_ext_tax),
-    avg(cs_ext_list_price) * decimal("1.1", 7, 2),
-    decimal("1.1", 7, 2) * avg(cs_ext_tax),
+    avg(cs_ext_list_price) * decimal('1.1', 7, 2),
+    decimal('1.1', 7, 2) * avg(cs_ext_tax),
 FROM
     Input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-decimal_comparison_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-decimal_comparison_/formatted.sql
index fa4ef023c9..dbf40b1ffc 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-decimal_comparison_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-decimal_comparison_/formatted.sql
@@ -7,18 +7,18 @@ SELECT
     cs_ext_list_price <= cs_ext_tax,
     cs_ext_list_price > cs_ext_tax,
     cs_ext_list_price >= cs_ext_tax,
-    cs_ext_tax == decimal("26.91", 7, 2),
-    cs_ext_tax != decimal("26.91", 7, 2),
-    cs_ext_tax < decimal("26.91", 7, 2),
-    cs_ext_tax <= decimal("26.91", 7, 2),
-    cs_ext_tax > decimal("26.91", 7, 2),
-    cs_ext_tax >= decimal("26.91", 7, 2),
-    decimal("26.91", 7, 2) == cs_ext_tax,
-    decimal("26.91", 7, 2) != cs_ext_tax,
-    decimal("26.91", 7, 2) < cs_ext_tax,
-    decimal("26.91", 7, 2) <= cs_ext_tax,
-    decimal("26.91", 7, 2) > cs_ext_tax,
-    decimal("26.91", 7, 2) >= cs_ext_tax,
+    cs_ext_tax == decimal('26.91', 7, 2),
+    cs_ext_tax != decimal('26.91', 7, 2),
+    cs_ext_tax < decimal('26.91', 7, 2),
+    cs_ext_tax <= decimal('26.91', 7, 2),
+    cs_ext_tax > decimal('26.91', 7, 2),
+    cs_ext_tax >= decimal('26.91', 7, 2),
+    decimal('26.91', 7, 2) == cs_ext_tax,
+    decimal('26.91', 7, 2) != cs_ext_tax,
+    decimal('26.91', 7, 2) < cs_ext_tax,
+    decimal('26.91', 7, 2) <= cs_ext_tax,
+    decimal('26.91', 7, 2) > cs_ext_tax,
+    decimal('26.91', 7, 2) >= cs_ext_tax,
 FROM
     Input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-decimal_multiplicative_ops_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-decimal_multiplicative_ops_/formatted.sql
index b6822fe631..a174787d83 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-decimal_multiplicative_ops_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-decimal_multiplicative_ops_/formatted.sql
@@ -4,20 +4,20 @@ SELECT
     cs_ext_list_price,
     cs_ext_tax,
     cs_ext_list_price * cs_ext_tax,
-    cs_ext_list_price * Just(decimal("13.37", 7, 2)),
-    Just(decimal("42.0", 7, 2)) * cs_ext_tax,
-    cs_ext_list_price * decimal("13.37", 7, 2),
-    decimal("42.0", 7, 2) * cs_ext_tax,
+    cs_ext_list_price * Just(decimal('13.37', 7, 2)),
+    Just(decimal('42.0', 7, 2)) * cs_ext_tax,
+    cs_ext_list_price * decimal('13.37', 7, 2),
+    decimal('42.0', 7, 2) * cs_ext_tax,
     cs_ext_list_price / cs_ext_tax,
-    cs_ext_list_price / Just(decimal("13.37", 7, 2)),
-    Just(decimal("42.0", 7, 2)) / cs_ext_tax,
-    cs_ext_list_price / decimal("13.37", 7, 2),
-    decimal("42.0", 7, 2) / cs_ext_tax,
+    cs_ext_list_price / Just(decimal('13.37', 7, 2)),
+    Just(decimal('42.0', 7, 2)) / cs_ext_tax,
+    cs_ext_list_price / decimal('13.37', 7, 2),
+    decimal('42.0', 7, 2) / cs_ext_tax,
     cs_ext_list_price % cs_ext_tax,
-    cs_ext_list_price % Just(decimal("13.37", 7, 2)),
-    Just(decimal("42.0", 7, 2)) % cs_ext_tax,
-    cs_ext_list_price % decimal("13.37", 7, 2),
-    decimal("42.0", 7, 2) % cs_ext_tax,
+    cs_ext_list_price % Just(decimal('13.37', 7, 2)),
+    Just(decimal('42.0', 7, 2)) % cs_ext_tax,
+    cs_ext_list_price % decimal('13.37', 7, 2),
+    decimal('42.0', 7, 2) % cs_ext_tax,
     cs_ext_list_price * Just(13),
     cs_ext_list_price * 13,
     cs_ext_list_price / Just(13),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-decimal_op_decimal_scalar_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-decimal_op_decimal_scalar_/formatted.sql
index e85770b427..2f122d8235 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-decimal_op_decimal_scalar_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-decimal_op_decimal_scalar_/formatted.sql
@@ -1,19 +1,19 @@
 USE plato;
 
 SELECT
-    cs_ext_list_price + CAST("10.2" AS decimal (7, 2)),
-    cs_ext_list_price + CAST("99999.99" AS decimal (7, 2)),
-    cs_ext_list_price - CAST("11.22" AS decimal (7, 2)),
-    cs_ext_list_price - CAST("99999.99" AS decimal (7, 2)),
+    cs_ext_list_price + CAST('10.2' AS decimal (7, 2)),
+    cs_ext_list_price + CAST('99999.99' AS decimal (7, 2)),
+    cs_ext_list_price - CAST('11.22' AS decimal (7, 2)),
+    cs_ext_list_price - CAST('99999.99' AS decimal (7, 2)),
 FROM
     Input
 ;
 
 SELECT
-    CAST("10.2" AS decimal (7, 2)) + cs_ext_list_price,
-    CAST("99999.99" AS decimal (7, 2)) + cs_ext_list_price,
-    CAST("11.22" AS decimal (7, 2)) - cs_ext_list_price,
-    CAST("99999.99" AS decimal (7, 2)) - cs_ext_list_price,
+    CAST('10.2' AS decimal (7, 2)) + cs_ext_list_price,
+    CAST('99999.99' AS decimal (7, 2)) + cs_ext_list_price,
+    CAST('11.22' AS decimal (7, 2)) - cs_ext_list_price,
+    CAST('99999.99' AS decimal (7, 2)) - cs_ext_list_price,
 FROM
     Input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_mixed_all_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_mixed_all_/formatted.sql
index 8688fd664e..5f5f01d4b8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_mixed_all_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_mixed_all_/formatted.sql
@@ -1,4 +1,4 @@
-PRAGMA yt.UsePartitionsByKeysForFinalAgg = "false";
+PRAGMA yt.UsePartitionsByKeysForFinalAgg = 'false';
 
 USE plato;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_mixed_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_mixed_keys_/formatted.sql
index 76f4e63780..c4446bf208 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_mixed_keys_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_mixed_keys_/formatted.sql
@@ -1,4 +1,4 @@
-PRAGMA yt.UsePartitionsByKeysForFinalAgg = "false";
+PRAGMA yt.UsePartitionsByKeysForFinalAgg = 'false';
 
 USE plato;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_opt_state_all_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_opt_state_all_/formatted.sql
index 74ff91d486..14eab809d0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_opt_state_all_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_opt_state_all_/formatted.sql
@@ -1,4 +1,4 @@
-PRAGMA yt.UsePartitionsByKeysForFinalAgg = "false";
+PRAGMA yt.UsePartitionsByKeysForFinalAgg = 'false';
 
 USE plato;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_opt_state_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_opt_state_keys_/formatted.sql
index 6a68b53ed4..bfbfb6c524 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_opt_state_keys_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_opt_state_keys_/formatted.sql
@@ -1,4 +1,4 @@
-PRAGMA yt.UsePartitionsByKeysForFinalAgg = "false";
+PRAGMA yt.UsePartitionsByKeysForFinalAgg = 'false';
 
 USE plato;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_pure_all_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_pure_all_/formatted.sql
index d3b52b5248..7457df0a34 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_pure_all_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_pure_all_/formatted.sql
@@ -1,4 +1,4 @@
-PRAGMA yt.UsePartitionsByKeysForFinalAgg = "false";
+PRAGMA yt.UsePartitionsByKeysForFinalAgg = 'false';
 
 USE plato;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_pure_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_pure_keys_/formatted.sql
index 11c9ce4019..c588d60f9a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_pure_keys_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_pure_keys_/formatted.sql
@@ -1,4 +1,4 @@
-PRAGMA yt.UsePartitionsByKeysForFinalAgg = "false";
+PRAGMA yt.UsePartitionsByKeysForFinalAgg = 'false';
 
 USE plato;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-finalize_hashed_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-finalize_hashed_keys_/formatted.sql
index 29656797b4..5e13708c90 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-finalize_hashed_keys_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-finalize_hashed_keys_/formatted.sql
@@ -1,4 +1,4 @@
-PRAGMA yt.UsePartitionsByKeysForFinalAgg = "false";
+PRAGMA yt.UsePartitionsByKeysForFinalAgg = 'false';
 
 USE plato;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-interval_add_date_scalar_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-interval_add_date_scalar_/formatted.sql
index dca6688d54..138e97da7f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-interval_add_date_scalar_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-interval_add_date_scalar_/formatted.sql
@@ -1,61 +1,61 @@
 USE plato;
 
-PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
+PRAGMA yt.DisableOptimizers = 'OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps';
 
 SELECT
-    ni + Date("2000-01-01"),
-    wi + Date("2000-01-01"),
-    ni + TzDate("2000-01-01,Europe/Moscow"),
-    wi + TzDate("2000-01-01,Europe/Moscow"),
-    ni + Datetime("2000-01-01T03:04:05Z"),
-    wi + Datetime("2000-01-01T03:04:05Z"),
-    ni + TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    wi + TzDatetime("2000-01-01T03:04:05,Europe/Moscow"),
-    ni + Timestamp("2000-01-01T03:04:05.678912Z"),
-    wi + Timestamp("2000-01-01T03:04:05.678912Z"),
-    ni + TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    wi + TzTimestamp("2000-01-01T03:04:05.678912,Europe/Moscow"),
-    ni + Date32("1900-01-01"),
-    wi + Date32("1900-01-01"),
-    ni + Datetime64("1900-01-01T03:04:05Z"),
-    wi + Datetime64("1900-01-01T03:04:05Z"),
-    ni + Timestamp64("1900-01-01T03:04:05.678912Z"),
-    wi + Timestamp64("1900-01-01T03:04:05.678912Z"),
-    ni + TzDate32("1900-01-01,Europe/Moscow"),
-    wi + TzDate32("1900-01-01,Europe/Moscow"),
-    ni + TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    wi + TzDatetime64("1900-01-01T03:04:05,Europe/Moscow"),
-    ni + TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
-    wi + TzTimestamp64("1900-01-01T03:04:05.678912,Europe/Moscow"),
+    ni + Date('2000-01-01'),
+    wi + Date('2000-01-01'),
+    ni + TzDate('2000-01-01,Europe/Moscow'),
+    wi + TzDate('2000-01-01,Europe/Moscow'),
+    ni + Datetime('2000-01-01T03:04:05Z'),
+    wi + Datetime('2000-01-01T03:04:05Z'),
+    ni + TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    wi + TzDatetime('2000-01-01T03:04:05,Europe/Moscow'),
+    ni + Timestamp('2000-01-01T03:04:05.678912Z'),
+    wi + Timestamp('2000-01-01T03:04:05.678912Z'),
+    ni + TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    wi + TzTimestamp('2000-01-01T03:04:05.678912,Europe/Moscow'),
+    ni + Date32('1900-01-01'),
+    wi + Date32('1900-01-01'),
+    ni + Datetime64('1900-01-01T03:04:05Z'),
+    wi + Datetime64('1900-01-01T03:04:05Z'),
+    ni + Timestamp64('1900-01-01T03:04:05.678912Z'),
+    wi + Timestamp64('1900-01-01T03:04:05.678912Z'),
+    ni + TzDate32('1900-01-01,Europe/Moscow'),
+    wi + TzDate32('1900-01-01,Europe/Moscow'),
+    ni + TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    wi + TzDatetime64('1900-01-01T03:04:05,Europe/Moscow'),
+    ni + TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
+    wi + TzTimestamp64('1900-01-01T03:04:05.678912,Europe/Moscow'),
 FROM
     Dates
 ;
 
 SELECT
-    Interval("P1D") + na,
-    Interval64("P1D") + na,
-    Interval("P1D") + naz,
-    Interval64("P1D") + naz,
-    Interval("P1D") + nd,
-    Interval64("P1D") + nd,
-    Interval("P1D") + ndz,
-    Interval64("P1D") + ndz,
-    Interval("P1D") + nt,
-    Interval64("P1D") + nt,
-    Interval("P1D") + ntz,
-    Interval64("P1D") + ntz,
-    Interval("P1D") + wa,
-    Interval64("P1D") + wa,
-    Interval("P1D") + wd,
-    Interval64("P1D") + wd,
-    Interval("P1D") + wt,
-    Interval64("P1D") + wt,
-    Interval("P1D") + waz,
-    Interval64("P1D") + waz,
-    Interval("P1D") + wdz,
-    Interval64("P1D") + wdz,
-    Interval("P1D") + wtz,
-    Interval64("P1D") + wtz
+    Interval('P1D') + na,
+    Interval64('P1D') + na,
+    Interval('P1D') + naz,
+    Interval64('P1D') + naz,
+    Interval('P1D') + nd,
+    Interval64('P1D') + nd,
+    Interval('P1D') + ndz,
+    Interval64('P1D') + ndz,
+    Interval('P1D') + nt,
+    Interval64('P1D') + nt,
+    Interval('P1D') + ntz,
+    Interval64('P1D') + ntz,
+    Interval('P1D') + wa,
+    Interval64('P1D') + wa,
+    Interval('P1D') + wd,
+    Interval64('P1D') + wd,
+    Interval('P1D') + wt,
+    Interval64('P1D') + wt,
+    Interval('P1D') + waz,
+    Interval64('P1D') + waz,
+    Interval('P1D') + wdz,
+    Interval64('P1D') + wdz,
+    Interval('P1D') + wtz,
+    Interval64('P1D') + wtz
 FROM
     Dates
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-interval_add_interval_scalar_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-interval_add_interval_scalar_/formatted.sql
index 67dfba86fc..bdb39e5824 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-interval_add_interval_scalar_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-interval_add_interval_scalar_/formatted.sql
@@ -1,19 +1,19 @@
 USE plato;
 
 SELECT
-    ni + Interval("P1D"),
-    wi + Interval("P1D"),
-    ni + Interval64("P1D"),
-    wi + Interval64("P1D")
+    ni + Interval('P1D'),
+    wi + Interval('P1D'),
+    ni + Interval64('P1D'),
+    wi + Interval64('P1D')
 FROM
     Dates
 ;
 
 SELECT
-    Interval("P1D") + ni,
-    Interval("P1D") + wi,
-    Interval64("P1D") + ni,
-    Interval64("P1D") + wi
+    Interval('P1D') + ni,
+    Interval('P1D') + wi,
+    Interval64('P1D') + ni,
+    Interval64('P1D') + wi
 FROM
     Dates
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-interval_div_scalar_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-interval_div_scalar_/formatted.sql
index 8603efecf9..0c8ff1ae4a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-interval_div_scalar_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-interval_div_scalar_/formatted.sql
@@ -1,43 +1,43 @@
 USE plato;
 
 SELECT
-    ni / Int8("10"),
-    wi / Int8("10"),
-    ni / Uint8("11"),
-    wi / Uint8("11"),
-    ni / Int16("12"),
-    wi / Int16("12"),
-    ni / Uint16("13"),
-    wi / Uint16("13"),
-    ni / Int32("14"),
-    wi / Int32("14"),
-    ni / Uint32("15"),
-    wi / Uint32("15"),
-    ni / Int64("16"),
-    wi / Int64("16"),
-    ni / Uint64("17"),
-    wi / Uint64("17"),
+    ni / Int8('10'),
+    wi / Int8('10'),
+    ni / Uint8('11'),
+    wi / Uint8('11'),
+    ni / Int16('12'),
+    wi / Int16('12'),
+    ni / Uint16('13'),
+    wi / Uint16('13'),
+    ni / Int32('14'),
+    wi / Int32('14'),
+    ni / Uint32('15'),
+    wi / Uint32('15'),
+    ni / Int64('16'),
+    wi / Int64('16'),
+    ni / Uint64('17'),
+    wi / Uint64('17'),
 FROM
     Dates
 ;
 
 SELECT
-    Interval("P1D") / i8,
-    Interval64("P1D") / i8,
-    Interval("P1D") / u8,
-    Interval64("P1D") / u8,
-    Interval("P1D") / i16,
-    Interval64("P1D") / i16,
-    Interval("P1D") / u16,
-    Interval64("P1D") / u16,
-    Interval("P1D") / i32,
-    Interval64("P1D") / i32,
-    Interval("P1D") / u32,
-    Interval64("P1D") / u32,
-    Interval("P1D") / i64,
-    Interval64("P1D") / i64,
-    Interval("P1D") / u64,
-    Interval64("P1D") / u64
+    Interval('P1D') / i8,
+    Interval64('P1D') / i8,
+    Interval('P1D') / u8,
+    Interval64('P1D') / u8,
+    Interval('P1D') / i16,
+    Interval64('P1D') / i16,
+    Interval('P1D') / u16,
+    Interval64('P1D') / u16,
+    Interval('P1D') / i32,
+    Interval64('P1D') / i32,
+    Interval('P1D') / u32,
+    Interval64('P1D') / u32,
+    Interval('P1D') / i64,
+    Interval64('P1D') / i64,
+    Interval('P1D') / u64,
+    Interval64('P1D') / u64
 FROM
     Dates
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-interval_mul_scalar_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-interval_mul_scalar_/formatted.sql
index b9a5f7034b..e945c6eff3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-interval_mul_scalar_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-interval_mul_scalar_/formatted.sql
@@ -1,85 +1,85 @@
 USE plato;
 
 SELECT
-    ni * Int8("10"),
-    wi * Int8("10"),
-    ni * Uint8("11"),
-    wi * Uint8("11"),
-    ni * Int16("12"),
-    wi * Int16("12"),
-    ni * Uint16("13"),
-    wi * Uint16("13"),
-    ni * Int32("14"),
-    wi * Int32("14"),
-    ni * Uint32("15"),
-    wi * Uint32("15"),
-    ni * Int64("16"),
-    wi * Int64("16"),
-    ni * Uint64("17"),
-    wi * Uint64("17"),
+    ni * Int8('10'),
+    wi * Int8('10'),
+    ni * Uint8('11'),
+    wi * Uint8('11'),
+    ni * Int16('12'),
+    wi * Int16('12'),
+    ni * Uint16('13'),
+    wi * Uint16('13'),
+    ni * Int32('14'),
+    wi * Int32('14'),
+    ni * Uint32('15'),
+    wi * Uint32('15'),
+    ni * Int64('16'),
+    wi * Int64('16'),
+    ni * Uint64('17'),
+    wi * Uint64('17'),
 FROM
     Dates
 ;
 
 SELECT
-    Int8("10") * ni,
-    Int8("10") * wi,
-    Uint8("11") * ni,
-    Uint8("11") * wi,
-    Int16("12") * ni,
-    Int16("12") * wi,
-    Uint16("13") * ni,
-    Uint16("13") * wi,
-    Int32("14") * ni,
-    Int32("14") * wi,
-    Uint32("15") * ni,
-    Uint32("15") * wi,
-    Int64("16") * ni,
-    Int64("16") * wi,
-    Uint64("17") * ni,
-    Uint64("17") * wi
+    Int8('10') * ni,
+    Int8('10') * wi,
+    Uint8('11') * ni,
+    Uint8('11') * wi,
+    Int16('12') * ni,
+    Int16('12') * wi,
+    Uint16('13') * ni,
+    Uint16('13') * wi,
+    Int32('14') * ni,
+    Int32('14') * wi,
+    Uint32('15') * ni,
+    Uint32('15') * wi,
+    Int64('16') * ni,
+    Int64('16') * wi,
+    Uint64('17') * ni,
+    Uint64('17') * wi
 FROM
     Dates
 ;
 
 SELECT
-    Interval("P1D") * i8,
-    Interval64("P1D") * i8,
-    Interval("P1D") * u8,
-    Interval64("P1D") * u8,
-    Interval("P1D") * i16,
-    Interval64("P1D") * i16,
-    Interval("P1D") * u16,
-    Interval64("P1D") * u16,
-    Interval("P1D") * i32,
-    Interval64("P1D") * i32,
-    Interval("P1D") * u32,
-    Interval64("P1D") * u32,
-    Interval("P1D") * i64,
-    Interval64("P1D") * i64,
-    Interval("P1D") * u64,
-    Interval64("P1D") * u64
+    Interval('P1D') * i8,
+    Interval64('P1D') * i8,
+    Interval('P1D') * u8,
+    Interval64('P1D') * u8,
+    Interval('P1D') * i16,
+    Interval64('P1D') * i16,
+    Interval('P1D') * u16,
+    Interval64('P1D') * u16,
+    Interval('P1D') * i32,
+    Interval64('P1D') * i32,
+    Interval('P1D') * u32,
+    Interval64('P1D') * u32,
+    Interval('P1D') * i64,
+    Interval64('P1D') * i64,
+    Interval('P1D') * u64,
+    Interval64('P1D') * u64
 FROM
     Dates
 ;
 
 SELECT
-    i8 * Interval("P1D"),
-    i8 * Interval64("P1D"),
-    u8 * Interval("P1D"),
-    u8 * Interval64("P1D"),
-    i16 * Interval("P1D"),
-    i16 * Interval64("P1D"),
-    u16 * Interval("P1D"),
-    u16 * Interval64("P1D"),
-    i32 * Interval("P1D"),
-    i32 * Interval64("P1D"),
-    u32 * Interval("P1D"),
-    u32 * Interval64("P1D"),
-    i64 * Interval("P1D"),
-    i64 * Interval64("P1D"),
-    u64 * Interval("P1D"),
-    u64 * Interval64("P1D")
+    i8 * Interval('P1D'),
+    i8 * Interval64('P1D'),
+    u8 * Interval('P1D'),
+    u8 * Interval64('P1D'),
+    i16 * Interval('P1D'),
+    i16 * Interval64('P1D'),
+    u16 * Interval('P1D'),
+    u16 * Interval64('P1D'),
+    i32 * Interval('P1D'),
+    i32 * Interval64('P1D'),
+    u32 * Interval('P1D'),
+    u32 * Interval64('P1D'),
+    i64 * Interval('P1D'),
+    i64 * Interval64('P1D'),
+    u64 * Interval('P1D'),
+    u64 * Interval64('P1D')
 FROM
     Dates
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-interval_sub_interval_scalar_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-interval_sub_interval_scalar_/formatted.sql
index 9d97944b0b..b2a1ef4b04 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-interval_sub_interval_scalar_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-interval_sub_interval_scalar_/formatted.sql
@@ -1,19 +1,19 @@
 USE plato;
 
 SELECT
-    ni - Interval("P1D"),
-    wi - Interval("P1D"),
-    ni - Interval64("P1D"),
-    wi - Interval64("P1D")
+    ni - Interval('P1D'),
+    wi - Interval('P1D'),
+    ni - Interval64('P1D'),
+    wi - Interval64('P1D')
 FROM
     Dates
 ;
 
 SELECT
-    Interval("P1D") - ni,
-    Interval("P1D") - wi,
-    Interval64("P1D") - ni,
-    Interval64("P1D") - wi
+    Interval('P1D') - ni,
+    Interval('P1D') - wi,
+    Interval64('P1D') - ni,
+    Interval64('P1D') - wi
 FROM
     Dates
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-lazy_nonstrict_basic_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-lazy_nonstrict_basic_/formatted.sql
index a3d29787e2..399d11a504 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-lazy_nonstrict_basic_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-lazy_nonstrict_basic_/formatted.sql
@@ -1,6 +1,6 @@
 USE plato;
 
-PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin";
+PRAGMA yt.DisableOptimizers = 'OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin';
 
 $ns_tolower = ($x) -> (AssumeNonStrict(String::AsciiToLower($x)));
 $ns_toupper = ($x) -> (AssumeNonStrict(String::AsciiToUpper($x)));
@@ -11,7 +11,7 @@ SELECT
 FROM
     Input
 WHERE
-    $ns_tolower(value) > "aaa" AND subkey == "1"
+    $ns_tolower(value) > 'aaa' AND subkey == '1'
 ;
 
 -- partial block due to lazy non-strict node
@@ -20,7 +20,7 @@ SELECT
 FROM
     Input
 WHERE
-    subkey == "2" AND $ns_toupper(value) <= "ZZZ"
+    subkey == '2' AND $ns_toupper(value) <= 'ZZZ'
 ;
 
 -- full block - same non strict is used in first arg of AND
@@ -29,5 +29,5 @@ SELECT
 FROM
     Input
 WHERE
-    $ns_toupper(value) >= "AAA" AND $ns_toupper(value) <= "ZZZ" AND subkey == "3"
+    $ns_toupper(value) >= 'AAA' AND $ns_toupper(value) <= 'ZZZ' AND subkey == '3'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-lazy_nonstrict_nested_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-lazy_nonstrict_nested_/formatted.sql
index 288c10b793..5999e90694 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-lazy_nonstrict_nested_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-lazy_nonstrict_nested_/formatted.sql
@@ -2,7 +2,7 @@ USE plato;
 
 -- partial blocks due to non strict in second arg of AND
 SELECT
-    if(value > "aaa" AND String::AsciiToLower(AssumeNonStrict(subkey)) > "3", "foo", "bar"),
+    if(value > 'aaa' AND String::AsciiToLower(AssumeNonStrict(subkey)) > '3', 'foo', 'bar'),
     value,
     subkey
 FROM
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-lazy_nonstrict_with_scalar_ctx_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-lazy_nonstrict_with_scalar_ctx_/formatted.sql
index 3749794c29..2a3a403df0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-lazy_nonstrict_with_scalar_ctx_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-lazy_nonstrict_with_scalar_ctx_/formatted.sql
@@ -20,7 +20,7 @@ SELECT
 FROM
     Input
 WHERE
-    subkey != "1" AND value > $one
+    subkey != '1' AND value > $one
 ;
 
 -- partially converted to blocks - AssumeStrict is calculated outside of scalar context
@@ -29,5 +29,5 @@ SELECT
 FROM
     Input
 WHERE
-    subkey != "2" AND value > $two
+    subkey != '2' AND value > $two
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-member_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-member_/formatted.sql
index 4a79b3ef64..a3ca2a8dd2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-member_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-member_/formatted.sql
@@ -2,13 +2,13 @@ USE plato;
 
 SELECT
     val.a AS a,
-    <|qq: key, qkrq: "QKRQ"|> AS q,
+    <|qq: key, qkrq: 'QKRQ'|> AS q,
 
     /* XXX: <AddMember> callable always expands to <AsStruct>. */
-    AddMember(val, "k", key) AS wik,
+    AddMember(val, 'k', key) AS wik,
 
     /* XXX: <RemoveMember> callable always expands to <AsStruct>. */
-    RemoveMember(val, "x") AS wox,
+    RemoveMember(val, 'x') AS wox,
 FROM
     Input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-minmax_strings_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-minmax_strings_/formatted.sql
index 6de209e92e..37a99e25f3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-minmax_strings_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-minmax_strings_/formatted.sql
@@ -1,4 +1,4 @@
-PRAGMA yt.UsePartitionsByKeysForFinalAgg = "false";
+PRAGMA yt.UsePartitionsByKeysForFinalAgg = 'false';
 
 USE plato;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-minmax_strings_filter_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-minmax_strings_filter_/formatted.sql
index 46cdcee475..53a8086338 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-minmax_strings_filter_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-minmax_strings_filter_/formatted.sql
@@ -1,4 +1,4 @@
-PRAGMA yt.UsePartitionsByKeysForFinalAgg = "false";
+PRAGMA yt.UsePartitionsByKeysForFinalAgg = 'false';
 
 USE plato;
 
@@ -11,7 +11,7 @@ SELECT
 FROM
     Input
 WHERE
-    key != "1" AND s NOT IN ("7", "8")
+    key != '1' AND s NOT IN ('7', '8')
 GROUP BY
     key
 ORDER BY
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-minmax_tuple_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-minmax_tuple_/formatted.sql
index 836983c297..36ad1fe5ee 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-minmax_tuple_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-minmax_tuple_/formatted.sql
@@ -1,4 +1,4 @@
-PRAGMA yt.UsePartitionsByKeysForFinalAgg = "false";
+PRAGMA yt.UsePartitionsByKeysForFinalAgg = 'false';
 
 USE plato;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-pg_to_strings_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-pg_to_strings_/formatted.sql
index fb07ee7cf6..2730829543 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-pg_to_strings_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-pg_to_strings_/formatted.sql
@@ -1,6 +1,6 @@
 USE plato;
 
-PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin";
+PRAGMA yt.DisableOptimizers = 'OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin';
 
 SELECT
     ToPg(s),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-string_with_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-string_with_/formatted.sql
index 491bfbcede..3f59f637ea 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-string_with_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-string_with_/formatted.sql
@@ -1,5 +1,5 @@
 PRAGMA AnsiLike;
-PRAGMA warning("disable", "4510");
+PRAGMA warning('disable', '4510');
 
 USE plato;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-type_and_callable_stats_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-type_and_callable_stats_/formatted.sql
index 35f39f4afa..2c3b52a882 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-type_and_callable_stats_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-type_and_callable_stats_/formatted.sql
@@ -13,7 +13,7 @@ SELECT
     AsList(key) AS no_block_list,
     AsSet(key) AS no_block_set_and_void,
     CAST(key AS Double) AS no_block_cast,
-    AsTuple(key, DyNumber("123")) AS no_block_dynumber,
+    AsTuple(key, DyNumber('123')) AS no_block_dynumber,
 FROM
     Input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_multi_val_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_multi_val_/formatted.sql
index bf70a69f22..a2fec0d5d8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_multi_val_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_multi_val_/formatted.sql
@@ -2,8 +2,8 @@ SELECT
     key,
     subkey,
     CASE value
-        WHEN "jar" THEN "JAR"
-        WHEN "foo" THEN "FOO"
+        WHEN 'jar' THEN 'JAR'
+        WHEN 'foo' THEN 'FOO'
         ELSE value
     END AS value
 FROM
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_opt_then_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_opt_then_/formatted.sql
index 9ec52d6f5e..e48011b9df 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_opt_then_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_opt_then_/formatted.sql
@@ -1,6 +1,6 @@
 SELECT
     CASE
-        WHEN TRUE THEN CAST("123" AS int)
+        WHEN TRUE THEN CAST('123' AS int)
         ELSE 100501
     END
 UNION ALL
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_size_eq_cast_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_size_eq_cast_/formatted.sql
index 361691f89a..e8474d7772 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_size_eq_cast_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_size_eq_cast_/formatted.sql
@@ -2,7 +2,7 @@ SELECT
     key,
     subkey,
     CASE length(value)
-        WHEN CAST(3 AS smallint) THEN "JAR"
+        WHEN CAST(3 AS smallint) THEN 'JAR'
         ELSE value
     END AS value
 FROM
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_val_when_then_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_val_when_then_/formatted.sql
index 363c06c271..95501f4d19 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_val_when_then_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_val_when_then_/formatted.sql
@@ -2,7 +2,7 @@ SELECT
     key,
     subkey,
     CASE value
-        WHEN subkey THEN "WAT"
+        WHEN subkey THEN 'WAT'
         ELSE value
     END AS value
 FROM
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_when_then_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_when_then_/formatted.sql
index 208b57882b..a302e902ac 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_when_then_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_when_then_/formatted.sql
@@ -2,7 +2,7 @@ SELECT
     key,
     subkey,
     CASE
-        WHEN value != subkey THEN "WAT"
+        WHEN value != subkey THEN 'WAT'
         ELSE value
     END AS value
 FROM
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-groups_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-groups_/formatted.sql
index 34d8d964cd..a57154324b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-groups_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-groups_/formatted.sql
@@ -6,7 +6,7 @@ $i =
     FROM
         Input
     WHERE
-        a > "a"
+        a > 'a'
 ;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_/formatted.sql
index 64ab2e7669..8fe01988dd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_/formatted.sql
@@ -6,7 +6,7 @@ $i1 =
     FROM
         Input
     WHERE
-        a > "a"
+        a > 'a'
 ;
 
 -- several publish consumers with same groups
@@ -16,7 +16,7 @@ $i2 =
     FROM
         Input
     WHERE
-        a > "a1"
+        a > 'a1'
 ;
 
 -- several publish consumers with different groups
@@ -26,7 +26,7 @@ $i3 =
     FROM
         Input
     WHERE
-        a < "a2"
+        a < 'a2'
 ;
 
 -- several consumers including publish
@@ -36,47 +36,47 @@ $i4 =
     FROM
         Input
     WHERE
-        a != "a"
+        a != 'a'
 ;
 
 -- several publish consumers with and without groups
 -- test column group spec normalization
-INSERT INTO Output1 WITH column_groups = "{g1=[a;b;c];def=#}"
+INSERT INTO Output1 WITH column_groups = '{g1=[a;b;c];def=#}'
 SELECT
     *
 FROM
     $i1
 ;
 
-INSERT INTO Output1 WITH column_groups = "{def=#;g1=[c;a;b];}"
+INSERT INTO Output1 WITH column_groups = '{def=#;g1=[c;a;b];}'
 SELECT
     *
 FROM
     $i2
 ;
 
-INSERT INTO Output2 WITH column_groups = "{def=#}"
+INSERT INTO Output2 WITH column_groups = '{def=#}'
 SELECT
     *
 FROM
     $i2
 ;
 
-INSERT INTO Output2 WITH column_groups = "{def=#}"
+INSERT INTO Output2 WITH column_groups = '{def=#}'
 SELECT
     *
 FROM
     $i3
 ;
 
-INSERT INTO Output3 WITH column_groups = "{g1=[a;b;c];def=#}"
+INSERT INTO Output3 WITH column_groups = '{g1=[a;b;c];def=#}'
 SELECT
     *
 FROM
     $i1
 ;
 
-INSERT INTO Output3 WITH column_groups = "{g1=[a;b;c];def=#}"
+INSERT INTO Output3 WITH column_groups = '{g1=[a;b;c];def=#}'
 SELECT
     *
 FROM
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_anon_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_anon_/formatted.sql
index 89f2be550b..96088708f8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_anon_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_anon_/formatted.sql
@@ -6,7 +6,7 @@ $i =
     FROM
         Input
     WHERE
-        a > "a"
+        a > 'a'
 ;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_anon_groups_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_anon_groups_/formatted.sql
index c53e2ab49c..9bb7e1d1ba 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_anon_groups_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_anon_groups_/formatted.sql
@@ -6,7 +6,7 @@ $i =
     FROM
         Input
     WHERE
-        a > "a"
+        a > 'a'
 ;
 
 SELECT
@@ -28,7 +28,7 @@ FROM
 ;
 
 -- Forces specific group for $i
-INSERT INTO @tmp WITH column_groups = "{grp=[b;c;d]}"
+INSERT INTO @tmp WITH column_groups = '{grp=[b;c;d]}'
 SELECT
     *
 FROM
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_append_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_append_fail_/formatted.sql
index d7c17f651b..0417f0e4ac 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_append_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_append_fail_/formatted.sql
@@ -1,7 +1,7 @@
 /* custom error:Insert with "column_groups" to existing table is not allowed*/
 USE plato;
 
-INSERT INTO Output WITH column_groups = "{g1=[a;b];def=#}"
+INSERT INTO Output WITH column_groups = '{g1=[a;b];def=#}'
 SELECT
     *
 FROM
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_diff_grp_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_diff_grp_fail_/formatted.sql
index fe9e76705f..a1c3f8dd87 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_diff_grp_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_diff_grp_fail_/formatted.sql
@@ -1,14 +1,14 @@
 /* custom error:All appends within the same commit should have the equal "column_groups" value*/
 USE plato;
 
-INSERT INTO Output WITH column_groups = "{g1=[a;b];def=#}"
+INSERT INTO Output WITH column_groups = '{g1=[a;b];def=#}'
 SELECT
     *
 FROM
     Input
 ;
 
-INSERT INTO Output WITH column_groups = "{g1=[c;d];def=#}"
+INSERT INTO Output WITH column_groups = '{g1=[c;d];def=#}'
 SELECT
     *
 FROM
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_dup_col_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_dup_col_fail_/formatted.sql
index 8793fc3348..e66ebb67b4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_dup_col_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_dup_col_fail_/formatted.sql
@@ -2,7 +2,7 @@
 USE plato;
 
 -- duplicate column
-INSERT INTO Output WITH column_groups = "{g1=[a;a;b];def=#}"
+INSERT INTO Output WITH column_groups = '{g1=[a;a;b];def=#}'
 SELECT
     *
 FROM
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_dup_def_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_dup_def_fail_/formatted.sql
index 8586050ac8..2cda979d0b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_dup_def_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_dup_def_fail_/formatted.sql
@@ -2,7 +2,7 @@
 USE plato;
 
 -- duplicate column
-INSERT INTO Output WITH column_groups = "{def1=#;def2=#}"
+INSERT INTO Output WITH column_groups = '{def1=#;def2=#}'
 SELECT
     *
 FROM
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_empty_grp_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_empty_grp_fail_/formatted.sql
index 6e4cc59f3b..9d02d99bcb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_empty_grp_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_empty_grp_fail_/formatted.sql
@@ -2,7 +2,7 @@
 USE plato;
 
 -- empty group
-INSERT INTO Output WITH column_groups = "{g1=[];def=#}"
+INSERT INTO Output WITH column_groups = '{g1=[];def=#}'
 SELECT
     *
 FROM
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_non_map_yson_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_non_map_yson_fail_/formatted.sql
index 11b8bf5490..da26881aee 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_non_map_yson_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_non_map_yson_fail_/formatted.sql
@@ -2,7 +2,7 @@
 USE plato;
 
 -- bad yson
-INSERT INTO Output WITH column_groups = "[abc]"
+INSERT INTO Output WITH column_groups = '[abc]'
 SELECT
     *
 FROM
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_non_str_yson_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_non_str_yson_fail_/formatted.sql
index 5b28eb43f5..62cc8ea3e9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_non_str_yson_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_non_str_yson_fail_/formatted.sql
@@ -2,7 +2,7 @@
 USE plato;
 
 -- bad yson
-INSERT INTO Output WITH column_groups = "{g1=[3;a]}"
+INSERT INTO Output WITH column_groups = '{g1=[3;a]}'
 SELECT
     *
 FROM
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_non_yson_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_non_yson_fail_/formatted.sql
index 8b8271a96e..7fdbbb1311 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_non_yson_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_non_yson_fail_/formatted.sql
@@ -2,7 +2,7 @@
 USE plato;
 
 -- bad yson
-INSERT INTO Output WITH column_groups = "!"
+INSERT INTO Output WITH column_groups = '!'
 SELECT
     *
 FROM
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_short_grp_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_short_grp_fail_/formatted.sql
index a24322c65a..e63d23530a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_short_grp_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_short_grp_fail_/formatted.sql
@@ -2,7 +2,7 @@
 USE plato;
 
 -- too short group
-INSERT INTO Output WITH column_groups = "{g1=[a];def=#}"
+INSERT INTO Output WITH column_groups = '{g1=[a];def=#}'
 SELECT
     *
 FROM
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_unk_col_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_unk_col_fail_/formatted.sql
index 4effd59ba1..b626062ca2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_unk_col_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_unk_col_fail_/formatted.sql
@@ -2,7 +2,7 @@
 USE plato;
 
 -- unknown column
-INSERT INTO Output WITH column_groups = "{g1=[l;b;c];def=#}"
+INSERT INTO Output WITH column_groups = '{g1=[l;b;c];def=#}'
 SELECT
     *
 FROM
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-insert_diff_groups1_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-insert_diff_groups1_fail_/formatted.sql
index 8e5c6643eb..1f367a6299 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-insert_diff_groups1_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-insert_diff_groups1_fail_/formatted.sql
@@ -1,7 +1,7 @@
 /* custom error:Insert with different "column_groups" to existing table is not allowed*/
 USE plato;
 
-PRAGMA yt.ColumnGroupMode = "perusage";
+PRAGMA yt.ColumnGroupMode = 'perusage';
 
 $s1 =
     SELECT
@@ -9,7 +9,7 @@ $s1 =
     FROM
         Input
     WHERE
-        a != ""
+        a != ''
 ;
 
 $s2 =
@@ -18,7 +18,7 @@ $s2 =
     FROM
         Input
     WHERE
-        a > "a1"
+        a > 'a1'
 ;
 
 INSERT INTO @a
@@ -30,7 +30,7 @@ FROM
 
 COMMIT;
 
-INSERT INTO @a WITH column_groups = "{a=#}"
+INSERT INTO @a WITH column_groups = '{a=#}'
 SELECT
     *
 FROM
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-insert_diff_groups2_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-insert_diff_groups2_fail_/formatted.sql
index 1883e54072..3a45986066 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-insert_diff_groups2_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-insert_diff_groups2_fail_/formatted.sql
@@ -1,7 +1,7 @@
 /* custom error:Insert with different "column_groups" to existing table is not allowed*/
 USE plato;
 
-PRAGMA yt.ColumnGroupMode = "perusage";
+PRAGMA yt.ColumnGroupMode = 'perusage';
 
 $s1 =
     SELECT
@@ -9,7 +9,7 @@ $s1 =
     FROM
         Input
     WHERE
-        a != ""
+        a != ''
 ;
 
 $s2 =
@@ -18,7 +18,7 @@ $s2 =
     FROM
         Input
     WHERE
-        a > "a1"
+        a > 'a1'
 ;
 
 INSERT INTO Output
@@ -30,7 +30,7 @@ FROM
 
 COMMIT;
 
-INSERT INTO Output WITH column_groups = "{a=#}"
+INSERT INTO Output WITH column_groups = '{a=#}'
 SELECT
     *
 FROM
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-insert_diff_groups3_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-insert_diff_groups3_fail_/formatted.sql
index e95eeea5a9..7892de23c9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-insert_diff_groups3_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-insert_diff_groups3_fail_/formatted.sql
@@ -1,13 +1,13 @@
 /* custom error:Insert with "column_groups" to existing table is not allowed*/
 USE plato;
 
-PRAGMA yt.ColumnGroupMode = "perusage";
+PRAGMA yt.ColumnGroupMode = 'perusage';
 
-INSERT INTO Output WITH column_groups = "{a=#}"
+INSERT INTO Output WITH column_groups = '{a=#}'
 SELECT
     *
 FROM
     Input
 WHERE
-    a != ""
+    a != ''
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-length_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-length_/formatted.sql
index fb519c6774..399e5846cc 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-length_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-length_/formatted.sql
@@ -6,7 +6,7 @@ $i =
     FROM
         Input
     WHERE
-        a > "a"
+        a > 'a'
 ;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-many_inserts_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-many_inserts_/formatted.sql
index 0040b43dfd..705a4979ba 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-many_inserts_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-many_inserts_/formatted.sql
@@ -1,6 +1,6 @@
 USE plato;
 
-PRAGMA yt.ColumnGroupMode = "perusage";
+PRAGMA yt.ColumnGroupMode = 'perusage';
 
 $s1 =
     SELECT
@@ -8,7 +8,7 @@ $s1 =
     FROM
         Input
     WHERE
-        a != ""
+        a != ''
 ;
 
 $s2 =
@@ -17,10 +17,10 @@ $s2 =
     FROM
         Input
     WHERE
-        a > "a1"
+        a > 'a1'
 ;
 
-INSERT INTO @a WITH column_groups = "{a=#}"
+INSERT INTO @a WITH column_groups = '{a=#}'
 SELECT
     *
 FROM
@@ -41,7 +41,7 @@ FROM
     $s1
 ;
 
-INSERT INTO Output WITH column_groups = "{a=#}"
+INSERT INTO Output WITH column_groups = '{a=#}'
 SELECT
     *
 FROM
@@ -50,7 +50,7 @@ FROM
 
 COMMIT;
 
-INSERT INTO @a WITH column_groups = "{a=#}"
+INSERT INTO @a WITH column_groups = '{a=#}'
 SELECT
     *
 FROM
@@ -64,14 +64,14 @@ FROM
     $s2
 ;
 
-INSERT INTO @c WITH column_groups = "{default=#}"
+INSERT INTO @c WITH column_groups = '{default=#}'
 SELECT
     *
 FROM
     $s2
 ;
 
-INSERT INTO Output WITH column_groups = "{a=#}"
+INSERT INTO Output WITH column_groups = '{a=#}'
 SELECT
     *
 FROM
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-min_group_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-min_group_/formatted.sql
index 3253f35ff5..e3d0987578 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-min_group_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-min_group_/formatted.sql
@@ -1,7 +1,7 @@
 USE plato;
 
-PRAGMA yt.MinColumnGroupSize = "3";
-PRAGMA yt.ColumnGroupMode = "perusage";
+PRAGMA yt.MinColumnGroupSize = '3';
+PRAGMA yt.ColumnGroupMode = 'perusage';
 
 $i =
     SELECT
@@ -9,7 +9,7 @@ $i =
     FROM
         Input
     WHERE
-        a > "a"
+        a > 'a'
 ;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-publish_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-publish_/formatted.sql
index 1e281e2bb6..9489f1b2cb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-publish_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-publish_/formatted.sql
@@ -6,7 +6,7 @@ $i =
     FROM
         Input
     WHERE
-        a > "a"
+        a > 'a'
 ;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_reorder_without_columnorder_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_reorder_without_columnorder_/formatted.sql
index b8bfa0480f..3edd591810 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_reorder_without_columnorder_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_reorder_without_columnorder_/formatted.sql
@@ -2,7 +2,7 @@
 USE plato;
 
 PRAGMA DisableOrderedColumns;
-PRAGMA warning("disable", "4517");
+PRAGMA warning('disable', '4517');
 
 $Group = 1u;
 
@@ -16,5 +16,5 @@ SELECT
 FROM
     Input
 WHERE
-    key == "150"
+    key == '150'
 LIMIT 1;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-join_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-join_/formatted.sql
index f28388240a..5be7867622 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-join_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-join_/formatted.sql
@@ -7,7 +7,7 @@ PRAGMA OrderedColumns;
 $foo =
     SELECT
         1 AS sk,
-        "150" AS key,
+        '150' AS key,
         2 AS v
 ;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-join_nosimple_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-join_nosimple_/formatted.sql
index 29398d86d9..5d2581ae00 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-join_nosimple_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-join_nosimple_/formatted.sql
@@ -8,7 +8,7 @@ PRAGMA DisableSimpleColumns;
 $foo =
     SELECT
         1 AS sk,
-        "150" AS key,
+        '150' AS key,
         2 AS v
 ;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_action_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_action_/formatted.sql
index af79c2b074..1b55bd3c83 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_action_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_action_/formatted.sql
@@ -4,7 +4,7 @@ USE plato;
 
 PRAGMA OrderedColumns;
 
-EVALUATE FOR $i IN ["1", "2", "3"] DO BEGIN
+EVALUATE FOR $i IN ['1', '2', '3'] DO BEGIN
     SELECT
         *
     FROM
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_groupby_with_star_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_groupby_with_star_/formatted.sql
index 300d06b711..0c38ea543e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_groupby_with_star_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_groupby_with_star_/formatted.sql
@@ -24,7 +24,7 @@ GROUP BY
     value,
     key
 HAVING
-    key == "150"
+    key == '150'
 ;
 
 SELECT
@@ -33,7 +33,7 @@ FROM
     Input
 GROUP BY
     subkey,
-    key || "x" AS key
+    key || 'x' AS key
 ORDER BY
     subkey,
     key
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_subquery_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_subquery_/formatted.sql
index e706f81546..03421d8632 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_subquery_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_subquery_/formatted.sql
@@ -17,5 +17,5 @@ END DEFINE;
 SELECT
     *
 FROM
-    $select_star("Input")
+    $select_star('Input')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_where_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_where_/formatted.sql
index 8b3ac87f0a..5fe5ab229b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_where_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_where_/formatted.sql
@@ -9,5 +9,5 @@ SELECT
 FROM
     Input
 WHERE
-    key == "150"
+    key == '150'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-union_all_positional_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-union_all_positional_/formatted.sql
index 7622f9d8b1..8b31846d55 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-union_all_positional_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-union_all_positional_/formatted.sql
@@ -1,7 +1,7 @@
 /* postgres can not */
 /* syntax version 1 */
 PRAGMA PositionalUnionAll;
-PRAGMA warning("disable", "1107");
+PRAGMA warning('disable', '1107');
 
 SELECT
     (1, 1u) AS z,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-adjacent_to_point_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-adjacent_to_point_/formatted.sql
index e3efaf350c..229ed75619 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-adjacent_to_point_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-adjacent_to_point_/formatted.sql
@@ -1,14 +1,14 @@
 /* syntax version 1 */
 /* postgres can not */
 /* yt can not */
-PRAGMA warning("disable", "4510");
+PRAGMA warning('disable', '4510');
 
 -- [10, 11) -> [10, 10]
 SELECT
     YQL::RangeComputeFor(
         Struct<x: UInt32>,
         ($row) -> ($row.x >= 10 AND $row.x < 11),
-        AsTuple(AsAtom("x"))
+        AsTuple(AsAtom('x'))
     )
 ;
 
@@ -17,7 +17,7 @@ SELECT
     YQL::RangeComputeFor(
         Struct<x: UInt32>,
         ($row) -> ($row.x > 10 AND $row.x <= 11),
-        AsTuple(AsAtom("x"))
+        AsTuple(AsAtom('x'))
     )
 ;
 
@@ -25,23 +25,23 @@ SELECT
 SELECT
     YQL::RangeComputeFor(
         Struct<x: Date??>,
-        ($row) -> (($row.x > Date("2021-09-08") AND $row.x <= Date("2021-09-09")) ?? FALSE),
-        AsTuple(AsAtom("x"))
+        ($row) -> (($row.x > Date('2021-09-08') AND $row.x <= Date('2021-09-09')) ?? FALSE),
+        AsTuple(AsAtom('x'))
     ),
     YQL::RangeComputeFor(
         Struct<x: Date32??>,
-        ($row) -> (($row.x > Date("2021-09-08") AND $row.x <= Date("2021-09-09")) ?? FALSE),
-        AsTuple(AsAtom("x"))
+        ($row) -> (($row.x > Date('2021-09-08') AND $row.x <= Date('2021-09-09')) ?? FALSE),
+        AsTuple(AsAtom('x'))
     ),
     YQL::RangeComputeFor(
         Struct<x: Date??>,
-        ($row) -> (($row.x > Date32("2021-09-08") AND $row.x <= Date32("2021-09-09")) ?? FALSE),
-        AsTuple(AsAtom("x"))
+        ($row) -> (($row.x > Date32('2021-09-08') AND $row.x <= Date32('2021-09-09')) ?? FALSE),
+        AsTuple(AsAtom('x'))
     ),
     YQL::RangeComputeFor(
         Struct<x: Date32??>,
-        ($row) -> (($row.x > Date32("-1-12-31") AND $row.x <= Date32("1-01-01")) ?? FALSE),
-        AsTuple(AsAtom("x"))
+        ($row) -> (($row.x > Date32('-1-12-31') AND $row.x <= Date32('1-01-01')) ?? FALSE),
+        AsTuple(AsAtom('x'))
     )
 ;
 
@@ -49,23 +49,23 @@ SELECT
 SELECT
     YQL::RangeComputeFor(
         Struct<x: Datetime?>,
-        ($row) -> (($row.x > Datetime("2021-09-09T12:00:00Z") AND $row.x <= Datetime("2021-09-09T12:00:01Z")) ?? FALSE),
-        AsTuple(AsAtom("x"))
+        ($row) -> (($row.x > Datetime('2021-09-09T12:00:00Z') AND $row.x <= Datetime('2021-09-09T12:00:01Z')) ?? FALSE),
+        AsTuple(AsAtom('x'))
     ),
     YQL::RangeComputeFor(
         Struct<x: Datetime64?>,
-        ($row) -> (($row.x > Datetime("2021-09-09T12:00:00Z") AND $row.x <= Datetime("2021-09-09T12:00:01Z")) ?? FALSE),
-        AsTuple(AsAtom("x"))
+        ($row) -> (($row.x > Datetime('2021-09-09T12:00:00Z') AND $row.x <= Datetime('2021-09-09T12:00:01Z')) ?? FALSE),
+        AsTuple(AsAtom('x'))
     ),
     YQL::RangeComputeFor(
         Struct<x: Datetime?>,
-        ($row) -> (($row.x > Datetime64("2021-09-09T12:00:00Z") AND $row.x <= Datetime64("2021-09-09T12:00:01Z")) ?? FALSE),
-        AsTuple(AsAtom("x"))
+        ($row) -> (($row.x > Datetime64('2021-09-09T12:00:00Z') AND $row.x <= Datetime64('2021-09-09T12:00:01Z')) ?? FALSE),
+        AsTuple(AsAtom('x'))
     ),
     YQL::RangeComputeFor(
         Struct<x: Datetime64?>,
-        ($row) -> (($row.x > Datetime64("-1-12-31T23:59:59Z") AND $row.x <= Datetime64("1-01-01T00:00:00Z")) ?? FALSE),
-        AsTuple(AsAtom("x"))
+        ($row) -> (($row.x > Datetime64('-1-12-31T23:59:59Z') AND $row.x <= Datetime64('1-01-01T00:00:00Z')) ?? FALSE),
+        AsTuple(AsAtom('x'))
     )
 ;
 
@@ -73,22 +73,22 @@ SELECT
 SELECT
     YQL::RangeComputeFor(
         Struct<x: Timestamp??>,
-        ($row) -> (($row.x > Timestamp("2021-09-09T12:00:00.000000Z") AND $row.x <= Timestamp("2021-09-09T12:00:00.000001Z")) ?? FALSE),
-        AsTuple(AsAtom("x"))
+        ($row) -> (($row.x > Timestamp('2021-09-09T12:00:00.000000Z') AND $row.x <= Timestamp('2021-09-09T12:00:00.000001Z')) ?? FALSE),
+        AsTuple(AsAtom('x'))
     ),
     YQL::RangeComputeFor(
         Struct<x: Timestamp64??>,
-        ($row) -> (($row.x > Timestamp("2021-09-09T12:00:00.000000Z") AND $row.x <= Timestamp("2021-09-09T12:00:00.000001Z")) ?? FALSE),
-        AsTuple(AsAtom("x"))
+        ($row) -> (($row.x > Timestamp('2021-09-09T12:00:00.000000Z') AND $row.x <= Timestamp('2021-09-09T12:00:00.000001Z')) ?? FALSE),
+        AsTuple(AsAtom('x'))
     ),
     YQL::RangeComputeFor(
         Struct<x: Timestamp??>,
-        ($row) -> (($row.x > Timestamp64("2021-09-09T12:00:00.000000Z") AND $row.x <= Timestamp64("2021-09-09T12:00:00.000001Z")) ?? FALSE),
-        AsTuple(AsAtom("x"))
+        ($row) -> (($row.x > Timestamp64('2021-09-09T12:00:00.000000Z') AND $row.x <= Timestamp64('2021-09-09T12:00:00.000001Z')) ?? FALSE),
+        AsTuple(AsAtom('x'))
     ),
     YQL::RangeComputeFor(
         Struct<x: Timestamp64??>,
-        ($row) -> (($row.x > Timestamp64("-1-12-31T23:59:59.999999Z") AND $row.x <= Timestamp64("1-01-01T00:00:00.000000Z")) ?? FALSE),
-        AsTuple(AsAtom("x"))
+        ($row) -> (($row.x > Timestamp64('-1-12-31T23:59:59.999999Z') AND $row.x <= Timestamp64('1-01-01T00:00:00.000000Z')) ?? FALSE),
+        AsTuple(AsAtom('x'))
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-decimal_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-decimal_/formatted.sql
index 57000dc496..ae2d22d8ee 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-decimal_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-decimal_/formatted.sql
@@ -1,11 +1,11 @@
 /* syntax version 1 */
 /* postgres can not */
 /* yt can not */
-PRAGMA warning("disable", "4510");
+PRAGMA warning('disable', '4510');
 
 $opt_type = Struct<x: Decimal (15, 10)?>;
-$keys = AsTuple(AsAtom("x"));
-$pred = ($row) -> (($row.x < Decimal("-inf", 15, 10)) ?? FALSE);
+$keys = AsTuple(AsAtom('x'));
+$pred = ($row) -> (($row.x < Decimal('-inf', 15, 10)) ?? FALSE);
 
 SELECT
     YQL::RangeComputeFor($opt_type, $pred, $keys)
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-huge_in_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-huge_in_/formatted.sql
index b9d938c98c..e1b354047a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-huge_in_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-huge_in_/formatted.sql
@@ -1,13 +1,13 @@
 /* syntax version 1 */
 /* postgres can not */
 /* yt can not */
-PRAGMA warning("disable", "4510");
-PRAGMA warning("disable", "1108");
+PRAGMA warning('disable', '4510');
+PRAGMA warning('disable', '1108');
 
 SELECT
     YQL::RangeComputeFor(
         Struct<x: Int32>,
         ($row) -> ($row.x IN ListFromRange(100000000, 0, -1)),
-        AsTuple(AsAtom("x"))
+        AsTuple(AsAtom('x'))
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-in2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-in2_/formatted.sql
index f34970aee6..f81eb646f7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-in2_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-in2_/formatted.sql
@@ -3,15 +3,15 @@
 /* dq can not */
 /* dqfile can not */
 /* yt can not */
-PRAGMA warning("disable", "4510");
-PRAGMA warning("disable", "1108");
+PRAGMA warning('disable', '4510');
+PRAGMA warning('disable', '1108');
 
 -- tuple
 SELECT
     YQL::RangeComputeFor(
         Struct<x: UInt32, y: Uint32, z: Uint32>,
         ($row) -> (($row.y, $row.x, $row.z) IN ((1, 2, 3), (100, 200, 300))),
-        AsTuple(AsAtom("x"), AsAtom("y"), AsAtom("z"))
+        AsTuple(AsAtom('x'), AsAtom('y'), AsAtom('z'))
     )
 ;
 
@@ -20,7 +20,7 @@ SELECT
     YQL::RangeComputeFor(
         Struct<x: UInt32>,
         ($row) -> (($row.x,) IN ((1,), (100,))),
-        AsTuple(AsAtom("x"))
+        AsTuple(AsAtom('x'))
     )
 ;
 
@@ -29,6 +29,6 @@ SELECT
     YQL::RangeComputeFor(
         Struct<x: UInt32, y: Uint32, z: Uint32>,
         ($row) -> (($row.y, $row.x) IN ((1, 2), (2, 2))),
-        AsTuple(AsAtom("x"), AsAtom("y"), AsAtom("z"))
+        AsTuple(AsAtom('x'), AsAtom('y'), AsAtom('z'))
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-in3_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-in3_/formatted.sql
index 96c9ca2353..19b93d63ab 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-in3_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-in3_/formatted.sql
@@ -3,8 +3,8 @@
 /* dq can not */
 /* dqfile can not */
 /* yt can not */
-PRAGMA warning("disable", "4510");
-PRAGMA warning("disable", "1108");
+PRAGMA warning('disable', '4510');
+PRAGMA warning('disable', '1108');
 
 $Input = [(4, 100), (5, 100)];
 
@@ -26,10 +26,10 @@ SELECT
             ) ?? FALSE
         ),
         AsTuple(
-            AsAtom("a"),
-            AsAtom("b"),
-            AsAtom("c"),
-            AsAtom("d"),
+            AsAtom('a'),
+            AsAtom('b'),
+            AsAtom('c'),
+            AsAtom('d'),
         )
     )
 ;
@@ -57,11 +57,11 @@ SELECT
             ) ?? FALSE
         ),
         AsTuple(
-            AsAtom("a"),
-            AsAtom("b"),
-            AsAtom("c"),
-            AsAtom("d"),
-            AsAtom("e"),
+            AsAtom('a'),
+            AsAtom('b'),
+            AsAtom('c'),
+            AsAtom('d'),
+            AsAtom('e'),
         )
     )
 ;
@@ -90,11 +90,11 @@ SELECT
             ) ?? FALSE
         ),
         AsTuple(
-            AsAtom("a"),
-            AsAtom("b"),
-            AsAtom("c"),
-            AsAtom("d"),
-            AsAtom("e"),
+            AsAtom('a'),
+            AsAtom('b'),
+            AsAtom('c'),
+            AsAtom('d'),
+            AsAtom('e'),
         )
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-in_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-in_/formatted.sql
index 3bb5d6156c..ddb2050af3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-in_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-in_/formatted.sql
@@ -1,15 +1,15 @@
 /* syntax version 1 */
 /* postgres can not */
 /* yt can not */
-PRAGMA warning("disable", "4510");
-PRAGMA warning("disable", "1108");
+PRAGMA warning('disable', '4510');
+PRAGMA warning('disable', '1108');
 
 -- basic IN
 SELECT
     YQL::RangeComputeFor(
         Struct<x: UInt32>,
         ($row) -> ($row.x IN (1, 2, -1)),
-        AsTuple(AsAtom("x"))
+        AsTuple(AsAtom('x'))
     )
 ;
 
@@ -18,7 +18,7 @@ SELECT
     YQL::RangeComputeFor(
         Struct<x: UInt32>,
         ($row) -> ($row.x IN ListFromRange(-1, 3)),
-        AsTuple(AsAtom("x"))
+        AsTuple(AsAtom('x'))
     )
 ;
 
@@ -27,7 +27,7 @@ SELECT
     YQL::RangeComputeFor(
         Struct<x: UInt32>,
         ($row) -> (($row.x IN Just(AsSet(-1, 1, 2))) ?? FALSE),
-        AsTuple(AsAtom("x"))
+        AsTuple(AsAtom('x'))
     )
 ;
 
@@ -36,7 +36,7 @@ SELECT
     YQL::RangeComputeFor(
         Struct<x: UInt32>,
         ($row) -> (($row.x IN (-1, 10u, 20, 1 / 0)) ?? FALSE),
-        AsTuple(AsAtom("x"))
+        AsTuple(AsAtom('x'))
     )
 ;
 
@@ -45,7 +45,7 @@ SELECT
     YQL::RangeComputeFor(
         Struct<x: UInt32, y: Uint32, z: Uint32>,
         ($row) -> (($row.y, $row.x, $row.z) IN [(1, 2, 3), (100, 200, 300)]),
-        AsTuple(AsAtom("x"), AsAtom("y"), AsAtom("z"))
+        AsTuple(AsAtom('x'), AsAtom('y'), AsAtom('z'))
     )
 ;
 
@@ -54,7 +54,7 @@ SELECT
     YQL::RangeComputeFor(
         Struct<x: UInt32, y: Uint32, z: Uint32>,
         ($row) -> (($row.y, $row.x, $row.z) IN [Just(Just((1, 2, 3))), (100, 200, 300), NULL]),
-        AsTuple(AsAtom("x"), AsAtom("y"))
+        AsTuple(AsAtom('x'), AsAtom('y'))
     )
 ;
 
@@ -63,6 +63,6 @@ SELECT
     YQL::RangeComputeFor(
         Struct<x: UInt32, y: Uint32, z: Uint32>,
         ($row) -> (($row.y, $row.x) IN ((1, 2, 3), (100, 200, 300))),
-        AsTuple(AsAtom("x"), AsAtom("y"))
+        AsTuple(AsAtom('x'), AsAtom('y'))
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-in_literal_nulls_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-in_literal_nulls_/formatted.sql
index f26a75f828..a16181aaa0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-in_literal_nulls_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-in_literal_nulls_/formatted.sql
@@ -3,13 +3,13 @@
 /* dq can not */
 /* dqfile can not */
 /* yt can not */
-PRAGMA warning("disable", "4510");
-PRAGMA warning("disable", "1108");
+PRAGMA warning('disable', '4510');
+PRAGMA warning('disable', '1108');
 
 SELECT
     YQL::RangeComputeFor(
         Struct<x: Int32?>,
         ($row) -> (($row.x IN (1, 2, 5, NULL)) ?? FALSE),
-        AsTuple(AsAtom("x"))
+        AsTuple(AsAtom('x'))
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-merge_adjacent_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-merge_adjacent_/formatted.sql
index 4cc85261d7..e44b0f4a89 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-merge_adjacent_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-merge_adjacent_/formatted.sql
@@ -1,15 +1,15 @@
 /* syntax version 1 */
 /* postgres can not */
 /* yt can not */
-PRAGMA warning("disable", "4510");
-PRAGMA warning("disable", "1108");
+PRAGMA warning('disable', '4510');
+PRAGMA warning('disable', '1108');
 
 -- basic in
 SELECT
     YQL::RangeComputeFor(
         Struct<x: UInt32>,
         ($row) -> ($row.x IN ListFromRange(-100, 100)),
-        AsTuple(AsAtom("x"))
+        AsTuple(AsAtom('x'))
     )
 ;
 
@@ -18,7 +18,7 @@ SELECT
     YQL::RangeComputeFor(
         Struct<x: Int32?>,
         ($row) -> (($row.x IN ListFromRange(2147483547ul, 2147483648ul)) ?? FALSE),
-        AsTuple(AsAtom("x"))
+        AsTuple(AsAtom('x'))
     )
 ;
 
@@ -26,8 +26,8 @@ SELECT
 SELECT
     YQL::RangeComputeFor(
         Struct<x: Date>,
-        ($row) -> ($row.x IN ListFromRange(Date("2105-01-01"), Date("2105-12-31")) OR $row.x == Date("2105-12-31")),
-        AsTuple(AsAtom("x"))
+        ($row) -> ($row.x IN ListFromRange(Date('2105-01-01'), Date('2105-12-31')) OR $row.x == Date('2105-12-31')),
+        AsTuple(AsAtom('x'))
     )
 ;
 
@@ -35,8 +35,8 @@ SELECT
 SELECT
     YQL::RangeComputeFor(
         Struct<x: Datetime>,
-        ($row) -> ($row.x == Datetime("2105-12-31T23:59:58Z") OR $row.x == Datetime("2105-12-31T23:59:59Z")),
-        AsTuple(AsAtom("x"))
+        ($row) -> ($row.x == Datetime('2105-12-31T23:59:58Z') OR $row.x == Datetime('2105-12-31T23:59:59Z')),
+        AsTuple(AsAtom('x'))
     )
 ;
 
@@ -44,7 +44,7 @@ SELECT
 SELECT
     YQL::RangeComputeFor(
         Struct<x: Timestamp>,
-        ($row) -> ($row.x == Timestamp("2105-12-31T23:59:59.999998Z") OR $row.x == Timestamp("2105-12-31T23:59:59.999999Z")),
-        AsTuple(AsAtom("x"))
+        ($row) -> ($row.x == Timestamp('2105-12-31T23:59:59.999998Z') OR $row.x == Timestamp('2105-12-31T23:59:59.999999Z')),
+        AsTuple(AsAtom('x'))
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-multiply_limit_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-multiply_limit_/formatted.sql
index 26e36c200c..c21b7bc93e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-multiply_limit_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-multiply_limit_/formatted.sql
@@ -3,15 +3,15 @@
 /* dq can not */
 /* dqfile can not */
 /* yt can not */
-PRAGMA warning("disable", "4510");
-PRAGMA warning("disable", "1108");
+PRAGMA warning('disable', '4510');
+PRAGMA warning('disable', '1108');
 
 -- single over limit
 SELECT
     YQL::RangeComputeFor(
         Struct<x: String, y: String>,
         ($row) -> ($row.x IN CAST(ListFromRange(0, 10001) AS List<String>)),
-        AsTuple(AsAtom("x"), AsAtom("y"))
+        AsTuple(AsAtom('x'), AsAtom('y'))
     )
 ;
 
@@ -20,7 +20,7 @@ SELECT
     YQL::RangeComputeFor(
         Struct<x: String, y: String>,
         ($row) -> ($row.x IN CAST(ListFromRange(0, 101) AS List<String>) AND $row.y IN CAST(ListFromRange(0, 101) AS List<String>)),
-        AsTuple(AsAtom("x"), AsAtom("y"))
+        AsTuple(AsAtom('x'), AsAtom('y'))
     )
 ;
 
@@ -30,6 +30,6 @@ SELECT
     YQL::RangeComputeFor(
         Struct<x: Int32>,
         ($row) -> ($row.x IN ListFromRange(0, 20000)),
-        AsTuple(AsAtom("x"))
+        AsTuple(AsAtom('x'))
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-multiply_limit_for_single_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-multiply_limit_for_single_key_/formatted.sql
index 60f5e7cdf5..ba53aedfda 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-multiply_limit_for_single_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-multiply_limit_for_single_key_/formatted.sql
@@ -3,14 +3,14 @@
 /* dq can not */
 /* dqfile can not */
 /* yt can not */
-PRAGMA warning("disable", "4510");
-PRAGMA warning("disable", "1108");
+PRAGMA warning('disable', '4510');
+PRAGMA warning('disable', '1108');
 
 -- single over limit
 SELECT
     YQL::RangeComputeFor(
         Struct<x: String, y: String>,
         ($row) -> ($row.x IN CAST(ListFromRange(0, 10001) AS List<String>)),
-        AsTuple(AsAtom("x"))
+        AsTuple(AsAtom('x'))
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-multiply_limit_with_dups_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-multiply_limit_with_dups_/formatted.sql
index 9f49d76ec8..449756d009 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-multiply_limit_with_dups_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-multiply_limit_with_dups_/formatted.sql
@@ -3,8 +3,8 @@
 /* dq can not */
 /* dqfile can not */
 /* yt can not */
-PRAGMA warning("disable", "4510");
-PRAGMA warning("disable", "1108");
+PRAGMA warning('disable', '4510');
+PRAGMA warning('disable', '1108');
 
 $lst = ListExtend(
     ListFromRange(0, 5000),
@@ -29,8 +29,8 @@ SELECT
             ) ?? FALSE
         ),
         AsTuple(
-            AsAtom("a"),
-            AsAtom("b"),
+            AsAtom('a'),
+            AsAtom('b'),
         )
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-multiply_limit_with_nulls_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-multiply_limit_with_nulls_/formatted.sql
index 5d4db48007..cda5f7fb8a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-multiply_limit_with_nulls_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-multiply_limit_with_nulls_/formatted.sql
@@ -3,13 +3,13 @@
 /* dq can not */
 /* dqfile can not */
 /* yt can not */
-PRAGMA warning("disable", "4510");
-PRAGMA warning("disable", "1108");
+PRAGMA warning('disable', '4510');
+PRAGMA warning('disable', '1108');
 
 SELECT
     YQL::RangeComputeFor(
         Struct<x: Uint32>,
         ($row) -> ($row.x IN ListFromRange(-1, 10001)),
-        AsTuple(AsAtom("x"))
+        AsTuple(AsAtom('x'))
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-norange_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-norange_/formatted.sql
index 5ed3573574..0bc9f1e7a2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-norange_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-norange_/formatted.sql
@@ -1,14 +1,14 @@
 /* syntax version 1 */
 /* postgres can not */
 /* yt can not */
-PRAGMA warning("disable", "4510");
+PRAGMA warning('disable', '4510');
 
 $opt_type = Struct<x: Int32?, y: Int32?, z: String?, t: String?>;
-$xy_keys = AsTuple(AsAtom("x"), AsAtom("y"));
+$xy_keys = AsTuple(AsAtom('x'), AsAtom('y'));
 $range_for = ($pred) -> (YQL::RangeComputeFor($opt_type, $pred, $xy_keys));
 $pred1 = ($row) -> (($row.x + $row.y > 0) ?? FALSE);
 $pred2 = ($row) -> (($row.x > 0 OR $row.y > 0) ?? FALSE);
-$pred3 = ($row) -> (($row.x > 0 OR $row.z == "test") ?? FALSE);
+$pred3 = ($row) -> (($row.x > 0 OR $row.z == 'test') ?? FALSE);
 
 SELECT
     $range_for($pred1) IS NULL,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-pg_compare_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-pg_compare_/formatted.sql
index ba17a93c14..426e581c96 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-pg_compare_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-pg_compare_/formatted.sql
@@ -3,15 +3,15 @@
 /* dq can not */
 /* dqfile can not */
 /* yt can not */
-PRAGMA warning("disable", "4510");
-PRAGMA warning("disable", "1108");
+PRAGMA warning('disable', '4510');
+PRAGMA warning('disable', '1108');
 
 -- a > 2
 SELECT
     YQL::RangeComputeFor(
         Struct<a: PgInt4, b: PgText>,
-        ($row) -> (FromPg(PgOp(">", $row.a, 2p)) ?? FALSE),
-        AsTuple(AsAtom("a"))
+        ($row) -> (FromPg(PgOp('>', $row.a, 2p)) ?? FALSE),
+        AsTuple(AsAtom('a'))
     )
 ;
 
@@ -20,7 +20,7 @@ SELECT
     YQL::RangeComputeFor(
         Struct<a: PgInt4, b: PgText>,
         ($row) -> (($row.a >= 2p) ?? FALSE),
-        AsTuple(AsAtom("a"))
+        AsTuple(AsAtom('a'))
     )
 ;
 
@@ -29,7 +29,7 @@ SELECT
     YQL::RangeComputeFor(
         Struct<a: PgInt4, b: PgText>,
         ($row) -> (('2'p > $row.b) ?? FALSE),
-        AsTuple(AsAtom("b"))
+        AsTuple(AsAtom('b'))
     )
 ;
 
@@ -37,7 +37,7 @@ SELECT
 SELECT
     YQL::RangeComputeFor(
         Struct<a: PgInt4, b: PgText>,
-        ($row) -> (FromPg(PgOp(">=", '2'p, $row.b)) ?? FALSE),
-        AsTuple(AsAtom("b"))
+        ($row) -> (FromPg(PgOp('>=', '2'p, $row.b)) ?? FALSE),
+        AsTuple(AsAtom('b'))
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-pg_equal_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-pg_equal_/formatted.sql
index 5ede2c2478..0569fb46ae 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-pg_equal_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-pg_equal_/formatted.sql
@@ -3,15 +3,15 @@
 /* dq can not */
 /* dqfile can not */
 /* yt can not */
-PRAGMA warning("disable", "4510");
-PRAGMA warning("disable", "1108");
+PRAGMA warning('disable', '4510');
+PRAGMA warning('disable', '1108');
 
 -- a != 2
 SELECT
     YQL::RangeComputeFor(
         Struct<a: PgFloat8, b: PgText>,
-        ($row) -> (FromPg(PgOp("<>", $row.a, 2.0pf8)) ?? FALSE),
-        AsTuple(AsAtom("a"))
+        ($row) -> (FromPg(PgOp('<>', $row.a, 2.0pf8)) ?? FALSE),
+        AsTuple(AsAtom('a'))
     )
 ;
 
@@ -20,6 +20,6 @@ SELECT
     YQL::RangeComputeFor(
         Struct<a: PgInt4, b: PgText>,
         ($row) -> (($row.b == 'foo'p) ?? FALSE),
-        AsTuple(AsAtom("b"))
+        AsTuple(AsAtom('b'))
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-pg_exists_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-pg_exists_/formatted.sql
index 5b2901dcad..106c38c790 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-pg_exists_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-pg_exists_/formatted.sql
@@ -3,14 +3,14 @@
 /* dq can not */
 /* dqfile can not */
 /* yt can not */
-PRAGMA warning("disable", "4510");
-PRAGMA warning("disable", "1108");
+PRAGMA warning('disable', '4510');
+PRAGMA warning('disable', '1108');
 
 SELECT
     YQL::RangeComputeFor(
         Struct<a: PgFloat8, b: PgText>,
         ($row) -> ($row.a IS NOT NULL),
-        AsTuple(AsAtom("a"))
+        AsTuple(AsAtom('a'))
     )
 ;
 
@@ -18,6 +18,6 @@ SELECT
     YQL::RangeComputeFor(
         Struct<a: PgInt4, b: PgText>,
         ($row) -> ($row.b IS NULL),
-        AsTuple(AsAtom("b"))
+        AsTuple(AsAtom('b'))
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-pg_sqlin_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-pg_sqlin_/formatted.sql
index 189d2c224b..d8f22933e0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-pg_sqlin_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-pg_sqlin_/formatted.sql
@@ -3,8 +3,8 @@
 /* dq can not */
 /* dqfile can not */
 /* yt can not */
-PRAGMA warning("disable", "4510");
-PRAGMA warning("disable", "1108");
+PRAGMA warning('disable', '4510');
+PRAGMA warning('disable', '1108');
 PRAGMA AnsiInForEmptyOrNullableItemsCollections;
 
 -- a != 2
@@ -12,7 +12,7 @@ SELECT
     YQL::RangeComputeFor(
         Struct<a: PgInt4, b: PgText>,
         ($row) -> (($row.a IN (3p, 2p, 1p)) ?? FALSE),
-        AsTuple(AsAtom("a"))
+        AsTuple(AsAtom('a'))
     )
 ;
 
@@ -21,6 +21,6 @@ SELECT
     YQL::RangeComputeFor(
         Struct<a: PgInt4, b: PgText>,
         ($row) -> (($row.b IN ('foo'p, 'bar'p, 'baz'p)) ?? FALSE),
-        AsTuple(AsAtom("b"))
+        AsTuple(AsAtom('b'))
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-pg_startswith_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-pg_startswith_/formatted.sql
index 5afabe157a..a316a09efd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-pg_startswith_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-pg_startswith_/formatted.sql
@@ -3,15 +3,15 @@
 /* dq can not */
 /* dqfile can not */
 /* yt can not */
-PRAGMA warning("disable", "4510");
-PRAGMA warning("disable", "1108");
+PRAGMA warning('disable', '4510');
+PRAGMA warning('disable', '1108');
 
 -- like 'aaaa'
 SELECT
     YQL::RangeComputeFor(
         Struct<a: PgInt4, b: PgText>,
         ($row) -> (StartsWith(FromPg($row.b), 'aaaa') ?? FALSE),
-        AsTuple(AsAtom("b"))
+        AsTuple(AsAtom('b'))
     )
 ;
 
@@ -20,7 +20,7 @@ SELECT
     YQL::RangeComputeFor(
         Struct<a: PgInt4, b: PgText>,
         ($row) -> (NOT (StartsWith(FromPg($row.b), 'aaaa') ?? TRUE)),
-        AsTuple(AsAtom("b"))
+        AsTuple(AsAtom('b'))
     )
 ;
 
@@ -29,7 +29,7 @@ SELECT
     YQL::RangeComputeFor(
         Struct<a: PgInt4, b: PgText>,
         ($row) -> (StartsWith(FromPg($row.b), 'a\xf5') ?? FALSE),
-        AsTuple(AsAtom("b"))
+        AsTuple(AsAtom('b'))
     )
 ;
 
@@ -38,6 +38,6 @@ SELECT
     YQL::RangeComputeFor(
         Struct<a: PgInt4, b: PgText>,
         ($row) -> (NOT (StartsWith(FromPg($row.b), 'a\xf5') ?? TRUE)),
-        AsTuple(AsAtom("b"))
+        AsTuple(AsAtom('b'))
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-preserve_rest_predicates_order_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-preserve_rest_predicates_order_/formatted.sql
index 6b1af5052b..581d224ab4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-preserve_rest_predicates_order_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-preserve_rest_predicates_order_/formatted.sql
@@ -1,19 +1,19 @@
 /* syntax version 1 */
 /* postgres can not */
 /* yt can not */
-PRAGMA warning("disable", "4510");
-PRAGMA warning("disable", "1108");
+PRAGMA warning('disable', '4510');
+PRAGMA warning('disable', '1108');
 
 SELECT
     YQL::RangeComputeFor(
         Struct<x: String, y: String, z: String>,
         ($row) -> (
-            ($row.x, $row.y, $row.z) > ("a", "b", "c")
-            AND ($row.x, $row.y, $row.z) < ("d", "e", "f")
-            AND $row.z IN AsList("t", "u", "v")
-            AND $row.y IN AsList("x", "y", "z")
+            ($row.x, $row.y, $row.z) > ('a', 'b', 'c')
+            AND ($row.x, $row.y, $row.z) < ('d', 'e', 'f')
+            AND $row.z IN AsList('t', 'u', 'v')
+            AND $row.y IN AsList('x', 'y', 'z')
             AND (len($row.z) == 1 OR len($row.z || 'x') == 2)
         ),
-        AsTuple(AsAtom("x"), AsAtom("y"), AsAtom("z"))
+        AsTuple(AsAtom('x'), AsAtom('y'), AsAtom('z'))
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-repeated_keyranges_in_and_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-repeated_keyranges_in_and_/formatted.sql
index 9fa4d7145d..4872b91897 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-repeated_keyranges_in_and_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-repeated_keyranges_in_and_/formatted.sql
@@ -1,8 +1,8 @@
 /* syntax version 1 */
 /* postgres can not */
 /* yt can not */
-PRAGMA warning("disable", "4510");
-PRAGMA warning("disable", "1108");
+PRAGMA warning('disable', '4510');
+PRAGMA warning('disable', '1108');
 
 SELECT
     YQL::RangeComputeFor(
@@ -13,6 +13,6 @@ SELECT
                 OR $row.y == 2 AND $row.z > 8 AND $row.z < 20
             )
         ),
-        AsTuple(AsAtom("x"), AsAtom("y"), AsAtom("z"))
+        AsTuple(AsAtom('x'), AsAtom('y'), AsAtom('z'))
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-startswith_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-startswith_/formatted.sql
index 27cf973471..bcee75af3c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-startswith_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-startswith_/formatted.sql
@@ -3,14 +3,14 @@
 /* dq can not */
 /* dqfile can not */
 /* yt can not */
-PRAGMA warning("disable", "4510");
+PRAGMA warning('disable', '4510');
 
 -- string/string
 SELECT
     YQL::RangeComputeFor(
         Struct<x: String>,
         ($row) -> (StartsWith($row.x, 'foo')),
-        AsTuple(AsAtom("x"))
+        AsTuple(AsAtom('x'))
     )
 ;
 
@@ -18,7 +18,7 @@ SELECT
     YQL::RangeComputeFor(
         Struct<x: String>,
         ($row) -> (NOT StartsWith($row.x, 'foo')),
-        AsTuple(AsAtom("x"))
+        AsTuple(AsAtom('x'))
     )
 ;
 
@@ -26,7 +26,7 @@ SELECT
     YQL::RangeComputeFor(
         Struct<x: String>,
         ($row) -> (StartsWith($row.x, '\xff\xff')),
-        AsTuple(AsAtom("x"))
+        AsTuple(AsAtom('x'))
     )
 ;
 
@@ -34,7 +34,7 @@ SELECT
     YQL::RangeComputeFor(
         Struct<x: String>,
         ($row) -> (NOT StartsWith($row.x, '\xff\xff')),
-        AsTuple(AsAtom("x"))
+        AsTuple(AsAtom('x'))
     )
 ;
 
@@ -43,7 +43,7 @@ SELECT
     YQL::RangeComputeFor(
         Struct<x: String?>,
         ($row) -> ((NOT StartsWith($row.x, 'foo')) ?? FALSE),
-        AsTuple(AsAtom("x"))
+        AsTuple(AsAtom('x'))
     )
 ;
 
@@ -52,7 +52,7 @@ SELECT
     YQL::RangeComputeFor(
         Struct<x: String?>,
         ($row) -> (StartsWith($row.x, if(1 > 2, 'void')) ?? FALSE),
-        AsTuple(AsAtom("x"))
+        AsTuple(AsAtom('x'))
     )
 ;
 
@@ -61,7 +61,7 @@ SELECT
     YQL::RangeComputeFor(
         Struct<x: Utf8>,
         ($row) -> (StartsWith($row.x, 'тест')),
-        AsTuple(AsAtom("x"))
+        AsTuple(AsAtom('x'))
     )
 ;
 
@@ -69,7 +69,7 @@ SELECT
     YQL::RangeComputeFor(
         Struct<x: Utf8>,
         ($row) -> (StartsWith($row.x, 'тест\xf5')),
-        AsTuple(AsAtom("x"))
+        AsTuple(AsAtom('x'))
     )
 ;
 
@@ -78,7 +78,7 @@ SELECT
     YQL::RangeComputeFor(
         Struct<x: Utf8?>,
         ($row) -> ((NOT StartsWith($row.x, 'тест'u)) ?? FALSE),
-        AsTuple(AsAtom("x"))
+        AsTuple(AsAtom('x'))
     )
 ;
 
@@ -86,7 +86,7 @@ SELECT
     YQL::RangeComputeFor(
         Struct<x: Utf8?>,
         ($row) -> (StartsWith($row.x, '\xf4\x8f\xbf\xbf'u) ?? FALSE),
-        AsTuple(AsAtom("x"))
+        AsTuple(AsAtom('x'))
     )
 ;
 
@@ -95,6 +95,6 @@ SELECT
     YQL::RangeComputeFor(
         Struct<x: Utf8?>,
         ($row) -> ((NOT StartsWith($row.x, 'тест\xf5')) ?? FALSE),
-        AsTuple(AsAtom("x"))
+        AsTuple(AsAtom('x'))
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-tuples_compare_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-tuples_compare_/formatted.sql
index cbab4b582d..3e1f62aba8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-tuples_compare_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-tuples_compare_/formatted.sql
@@ -1,10 +1,10 @@
 /* syntax version 1 */
 /* postgres can not */
 /* yt can not */
-PRAGMA warning("disable", "4510");
+PRAGMA warning('disable', '4510');
 
 $type = Struct<x: Int32, y: Int32, z: Int32>;
-$keys = AsTuple(AsAtom("x"), AsAtom("y"), AsAtom("z"));
+$keys = AsTuple(AsAtom('x'), AsAtom('y'), AsAtom('z'));
 $range_for = ($pred) -> (YQL::RangeComputeFor($type, $pred, $keys));
 $pred1 = ($row) -> (($row.x, $row.y, $row.z) >= (11, 22, 33));
 $pred2 = ($row) -> (($row.x, $row.y, $row.z) > (11, 22, 33));
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-tztypes_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-tztypes_/formatted.sql
index 1245226a19..98d2b5aa72 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-tztypes_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-tztypes_/formatted.sql
@@ -1,14 +1,14 @@
 /* syntax version 1 */
 /* postgres can not */
 /* yt can not */
-PRAGMA warning("disable", "4510");
+PRAGMA warning('disable', '4510');
 
 -- ==
 SELECT
     YQL::RangeComputeFor(
         Struct<x: TzDate>,
         ($row) -> ($row.x == TzDate('2000-01-01,Europe/Moscow')),
-        AsTuple(AsAtom("x"))
+        AsTuple(AsAtom('x'))
     )
 ;
 
@@ -17,7 +17,7 @@ SELECT
     YQL::RangeComputeFor(
         Struct<x: TzDate>,
         ($row) -> ($row.x != TzDate('2000-01-01,Europe/Moscow')),
-        AsTuple(AsAtom("x"))
+        AsTuple(AsAtom('x'))
     )
 ;
 
@@ -26,7 +26,7 @@ SELECT
     YQL::RangeComputeFor(
         Struct<x: TzDatetime>,
         ($row) -> ($row.x > TzDatetime('2000-01-01T00:00:00,Europe/Moscow')),
-        AsTuple(AsAtom("x"))
+        AsTuple(AsAtom('x'))
     )
 ;
 
@@ -35,7 +35,7 @@ SELECT
     YQL::RangeComputeFor(
         Struct<x: TzDatetime>,
         ($row) -> ($row.x >= TzDatetime('2000-01-01T00:00:00,Europe/Moscow')),
-        AsTuple(AsAtom("x"))
+        AsTuple(AsAtom('x'))
     )
 ;
 
@@ -44,7 +44,7 @@ SELECT
     YQL::RangeComputeFor(
         Struct<x: TzTimestamp>,
         ($row) -> ($row.x < TzTimestamp('2000-01-01T00:00:00.000000,Europe/Moscow')),
-        AsTuple(AsAtom("x"))
+        AsTuple(AsAtom('x'))
     )
 ;
 
@@ -53,6 +53,6 @@ SELECT
     YQL::RangeComputeFor(
         Struct<x: TzTimestamp>,
         ($row) -> ($row.x <= TzTimestamp('2000-01-01T00:00:00.000000,Europe/Moscow')),
-        AsTuple(AsAtom("x"))
+        AsTuple(AsAtom('x'))
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-yql-12941_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-yql-12941_/formatted.sql
index 8b7643cb38..87292660d2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-yql-12941_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-yql-12941_/formatted.sql
@@ -1,10 +1,10 @@
 /* syntax version 1 */
 /* postgres can not */
 /* yt can not */
-PRAGMA warning("disable", "4510");
+PRAGMA warning('disable', '4510');
 
 $opt_type = Struct<x: UInt32?, y: Int32?>;
-$xy_keys = AsTuple(AsAtom("x"), AsAtom("y"));
+$xy_keys = AsTuple(AsAtom('x'), AsAtom('y'));
 $range_for = ($pred) -> (YQL::RangeComputeFor($opt_type, $pred, $xy_keys));
 $pred1 = ($row) -> (($row.x == 3u AND ($row.y > 300 OR $row.y == 100)) ?? FALSE);
 $pred2 = ($row) -> (($row.y > 300 AND $row.x == 3u OR $row.x == 3u AND $row.y == 100) ?? FALSE);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-yql-13489_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-yql-13489_/formatted.sql
index 737fece90e..4710ef8937 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-yql-13489_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-yql-13489_/formatted.sql
@@ -1,13 +1,13 @@
 /* syntax version 1 */
 /* postgres can not */
 /* yt can not */
-PRAGMA warning("disable", "4510");
+PRAGMA warning('disable', '4510');
 
 SELECT
     YQL::RangeComputeFor(
         Struct<x: Int32, y: Int32>,
         ($row) -> ($row.x > 2 OR ($row.x == 2 AND $row.y >= 10) OR ($row.x == 0 AND $row.y < 10)),
-        AsTuple(AsAtom("x"))
+        AsTuple(AsAtom('x'))
     )
 ;
 
@@ -15,6 +15,6 @@ SELECT
     YQL::RangeComputeFor(
         Struct<x: Int32, y: Int32>,
         ($row) -> (($row.x > 10 AND $row.y > 1) OR $row.x < 5),
-        AsTuple(AsAtom("x"), AsAtom("y"))
+        AsTuple(AsAtom('x'), AsAtom('y'))
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-const_body_diff_lambda_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-const_body_diff_lambda_/formatted.sql
index cad7187136..91b9e653df 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-const_body_diff_lambda_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-const_body_diff_lambda_/formatted.sql
@@ -6,7 +6,7 @@ SELECT
             }
         ),
         ListMap(
-            AsList("foo", "bar"), ($_x) -> {
+            AsList('foo', 'bar'), ($_x) -> {
                 RETURN 3 + 4;
             }
         )
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-yql-7237_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-yql-7237_/formatted.sql
index f955ab1659..e10c40fa3d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-yql-7237_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-yql-7237_/formatted.sql
@@ -2,7 +2,7 @@
 USE plato;
 
 $push_final_data = AsList(
-    AsStruct("manufacturer" AS manufacturer, "state" AS state)
+    AsStruct('manufacturer' AS manufacturer, 'state' AS state)
 );
 
 INSERT INTO @push_final
@@ -17,16 +17,16 @@ COMMIT;
 $manufacturer_name_fix = ($manufacturer) -> {
     $lowered_manufacturer = CAST(Unicode::ToLower(CAST(String::Strip($manufacturer) AS Utf8)) AS String);
     $in = AsList(
-        "oysters", -- bullshit in naming
-        "qumo", -- bullshit in naming
-        "texet", -- bullshit in naming
-        "alcatel", -- bullshit in naming
-        "dexp", -- bullshit in naming
-        "haier", -- bullshit in naming
-        "dexp", -- bullshit in naming
-        "asus", -- ASUSTek Computer Inc & ASUS both usable
-        "yota", -- Yota Devices & Yota Devices Limited ...
-        "ark" -- "ark" & "ark electronic technology" & "ark_electronic_technology"
+        'oysters', -- bullshit in naming
+        'qumo', -- bullshit in naming
+        'texet', -- bullshit in naming
+        'alcatel', -- bullshit in naming
+        'dexp', -- bullshit in naming
+        'haier', -- bullshit in naming
+        'dexp', -- bullshit in naming
+        'asus', -- ASUSTek Computer Inc & ASUS both usable
+        'yota', -- Yota Devices & Yota Devices Limited ...
+        'ark' -- "ark" & "ark electronic technology" & "ark_electronic_technology"
     );
     $lambda = ($substring) -> {
         RETURN FIND($lowered_manufacturer, $substring) IS NULL;
@@ -60,7 +60,7 @@ $push_final_preprocessing = (
 );
 
 SELECT
-    COALESCE(fixed_manufacturer, "other") AS manufacturer,
+    COALESCE(fixed_manufacturer, 'other') AS manufacturer,
     L.*
 WITHOUT
     L.manufacturer
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_arithmetic_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_arithmetic_/formatted.sql
index 5623a07960..909e03c71d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_arithmetic_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_arithmetic_/formatted.sql
@@ -1,72 +1,72 @@
 /* postgres can not */
 SELECT
-    CAST(date("1970-01-02") - date("1970-01-01") AS string)
+    CAST(date('1970-01-02') - date('1970-01-01') AS string)
 ;
 
 SELECT
-    CAST(date("1970-01-01") + interval("P1D") AS string)
+    CAST(date('1970-01-01') + interval('P1D') AS string)
 ;
 
 SELECT
-    CAST(interval("P1D") + date("1970-01-01") AS string)
+    CAST(interval('P1D') + date('1970-01-01') AS string)
 ;
 
 SELECT
-    CAST(date("1970-01-02") - interval("P1D") AS string)
+    CAST(date('1970-01-02') - interval('P1D') AS string)
 ;
 
 SELECT
-    CAST(datetime("1970-01-02T00:00:00Z") - datetime("1970-01-01T00:00:00Z") AS string)
+    CAST(datetime('1970-01-02T00:00:00Z') - datetime('1970-01-01T00:00:00Z') AS string)
 ;
 
 SELECT
-    CAST(datetime("1970-01-01T00:00:00Z") + interval("P1D") AS string)
+    CAST(datetime('1970-01-01T00:00:00Z') + interval('P1D') AS string)
 ;
 
 SELECT
-    CAST(interval("P1D") + datetime("1970-01-01T00:00:00Z") AS string)
+    CAST(interval('P1D') + datetime('1970-01-01T00:00:00Z') AS string)
 ;
 
 SELECT
-    CAST(datetime("1970-01-02T00:00:00Z") - interval("P1D") AS string)
+    CAST(datetime('1970-01-02T00:00:00Z') - interval('P1D') AS string)
 ;
 
 SELECT
-    CAST(timestamp("1970-01-02T00:00:00.6Z") - timestamp("1970-01-01T00:00:00.3Z") AS string)
+    CAST(timestamp('1970-01-02T00:00:00.6Z') - timestamp('1970-01-01T00:00:00.3Z') AS string)
 ;
 
 SELECT
-    CAST(timestamp("1970-01-01T00:00:00.6Z") + interval("P1D") AS string)
+    CAST(timestamp('1970-01-01T00:00:00.6Z') + interval('P1D') AS string)
 ;
 
 SELECT
-    CAST(interval("P1D") + timestamp("1970-01-01T00:00:00.6Z") AS string)
+    CAST(interval('P1D') + timestamp('1970-01-01T00:00:00.6Z') AS string)
 ;
 
 SELECT
-    CAST(timestamp("1970-01-02T00:00:00.6Z") - interval("P1D") AS string)
+    CAST(timestamp('1970-01-02T00:00:00.6Z') - interval('P1D') AS string)
 ;
 
 SELECT
-    CAST(interval("P1D") + interval("P1D") AS string)
+    CAST(interval('P1D') + interval('P1D') AS string)
 ;
 
 SELECT
-    CAST(interval("P1D") - interval("P1D") AS string)
+    CAST(interval('P1D') - interval('P1D') AS string)
 ;
 
 SELECT
-    CAST(interval("P1D") * 2l AS string)
+    CAST(interval('P1D') * 2l AS string)
 ;
 
 SELECT
-    CAST(2u * interval("P1D") AS string)
+    CAST(2u * interval('P1D') AS string)
 ;
 
 SELECT
-    CAST(interval("P1D") / 2 AS string)
+    CAST(interval('P1D') / 2 AS string)
 ;
 
 SELECT
-    CAST(interval("P1D") / 0ut AS string)
+    CAST(interval('P1D') / 0ut AS string)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_bitcast_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_bitcast_/formatted.sql
index 292377406b..1c9b6f5c8f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_bitcast_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_bitcast_/formatted.sql
@@ -1,128 +1,128 @@
 /* postgres can not */
 SELECT
-    BITCAST(Yql::Date(AsAtom("1")) AS Uint8)
+    BITCAST(Yql::Date(AsAtom('1')) AS Uint8)
 ;
 
 SELECT
-    BITCAST(Yql::Date(AsAtom("1")) AS Int8)
+    BITCAST(Yql::Date(AsAtom('1')) AS Int8)
 ;
 
 SELECT
-    BITCAST(Yql::Date(AsAtom("1")) AS Uint16)
+    BITCAST(Yql::Date(AsAtom('1')) AS Uint16)
 ;
 
 SELECT
-    BITCAST(Yql::Date(AsAtom("1")) AS Int16)
+    BITCAST(Yql::Date(AsAtom('1')) AS Int16)
 ;
 
 SELECT
-    BITCAST(Yql::Date(AsAtom("1")) AS Uint32)
+    BITCAST(Yql::Date(AsAtom('1')) AS Uint32)
 ;
 
 SELECT
-    BITCAST(Yql::Date(AsAtom("1")) AS Int32)
+    BITCAST(Yql::Date(AsAtom('1')) AS Int32)
 ;
 
 SELECT
-    BITCAST(Yql::Date(AsAtom("1")) AS Uint64)
+    BITCAST(Yql::Date(AsAtom('1')) AS Uint64)
 ;
 
 SELECT
-    BITCAST(Yql::Date(AsAtom("1")) AS Int64)
+    BITCAST(Yql::Date(AsAtom('1')) AS Int64)
 ;
 
 SELECT
-    BITCAST(Yql::Datetime(AsAtom("1")) AS Uint8)
+    BITCAST(Yql::Datetime(AsAtom('1')) AS Uint8)
 ;
 
 SELECT
-    BITCAST(Yql::Datetime(AsAtom("1")) AS Int8)
+    BITCAST(Yql::Datetime(AsAtom('1')) AS Int8)
 ;
 
 SELECT
-    BITCAST(Yql::Datetime(AsAtom("1")) AS Uint16)
+    BITCAST(Yql::Datetime(AsAtom('1')) AS Uint16)
 ;
 
 SELECT
-    BITCAST(Yql::Datetime(AsAtom("1")) AS Int16)
+    BITCAST(Yql::Datetime(AsAtom('1')) AS Int16)
 ;
 
 SELECT
-    BITCAST(Yql::Datetime(AsAtom("1")) AS Uint32)
+    BITCAST(Yql::Datetime(AsAtom('1')) AS Uint32)
 ;
 
 SELECT
-    BITCAST(Yql::Datetime(AsAtom("1")) AS Int32)
+    BITCAST(Yql::Datetime(AsAtom('1')) AS Int32)
 ;
 
 SELECT
-    BITCAST(Yql::Datetime(AsAtom("1")) AS Uint64)
+    BITCAST(Yql::Datetime(AsAtom('1')) AS Uint64)
 ;
 
 SELECT
-    BITCAST(Yql::Datetime(AsAtom("1")) AS Int64)
+    BITCAST(Yql::Datetime(AsAtom('1')) AS Int64)
 ;
 
 SELECT
-    BITCAST(Yql::Timestamp(AsAtom("1")) AS Uint8)
+    BITCAST(Yql::Timestamp(AsAtom('1')) AS Uint8)
 ;
 
 SELECT
-    BITCAST(Yql::Timestamp(AsAtom("1")) AS Int8)
+    BITCAST(Yql::Timestamp(AsAtom('1')) AS Int8)
 ;
 
 SELECT
-    BITCAST(Yql::Timestamp(AsAtom("1")) AS Uint16)
+    BITCAST(Yql::Timestamp(AsAtom('1')) AS Uint16)
 ;
 
 SELECT
-    BITCAST(Yql::Timestamp(AsAtom("1")) AS Int16)
+    BITCAST(Yql::Timestamp(AsAtom('1')) AS Int16)
 ;
 
 SELECT
-    BITCAST(Yql::Timestamp(AsAtom("1")) AS Uint32)
+    BITCAST(Yql::Timestamp(AsAtom('1')) AS Uint32)
 ;
 
 SELECT
-    BITCAST(Yql::Timestamp(AsAtom("1")) AS Int32)
+    BITCAST(Yql::Timestamp(AsAtom('1')) AS Int32)
 ;
 
 SELECT
-    BITCAST(Yql::Timestamp(AsAtom("1")) AS Uint64)
+    BITCAST(Yql::Timestamp(AsAtom('1')) AS Uint64)
 ;
 
 SELECT
-    BITCAST(Yql::Timestamp(AsAtom("1")) AS Int64)
+    BITCAST(Yql::Timestamp(AsAtom('1')) AS Int64)
 ;
 
 SELECT
-    BITCAST(Yql::Interval(AsAtom("1")) AS Uint8)
+    BITCAST(Yql::Interval(AsAtom('1')) AS Uint8)
 ;
 
 SELECT
-    BITCAST(Yql::Interval(AsAtom("1")) AS Int8)
+    BITCAST(Yql::Interval(AsAtom('1')) AS Int8)
 ;
 
 SELECT
-    BITCAST(Yql::Interval(AsAtom("1")) AS Uint16)
+    BITCAST(Yql::Interval(AsAtom('1')) AS Uint16)
 ;
 
 SELECT
-    BITCAST(Yql::Interval(AsAtom("1")) AS Int16)
+    BITCAST(Yql::Interval(AsAtom('1')) AS Int16)
 ;
 
 SELECT
-    BITCAST(Yql::Interval(AsAtom("1")) AS Uint32)
+    BITCAST(Yql::Interval(AsAtom('1')) AS Uint32)
 ;
 
 SELECT
-    BITCAST(Yql::Interval(AsAtom("1")) AS Int32)
+    BITCAST(Yql::Interval(AsAtom('1')) AS Int32)
 ;
 
 SELECT
-    BITCAST(Yql::Interval(AsAtom("1")) AS Uint64)
+    BITCAST(Yql::Interval(AsAtom('1')) AS Uint64)
 ;
 
 SELECT
-    BITCAST(Yql::Interval(AsAtom("1")) AS Int64)
+    BITCAST(Yql::Interval(AsAtom('1')) AS Int64)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_cast_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_cast_/formatted.sql
index 0c6adf0dbc..410eed8ce9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_cast_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_cast_/formatted.sql
@@ -1,82 +1,82 @@
 /* postgres can not */
 SELECT
-    CAST(Yql::Date(AsAtom("1")) AS Uint8)
+    CAST(Yql::Date(AsAtom('1')) AS Uint8)
 ;
 
 SELECT
-    CAST(Yql::Date(AsAtom("1")) AS Uint32)
+    CAST(Yql::Date(AsAtom('1')) AS Uint32)
 ;
 
 SELECT
-    CAST(Yql::Date(AsAtom("1")) AS Int32)
+    CAST(Yql::Date(AsAtom('1')) AS Int32)
 ;
 
 SELECT
-    CAST(Yql::Date(AsAtom("1")) AS Uint64)
+    CAST(Yql::Date(AsAtom('1')) AS Uint64)
 ;
 
 SELECT
-    CAST(Yql::Date(AsAtom("1")) AS Int64)
+    CAST(Yql::Date(AsAtom('1')) AS Int64)
 ;
 
 SELECT
-    CAST(Yql::Datetime(AsAtom("1")) AS Uint8)
+    CAST(Yql::Datetime(AsAtom('1')) AS Uint8)
 ;
 
 SELECT
-    CAST(Yql::Datetime(AsAtom("1")) AS Uint32)
+    CAST(Yql::Datetime(AsAtom('1')) AS Uint32)
 ;
 
 SELECT
-    CAST(Yql::Datetime(AsAtom("1")) AS Int32)
+    CAST(Yql::Datetime(AsAtom('1')) AS Int32)
 ;
 
 SELECT
-    CAST(Yql::Datetime(AsAtom("1")) AS Uint64)
+    CAST(Yql::Datetime(AsAtom('1')) AS Uint64)
 ;
 
 SELECT
-    CAST(Yql::Datetime(AsAtom("1")) AS Int64)
+    CAST(Yql::Datetime(AsAtom('1')) AS Int64)
 ;
 
 SELECT
-    CAST(Yql::Timestamp(AsAtom("1")) AS Uint8)
+    CAST(Yql::Timestamp(AsAtom('1')) AS Uint8)
 ;
 
 SELECT
-    CAST(Yql::Timestamp(AsAtom("1")) AS Uint32)
+    CAST(Yql::Timestamp(AsAtom('1')) AS Uint32)
 ;
 
 SELECT
-    CAST(Yql::Timestamp(AsAtom("1")) AS Int32)
+    CAST(Yql::Timestamp(AsAtom('1')) AS Int32)
 ;
 
 SELECT
-    CAST(Yql::Timestamp(AsAtom("1")) AS Uint64)
+    CAST(Yql::Timestamp(AsAtom('1')) AS Uint64)
 ;
 
 SELECT
-    CAST(Yql::Timestamp(AsAtom("1")) AS Int64)
+    CAST(Yql::Timestamp(AsAtom('1')) AS Int64)
 ;
 
 SELECT
-    CAST(Yql::Interval(AsAtom("1")) AS Uint8)
+    CAST(Yql::Interval(AsAtom('1')) AS Uint8)
 ;
 
 SELECT
-    CAST(Yql::Interval(AsAtom("1")) AS Uint32)
+    CAST(Yql::Interval(AsAtom('1')) AS Uint32)
 ;
 
 SELECT
-    CAST(Yql::Interval(AsAtom("1")) AS Int32)
+    CAST(Yql::Interval(AsAtom('1')) AS Int32)
 ;
 
 SELECT
-    CAST(Yql::Interval(AsAtom("1")) AS Uint64)
+    CAST(Yql::Interval(AsAtom('1')) AS Uint64)
 ;
 
 SELECT
-    CAST(Yql::Interval(AsAtom("1")) AS Int64)
+    CAST(Yql::Interval(AsAtom('1')) AS Int64)
 ;
 
 SELECT
@@ -113,83 +113,83 @@ SELECT
 
 /* postgres can not */
 SELECT
-    CAST(Yql::Date(AsAtom("1")) AS Uint8)
+    CAST(Yql::Date(AsAtom('1')) AS Uint8)
 ;
 
 SELECT
-    CAST(Yql::Date(AsAtom("1")) AS Uint32)
+    CAST(Yql::Date(AsAtom('1')) AS Uint32)
 ;
 
 SELECT
-    CAST(Yql::Date(AsAtom("1")) AS Int32)
+    CAST(Yql::Date(AsAtom('1')) AS Int32)
 ;
 
 SELECT
-    CAST(Yql::Date(AsAtom("1")) AS Uint64)
+    CAST(Yql::Date(AsAtom('1')) AS Uint64)
 ;
 
 SELECT
-    CAST(Yql::Date(AsAtom("1")) AS Int64)
+    CAST(Yql::Date(AsAtom('1')) AS Int64)
 ;
 
 SELECT
-    CAST(Yql::Datetime(AsAtom("1")) AS Uint8)
+    CAST(Yql::Datetime(AsAtom('1')) AS Uint8)
 ;
 
 SELECT
-    CAST(Yql::Datetime(AsAtom("1")) AS Uint32)
+    CAST(Yql::Datetime(AsAtom('1')) AS Uint32)
 ;
 
 SELECT
-    CAST(Yql::Datetime(AsAtom("1")) AS Int32)
+    CAST(Yql::Datetime(AsAtom('1')) AS Int32)
 ;
 
 SELECT
-    CAST(Yql::Datetime(AsAtom("1")) AS Uint64)
+    CAST(Yql::Datetime(AsAtom('1')) AS Uint64)
 ;
 
 SELECT
-    CAST(Yql::Datetime(AsAtom("1")) AS Int64)
+    CAST(Yql::Datetime(AsAtom('1')) AS Int64)
 ;
 
 SELECT
-    CAST(Yql::Timestamp(AsAtom("1")) AS Uint8)
+    CAST(Yql::Timestamp(AsAtom('1')) AS Uint8)
 ;
 
 SELECT
-    CAST(Yql::Timestamp(AsAtom("1")) AS Uint32)
+    CAST(Yql::Timestamp(AsAtom('1')) AS Uint32)
 ;
 
 SELECT
-    CAST(Yql::Timestamp(AsAtom("1")) AS Int32)
+    CAST(Yql::Timestamp(AsAtom('1')) AS Int32)
 ;
 
 SELECT
-    CAST(Yql::Timestamp(AsAtom("1")) AS Uint64)
+    CAST(Yql::Timestamp(AsAtom('1')) AS Uint64)
 ;
 
 SELECT
-    CAST(Yql::Timestamp(AsAtom("1")) AS Int64)
+    CAST(Yql::Timestamp(AsAtom('1')) AS Int64)
 ;
 
 SELECT
-    CAST(Yql::Interval(AsAtom("1")) AS Uint8)
+    CAST(Yql::Interval(AsAtom('1')) AS Uint8)
 ;
 
 SELECT
-    CAST(Yql::Interval(AsAtom("1")) AS Uint32)
+    CAST(Yql::Interval(AsAtom('1')) AS Uint32)
 ;
 
 SELECT
-    CAST(Yql::Interval(AsAtom("1")) AS Int32)
+    CAST(Yql::Interval(AsAtom('1')) AS Int32)
 ;
 
 SELECT
-    CAST(Yql::Interval(AsAtom("1")) AS Uint64)
+    CAST(Yql::Interval(AsAtom('1')) AS Uint64)
 ;
 
 SELECT
-    CAST(Yql::Interval(AsAtom("1")) AS Int64)
+    CAST(Yql::Interval(AsAtom('1')) AS Int64)
 ;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_convert_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_convert_/formatted.sql
index f901eef852..108e6642ad 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_convert_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_convert_/formatted.sql
@@ -1,80 +1,80 @@
 /* postgres can not */
 SELECT
-    Yql::Convert(Yql::Date(AsAtom("1")), AsAtom("Uint8"))
+    Yql::Convert(Yql::Date(AsAtom('1')), AsAtom('Uint8'))
 ;
 
 SELECT
-    Yql::Convert(Yql::Date(AsAtom("1")), AsAtom("Uint32"))
+    Yql::Convert(Yql::Date(AsAtom('1')), AsAtom('Uint32'))
 ;
 
 SELECT
-    Yql::Convert(Yql::Date(AsAtom("1")), AsAtom("Int32"))
+    Yql::Convert(Yql::Date(AsAtom('1')), AsAtom('Int32'))
 ;
 
 SELECT
-    Yql::Convert(Yql::Date(AsAtom("1")), AsAtom("Uint64"))
+    Yql::Convert(Yql::Date(AsAtom('1')), AsAtom('Uint64'))
 ;
 
 SELECT
-    Yql::Convert(Yql::Date(AsAtom("1")), AsAtom("Int64"))
+    Yql::Convert(Yql::Date(AsAtom('1')), AsAtom('Int64'))
 ;
 
 SELECT
-    Yql::Convert(Yql::Datetime(AsAtom("1")), AsAtom("Uint8"))
+    Yql::Convert(Yql::Datetime(AsAtom('1')), AsAtom('Uint8'))
 ;
 
 SELECT
-    Yql::Convert(Yql::Datetime(AsAtom("1")), AsAtom("Uint32"))
+    Yql::Convert(Yql::Datetime(AsAtom('1')), AsAtom('Uint32'))
 ;
 
 SELECT
-    Yql::Convert(Yql::Datetime(AsAtom("1")), AsAtom("Int32"))
+    Yql::Convert(Yql::Datetime(AsAtom('1')), AsAtom('Int32'))
 ;
 
 SELECT
-    Yql::Convert(Yql::Datetime(AsAtom("1")), AsAtom("Uint64"))
+    Yql::Convert(Yql::Datetime(AsAtom('1')), AsAtom('Uint64'))
 ;
 
 SELECT
-    Yql::Convert(Yql::Datetime(AsAtom("1")), AsAtom("Int64"))
+    Yql::Convert(Yql::Datetime(AsAtom('1')), AsAtom('Int64'))
 ;
 
 SELECT
-    Yql::Convert(Yql::Timestamp(AsAtom("1")), AsAtom("Uint8"))
+    Yql::Convert(Yql::Timestamp(AsAtom('1')), AsAtom('Uint8'))
 ;
 
 SELECT
-    Yql::Convert(Yql::Timestamp(AsAtom("1")), AsAtom("Uint32"))
+    Yql::Convert(Yql::Timestamp(AsAtom('1')), AsAtom('Uint32'))
 ;
 
 SELECT
-    Yql::Convert(Yql::Timestamp(AsAtom("1")), AsAtom("Int32"))
+    Yql::Convert(Yql::Timestamp(AsAtom('1')), AsAtom('Int32'))
 ;
 
 SELECT
-    Yql::Convert(Yql::Timestamp(AsAtom("1")), AsAtom("Uint64"))
+    Yql::Convert(Yql::Timestamp(AsAtom('1')), AsAtom('Uint64'))
 ;
 
 SELECT
-    Yql::Convert(Yql::Timestamp(AsAtom("1")), AsAtom("Int64"))
+    Yql::Convert(Yql::Timestamp(AsAtom('1')), AsAtom('Int64'))
 ;
 
 SELECT
-    Yql::Convert(Yql::Interval(AsAtom("1")), AsAtom("Uint8"))
+    Yql::Convert(Yql::Interval(AsAtom('1')), AsAtom('Uint8'))
 ;
 
 SELECT
-    Yql::Convert(Yql::Interval(AsAtom("1")), AsAtom("Uint32"))
+    Yql::Convert(Yql::Interval(AsAtom('1')), AsAtom('Uint32'))
 ;
 
 SELECT
-    Yql::Convert(Yql::Interval(AsAtom("1")), AsAtom("Int32"))
+    Yql::Convert(Yql::Interval(AsAtom('1')), AsAtom('Int32'))
 ;
 
 SELECT
-    Yql::Convert(Yql::Interval(AsAtom("1")), AsAtom("Uint64"))
+    Yql::Convert(Yql::Interval(AsAtom('1')), AsAtom('Uint64'))
 ;
 
 SELECT
-    Yql::Convert(Yql::Interval(AsAtom("1")), AsAtom("Int64"))
+    Yql::Convert(Yql::Interval(AsAtom('1')), AsAtom('Int64'))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_diff_compare_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_diff_compare_/formatted.sql
index e02978dc71..724b79f16d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_diff_compare_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_diff_compare_/formatted.sql
@@ -1,72 +1,72 @@
 /* postgres can not */
 SELECT
-    Date("2001-01-01") == Datetime("2001-01-01T00:00:00Z")
+    Date('2001-01-01') == Datetime('2001-01-01T00:00:00Z')
 ;
 
 SELECT
-    Date("2001-01-01") == Timestamp("2001-01-01T00:00:00Z")
+    Date('2001-01-01') == Timestamp('2001-01-01T00:00:00Z')
 ;
 
 SELECT
-    Datetime("2001-01-01T00:00:00Z") == Timestamp("2001-01-01T00:00:00Z")
+    Datetime('2001-01-01T00:00:00Z') == Timestamp('2001-01-01T00:00:00Z')
 ;
 
 SELECT
-    Date("2001-01-01") != Datetime("2001-01-01T00:00:00Z")
+    Date('2001-01-01') != Datetime('2001-01-01T00:00:00Z')
 ;
 
 SELECT
-    Date("2001-01-01") != Timestamp("2001-01-01T00:00:00Z")
+    Date('2001-01-01') != Timestamp('2001-01-01T00:00:00Z')
 ;
 
 SELECT
-    Datetime("2001-01-01T00:00:00Z") != Timestamp("2001-01-01T00:00:00Z")
+    Datetime('2001-01-01T00:00:00Z') != Timestamp('2001-01-01T00:00:00Z')
 ;
 
 SELECT
-    Date("2001-01-01") < Datetime("2001-01-01T00:00:00Z")
+    Date('2001-01-01') < Datetime('2001-01-01T00:00:00Z')
 ;
 
 SELECT
-    Date("2001-01-01") < Timestamp("2001-01-01T00:00:00Z")
+    Date('2001-01-01') < Timestamp('2001-01-01T00:00:00Z')
 ;
 
 SELECT
-    Datetime("2001-01-01T00:00:00Z") < Timestamp("2001-01-01T00:00:00Z")
+    Datetime('2001-01-01T00:00:00Z') < Timestamp('2001-01-01T00:00:00Z')
 ;
 
 SELECT
-    Date("2001-01-01") <= Datetime("2001-01-01T00:00:00Z")
+    Date('2001-01-01') <= Datetime('2001-01-01T00:00:00Z')
 ;
 
 SELECT
-    Date("2001-01-01") <= Timestamp("2001-01-01T00:00:00Z")
+    Date('2001-01-01') <= Timestamp('2001-01-01T00:00:00Z')
 ;
 
 SELECT
-    Datetime("2001-01-01T00:00:00Z") <= Timestamp("2001-01-01T00:00:00Z")
+    Datetime('2001-01-01T00:00:00Z') <= Timestamp('2001-01-01T00:00:00Z')
 ;
 
 SELECT
-    Date("2001-01-01") > Datetime("2001-01-01T00:00:00Z")
+    Date('2001-01-01') > Datetime('2001-01-01T00:00:00Z')
 ;
 
 SELECT
-    Date("2001-01-01") > Timestamp("2001-01-01T00:00:00Z")
+    Date('2001-01-01') > Timestamp('2001-01-01T00:00:00Z')
 ;
 
 SELECT
-    Datetime("2001-01-01T00:00:00Z") > Timestamp("2001-01-01T00:00:00Z")
+    Datetime('2001-01-01T00:00:00Z') > Timestamp('2001-01-01T00:00:00Z')
 ;
 
 SELECT
-    Date("2001-01-01") >= Datetime("2001-01-01T00:00:00Z")
+    Date('2001-01-01') >= Datetime('2001-01-01T00:00:00Z')
 ;
 
 SELECT
-    Date("2001-01-01") >= Timestamp("2001-01-01T00:00:00Z")
+    Date('2001-01-01') >= Timestamp('2001-01-01T00:00:00Z')
 ;
 
 SELECT
-    Datetime("2001-01-01T00:00:00Z") >= Timestamp("2001-01-01T00:00:00Z")
+    Datetime('2001-01-01T00:00:00Z') >= Timestamp('2001-01-01T00:00:00Z')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_diff_sub_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_diff_sub_/formatted.sql
index ac5517f65c..fa2bd5d941 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_diff_sub_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_diff_sub_/formatted.sql
@@ -1,24 +1,24 @@
 /* postgres can not */
 SELECT
-    Date("2001-01-01") - Datetime("2001-01-01T00:00:00Z")
+    Date('2001-01-01') - Datetime('2001-01-01T00:00:00Z')
 ;
 
 SELECT
-    Date("2001-01-01") - Timestamp("2001-01-01T00:00:00Z")
+    Date('2001-01-01') - Timestamp('2001-01-01T00:00:00Z')
 ;
 
 SELECT
-    Datetime("2001-01-01T00:00:00Z") - Timestamp("2001-01-01T00:00:00Z")
+    Datetime('2001-01-01T00:00:00Z') - Timestamp('2001-01-01T00:00:00Z')
 ;
 
 SELECT
-    Datetime("2001-01-01T00:00:00Z") - Date("2001-01-01")
+    Datetime('2001-01-01T00:00:00Z') - Date('2001-01-01')
 ;
 
 SELECT
-    Timestamp("2001-01-01T00:00:00Z") - Date("2001-01-01")
+    Timestamp('2001-01-01T00:00:00Z') - Date('2001-01-01')
 ;
 
 SELECT
-    Timestamp("2001-01-01T00:00:00Z") - Datetime("2001-01-01T00:00:00Z")
+    Timestamp('2001-01-01T00:00:00Z') - Datetime('2001-01-01T00:00:00Z')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_in_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_in_/formatted.sql
index 4fb66b1aa4..ee14d8206b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_in_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_in_/formatted.sql
@@ -1,140 +1,140 @@
 /* postgres can not */
 SELECT
-    CAST("1970-01-01" AS date),
-    CAST(CAST("1970-01-01" AS date) AS string)
+    CAST('1970-01-01' AS date),
+    CAST(CAST('1970-01-01' AS date) AS string)
 ;
 
 SELECT
-    CAST("2000-04-05" AS date),
-    CAST(CAST("2000-04-05" AS date) AS string)
+    CAST('2000-04-05' AS date),
+    CAST(CAST('2000-04-05' AS date) AS string)
 ;
 
 SELECT
-    CAST("2100-02-29" AS date),
-    CAST(CAST("2100-02-29" AS date) AS string)
+    CAST('2100-02-29' AS date),
+    CAST(CAST('2100-02-29' AS date) AS string)
 ;
 
 SELECT
-    CAST("2100-03-01" AS date),
-    CAST(CAST("2100-03-01" AS date) AS string)
+    CAST('2100-03-01' AS date),
+    CAST(CAST('2100-03-01' AS date) AS string)
 ;
 
 SELECT
-    CAST("2000-04-05T06:07:08Z" AS datetime),
-    CAST(CAST("2000-04-05T06:07:08Z" AS datetime) AS string)
+    CAST('2000-04-05T06:07:08Z' AS datetime),
+    CAST(CAST('2000-04-05T06:07:08Z' AS datetime) AS string)
 ;
 
 SELECT
-    CAST("2000-04-05T06:07:08Z" AS timestamp),
-    CAST(CAST("2000-04-05T06:07:08Z" AS timestamp) AS string)
+    CAST('2000-04-05T06:07:08Z' AS timestamp),
+    CAST(CAST('2000-04-05T06:07:08Z' AS timestamp) AS string)
 ;
 
 SELECT
-    CAST("2000-04-05T06:07:08.9Z" AS timestamp),
-    CAST(CAST("2000-04-05T06:07:08.9Z" AS timestamp) AS string)
+    CAST('2000-04-05T06:07:08.9Z' AS timestamp),
+    CAST(CAST('2000-04-05T06:07:08.9Z' AS timestamp) AS string)
 ;
 
 SELECT
-    CAST("2000-04-05T06:07:08.000009Z" AS timestamp),
-    CAST(CAST("2000-04-05T06:07:08.000009Z" AS timestamp) AS string)
+    CAST('2000-04-05T06:07:08.000009Z' AS timestamp),
+    CAST(CAST('2000-04-05T06:07:08.000009Z' AS timestamp) AS string)
 ;
 
 SELECT
-    CAST("P" AS interval),
-    CAST(CAST("P" AS interval) AS string)
+    CAST('P' AS interval),
+    CAST(CAST('P' AS interval) AS string)
 ;
 
 SELECT
-    CAST("P1D" AS interval),
-    CAST(CAST("P1D" AS interval) AS string)
+    CAST('P1D' AS interval),
+    CAST(CAST('P1D' AS interval) AS string)
 ;
 
 SELECT
-    CAST("-P1D" AS interval),
-    CAST(CAST("-P1D" AS interval) AS string)
+    CAST('-P1D' AS interval),
+    CAST(CAST('-P1D' AS interval) AS string)
 ;
 
 SELECT
-    CAST("PT2H" AS interval),
-    CAST(CAST("PT2H" AS interval) AS string)
+    CAST('PT2H' AS interval),
+    CAST(CAST('PT2H' AS interval) AS string)
 ;
 
 SELECT
-    CAST("PT2H3M" AS interval),
-    CAST(CAST("PT2H3M" AS interval) AS string)
+    CAST('PT2H3M' AS interval),
+    CAST(CAST('PT2H3M' AS interval) AS string)
 ;
 
 SELECT
-    CAST("PT3M" AS interval),
-    CAST(CAST("PT3M" AS interval) AS string)
+    CAST('PT3M' AS interval),
+    CAST(CAST('PT3M' AS interval) AS string)
 ;
 
 SELECT
-    CAST("PT3M4S" AS interval),
-    CAST(CAST("PT3M4S" AS interval) AS string)
+    CAST('PT3M4S' AS interval),
+    CAST(CAST('PT3M4S' AS interval) AS string)
 ;
 
 SELECT
-    CAST("PT4S" AS interval),
-    CAST(CAST("PT4S" AS interval) AS string)
+    CAST('PT4S' AS interval),
+    CAST(CAST('PT4S' AS interval) AS string)
 ;
 
 SELECT
-    CAST("PT0S" AS interval),
-    CAST(CAST("PT0S" AS interval) AS string)
+    CAST('PT0S' AS interval),
+    CAST(CAST('PT0S' AS interval) AS string)
 ;
 
 SELECT
-    CAST("PT4.5S" AS interval),
-    CAST(CAST("PT4.5S" AS interval) AS string)
+    CAST('PT4.5S' AS interval),
+    CAST(CAST('PT4.5S' AS interval) AS string)
 ;
 
 SELECT
-    CAST("PT4.000005S" AS interval),
-    CAST(CAST("PT4.000005S" AS interval) AS string)
+    CAST('PT4.000005S' AS interval),
+    CAST(CAST('PT4.000005S' AS interval) AS string)
 ;
 
 SELECT
-    CAST("P1DT2H3M4.5S" AS interval),
-    CAST(CAST("P1DT2H3M4.5S" AS interval) AS string)
+    CAST('P1DT2H3M4.5S' AS interval),
+    CAST(CAST('P1DT2H3M4.5S' AS interval) AS string)
 ;
 
 SELECT
-    CAST("2105-12-31" AS date),
-    CAST(CAST("2105-12-31" AS date) AS string)
+    CAST('2105-12-31' AS date),
+    CAST(CAST('2105-12-31' AS date) AS string)
 ;
 
 SELECT
-    CAST("2106-01-01" AS date),
-    CAST(CAST("2106-01-01" AS date) AS string)
+    CAST('2106-01-01' AS date),
+    CAST(CAST('2106-01-01' AS date) AS string)
 ;
 
 SELECT
-    CAST("2105-12-31T23:59:59Z" AS datetime),
-    CAST(CAST("2105-12-31T23:59:59Z" AS datetime) AS string)
+    CAST('2105-12-31T23:59:59Z' AS datetime),
+    CAST(CAST('2105-12-31T23:59:59Z' AS datetime) AS string)
 ;
 
 SELECT
-    CAST("2106-01-01T00:00:00Z" AS datetime),
-    CAST(CAST("2106-01-01T00:00:00Z" AS datetime) AS string)
+    CAST('2106-01-01T00:00:00Z' AS datetime),
+    CAST(CAST('2106-01-01T00:00:00Z' AS datetime) AS string)
 ;
 
 SELECT
-    CAST("2105-12-31T23:59:59.999999Z" AS timestamp),
-    CAST(CAST("2105-12-31T23:59:59.999999Z" AS timestamp) AS string)
+    CAST('2105-12-31T23:59:59.999999Z' AS timestamp),
+    CAST(CAST('2105-12-31T23:59:59.999999Z' AS timestamp) AS string)
 ;
 
 SELECT
-    CAST("2106-01-01T00:00:00.000000Z" AS timestamp),
-    CAST(CAST("2106-01-01T00:00:00.000000Z" AS timestamp) AS string)
+    CAST('2106-01-01T00:00:00.000000Z' AS timestamp),
+    CAST(CAST('2106-01-01T00:00:00.000000Z' AS timestamp) AS string)
 ;
 
 SELECT
-    CAST("P49672DT23H59M59.999999S" AS interval),
-    CAST(CAST("P49672DT23H59M59.999999S" AS interval) AS string)
+    CAST('P49672DT23H59M59.999999S' AS interval),
+    CAST(CAST('P49672DT23H59M59.999999S' AS interval) AS string)
 ;
 
 SELECT
-    CAST("P49673D" AS interval),
-    CAST(CAST("P49673D" AS interval) AS string)
+    CAST('P49673D' AS interval),
+    CAST(CAST('P49673D' AS interval) AS string)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_types_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_types_/formatted.sql
index 0d0a839215..985bf8daf3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_types_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_types_/formatted.sql
@@ -2,17 +2,17 @@
 USE plato;
 
 SELECT
-    Yql::Date(AsAtom("1")),
-    Yql::Datetime(AsAtom("2")),
-    Yql::Timestamp(AsAtom("3")),
-    Yql::Interval(AsAtom("4"))
+    Yql::Date(AsAtom('1')),
+    Yql::Datetime(AsAtom('2')),
+    Yql::Timestamp(AsAtom('3')),
+    Yql::Interval(AsAtom('4'))
 FROM
     Input
 ;
 
 SELECT
-    Yql::Date(AsAtom("1")),
-    Yql::Datetime(AsAtom("2")),
-    Yql::Timestamp(AsAtom("3")),
-    Yql::Interval(AsAtom("4"))
+    Yql::Date(AsAtom('1')),
+    Yql::Datetime(AsAtom('2')),
+    Yql::Timestamp(AsAtom('3')),
+    Yql::Interval(AsAtom('4'))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_addremove_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_addremove_/formatted.sql
index 47df43e5ef..949b495135 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_addremove_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_addremove_/formatted.sql
@@ -1,7 +1,7 @@
 /* postgres can not */
 SELECT
-    AddTimezone(Datetime("2000-01-01T12:00:00Z"), "Europe/Moscow"),
-    AddTimezone(Datetime("2000-01-01T12:00:00Z"), "America/Los_Angeles"),
-    CAST(RemoveTimezone(TzDatetime("2000-01-01T12:00:00,Europe/Moscow")) AS string),
-    CAST(RemoveTimezone(TzDatetime("2000-01-01T12:00:00,America/Los_Angeles")) AS string)
+    AddTimezone(Datetime('2000-01-01T12:00:00Z'), 'Europe/Moscow'),
+    AddTimezone(Datetime('2000-01-01T12:00:00Z'), 'America/Los_Angeles'),
+    CAST(RemoveTimezone(TzDatetime('2000-01-01T12:00:00,Europe/Moscow')) AS string),
+    CAST(RemoveTimezone(TzDatetime('2000-01-01T12:00:00,America/Los_Angeles')) AS string)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_arithmetic_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_arithmetic_/formatted.sql
index 7171d4e275..7000191021 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_arithmetic_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_arithmetic_/formatted.sql
@@ -1,72 +1,72 @@
 /* postgres can not */
 SELECT
-    CAST(date("1970-01-02") - tzdate("1970-01-01,America/Los_Angeles") AS string)
+    CAST(date('1970-01-02') - tzdate('1970-01-01,America/Los_Angeles') AS string)
 ;
 
 SELECT
-    CAST(tzdate("1970-01-02,America/Los_Angeles") - date("1970-01-01") AS string)
+    CAST(tzdate('1970-01-02,America/Los_Angeles') - date('1970-01-01') AS string)
 ;
 
 SELECT
-    CAST(tzdate("1970-01-02,America/Los_Angeles") - tzdate("1970-01-01,America/Los_Angeles") AS string)
+    CAST(tzdate('1970-01-02,America/Los_Angeles') - tzdate('1970-01-01,America/Los_Angeles') AS string)
 ;
 
 SELECT
-    CAST(tzdate("1970-01-01,America/Los_Angeles") + interval("P1D") AS string)
+    CAST(tzdate('1970-01-01,America/Los_Angeles') + interval('P1D') AS string)
 ;
 
 SELECT
-    CAST(interval("P1D") + tzdate("1970-01-01,America/Los_Angeles") AS string)
+    CAST(interval('P1D') + tzdate('1970-01-01,America/Los_Angeles') AS string)
 ;
 
 SELECT
-    CAST(tzdate("1970-01-02,America/Los_Angeles") - interval("P1D") AS string)
+    CAST(tzdate('1970-01-02,America/Los_Angeles') - interval('P1D') AS string)
 ;
 
 SELECT
-    CAST(datetime("1970-01-02T00:00:00Z") - tzdatetime("1970-01-01T00:00:00,America/Los_Angeles") AS string)
+    CAST(datetime('1970-01-02T00:00:00Z') - tzdatetime('1970-01-01T00:00:00,America/Los_Angeles') AS string)
 ;
 
 SELECT
-    CAST(tzdatetime("1970-01-02T00:00:00,America/Los_Angeles") - datetime("1970-01-01T00:00:00Z") AS string)
+    CAST(tzdatetime('1970-01-02T00:00:00,America/Los_Angeles') - datetime('1970-01-01T00:00:00Z') AS string)
 ;
 
 SELECT
-    CAST(tzdatetime("1970-01-02T00:00:00,America/Los_Angeles") - tzdatetime("1970-01-01T00:00:00,America/Los_Angeles") AS string)
+    CAST(tzdatetime('1970-01-02T00:00:00,America/Los_Angeles') - tzdatetime('1970-01-01T00:00:00,America/Los_Angeles') AS string)
 ;
 
 SELECT
-    CAST(tzdatetime("1970-01-01T00:00:00,America/Los_Angeles") + interval("P1D") AS string)
+    CAST(tzdatetime('1970-01-01T00:00:00,America/Los_Angeles') + interval('P1D') AS string)
 ;
 
 SELECT
-    CAST(interval("P1D") + tzdatetime("1970-01-01T00:00:00,America/Los_Angeles") AS string)
+    CAST(interval('P1D') + tzdatetime('1970-01-01T00:00:00,America/Los_Angeles') AS string)
 ;
 
 SELECT
-    CAST(tzdatetime("1970-01-02T00:00:00,America/Los_Angeles") - interval("P1D") AS string)
+    CAST(tzdatetime('1970-01-02T00:00:00,America/Los_Angeles') - interval('P1D') AS string)
 ;
 
 SELECT
-    CAST(timestamp("1970-01-02T00:00:00.6Z") - tztimestamp("1970-01-01T00:00:00.3,America/Los_Angeles") AS string)
+    CAST(timestamp('1970-01-02T00:00:00.6Z') - tztimestamp('1970-01-01T00:00:00.3,America/Los_Angeles') AS string)
 ;
 
 SELECT
-    CAST(tztimestamp("1970-01-02T00:00:00.6,America/Los_Angeles") - timestamp("1970-01-01T00:00:00.3Z") AS string)
+    CAST(tztimestamp('1970-01-02T00:00:00.6,America/Los_Angeles') - timestamp('1970-01-01T00:00:00.3Z') AS string)
 ;
 
 SELECT
-    CAST(tztimestamp("1970-01-02T00:00:00.6,America/Los_Angeles") - tztimestamp("1970-01-01T00:00:00.3,America/Los_Angeles") AS string)
+    CAST(tztimestamp('1970-01-02T00:00:00.6,America/Los_Angeles') - tztimestamp('1970-01-01T00:00:00.3,America/Los_Angeles') AS string)
 ;
 
 SELECT
-    CAST(tztimestamp("1970-01-01T00:00:00.6,America/Los_Angeles") + interval("P1D") AS string)
+    CAST(tztimestamp('1970-01-01T00:00:00.6,America/Los_Angeles') + interval('P1D') AS string)
 ;
 
 SELECT
-    CAST(interval("P1D") + tztimestamp("1970-01-01T00:00:00.6,America/Los_Angeles") AS string)
+    CAST(interval('P1D') + tztimestamp('1970-01-01T00:00:00.6,America/Los_Angeles') AS string)
 ;
 
 SELECT
-    CAST(tztimestamp("1970-01-02T00:00:00.6,America/Los_Angeles") - interval("P1D") AS string)
+    CAST(tztimestamp('1970-01-02T00:00:00.6,America/Los_Angeles') - interval('P1D') AS string)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_bitcast_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_bitcast_/formatted.sql
index 56c34b1436..0bf53bb48f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_bitcast_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_bitcast_/formatted.sql
@@ -1,96 +1,96 @@
 /* postgres can not */
 SELECT
-    BITCAST(Yql::TzDate(AsAtom("1,UTC")) AS Uint8)
+    BITCAST(Yql::TzDate(AsAtom('1,UTC')) AS Uint8)
 ;
 
 SELECT
-    BITCAST(Yql::TzDate(AsAtom("1,UTC")) AS Int8)
+    BITCAST(Yql::TzDate(AsAtom('1,UTC')) AS Int8)
 ;
 
 SELECT
-    BITCAST(Yql::TzDate(AsAtom("1,UTC")) AS Uint16)
+    BITCAST(Yql::TzDate(AsAtom('1,UTC')) AS Uint16)
 ;
 
 SELECT
-    BITCAST(Yql::TzDate(AsAtom("1,UTC")) AS Int16)
+    BITCAST(Yql::TzDate(AsAtom('1,UTC')) AS Int16)
 ;
 
 SELECT
-    BITCAST(Yql::TzDate(AsAtom("1,UTC")) AS Uint32)
+    BITCAST(Yql::TzDate(AsAtom('1,UTC')) AS Uint32)
 ;
 
 SELECT
-    BITCAST(Yql::TzDate(AsAtom("1,UTC")) AS Int32)
+    BITCAST(Yql::TzDate(AsAtom('1,UTC')) AS Int32)
 ;
 
 SELECT
-    BITCAST(Yql::TzDate(AsAtom("1,UTC")) AS Uint64)
+    BITCAST(Yql::TzDate(AsAtom('1,UTC')) AS Uint64)
 ;
 
 SELECT
-    BITCAST(Yql::TzDate(AsAtom("1,UTC")) AS Int64)
+    BITCAST(Yql::TzDate(AsAtom('1,UTC')) AS Int64)
 ;
 
 SELECT
-    BITCAST(Yql::TzDatetime(AsAtom("1,UTC")) AS Uint8)
+    BITCAST(Yql::TzDatetime(AsAtom('1,UTC')) AS Uint8)
 ;
 
 SELECT
-    BITCAST(Yql::TzDatetime(AsAtom("1,UTC")) AS Int8)
+    BITCAST(Yql::TzDatetime(AsAtom('1,UTC')) AS Int8)
 ;
 
 SELECT
-    BITCAST(Yql::TzDatetime(AsAtom("1,UTC")) AS Uint16)
+    BITCAST(Yql::TzDatetime(AsAtom('1,UTC')) AS Uint16)
 ;
 
 SELECT
-    BITCAST(Yql::TzDatetime(AsAtom("1,UTC")) AS Int16)
+    BITCAST(Yql::TzDatetime(AsAtom('1,UTC')) AS Int16)
 ;
 
 SELECT
-    BITCAST(Yql::TzDatetime(AsAtom("1,UTC")) AS Uint32)
+    BITCAST(Yql::TzDatetime(AsAtom('1,UTC')) AS Uint32)
 ;
 
 SELECT
-    BITCAST(Yql::TzDatetime(AsAtom("1,UTC")) AS Int32)
+    BITCAST(Yql::TzDatetime(AsAtom('1,UTC')) AS Int32)
 ;
 
 SELECT
-    BITCAST(Yql::TzDatetime(AsAtom("1,UTC")) AS Uint64)
+    BITCAST(Yql::TzDatetime(AsAtom('1,UTC')) AS Uint64)
 ;
 
 SELECT
-    BITCAST(Yql::TzDatetime(AsAtom("1,UTC")) AS Int64)
+    BITCAST(Yql::TzDatetime(AsAtom('1,UTC')) AS Int64)
 ;
 
 SELECT
-    BITCAST(Yql::TzTimestamp(AsAtom("1,UTC")) AS Uint8)
+    BITCAST(Yql::TzTimestamp(AsAtom('1,UTC')) AS Uint8)
 ;
 
 SELECT
-    BITCAST(Yql::TzTimestamp(AsAtom("1,UTC")) AS Int8)
+    BITCAST(Yql::TzTimestamp(AsAtom('1,UTC')) AS Int8)
 ;
 
 SELECT
-    BITCAST(Yql::TzTimestamp(AsAtom("1,UTC")) AS Uint16)
+    BITCAST(Yql::TzTimestamp(AsAtom('1,UTC')) AS Uint16)
 ;
 
 SELECT
-    BITCAST(Yql::TzTimestamp(AsAtom("1,UTC")) AS Int16)
+    BITCAST(Yql::TzTimestamp(AsAtom('1,UTC')) AS Int16)
 ;
 
 SELECT
-    BITCAST(Yql::TzTimestamp(AsAtom("1,UTC")) AS Uint32)
+    BITCAST(Yql::TzTimestamp(AsAtom('1,UTC')) AS Uint32)
 ;
 
 SELECT
-    BITCAST(Yql::TzTimestamp(AsAtom("1,UTC")) AS Int32)
+    BITCAST(Yql::TzTimestamp(AsAtom('1,UTC')) AS Int32)
 ;
 
 SELECT
-    BITCAST(Yql::TzTimestamp(AsAtom("1,UTC")) AS Uint64)
+    BITCAST(Yql::TzTimestamp(AsAtom('1,UTC')) AS Uint64)
 ;
 
 SELECT
-    BITCAST(Yql::TzTimestamp(AsAtom("1,UTC")) AS Int64)
+    BITCAST(Yql::TzTimestamp(AsAtom('1,UTC')) AS Int64)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_bounds_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_bounds_/formatted.sql
index 0e37b01a38..ee3d343b1f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_bounds_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_bounds_/formatted.sql
@@ -1,15 +1,15 @@
 /* postgres can not */
 SELECT
-    TZDATE("1970-01-02,Europe/Moscow"),
-    TZDATE("1970-01-01,America/Los_Angeles"),
-    TZDATE("2105-12-31,Europe/Moscow"),
-    TZDATE("2105-12-31,America/Los_Angeles"),
-    TZDATETIME("1970-01-01T03:00:00,Europe/Moscow"),
-    TZDATETIME("1969-12-31T16:00:00,America/Los_Angeles"),
-    TZDATETIME("2106-01-01T02:59:59,Europe/Moscow"),
-    TZDATETIME("2105-12-31T15:59:59,America/Los_Angeles"),
-    TZTIMESTAMP("1970-01-01T03:00:00.000000,Europe/Moscow"),
-    TZTIMESTAMP("1969-12-31T16:00:00.000000,America/Los_Angeles"),
-    TZTIMESTAMP("2106-01-01T02:59:59.999999,Europe/Moscow"),
-    TZTIMESTAMP("2105-12-31T15:59:59.999999,America/Los_Angeles")
+    TZDATE('1970-01-02,Europe/Moscow'),
+    TZDATE('1970-01-01,America/Los_Angeles'),
+    TZDATE('2105-12-31,Europe/Moscow'),
+    TZDATE('2105-12-31,America/Los_Angeles'),
+    TZDATETIME('1970-01-01T03:00:00,Europe/Moscow'),
+    TZDATETIME('1969-12-31T16:00:00,America/Los_Angeles'),
+    TZDATETIME('2106-01-01T02:59:59,Europe/Moscow'),
+    TZDATETIME('2105-12-31T15:59:59,America/Los_Angeles'),
+    TZTIMESTAMP('1970-01-01T03:00:00.000000,Europe/Moscow'),
+    TZTIMESTAMP('1969-12-31T16:00:00.000000,America/Los_Angeles'),
+    TZTIMESTAMP('2106-01-01T02:59:59.999999,Europe/Moscow'),
+    TZTIMESTAMP('2105-12-31T15:59:59.999999,America/Los_Angeles')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_bounds_scale_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_bounds_scale_/formatted.sql
index 929a5d6fee..dccb0306ff 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_bounds_scale_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_bounds_scale_/formatted.sql
@@ -1,27 +1,27 @@
 /* postgres can not */
 SELECT
-    CAST(TZDATE("1970-01-02,Europe/Moscow") AS TzDatetime),
-    CAST(TZDATE("1970-01-01,America/Los_Angeles") AS TzDatetime),
-    CAST(TZDATE("2105-12-31,Europe/Moscow") AS TzDatetime),
-    CAST(TZDATE("2105-12-31,America/Los_Angeles") AS TzDatetime),
-    CAST(TZDATE("1970-01-02,Europe/Moscow") AS TzTimestamp),
-    CAST(TZDATE("1970-01-01,America/Los_Angeles") AS TzTimestamp),
-    CAST(TZDATE("2105-12-31,Europe/Moscow") AS TzTimestamp),
-    CAST(TZDATE("2105-12-31,America/Los_Angeles") AS TzTimestamp),
-    CAST(TZDATETIME("1970-01-02T00:00:00,Europe/Moscow") AS TzDate),
-    CAST(TZDATETIME("1970-01-01T00:00:00,America/Los_Angeles") AS TzDate),
-    CAST(TZDATETIME("2106-01-01T02:59:59,Europe/Moscow") AS TzDate),
-    CAST(TZDATETIME("2105-12-31T15:59:59,America/Los_Angeles") AS TzDate),
-    CAST(TZDATETIME("1970-01-02T00:00:00,Europe/Moscow") AS TzTimestamp),
-    CAST(TZDATETIME("1970-01-01T00:00:00,America/Los_Angeles") AS TzTimestamp),
-    CAST(TZDATETIME("2106-01-01T02:59:59,Europe/Moscow") AS TzTimestamp),
-    CAST(TZDATETIME("2105-12-31T15:59:59,America/Los_Angeles") AS TzTimestamp),
-    CAST(TZTIMESTAMP("1970-01-02T00:00:00.000000,Europe/Moscow") AS TzDate),
-    CAST(TZTIMESTAMP("1970-01-01T00:00:00.000000,America/Los_Angeles") AS TzDate),
-    CAST(TZTIMESTAMP("2106-01-01T02:59:59.999999,Europe/Moscow") AS TzDate),
-    CAST(TZTIMESTAMP("2105-12-31T15:59:59.999999,America/Los_Angeles") AS TzDate),
-    CAST(TZTIMESTAMP("1970-01-02T00:00:00.000000,Europe/Moscow") AS TzDatetime),
-    CAST(TZTIMESTAMP("1970-01-01T00:00:00.000000,America/Los_Angeles") AS TzDatetime),
-    CAST(TZTIMESTAMP("2106-01-01T02:59:59.999999,Europe/Moscow") AS TzDatetime),
-    CAST(TZTIMESTAMP("2105-12-31T15:59:59.999999,America/Los_Angeles") AS TzDatetime)
+    CAST(TZDATE('1970-01-02,Europe/Moscow') AS TzDatetime),
+    CAST(TZDATE('1970-01-01,America/Los_Angeles') AS TzDatetime),
+    CAST(TZDATE('2105-12-31,Europe/Moscow') AS TzDatetime),
+    CAST(TZDATE('2105-12-31,America/Los_Angeles') AS TzDatetime),
+    CAST(TZDATE('1970-01-02,Europe/Moscow') AS TzTimestamp),
+    CAST(TZDATE('1970-01-01,America/Los_Angeles') AS TzTimestamp),
+    CAST(TZDATE('2105-12-31,Europe/Moscow') AS TzTimestamp),
+    CAST(TZDATE('2105-12-31,America/Los_Angeles') AS TzTimestamp),
+    CAST(TZDATETIME('1970-01-02T00:00:00,Europe/Moscow') AS TzDate),
+    CAST(TZDATETIME('1970-01-01T00:00:00,America/Los_Angeles') AS TzDate),
+    CAST(TZDATETIME('2106-01-01T02:59:59,Europe/Moscow') AS TzDate),
+    CAST(TZDATETIME('2105-12-31T15:59:59,America/Los_Angeles') AS TzDate),
+    CAST(TZDATETIME('1970-01-02T00:00:00,Europe/Moscow') AS TzTimestamp),
+    CAST(TZDATETIME('1970-01-01T00:00:00,America/Los_Angeles') AS TzTimestamp),
+    CAST(TZDATETIME('2106-01-01T02:59:59,Europe/Moscow') AS TzTimestamp),
+    CAST(TZDATETIME('2105-12-31T15:59:59,America/Los_Angeles') AS TzTimestamp),
+    CAST(TZTIMESTAMP('1970-01-02T00:00:00.000000,Europe/Moscow') AS TzDate),
+    CAST(TZTIMESTAMP('1970-01-01T00:00:00.000000,America/Los_Angeles') AS TzDate),
+    CAST(TZTIMESTAMP('2106-01-01T02:59:59.999999,Europe/Moscow') AS TzDate),
+    CAST(TZTIMESTAMP('2105-12-31T15:59:59.999999,America/Los_Angeles') AS TzDate),
+    CAST(TZTIMESTAMP('1970-01-02T00:00:00.000000,Europe/Moscow') AS TzDatetime),
+    CAST(TZTIMESTAMP('1970-01-01T00:00:00.000000,America/Los_Angeles') AS TzDatetime),
+    CAST(TZTIMESTAMP('2106-01-01T02:59:59.999999,Europe/Moscow') AS TzDatetime),
+    CAST(TZTIMESTAMP('2105-12-31T15:59:59.999999,America/Los_Angeles') AS TzDatetime)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_bytes_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_bytes_/formatted.sql
index e740aaa065..e901ebd4ed 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_bytes_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_bytes_/formatted.sql
@@ -1,25 +1,25 @@
 /* postgres can not */
 /* syntax version 1 */
 SELECT
-    ToBytes(TzDate("2001-01-01,Europe/Moscow"))
+    ToBytes(TzDate('2001-01-01,Europe/Moscow'))
 ;
 
 SELECT
-    CAST(FromBytes(ToBytes(TzDate("2001-01-01,Europe/Moscow")), TzDate) AS string)
+    CAST(FromBytes(ToBytes(TzDate('2001-01-01,Europe/Moscow')), TzDate) AS string)
 ;
 
 SELECT
-    ToBytes(TzDatetime("2001-01-01T01:02:03,Europe/Moscow"))
+    ToBytes(TzDatetime('2001-01-01T01:02:03,Europe/Moscow'))
 ;
 
 SELECT
-    CAST(FromBytes(ToBytes(TzDatetime("2001-01-01T01:02:03,Europe/Moscow")), TzDatetime) AS string)
+    CAST(FromBytes(ToBytes(TzDatetime('2001-01-01T01:02:03,Europe/Moscow')), TzDatetime) AS string)
 ;
 
 SELECT
-    ToBytes(TzTimestamp("2001-01-01T01:02:03.456789,Europe/Moscow"))
+    ToBytes(TzTimestamp('2001-01-01T01:02:03.456789,Europe/Moscow'))
 ;
 
 SELECT
-    CAST(FromBytes(ToBytes(TzTimestamp("2001-01-01T01:02:03.456789,Europe/Moscow")), TzTimestamp) AS string)
+    CAST(FromBytes(ToBytes(TzTimestamp('2001-01-01T01:02:03.456789,Europe/Moscow')), TzTimestamp) AS string)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_cast_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_cast_/formatted.sql
index bbb4e15907..f78ebda58a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_cast_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_cast_/formatted.sql
@@ -1,62 +1,62 @@
 /* postgres can not */
 SELECT
-    CAST(Yql::TzDate(AsAtom("1,UTC")) AS Uint8)
+    CAST(Yql::TzDate(AsAtom('1,UTC')) AS Uint8)
 ;
 
 SELECT
-    CAST(Yql::TzDate(AsAtom("1,UTC")) AS Uint32)
+    CAST(Yql::TzDate(AsAtom('1,UTC')) AS Uint32)
 ;
 
 SELECT
-    CAST(Yql::TzDate(AsAtom("1,UTC")) AS Int32)
+    CAST(Yql::TzDate(AsAtom('1,UTC')) AS Int32)
 ;
 
 SELECT
-    CAST(Yql::TzDate(AsAtom("1,UTC")) AS Uint64)
+    CAST(Yql::TzDate(AsAtom('1,UTC')) AS Uint64)
 ;
 
 SELECT
-    CAST(Yql::TzDate(AsAtom("1,UTC")) AS Int64)
+    CAST(Yql::TzDate(AsAtom('1,UTC')) AS Int64)
 ;
 
 SELECT
-    CAST(Yql::TzDatetime(AsAtom("1,UTC")) AS Uint8)
+    CAST(Yql::TzDatetime(AsAtom('1,UTC')) AS Uint8)
 ;
 
 SELECT
-    CAST(Yql::TzDatetime(AsAtom("1,UTC")) AS Uint32)
+    CAST(Yql::TzDatetime(AsAtom('1,UTC')) AS Uint32)
 ;
 
 SELECT
-    CAST(Yql::TzDatetime(AsAtom("1,UTC")) AS Int32)
+    CAST(Yql::TzDatetime(AsAtom('1,UTC')) AS Int32)
 ;
 
 SELECT
-    CAST(Yql::TzDatetime(AsAtom("1,UTC")) AS Uint64)
+    CAST(Yql::TzDatetime(AsAtom('1,UTC')) AS Uint64)
 ;
 
 SELECT
-    CAST(Yql::TzDatetime(AsAtom("1,UTC")) AS Int64)
+    CAST(Yql::TzDatetime(AsAtom('1,UTC')) AS Int64)
 ;
 
 SELECT
-    CAST(Yql::TzTimestamp(AsAtom("1,UTC")) AS Uint8)
+    CAST(Yql::TzTimestamp(AsAtom('1,UTC')) AS Uint8)
 ;
 
 SELECT
-    CAST(Yql::TzTimestamp(AsAtom("1,UTC")) AS Uint32)
+    CAST(Yql::TzTimestamp(AsAtom('1,UTC')) AS Uint32)
 ;
 
 SELECT
-    CAST(Yql::TzTimestamp(AsAtom("1,UTC")) AS Int32)
+    CAST(Yql::TzTimestamp(AsAtom('1,UTC')) AS Int32)
 ;
 
 SELECT
-    CAST(Yql::TzTimestamp(AsAtom("1,UTC")) AS Uint64)
+    CAST(Yql::TzTimestamp(AsAtom('1,UTC')) AS Uint64)
 ;
 
 SELECT
-    CAST(Yql::TzTimestamp(AsAtom("1,UTC")) AS Int64)
+    CAST(Yql::TzTimestamp(AsAtom('1,UTC')) AS Int64)
 ;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_compare_diff_zones_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_compare_diff_zones_/formatted.sql
index cab5bfc99d..5fe7c180ba 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_compare_diff_zones_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_compare_diff_zones_/formatted.sql
@@ -1,69 +1,69 @@
 /* postgres can not */
 SELECT
-    CAST("2000-01-01,GMT" AS tzdate) > tzdate("2000-01-01,Europe/Moscow")
+    CAST('2000-01-01,GMT' AS tzdate) > tzdate('2000-01-01,Europe/Moscow')
 ;
 
 SELECT
-    CAST("1999-12-31,GMT" AS tzdate) == tzdate("2000-01-01,Europe/Moscow")
+    CAST('1999-12-31,GMT' AS tzdate) == tzdate('2000-01-01,Europe/Moscow')
 ;
 
 SELECT
-    RemoveTimezone(CAST("1999-12-31,GMT" AS tzdate)) == RemoveTimezone(tzdate("2000-01-01,Europe/Moscow"))
+    RemoveTimezone(CAST('1999-12-31,GMT' AS tzdate)) == RemoveTimezone(tzdate('2000-01-01,Europe/Moscow'))
 ;
 
 SELECT
-    CAST("2000-01-01,GMT" AS tzdate) == tzdate("2000-01-01,America/Los_Angeles")
+    CAST('2000-01-01,GMT' AS tzdate) == tzdate('2000-01-01,America/Los_Angeles')
 ;
 
 -- same time value
 SELECT
-    RemoveTimezone(CAST("2000-01-01,GMT" AS tzdate)) == RemoveTimezone(tzdate("2000-01-01,America/Los_Angeles"))
+    RemoveTimezone(CAST('2000-01-01,GMT' AS tzdate)) == RemoveTimezone(tzdate('2000-01-01,America/Los_Angeles'))
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00,GMT" AS tzdatetime) > tzdatetime("2000-01-01T12:00:00,Europe/Moscow")
+    CAST('2000-01-01T12:00:00,GMT' AS tzdatetime) > tzdatetime('2000-01-01T12:00:00,Europe/Moscow')
 ;
 
 SELECT
-    CAST("2000-01-01T09:00:00,GMT" AS tzdatetime) == tzdatetime("2000-01-01T12:00:00,Europe/Moscow")
+    CAST('2000-01-01T09:00:00,GMT' AS tzdatetime) == tzdatetime('2000-01-01T12:00:00,Europe/Moscow')
 ;
 
 SELECT
-    RemoveTimezone(CAST("2000-01-01T09:00:00,GMT" AS tzdatetime)) == RemoveTimezone(tzdatetime("2000-01-01T12:00:00,Europe/Moscow"))
+    RemoveTimezone(CAST('2000-01-01T09:00:00,GMT' AS tzdatetime)) == RemoveTimezone(tzdatetime('2000-01-01T12:00:00,Europe/Moscow'))
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00,GMT" AS tzdatetime) < tzdatetime("2000-01-01T12:00:00,America/Los_Angeles")
+    CAST('2000-01-01T12:00:00,GMT' AS tzdatetime) < tzdatetime('2000-01-01T12:00:00,America/Los_Angeles')
 ;
 
 SELECT
-    CAST("2000-01-01T20:00:00,GMT" AS tzdatetime) == tzdatetime("2000-01-01T12:00:00,America/Los_Angeles")
+    CAST('2000-01-01T20:00:00,GMT' AS tzdatetime) == tzdatetime('2000-01-01T12:00:00,America/Los_Angeles')
 ;
 
 SELECT
-    RemoveTimezone(CAST("2000-01-01T20:00:00,GMT" AS tzdatetime)) == RemoveTimezone(tzdatetime("2000-01-01T12:00:00,America/Los_Angeles"))
+    RemoveTimezone(CAST('2000-01-01T20:00:00,GMT' AS tzdatetime)) == RemoveTimezone(tzdatetime('2000-01-01T12:00:00,America/Los_Angeles'))
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00,GMT" AS tztimestamp) > tztimestamp("2000-01-01T12:00:00,Europe/Moscow")
+    CAST('2000-01-01T12:00:00,GMT' AS tztimestamp) > tztimestamp('2000-01-01T12:00:00,Europe/Moscow')
 ;
 
 SELECT
-    CAST("2000-01-01T09:00:00,GMT" AS tztimestamp) == tztimestamp("2000-01-01T12:00:00,Europe/Moscow")
+    CAST('2000-01-01T09:00:00,GMT' AS tztimestamp) == tztimestamp('2000-01-01T12:00:00,Europe/Moscow')
 ;
 
 SELECT
-    RemoveTimezone(CAST("2000-01-01T09:00:00,GMT" AS tztimestamp)) == RemoveTimezone(tztimestamp("2000-01-01T12:00:00,Europe/Moscow"))
+    RemoveTimezone(CAST('2000-01-01T09:00:00,GMT' AS tztimestamp)) == RemoveTimezone(tztimestamp('2000-01-01T12:00:00,Europe/Moscow'))
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00,GMT" AS tztimestamp) < tztimestamp("2000-01-01T12:00:00,America/Los_Angeles")
+    CAST('2000-01-01T12:00:00,GMT' AS tztimestamp) < tztimestamp('2000-01-01T12:00:00,America/Los_Angeles')
 ;
 
 SELECT
-    CAST("2000-01-01T20:00:00,GMT" AS tztimestamp) == tztimestamp("2000-01-01T12:00:00,America/Los_Angeles")
+    CAST('2000-01-01T20:00:00,GMT' AS tztimestamp) == tztimestamp('2000-01-01T12:00:00,America/Los_Angeles')
 ;
 
 SELECT
-    RemoveTimezone(CAST("2000-01-01T20:00:00,GMT" AS tztimestamp)) == RemoveTimezone(tztimestamp("2000-01-01T12:00:00,America/Los_Angeles"))
+    RemoveTimezone(CAST('2000-01-01T20:00:00,GMT' AS tztimestamp)) == RemoveTimezone(tztimestamp('2000-01-01T12:00:00,America/Los_Angeles'))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_compare_gmt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_compare_gmt_/formatted.sql
index 1ce45e417f..60268a62d7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_compare_gmt_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_compare_gmt_/formatted.sql
@@ -1,144 +1,144 @@
 /* postgres can not */
 SELECT
-    CAST("2000-01-01,GMT" AS tzdate) == CAST("2000-01-01" AS date)
+    CAST('2000-01-01,GMT' AS tzdate) == CAST('2000-01-01' AS date)
 ;
 
 SELECT
-    CAST("2000-01-01,GMT" AS tzdate) < CAST("2000-01-01" AS date)
+    CAST('2000-01-01,GMT' AS tzdate) < CAST('2000-01-01' AS date)
 ;
 
 SELECT
-    CAST("2000-01-01,GMT" AS tzdate) <= CAST("2000-01-01" AS date)
+    CAST('2000-01-01,GMT' AS tzdate) <= CAST('2000-01-01' AS date)
 ;
 
 SELECT
-    CAST("2000-01-01,GMT" AS tzdate) > CAST("2000-01-01" AS date)
+    CAST('2000-01-01,GMT' AS tzdate) > CAST('2000-01-01' AS date)
 ;
 
 SELECT
-    CAST("2000-01-01,GMT" AS tzdate) >= CAST("2000-01-01" AS date)
+    CAST('2000-01-01,GMT' AS tzdate) >= CAST('2000-01-01' AS date)
 ;
 
 SELECT
-    CAST("2000-01-01,GMT" AS tzdate) != CAST("2000-01-01" AS date)
+    CAST('2000-01-01,GMT' AS tzdate) != CAST('2000-01-01' AS date)
 ;
 
 SELECT
-    CAST("2000-01-01" AS date) == CAST("2000-01-01,GMT" AS tzdate)
+    CAST('2000-01-01' AS date) == CAST('2000-01-01,GMT' AS tzdate)
 ;
 
 SELECT
-    CAST("2000-01-01" AS date) < CAST("2000-01-01,GMT" AS tzdate)
+    CAST('2000-01-01' AS date) < CAST('2000-01-01,GMT' AS tzdate)
 ;
 
 SELECT
-    CAST("2000-01-01" AS date) <= CAST("2000-01-01,GMT" AS tzdate)
+    CAST('2000-01-01' AS date) <= CAST('2000-01-01,GMT' AS tzdate)
 ;
 
 SELECT
-    CAST("2000-01-01" AS date) > CAST("2000-01-01,GMT" AS tzdate)
+    CAST('2000-01-01' AS date) > CAST('2000-01-01,GMT' AS tzdate)
 ;
 
 SELECT
-    CAST("2000-01-01" AS date) >= CAST("2000-01-01,GMT" AS tzdate)
+    CAST('2000-01-01' AS date) >= CAST('2000-01-01,GMT' AS tzdate)
 ;
 
 SELECT
-    CAST("2000-01-01" AS date) != CAST("2000-01-01,GMT" AS tzdate)
+    CAST('2000-01-01' AS date) != CAST('2000-01-01,GMT' AS tzdate)
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00,GMT" AS tzdatetime) == CAST("2000-01-01T12:00:00Z" AS datetime)
+    CAST('2000-01-01T12:00:00,GMT' AS tzdatetime) == CAST('2000-01-01T12:00:00Z' AS datetime)
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00,GMT" AS tzdatetime) < CAST("2000-01-01T12:00:00Z" AS datetime)
+    CAST('2000-01-01T12:00:00,GMT' AS tzdatetime) < CAST('2000-01-01T12:00:00Z' AS datetime)
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00,GMT" AS tzdatetime) <= CAST("2000-01-01T12:00:00Z" AS datetime)
+    CAST('2000-01-01T12:00:00,GMT' AS tzdatetime) <= CAST('2000-01-01T12:00:00Z' AS datetime)
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00,GMT" AS tzdatetime) > CAST("2000-01-01T12:00:00Z" AS datetime)
+    CAST('2000-01-01T12:00:00,GMT' AS tzdatetime) > CAST('2000-01-01T12:00:00Z' AS datetime)
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00,GMT" AS tzdatetime) >= CAST("2000-01-01T12:00:00Z" AS datetime)
+    CAST('2000-01-01T12:00:00,GMT' AS tzdatetime) >= CAST('2000-01-01T12:00:00Z' AS datetime)
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00,GMT" AS tzdatetime) != CAST("2000-01-01T12:00:00Z" AS datetime)
+    CAST('2000-01-01T12:00:00,GMT' AS tzdatetime) != CAST('2000-01-01T12:00:00Z' AS datetime)
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00Z" AS datetime) == CAST("2000-01-01T12:00:00,GMT" AS tzdatetime)
+    CAST('2000-01-01T12:00:00Z' AS datetime) == CAST('2000-01-01T12:00:00,GMT' AS tzdatetime)
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00Z" AS datetime) < CAST("2000-01-01T12:00:00,GMT" AS tzdatetime)
+    CAST('2000-01-01T12:00:00Z' AS datetime) < CAST('2000-01-01T12:00:00,GMT' AS tzdatetime)
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00Z" AS datetime) <= CAST("2000-01-01T12:00:00,GMT" AS tzdatetime)
+    CAST('2000-01-01T12:00:00Z' AS datetime) <= CAST('2000-01-01T12:00:00,GMT' AS tzdatetime)
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00Z" AS datetime) > CAST("2000-01-01T12:00:00,GMT" AS tzdatetime)
+    CAST('2000-01-01T12:00:00Z' AS datetime) > CAST('2000-01-01T12:00:00,GMT' AS tzdatetime)
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00Z" AS datetime) >= CAST("2000-01-01T12:00:00,GMT" AS tzdatetime)
+    CAST('2000-01-01T12:00:00Z' AS datetime) >= CAST('2000-01-01T12:00:00,GMT' AS tzdatetime)
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00Z" AS datetime) != CAST("2000-01-01T12:00:00,GMT" AS tzdatetime)
+    CAST('2000-01-01T12:00:00Z' AS datetime) != CAST('2000-01-01T12:00:00,GMT' AS tzdatetime)
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00.123456,GMT" AS tztimestamp) == CAST("2000-01-01T12:00:00.123456Z" AS timestamp)
+    CAST('2000-01-01T12:00:00.123456,GMT' AS tztimestamp) == CAST('2000-01-01T12:00:00.123456Z' AS timestamp)
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00.123456,GMT" AS tztimestamp) < CAST("2000-01-01T12:00:00.123456Z" AS timestamp)
+    CAST('2000-01-01T12:00:00.123456,GMT' AS tztimestamp) < CAST('2000-01-01T12:00:00.123456Z' AS timestamp)
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00.123456,GMT" AS tztimestamp) <= CAST("2000-01-01T12:00:00.123456Z" AS timestamp)
+    CAST('2000-01-01T12:00:00.123456,GMT' AS tztimestamp) <= CAST('2000-01-01T12:00:00.123456Z' AS timestamp)
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00.123456,GMT" AS tztimestamp) > CAST("2000-01-01T12:00:00.123456Z" AS timestamp)
+    CAST('2000-01-01T12:00:00.123456,GMT' AS tztimestamp) > CAST('2000-01-01T12:00:00.123456Z' AS timestamp)
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00.123456,GMT" AS tztimestamp) >= CAST("2000-01-01T12:00:00.123456Z" AS timestamp)
+    CAST('2000-01-01T12:00:00.123456,GMT' AS tztimestamp) >= CAST('2000-01-01T12:00:00.123456Z' AS timestamp)
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00.123456,GMT" AS tztimestamp) != CAST("2000-01-01T12:00:00.123456Z" AS timestamp)
+    CAST('2000-01-01T12:00:00.123456,GMT' AS tztimestamp) != CAST('2000-01-01T12:00:00.123456Z' AS timestamp)
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00.123456Z" AS timestamp) == CAST("2000-01-01T12:00:00.123456,GMT" AS tztimestamp)
+    CAST('2000-01-01T12:00:00.123456Z' AS timestamp) == CAST('2000-01-01T12:00:00.123456,GMT' AS tztimestamp)
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00.123456Z" AS timestamp) < CAST("2000-01-01T12:00:00.123456,GMT" AS tztimestamp)
+    CAST('2000-01-01T12:00:00.123456Z' AS timestamp) < CAST('2000-01-01T12:00:00.123456,GMT' AS tztimestamp)
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00.123456Z" AS timestamp) <= CAST("2000-01-01T12:00:00.123456,GMT" AS tztimestamp)
+    CAST('2000-01-01T12:00:00.123456Z' AS timestamp) <= CAST('2000-01-01T12:00:00.123456,GMT' AS tztimestamp)
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00.123456Z" AS timestamp) > CAST("2000-01-01T12:00:00.123456,GMT" AS tztimestamp)
+    CAST('2000-01-01T12:00:00.123456Z' AS timestamp) > CAST('2000-01-01T12:00:00.123456,GMT' AS tztimestamp)
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00.123456Z" AS timestamp) >= CAST("2000-01-01T12:00:00.123456,GMT" AS tztimestamp)
+    CAST('2000-01-01T12:00:00.123456Z' AS timestamp) >= CAST('2000-01-01T12:00:00.123456,GMT' AS tztimestamp)
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00.123456Z" AS timestamp) != CAST("2000-01-01T12:00:00.123456,GMT" AS tztimestamp)
+    CAST('2000-01-01T12:00:00.123456Z' AS timestamp) != CAST('2000-01-01T12:00:00.123456,GMT' AS tztimestamp)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_compare_same_zones_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_compare_same_zones_/formatted.sql
index 51a17c2601..de7da28c52 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_compare_same_zones_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_compare_same_zones_/formatted.sql
@@ -1,144 +1,144 @@
 /* postgres can not */
 SELECT
-    CAST("2000-01-01,GMT" AS tzdate) == tzdate("2000-01-01,GMT")
+    CAST('2000-01-01,GMT' AS tzdate) == tzdate('2000-01-01,GMT')
 ;
 
 SELECT
-    CAST("2000-01-01,GMT" AS tzdate) < CAST("2000-01-01" AS date)
+    CAST('2000-01-01,GMT' AS tzdate) < CAST('2000-01-01' AS date)
 ;
 
 SELECT
-    CAST("2000-01-01,GMT" AS tzdate) <= tzdate("2000-01-01,GMT")
+    CAST('2000-01-01,GMT' AS tzdate) <= tzdate('2000-01-01,GMT')
 ;
 
 SELECT
-    CAST("2000-01-01,GMT" AS tzdate) > tzdate("2000-01-01,GMT")
+    CAST('2000-01-01,GMT' AS tzdate) > tzdate('2000-01-01,GMT')
 ;
 
 SELECT
-    CAST("2000-01-01,GMT" AS tzdate) >= tzdate("2000-01-01,GMT")
+    CAST('2000-01-01,GMT' AS tzdate) >= tzdate('2000-01-01,GMT')
 ;
 
 SELECT
-    CAST("2000-01-01,GMT" AS tzdate) != tzdate("2000-01-01,GMT")
+    CAST('2000-01-01,GMT' AS tzdate) != tzdate('2000-01-01,GMT')
 ;
 
 SELECT
-    tzdate("2000-01-01,GMT") == CAST("2000-01-01,GMT" AS tzdate)
+    tzdate('2000-01-01,GMT') == CAST('2000-01-01,GMT' AS tzdate)
 ;
 
 SELECT
-    tzdate("2000-01-01,GMT") < CAST("2000-01-01,GMT" AS tzdate)
+    tzdate('2000-01-01,GMT') < CAST('2000-01-01,GMT' AS tzdate)
 ;
 
 SELECT
-    tzdate("2000-01-01,GMT") <= CAST("2000-01-01,GMT" AS tzdate)
+    tzdate('2000-01-01,GMT') <= CAST('2000-01-01,GMT' AS tzdate)
 ;
 
 SELECT
-    tzdate("2000-01-01,GMT") > CAST("2000-01-01,GMT" AS tzdate)
+    tzdate('2000-01-01,GMT') > CAST('2000-01-01,GMT' AS tzdate)
 ;
 
 SELECT
-    tzdate("2000-01-01,GMT") >= CAST("2000-01-01,GMT" AS tzdate)
+    tzdate('2000-01-01,GMT') >= CAST('2000-01-01,GMT' AS tzdate)
 ;
 
 SELECT
-    tzdate("2000-01-01,GMT") != CAST("2000-01-01,GMT" AS tzdate)
+    tzdate('2000-01-01,GMT') != CAST('2000-01-01,GMT' AS tzdate)
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00,GMT" AS tzdatetime) == tzdatetime("2000-01-01T12:00:00,GMT")
+    CAST('2000-01-01T12:00:00,GMT' AS tzdatetime) == tzdatetime('2000-01-01T12:00:00,GMT')
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00,GMT" AS tzdatetime) < tzdatetime("2000-01-01T12:00:00,GMT")
+    CAST('2000-01-01T12:00:00,GMT' AS tzdatetime) < tzdatetime('2000-01-01T12:00:00,GMT')
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00,GMT" AS tzdatetime) <= tzdatetime("2000-01-01T12:00:00,GMT")
+    CAST('2000-01-01T12:00:00,GMT' AS tzdatetime) <= tzdatetime('2000-01-01T12:00:00,GMT')
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00,GMT" AS tzdatetime) > tzdatetime("2000-01-01T12:00:00,GMT")
+    CAST('2000-01-01T12:00:00,GMT' AS tzdatetime) > tzdatetime('2000-01-01T12:00:00,GMT')
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00,GMT" AS tzdatetime) >= tzdatetime("2000-01-01T12:00:00,GMT")
+    CAST('2000-01-01T12:00:00,GMT' AS tzdatetime) >= tzdatetime('2000-01-01T12:00:00,GMT')
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00,GMT" AS tzdatetime) != tzdatetime("2000-01-01T12:00:00,GMT")
+    CAST('2000-01-01T12:00:00,GMT' AS tzdatetime) != tzdatetime('2000-01-01T12:00:00,GMT')
 ;
 
 SELECT
-    tzdatetime("2000-01-01T12:00:00,GMT") == CAST("2000-01-01T12:00:00,GMT" AS tzdatetime)
+    tzdatetime('2000-01-01T12:00:00,GMT') == CAST('2000-01-01T12:00:00,GMT' AS tzdatetime)
 ;
 
 SELECT
-    tzdatetime("2000-01-01T12:00:00,GMT") < CAST("2000-01-01T12:00:00,GMT" AS tzdatetime)
+    tzdatetime('2000-01-01T12:00:00,GMT') < CAST('2000-01-01T12:00:00,GMT' AS tzdatetime)
 ;
 
 SELECT
-    tzdatetime("2000-01-01T12:00:00,GMT") <= CAST("2000-01-01T12:00:00,GMT" AS tzdatetime)
+    tzdatetime('2000-01-01T12:00:00,GMT') <= CAST('2000-01-01T12:00:00,GMT' AS tzdatetime)
 ;
 
 SELECT
-    tzdatetime("2000-01-01T12:00:00,GMT") > CAST("2000-01-01T12:00:00,GMT" AS tzdatetime)
+    tzdatetime('2000-01-01T12:00:00,GMT') > CAST('2000-01-01T12:00:00,GMT' AS tzdatetime)
 ;
 
 SELECT
-    tzdatetime("2000-01-01T12:00:00,GMT") >= CAST("2000-01-01T12:00:00,GMT" AS tzdatetime)
+    tzdatetime('2000-01-01T12:00:00,GMT') >= CAST('2000-01-01T12:00:00,GMT' AS tzdatetime)
 ;
 
 SELECT
-    tzdatetime("2000-01-01T12:00:00,GMT") != CAST("2000-01-01T12:00:00,GMT" AS tzdatetime)
+    tzdatetime('2000-01-01T12:00:00,GMT') != CAST('2000-01-01T12:00:00,GMT' AS tzdatetime)
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00.123456,GMT" AS tztimestamp) == tztimestamp("2000-01-01T12:00:00.123456,GMT")
+    CAST('2000-01-01T12:00:00.123456,GMT' AS tztimestamp) == tztimestamp('2000-01-01T12:00:00.123456,GMT')
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00.123456,GMT" AS tztimestamp) < tztimestamp("2000-01-01T12:00:00.123456,GMT")
+    CAST('2000-01-01T12:00:00.123456,GMT' AS tztimestamp) < tztimestamp('2000-01-01T12:00:00.123456,GMT')
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00.123456,GMT" AS tztimestamp) <= tztimestamp("2000-01-01T12:00:00.123456,GMT")
+    CAST('2000-01-01T12:00:00.123456,GMT' AS tztimestamp) <= tztimestamp('2000-01-01T12:00:00.123456,GMT')
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00.123456,GMT" AS tztimestamp) > tztimestamp("2000-01-01T12:00:00.123456,GMT")
+    CAST('2000-01-01T12:00:00.123456,GMT' AS tztimestamp) > tztimestamp('2000-01-01T12:00:00.123456,GMT')
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00.123456,GMT" AS tztimestamp) >= tztimestamp("2000-01-01T12:00:00.123456,GMT")
+    CAST('2000-01-01T12:00:00.123456,GMT' AS tztimestamp) >= tztimestamp('2000-01-01T12:00:00.123456,GMT')
 ;
 
 SELECT
-    CAST("2000-01-01T12:00:00.123456,GMT" AS tztimestamp) != tztimestamp("2000-01-01T12:00:00.123456,GMT")
+    CAST('2000-01-01T12:00:00.123456,GMT' AS tztimestamp) != tztimestamp('2000-01-01T12:00:00.123456,GMT')
 ;
 
 SELECT
-    tztimestamp("2000-01-01T12:00:00.123456,GMT") == CAST("2000-01-01T12:00:00.123456,GMT" AS tztimestamp)
+    tztimestamp('2000-01-01T12:00:00.123456,GMT') == CAST('2000-01-01T12:00:00.123456,GMT' AS tztimestamp)
 ;
 
 SELECT
-    tztimestamp("2000-01-01T12:00:00.123456,GMT") < CAST("2000-01-01T12:00:00.123456,GMT" AS tztimestamp)
+    tztimestamp('2000-01-01T12:00:00.123456,GMT') < CAST('2000-01-01T12:00:00.123456,GMT' AS tztimestamp)
 ;
 
 SELECT
-    tztimestamp("2000-01-01T12:00:00.123456,GMT") <= CAST("2000-01-01T12:00:00.123456,GMT" AS tztimestamp)
+    tztimestamp('2000-01-01T12:00:00.123456,GMT') <= CAST('2000-01-01T12:00:00.123456,GMT' AS tztimestamp)
 ;
 
 SELECT
-    tztimestamp("2000-01-01T12:00:00.123456,GMT") > CAST("2000-01-01T12:00:00.123456,GMT" AS tztimestamp)
+    tztimestamp('2000-01-01T12:00:00.123456,GMT') > CAST('2000-01-01T12:00:00.123456,GMT' AS tztimestamp)
 ;
 
 SELECT
-    tztimestamp("2000-01-01T12:00:00.123456,GMT") >= CAST("2000-01-01T12:00:00.123456,GMT" AS tztimestamp)
+    tztimestamp('2000-01-01T12:00:00.123456,GMT') >= CAST('2000-01-01T12:00:00.123456,GMT' AS tztimestamp)
 ;
 
 SELECT
-    tztimestamp("2000-01-01T12:00:00.123456,GMT") != CAST("2000-01-01T12:00:00.123456,GMT" AS tztimestamp)
+    tztimestamp('2000-01-01T12:00:00.123456,GMT') != CAST('2000-01-01T12:00:00.123456,GMT' AS tztimestamp)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_expand_gmt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_expand_gmt_/formatted.sql
index 74c1f1a7fc..1f11678e73 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_expand_gmt_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_expand_gmt_/formatted.sql
@@ -1,6 +1,6 @@
 /* postgres can not */
 SELECT
-    CAST(Date("2000-01-01") AS TzDate),
-    CAST(Datetime("2000-01-01T01:02:03Z") AS TzDatetime),
-    CAST(Timestamp("2000-01-01T01:02:03.456789Z") AS TzTimestamp)
+    CAST(Date('2000-01-01') AS TzDate),
+    CAST(Datetime('2000-01-01T01:02:03Z') AS TzDatetime),
+    CAST(Timestamp('2000-01-01T01:02:03.456789Z') AS TzTimestamp)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_impossible_cast_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_impossible_cast_/formatted.sql
index 53824d3e5a..ad10556978 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_impossible_cast_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_impossible_cast_/formatted.sql
@@ -4,7 +4,7 @@ SELECT
         AddTimezone(
             /* "1970-01-01T20:59:59Z" */
             CAST(75599 AS DateTime),
-            "Europe/Moscow"
+            'Europe/Moscow'
         ) AS TzDate
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_io_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_io_/formatted.sql
index cba5c62dbf..7fb3154311 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_io_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_io_/formatted.sql
@@ -1,6 +1,6 @@
 /* postgres can not */
 SELECT
-    CAST(CAST(TzDate("2000-01-01,Europe/Moscow") AS string) AS TzDate),
-    CAST(CAST(TzDatetime("2000-01-01T01:02:03,Europe/Moscow") AS string) AS TzDatetime),
-    CAST(CAST(TzTimestamp("2000-01-01T01:02:03.456789,Europe/Moscow") AS string) AS TzTimestamp)
+    CAST(CAST(TzDate('2000-01-01,Europe/Moscow') AS string) AS TzDate),
+    CAST(CAST(TzDatetime('2000-01-01T01:02:03,Europe/Moscow') AS string) AS TzDatetime),
+    CAST(CAST(TzTimestamp('2000-01-01T01:02:03.456789,Europe/Moscow') AS string) AS TzTimestamp)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_scale_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_scale_/formatted.sql
index 56f11cc8da..425e8eb4fc 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_scale_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_scale_/formatted.sql
@@ -1,48 +1,48 @@
 /* postgres can not */
 SELECT
-    CAST(TzDate("2000-01-01,Europe/Moscow") AS TzDatetime)
+    CAST(TzDate('2000-01-01,Europe/Moscow') AS TzDatetime)
 ;
 
 SELECT
-    CAST(TzDate("2000-01-01,Europe/Moscow") AS TzTimestamp)
+    CAST(TzDate('2000-01-01,Europe/Moscow') AS TzTimestamp)
 ;
 
 SELECT
-    CAST(TzDatetime("2000-01-01T12:00:00,Europe/Moscow") AS TzDate)
+    CAST(TzDatetime('2000-01-01T12:00:00,Europe/Moscow') AS TzDate)
 ;
 
 SELECT
-    CAST(TzDatetime("2000-01-01T12:00:00,Europe/Moscow") AS TzTimestamp)
+    CAST(TzDatetime('2000-01-01T12:00:00,Europe/Moscow') AS TzTimestamp)
 ;
 
 SELECT
-    CAST(TzTimestamp("2000-01-01T12:00:00.456789,Europe/Moscow") AS TzDate)
+    CAST(TzTimestamp('2000-01-01T12:00:00.456789,Europe/Moscow') AS TzDate)
 ;
 
 SELECT
-    CAST(TzTimestamp("2000-01-01T12:00:00.456789,Europe/Moscow") AS TzDatetime)
+    CAST(TzTimestamp('2000-01-01T12:00:00.456789,Europe/Moscow') AS TzDatetime)
 ;
 
 SELECT
-    CAST(TzDate("2000-01-01,America/Los_Angeles") AS TzDatetime)
+    CAST(TzDate('2000-01-01,America/Los_Angeles') AS TzDatetime)
 ;
 
 SELECT
-    CAST(TzDate("2000-01-01,America/Los_Angeles") AS TzTimestamp)
+    CAST(TzDate('2000-01-01,America/Los_Angeles') AS TzTimestamp)
 ;
 
 SELECT
-    CAST(TzDatetime("2000-01-01T12:00:00,America/Los_Angeles") AS TzDate)
+    CAST(TzDatetime('2000-01-01T12:00:00,America/Los_Angeles') AS TzDate)
 ;
 
 SELECT
-    CAST(TzDatetime("2000-01-01T12:00:00,America/Los_Angeles") AS TzTimestamp)
+    CAST(TzDatetime('2000-01-01T12:00:00,America/Los_Angeles') AS TzTimestamp)
 ;
 
 SELECT
-    CAST(TzTimestamp("2000-01-01T12:00:00.456789,America/Los_Angeles") AS TzDate)
+    CAST(TzTimestamp('2000-01-01T12:00:00.456789,America/Los_Angeles') AS TzDate)
 ;
 
 SELECT
-    CAST(TzTimestamp("2000-01-01T12:00:00.456789,America/Los_Angeles") AS TzDatetime)
+    CAST(TzTimestamp('2000-01-01T12:00:00.456789,America/Los_Angeles') AS TzDatetime)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_distinct-distinct_groupby_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_distinct-distinct_groupby_/formatted.sql
index 6a87da5f52..724e303d2c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_distinct-distinct_groupby_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_distinct-distinct_groupby_/formatted.sql
@@ -2,8 +2,8 @@
 USE plato;
 
 SELECT DISTINCT
-    k || "_" AS k1,
-    "_" || v AS v1
+    k || '_' AS k1,
+    '_' || v AS v1
 FROM
     Input2
 GROUP BY
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_distinct-distinct_having_no_agg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_distinct-distinct_having_no_agg_/formatted.sql
index d319ce4c56..5003f3c69a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_distinct-distinct_having_no_agg_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_distinct-distinct_having_no_agg_/formatted.sql
@@ -1,5 +1,5 @@
 /* syntax version 1 */
-PRAGMA warning("disable", "4526");
+PRAGMA warning('disable', '4526');
 
 USE plato;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-join_cbo_native_3_tables_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-join_cbo_native_3_tables_/formatted.sql
index 366b5f80f5..49bf0da92c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-join_cbo_native_3_tables_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-join_cbo_native_3_tables_/formatted.sql
@@ -1,6 +1,6 @@
 USE plato;
 
-PRAGMA CostBasedOptimizer = "native";
+PRAGMA CostBasedOptimizer = 'native';
 
 SELECT
     i1.value,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-mem_limit_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-mem_limit_/formatted.sql
index eb56a0d044..0fbd4f027e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-mem_limit_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-mem_limit_/formatted.sql
@@ -2,15 +2,15 @@
 /* dqfile can not */
 USE plato;
 
-PRAGMA DqEngine = "force";
-PRAGMA dq.MemoryLimit = "1M";
+PRAGMA DqEngine = 'force';
+PRAGMA dq.MemoryLimit = '1M';
 
 SELECT
     String::JoinFromList(
         ListMap(
             ListFromRange(0, 1000000), ($_) -> {
-                RETURN "0";
+                RETURN '0';
             }
-        ), ""
+        ), ''
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-precompute_asyncfile_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-precompute_asyncfile_/formatted.sql
index 2ab607462e..b550a41d03 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-precompute_asyncfile_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-precompute_asyncfile_/formatted.sql
@@ -6,7 +6,7 @@ $a =
     FROM
         Input
     WHERE
-        key IN ParseFile("String", "list.txt")
+        key IN ParseFile('String', 'list.txt')
 ;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-precompute_tree_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-precompute_tree_/formatted.sql
index 41ac6c72f6..c1eeb51e63 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-precompute_tree_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-precompute_tree_/formatted.sql
@@ -22,7 +22,7 @@ $c =
     FROM
         Input
     WHERE
-        key < "080"
+        key < '080'
 ;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-read_cost_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-read_cost_/formatted.sql
index 000506a90d..a1bd14f3e0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-read_cost_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-read_cost_/formatted.sql
@@ -1,5 +1,5 @@
-PRAGMA warning("disable", "4510");
-PRAGMA CostBasedOptimizer = "PG";
+PRAGMA warning('disable', '4510');
+PRAGMA CostBasedOptimizer = 'PG';
 
 USE plato;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-read_cost_native_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-read_cost_native_/formatted.sql
index 0504e723d4..1d2755bf27 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-read_cost_native_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-read_cost_native_/formatted.sql
@@ -1,5 +1,5 @@
-PRAGMA warning("disable", "4510");
-PRAGMA CostBasedOptimizer = "Native";
+PRAGMA warning('disable', '4510');
+PRAGMA CostBasedOptimizer = 'Native';
 
 USE plato;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-truncate_local_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-truncate_local_/formatted.sql
index 749baf0ee7..ca660690bb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-truncate_local_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-truncate_local_/formatted.sql
@@ -1,4 +1,4 @@
-PRAGMA DqEngine = "auto";
+PRAGMA DqEngine = 'auto';
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-use_and_drop_anonymous_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-use_and_drop_anonymous_/formatted.sql
index ff11765b7b..eb9ec78587 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-use_and_drop_anonymous_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-use_and_drop_anonymous_/formatted.sql
@@ -8,7 +8,7 @@ SELECT
 FROM
     Input
 WHERE
-    key > "100"
+    key > '100'
 ;
 
 COMMIT;
@@ -19,7 +19,7 @@ SELECT
 FROM
     @tmp
 WHERE
-    key != "150"
+    key != '150'
 ;
 
 DROP TABLE @tmp;
@@ -32,7 +32,7 @@ SELECT
 FROM
     Input
 WHERE
-    key > "200"
+    key > '200'
 ;
 
 COMMIT;
@@ -43,7 +43,7 @@ SELECT
 FROM
     @tmp
 WHERE
-    key != "150"
+    key != '150'
 ;
 
 DROP TABLE @tmp;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-use_sorted_by_complex_type_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-use_sorted_by_complex_type_/formatted.sql
index 2f9eb00b31..b80bf7c1e8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-use_sorted_by_complex_type_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-use_sorted_by_complex_type_/formatted.sql
@@ -22,5 +22,5 @@ SELECT
 FROM
     Output
 WHERE
-    key > "150"
+    key > '150'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_dict_dict_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_dict_dict_key_/formatted.sql
index 7ab4871a92..5e3552ded3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_dict_dict_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_dict_dict_key_/formatted.sql
@@ -1,12 +1,12 @@
 /* postgres can not */
 $d1 = AsDict(
-    AsTuple(AsList(1, 2, 3), "foo"),
-    AsTuple(AsList(1, 2), "bar")
+    AsTuple(AsList(1, 2, 3), 'foo'),
+    AsTuple(AsList(1, 2), 'bar')
 );
 
 $d2 = AsDict(
-    AsTuple(AsList(1, 3), "baz"),
-    AsTuple(AsList(1, 2), "qwe")
+    AsTuple(AsList(1, 3), 'baz'),
+    AsTuple(AsList(1, 2), 'qwe')
 );
 
 $d3 = DictCreate(DictKeyType(TypeOf($d2)), DictPayloadType(TypeOf($d2)));
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_dict_list_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_dict_list_key_/formatted.sql
index 61374c360a..f17b937a68 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_dict_list_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_dict_list_key_/formatted.sql
@@ -1,7 +1,7 @@
 /* postgres can not */
 $d = AsDict(
-    AsTuple(AsList(1, 2, 3), "foo"),
-    AsTuple(AsList(1, 2), "bar")
+    AsTuple(AsList(1, 2, 3), 'foo'),
+    AsTuple(AsList(1, 2), 'bar')
 );
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_dict_tuple_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_dict_tuple_key_/formatted.sql
index a1df8d632e..ff310b0332 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_dict_tuple_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_dict_tuple_key_/formatted.sql
@@ -1,7 +1,7 @@
 /* postgres can not */
 $d = AsDict(
-    AsTuple(AsTuple(), "foo"),
-    AsTuple(AsTuple(), "bar")
+    AsTuple(AsTuple(), 'foo'),
+    AsTuple(AsTuple(), 'bar')
 );
 
 SELECT
@@ -19,8 +19,8 @@ SELECT
 ;
 
 $d = AsDict(
-    AsTuple(AsTuple(1), "foo"),
-    AsTuple(AsTuple(2), "bar")
+    AsTuple(AsTuple(1), 'foo'),
+    AsTuple(AsTuple(2), 'bar')
 );
 
 SELECT
@@ -40,8 +40,8 @@ SELECT
 ;
 
 $d = AsDict(
-    AsTuple(AsTuple(1, 2), "foo"),
-    AsTuple(AsTuple(1, 3), "bar")
+    AsTuple(AsTuple(1, 2), 'foo'),
+    AsTuple(AsTuple(1, 3), 'bar')
 );
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_table_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_table_/formatted.sql
index ccf18e4fce..d326c696bc 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_table_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_table_/formatted.sql
@@ -1,8 +1,8 @@
 /* postgres can not */
 $data = AsList(
-    AsStruct(1u AS Key, "v1" AS Value1, 100 AS Value2),
-    AsStruct(2u AS Key, "v2" AS Value1, 200 AS Value2),
-    AsStruct(3u AS Key, "v3" AS Value1, 300 AS Value2)
+    AsStruct(1u AS Key, 'v1' AS Value1, 100 AS Value2),
+    AsStruct(2u AS Key, 'v2' AS Value1, 200 AS Value2),
+    AsStruct(3u AS Key, 'v3' AS Value1, 300 AS Value2)
 );
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_table_bad_columns_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_table_bad_columns_fail_/formatted.sql
index accd2beac6..74603dcb72 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_table_bad_columns_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_table_bad_columns_fail_/formatted.sql
@@ -1,9 +1,9 @@
 /* postgres can not */
 /* custom error:Member not found: Value3. Did you mean Value1?*/
 $data = AsList(
-    AsStruct(1u AS Key, "v1" AS Value1, 100 AS Value2),
-    AsStruct(2u AS Key, "v2" AS Value1, 200 AS Value2),
-    AsStruct(3u AS Key, "v3" AS Value1, 300 AS Value2)
+    AsStruct(1u AS Key, 'v1' AS Value1, 100 AS Value2),
+    AsStruct(2u AS Key, 'v2' AS Value1, 200 AS Value2),
+    AsStruct(3u AS Key, 'v3' AS Value1, 300 AS Value2)
 );
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_variant_enum_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_variant_enum_/formatted.sql
index 99c14db788..d6b9832360 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_variant_enum_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_variant_enum_/formatted.sql
@@ -1,6 +1,6 @@
 /* postgres can not */
 /* syntax version 1 */
 SELECT
-    AsVariant(1, "int"),
-    AsEnum("monday")
+    AsVariant(1, 'int'),
+    AsEnum('monday')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_variant_enum_compare_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_variant_enum_compare_/formatted.sql
index 6db3233749..40279a6f86 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_variant_enum_compare_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_variant_enum_compare_/formatted.sql
@@ -1,7 +1,7 @@
 /* postgres can not */
 /* syntax version 1 */
 SELECT
-    ENUM ("foo", Enum<"foo", "bar">) == AsEnum("foo"),
-    ENUM ("foo", Enum<"foo", "bar">) == AsEnum("bar"),
-    ENUM ("foo", Enum<"foo", "bar">) == AsEnum("baz")
+    ENUM ('foo', Enum<'foo', 'bar'>) == AsEnum('foo'),
+    ENUM ('foo', Enum<'foo', 'bar'>) == AsEnum('bar'),
+    ENUM ('foo', Enum<'foo', 'bar'>) == AsEnum('baz')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_dynumber_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_dynumber_/formatted.sql
index b89bfb21ed..572f4dcf09 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_dynumber_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_dynumber_/formatted.sql
@@ -1,11 +1,11 @@
 /* postgres can not */
 /* syntax version 1 */
 SELECT
-    CAST(DyNumber("-21.33") AS String),
-    CAST(DyNumber("0") AS Utf8),
-    CAST(["-21.33E2", "3.14", "42", "", "bad"] AS List<DyNumber>)
+    CAST(DyNumber('-21.33') AS String),
+    CAST(DyNumber('0') AS Utf8),
+    CAST(['-21.33E2', '3.14', '42', '', 'bad'] AS List<DyNumber>)
 ;
 
 SELECT
-    ListMap(["\x00\x80\x65", "\x00\x81\x66", "\x00\x82\x56", "\x01", "\x02\x84\x9A", "\x02\x85\x99", "\x02\x86\xA9"], ($i) -> (FromBytes($i, DyNumber)))
+    ListMap(['\x00\x80\x65', '\x00\x81\x66', '\x00\x82\x56', '\x01', '\x02\x84\x9A', '\x02\x85\x99', '\x02\x86\xA9'], ($i) -> (FromBytes($i, DyNumber)))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_from_utf8_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_from_utf8_/formatted.sql
index 1a646e8638..704eed6507 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_from_utf8_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_from_utf8_/formatted.sql
@@ -1,9 +1,9 @@
 /* postgres can not */
 SELECT
-    CAST(Utf8("true") AS bool),
-    CAST(Utf8("-1") AS Int32),
-    CAST(Utf8("-3.5") AS Double),
-    CAST(Utf8("P1D") AS Interval),
-    CAST(Utf8("2000-01-01") AS Date),
-    CAST(Utf8("2000-01-01,GMT") AS TzDate)
+    CAST(Utf8('true') AS bool),
+    CAST(Utf8('-1') AS Int32),
+    CAST(Utf8('-3.5') AS Double),
+    CAST(Utf8('P1D') AS Interval),
+    CAST(Utf8('2000-01-01') AS Date),
+    CAST(Utf8('2000-01-01,GMT') AS TzDate)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_longint_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_longint_/formatted.sql
index 9db241cc71..75c6151214 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_longint_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_longint_/formatted.sql
@@ -4,6 +4,6 @@ $value = CAST(-7 AS Decimal (10, 0));
 SELECT
     $value AS binary,
     CAST($value AS String) AS to_string,
-    CAST("+123" AS Decimal (10, 0)) AS from_string,
-    CAST("bad" AS Decimal (10, 0)) AS bad_cast
+    CAST('+123' AS Decimal (10, 0)) AS from_string,
+    CAST('bad' AS Decimal (10, 0)) AS bad_cast
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_reverse_list_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_reverse_list_/formatted.sql
index 75b3a21ccd..879eedba0c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_reverse_list_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_reverse_list_/formatted.sql
@@ -1,5 +1,5 @@
 /* postgres can not */
 /* syntax version 1 */
 SELECT
-    CAST(ListReverse(ListExtend(["1", "2", "3"], ["4", "5", "6"])) AS List<Int64>)
+    CAST(ListReverse(ListExtend(['1', '2', '3'], ['4', '5', '6'])) AS List<Int64>)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_utf8_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_utf8_/formatted.sql
index 593cbc33d9..4600ce94ea 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_utf8_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_utf8_/formatted.sql
@@ -1,4 +1,4 @@
 /* postgres can not */
 SELECT
-    CAST("Espa\u00f1ol" AS Utf8)
+    CAST('Espa\u00f1ol' AS Utf8)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_variant_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_variant_/formatted.sql
index 431457b194..5671f7f2e0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_variant_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_variant_/formatted.sql
@@ -1,9 +1,9 @@
 /* postgres can not */
 /* syntax version 1 */
-$a = AsEnum("a");
-$b = AsEnum("b");
-$c = AsEnum("c");
-$d = AsEnum("d");
+$a = AsEnum('a');
+$b = AsEnum('b');
+$c = AsEnum('c');
+$d = AsEnum('d');
 $t = TypeOf([Just($a), Just($b), just($c)]);
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-checked_ops_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-checked_ops_/formatted.sql
index 5058b607dc..ec840613b8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-checked_ops_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-checked_ops_/formatted.sql
@@ -1,4 +1,4 @@
-PRAGMA CheckedOps = "true";
+PRAGMA CheckedOps = 'true';
 
 SELECT
     5 + 3,
@@ -29,5 +29,5 @@ SELECT
 ;
 
 SELECT
-    -CAST("-128" AS int8)
+    -CAST('-128' AS int8)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-checked_ops_agg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-checked_ops_agg_/formatted.sql
index 14e6b4641a..0a64d48d17 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-checked_ops_agg_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-checked_ops_agg_/formatted.sql
@@ -1,4 +1,4 @@
-PRAGMA CheckedOps = "true";
+PRAGMA CheckedOps = 'true';
 
 SELECT
     sum(NULL),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-common_type_for_resource_and_data_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-common_type_for_resource_and_data_/formatted.sql
index 16210b1ac9..234b1ccb5f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-common_type_for_resource_and_data_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-common_type_for_resource_and_data_/formatted.sql
@@ -3,13 +3,13 @@ SELECT
 ;
 
 SELECT
-    AsList(Yson::Parse("1"), "2"y)
+    AsList(Yson::Parse('1'), "2"y)
 ;
 
 SELECT
-    AsList(Yson::ParseJson("1"), "2"j)
+    AsList(Yson::ParseJson('1'), "2"j)
 ;
 
 SELECT
-    AsList(Json2::Parse("1"), "2"j)
+    AsList(Json2::Parse('1'), "2"j)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-constraints_of_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-constraints_of_/formatted.sql
index 3886688df5..b4ba1bf104 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-constraints_of_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-constraints_of_/formatted.sql
@@ -1,6 +1,6 @@
 /* syntax version 1 */
 /* postgres can not */
-PRAGMA warning("disable", "4510");
+PRAGMA warning('disable', '4510');
 
 USE plato;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-container_comp_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-container_comp_/formatted.sql
index 149ac45cb7..c033021b06 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-container_comp_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-container_comp_/formatted.sql
@@ -32,5 +32,5 @@ SELECT
 ;
 
 SELECT
-    AsTagged(1, "foo") == AsTagged(1u, "foo")
+    AsTagged(1, 'foo') == AsTagged(1u, 'foo')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-current_tz_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-current_tz_/formatted.sql
index 5b551ff168..3a19f5dfd1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-current_tz_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-current_tz_/formatted.sql
@@ -1,9 +1,9 @@
 /* syntax version 1 */
 /* postgres can not */
 SELECT
-    CurrentTzDate("Europe/Moscow"),
-    CurrentTzDatetime("Europe/Moscow"),
-    CurrentTzTimestamp("Europe/Moscow"),
+    CurrentTzDate('Europe/Moscow'),
+    CurrentTzDatetime('Europe/Moscow'),
+    CurrentTzTimestamp('Europe/Moscow'),
     CurrentUtcDate(),
     CurrentUtcDatetime(),
     CurrentUtcTimestamp()
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-decimal_bytes_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-decimal_bytes_/formatted.sql
index 90ee14d4ca..4cadcd1cb9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-decimal_bytes_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-decimal_bytes_/formatted.sql
@@ -1,17 +1,17 @@
 SELECT
-    ToBytes(Decimal("14.2", 5, 1)),
-    ToBytes(Decimal("inf", 5, 1)),
-    ToBytes(Decimal("-inf", 5, 1)),
-    ToBytes(Decimal("nan", 5, 1)),
+    ToBytes(Decimal('14.2', 5, 1)),
+    ToBytes(Decimal('inf', 5, 1)),
+    ToBytes(Decimal('-inf', 5, 1)),
+    ToBytes(Decimal('nan', 5, 1)),
     ToBytes(Nothing(Optional<Decimal (5, 1)>))
 ;
 
 SELECT
-    FromBytes(ToBytes(Decimal("14.2", 5, 1)), Decimal(5, 1)),
-    FromBytes(ToBytes(Decimal("10", 5, 1)), Decimal(2, 1)),
-    FromBytes(ToBytes(Decimal("-10", 5, 1)), Decimal(2, 0)),
-    FromBytes(ToBytes(Decimal("inf", 5, 1)), Decimal(5, 1)),
-    FromBytes(ToBytes(Decimal("-inf", 5, 1)), Decimal(5, 1)),
-    FromBytes(ToBytes(Decimal("nan", 5, 1)), Decimal(5, 1)),
+    FromBytes(ToBytes(Decimal('14.2', 5, 1)), Decimal(5, 1)),
+    FromBytes(ToBytes(Decimal('10', 5, 1)), Decimal(2, 1)),
+    FromBytes(ToBytes(Decimal('-10', 5, 1)), Decimal(2, 0)),
+    FromBytes(ToBytes(Decimal('inf', 5, 1)), Decimal(5, 1)),
+    FromBytes(ToBytes(Decimal('-inf', 5, 1)), Decimal(5, 1)),
+    FromBytes(ToBytes(Decimal('nan', 5, 1)), Decimal(5, 1)),
     FromBytes(Nothing(String?), Decimal(5, 1))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-dict_builtins_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-dict_builtins_/formatted.sql
index fbd64aac61..fb71158ab5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-dict_builtins_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-dict_builtins_/formatted.sql
@@ -1,15 +1,15 @@
 /* postgres can not */
 /* syntax version 1 */
-$dict = AsDict(AsTuple("foo", 3), AsTuple("bar", 4));
+$dict = AsDict(AsTuple('foo', 3), AsTuple('bar', 4));
 
 SELECT
     DictKeys($dict),
     DictPayloads($dict),
     DictItems($dict),
-    DictLookup($dict, "foo"),
-    DictLookup($dict, "baz"),
-    DictContains($dict, "foo"),
-    DictContains($dict, "baz"),
+    DictLookup($dict, 'foo'),
+    DictLookup($dict, 'baz'),
+    DictContains($dict, 'foo'),
+    DictContains($dict, 'baz'),
     DictCreate(String, Tuple<String, Double?>),
-    DictCreate(Tuple<Int32?, String>, OptionalType(DataType("String")))
+    DictCreate(Tuple<Int32?, String>, OptionalType(DataType('String')))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-dict_builtins_null_lookup_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-dict_builtins_null_lookup_/formatted.sql
index 942c7f7933..053a8e0f2c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-dict_builtins_null_lookup_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-dict_builtins_null_lookup_/formatted.sql
@@ -1,9 +1,9 @@
 /* postgres can not */
-$d2 = AsDict(AsTuple(1 / 1, "bar"));
-$d3 = AsDict(AsTuple(1 / 0, "baz"));
-$t1 = AsDict(AsTuple(AsTuple(1, "key"), AsTuple(1, "value")));
-$t2 = AsDict(AsTuple(AsTuple(1 / 1, "key"), AsTuple(2 / 1, "value")));
-$t3 = AsDict(AsTuple(AsTuple(1 / 0, "key"), AsTuple(123, "value")));
+$d2 = AsDict(AsTuple(1 / 1, 'bar'));
+$d3 = AsDict(AsTuple(1 / 0, 'baz'));
+$t1 = AsDict(AsTuple(AsTuple(1, 'key'), AsTuple(1, 'value')));
+$t2 = AsDict(AsTuple(AsTuple(1 / 1, 'key'), AsTuple(2 / 1, 'value')));
+$t3 = AsDict(AsTuple(AsTuple(1 / 0, 'key'), AsTuple(123, 'value')));
 
 SELECT
     DictContains($d2, NULL), -- false, no such key
@@ -14,12 +14,12 @@ SELECT
 
 -- Just("baz"), null is convertible to Nothing<T> for any T
 SELECT
-    DictContains($t1, AsTuple(1, "keyy")), -- false, missing key
-    DictContains($t1, AsTuple(1, "key")), -- true,  match
-    DictContains($t1, Just(AsTuple(1, "key"))), -- true,  match with optional
-    DictContains($t2, AsTuple(NULL, "key")), -- false, no such key
-    DictContains($t3, AsTuple(NULL, "key")), -- true, null is convertible to Nothing<T> for any T
-    DictLookup($t2, AsTuple(NULL, "key")), -- Nothing(Tuple<Int32?, String>?), no such key
-    DictLookup($t3, AsTuple(NULL, "key"))
+    DictContains($t1, AsTuple(1, 'keyy')), -- false, missing key
+    DictContains($t1, AsTuple(1, 'key')), -- true,  match
+    DictContains($t1, Just(AsTuple(1, 'key'))), -- true,  match with optional
+    DictContains($t2, AsTuple(NULL, 'key')), -- false, no such key
+    DictContains($t3, AsTuple(NULL, 'key')), -- true, null is convertible to Nothing<T> for any T
+    DictLookup($t2, AsTuple(NULL, 'key')), -- Nothing(Tuple<Int32?, String>?), no such key
+    DictLookup($t3, AsTuple(NULL, 'key'))
 ;
 -- Just(AsTuple(123, "value")), null is convertible to Nothing<T> for any T
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-dict_common_type_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-dict_common_type_/formatted.sql
index f250c31bcb..2145df4579 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-dict_common_type_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-dict_common_type_/formatted.sql
@@ -1,7 +1,7 @@
 /* syntax version 1 */
 /* postgres can not */
 /* yt can not */
-PRAGMA warning("disable", "4510");
+PRAGMA warning('disable', '4510');
 
 $d1 = ToDict([(1, 1u)]);
 $d2 = AsDict((2, 2u));
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-distinct_from_containers_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-distinct_from_containers_/formatted.sql
index e73f279937..39d6f76978 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-distinct_from_containers_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-distinct_from_containers_/formatted.sql
@@ -1,15 +1,15 @@
 /* syntax version 1 */
 /* postgres can not */
-$vt1 = ParseType("Variant<Int32,Int32?>");
-$vt2 = ParseType("Variant<Int64,Null>");
-$svt1 = ParseType("Variant<a:Int32,b:Int32?>");
-$svt2 = ParseType("Variant<a:Int64,b:Null>");
+$vt1 = ParseType('Variant<Int32,Int32?>');
+$vt2 = ParseType('Variant<Int64,Null>');
+$svt1 = ParseType('Variant<a:Int32,b:Int32?>');
+$svt2 = ParseType('Variant<a:Int64,b:Null>');
 
 SELECT
     (1, 2) IS NOT DISTINCT FROM (1, 2, 1 / 0), --true
     <|a: 1 / 0, b: Nothing(String?), c: 1|> IS NOT DISTINCT FROM <|c: 1u, d: 1u / 0u, e: Nothing(Utf8?)|>, --true
     [1, 2, NULL] IS NOT DISTINCT FROM [1, 2, just(1 / 0)], --false
     {1: NULL} IS DISTINCT FROM {1u: 2 / 0}, --false
-    VARIANT (1 / 0, "1", $vt1) IS DISTINCT FROM VARIANT (NULL, "1", $vt2), --false
-    VARIANT (1 / 0, "b", $svt1) IS NOT DISTINCT FROM VARIANT (NULL, "b", $svt2), --true
+    VARIANT (1 / 0, '1', $vt1) IS DISTINCT FROM VARIANT (NULL, '1', $vt2), --false
+    VARIANT (1 / 0, 'b', $svt1) IS NOT DISTINCT FROM VARIANT (NULL, 'b', $svt2), --true
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_iterator2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_iterator2_/formatted.sql
index e0b8d0aaa9..9f2cb751bd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_iterator2_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_iterator2_/formatted.sql
@@ -12,7 +12,7 @@ $train =
         key,
         value
     HAVING
-        key > "900"
+        key > '900'
 ;
 
 $method = ($stream) -> {
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_iterator_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_iterator_/formatted.sql
index a24ff0d799..90f5950a79 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_iterator_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_iterator_/formatted.sql
@@ -8,7 +8,7 @@ $train =
     FROM
         Input
     WHERE
-        key > "900"
+        key > '900'
     GROUP BY
         value
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_list_ops3_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_list_ops3_/formatted.sql
index e39bed21c5..da5fc919c9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_list_ops3_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_list_ops3_/formatted.sql
@@ -5,12 +5,12 @@ $pred = ($x) -> {
 };
 
 SELECT
-    ListExtract([], "a"),
+    ListExtract([], 'a'),
     ListTakeWhile([], $pred),
     ListSkipWhile([], $pred),
     ListTakeWhileInclusive([], $pred),
     ListSkipWhileInclusive([], $pred),
-    ListAggregate([], AGGREGATION_FACTORY("Sum")),
+    ListAggregate([], AGGREGATION_FACTORY('Sum')),
     ToDict([]),
     ToMultiDict([]),
     ToSet([]),
@@ -41,12 +41,12 @@ SELECT
         }
     ),
     Yql::LazyList([]),
-    ListExtract(Just([]), "a"),
+    ListExtract(Just([]), 'a'),
     ListTakeWhile(Just([]), $pred),
     ListSkipWhile(Just([]), $pred),
     ListTakeWhileInclusive(Just([]), $pred),
     ListSkipWhileInclusive(Just([]), $pred),
-    ListAggregate(Just([]), AGGREGATION_FACTORY("Sum")),
+    ListAggregate(Just([]), AGGREGATION_FACTORY('Sum')),
     ToDict(Just([])),
     ToMultiDict(Just([])),
     ToSet(Just([])),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-ensure_ok_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-ensure_ok_/formatted.sql
index c919a520d6..64d5ca77a2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-ensure_ok_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-ensure_ok_/formatted.sql
@@ -1,3 +1,3 @@
 SELECT
-    Ensure(42, TRUE, "message")
+    Ensure(42, TRUE, 'message')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-ensure_runtime_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-ensure_runtime_fail_/formatted.sql
index 75b097377b..6f8388da37 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-ensure_runtime_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-ensure_runtime_fail_/formatted.sql
@@ -1,5 +1,5 @@
 /* postgres can not */
 /* custom error:message*/
 SELECT
-    Ensure(42, 2 != 2, "message")
+    Ensure(42, 2 != 2, 'message')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-ensure_type_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-ensure_type_fail_/formatted.sql
index 4bfa2af1dc..7e07f4dcbb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-ensure_type_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-ensure_type_fail_/formatted.sql
@@ -3,5 +3,5 @@
 /* syntax version 1 */
 /* custom error:Mismatch types: Int32 != String (message)*/
 SELECT
-    EnsureType(42, String, "message")
+    EnsureType(42, String, 'message')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-exapnd_with_singular_types_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-exapnd_with_singular_types_/formatted.sql
index 6a44100ae4..ce3c013b81 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-exapnd_with_singular_types_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-exapnd_with_singular_types_/formatted.sql
@@ -9,6 +9,6 @@ $callable = CALLABLE (
 );
 
 SELECT
-    $callable(<|a: "1"|>),
-    $callable(AddMember(<||>, "a", "2"))
+    $callable(<|a: '1'|>),
+    $callable(AddMember(<||>, 'a', '2'))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-expr_named_yql_lambda_multiline_atoms_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-expr_named_yql_lambda_multiline_atoms_/formatted.sql
index c1662618e1..5186ecf7ac 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-expr_named_yql_lambda_multiline_atoms_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-expr_named_yql_lambda_multiline_atoms_/formatted.sql
@@ -2,5 +2,5 @@ $foo = YQL::@@(lambda '(item) (Concat (String '@@@@foo@@@@@@@@
 @@@@) item))@@;
 
 SELECT
-    $foo("bar")
+    $foo('bar')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-expr_named_yql_lambda_quotes_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-expr_named_yql_lambda_quotes_/formatted.sql
index 0250812888..4a802c3a63 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-expr_named_yql_lambda_quotes_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-expr_named_yql_lambda_quotes_/formatted.sql
@@ -2,6 +2,6 @@ $foo1 = YQL::"(lambda '(item) (Concat (String '\"foo\\\"\") item))";
 $foo2 = YQL::'(lambda \'(item) (Concat (String \'"foo\\\'") item))';
 
 SELECT
-    $foo1("bar"),
-    $foo2("bar")
+    $foo1('bar'),
+    $foo2('bar')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-expr_yql_from_string_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-expr_yql_from_string_/formatted.sql
index 116503b965..9c0b31a631 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-expr_yql_from_string_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-expr_yql_from_string_/formatted.sql
@@ -1,3 +1,3 @@
 SELECT
-    YQL::FromString("100500", YQL::@@'Uint64@@)
+    YQL::FromString('100500', YQL::@@'Uint64@@)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-extra_opt_try_member_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-extra_opt_try_member_/formatted.sql
index abd9222b9f..0a61334246 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-extra_opt_try_member_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-extra_opt_try_member_/formatted.sql
@@ -9,10 +9,10 @@ $es = Nothing(Struct<a: Int32, b: Uint32?, c: Int32??>?);
 -- field type should either match third type exactly, or (if the third type is optional) 
 -- Optional(field) should be equal to third type
 SELECT
-    TryMember($s, "b", Just(Just(99u))),
-    TryMember($s, "c", Just(Just(Just(2)))),
-    TryMember($js, "b", Just(Just(999u))),
-    TryMember($js, "c", Just(Just(Just(999)))),
-    TryMember($es, "b", Just(Just(999u))),
-    TryMember($es, "c", Just(Just(Just(999)))),
+    TryMember($s, 'b', Just(Just(99u))),
+    TryMember($s, 'c', Just(Just(Just(2)))),
+    TryMember($js, 'b', Just(Just(999u))),
+    TryMember($js, 'c', Just(Just(Just(999)))),
+    TryMember($es, 'b', Just(Just(999u))),
+    TryMember($es, 'c', Just(Just(Just(999)))),
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fail_constraint_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fail_constraint_/formatted.sql
index b835c26c0a..9d937e0f10 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fail_constraint_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fail_constraint_/formatted.sql
@@ -1,5 +1,5 @@
 /* custom error:missing Empty constraint in node AsList*/
-PRAGMA warning("disable", "4510");
+PRAGMA warning('disable', '4510');
 
 SELECT
     Yql::FailMe(AsAtom('constraint'))
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fail_expr_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fail_expr_/formatted.sql
index 8bd146d7c7..8dd99cd4b0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fail_expr_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fail_expr_/formatted.sql
@@ -1,5 +1,5 @@
 /* custom error:Detected a type error after initial validation*/
-PRAGMA warning("disable", "4510");
+PRAGMA warning('disable', '4510');
 
 SELECT
     Yql::FailMe(AsAtom('expr'))
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fail_type_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fail_type_/formatted.sql
index 8b1b217f24..8db87d5b01 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fail_type_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fail_type_/formatted.sql
@@ -1,5 +1,5 @@
 /* custom error:Rewrite error, type should be : String, but it is: Int32 for node Int32*/
-PRAGMA warning("disable", "4510");
+PRAGMA warning('disable', '4510');
 
 SELECT
     Yql::FailMe(AsAtom('type'))
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fallback_filternullelements_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fallback_filternullelements_/formatted.sql
index fb7566ed3d..e1c14c7534 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fallback_filternullelements_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fallback_filternullelements_/formatted.sql
@@ -1,5 +1,5 @@
 /* syntax version 1 */
-$lists = AsList(AsList("one", "two", "three"), AsList("head", NULL), AsList(NULL, "tail"), ListCreate(String?));
+$lists = AsList(AsList('one', 'two', 'three'), AsList('head', NULL), AsList(NULL, 'tail'), ListCreate(String?));
 
 $map = ($l) -> {
     RETURN AsTuple(ListHead($l), ListLast($l));
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fallback_filternullmembers_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fallback_filternullmembers_/formatted.sql
index b33ff4f196..833d5c2ee9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fallback_filternullmembers_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fallback_filternullmembers_/formatted.sql
@@ -1,5 +1,5 @@
 /* syntax version 1 */
-$lists = AsList(AsList("one", "two", "three"), AsList("head", NULL), AsList(NULL, "tail"), ListCreate(String?));
+$lists = AsList(AsList('one', 'two', 'three'), AsList('head', NULL), AsList(NULL, 'tail'), ListCreate(String?));
 
 $map = ($l) -> {
     RETURN AsStruct(ListHead($l) AS head, ListLast($l) AS tail);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-flatmap_by_map_lazy_list_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-flatmap_by_map_lazy_list_/formatted.sql
index 0655144f49..ccd9020f8b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-flatmap_by_map_lazy_list_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-flatmap_by_map_lazy_list_/formatted.sql
@@ -1,5 +1,5 @@
 $lazy = ListFromRange(1us, 3us);
-$list = AsList("one", "two");
+$list = AsList('one', 'two');
 
 SELECT
     ListFlatMap(
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-formattypediff_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-formattypediff_/formatted.sql
index 092f5918a2..843198fb43 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-formattypediff_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-formattypediff_/formatted.sql
@@ -1,8 +1,8 @@
 SELECT
-    FormatTypeDiff(ParseType("Tuple<Tuple<Int32>, Tuple<String, Double>>"), ParseType("Tuple<String, Tuple<String, String>>")),
-    FormatTypeDiffPretty(ParseType("Tuple<Tuple<Int32>, Tuple<String, Double>>"), ParseType("Tuple<String, Tuple<String, String>>")),
-    FormatTypeDiffPretty(TypeHandle(ParseType("Tuple<Tuple<Int32>, Tuple<String, Double>>")), TypeHandle(ParseType("Tuple<String, Tuple<String, String>>"))),
-    FormatTypeDiff(ParseType("Tuple<Tuple<Int32>, Tuple<String, Double>>"), TypeHandle(ParseType("Tuple<String, Tuple<String, String>>"))),
-    FormatTypeDiffPretty(TypeHandle(ParseType("Tuple<Tuple<Int32>, Tuple<String, Double>>")), ParseType("Tuple<String, Tuple<String, String>>")),
-    FormatTypeDiff(TypeHandle(ParseType("Int32")), TypeHandle(ParseType("Int32")))
+    FormatTypeDiff(ParseType('Tuple<Tuple<Int32>, Tuple<String, Double>>'), ParseType('Tuple<String, Tuple<String, String>>')),
+    FormatTypeDiffPretty(ParseType('Tuple<Tuple<Int32>, Tuple<String, Double>>'), ParseType('Tuple<String, Tuple<String, String>>')),
+    FormatTypeDiffPretty(TypeHandle(ParseType('Tuple<Tuple<Int32>, Tuple<String, Double>>')), TypeHandle(ParseType('Tuple<String, Tuple<String, String>>'))),
+    FormatTypeDiff(ParseType('Tuple<Tuple<Int32>, Tuple<String, Double>>'), TypeHandle(ParseType('Tuple<String, Tuple<String, String>>'))),
+    FormatTypeDiffPretty(TypeHandle(ParseType('Tuple<Tuple<Int32>, Tuple<String, Double>>')), ParseType('Tuple<String, Tuple<String, String>>')),
+    FormatTypeDiff(TypeHandle(ParseType('Int32')), TypeHandle(ParseType('Int32')))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-implicit_bitcast_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-implicit_bitcast_fail_/formatted.sql
index 245fe781f1..c62105407c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-implicit_bitcast_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-implicit_bitcast_fail_/formatted.sql
@@ -1,6 +1,6 @@
 /* postgres can not */
 /* custom error:Cannot infer common type for Int64 and Uint64*/
-PRAGMA warning("error", "1107");
+PRAGMA warning('error', '1107');
 
 SELECT
     AsList(
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-inline_call_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-inline_call_/formatted.sql
index bee57de5fd..3f9639a88d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-inline_call_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-inline_call_/formatted.sql
@@ -15,7 +15,7 @@ SELECT
 ;
 
 SELECT
-    length("foo")
+    length('foo')
 ;
 
 SELECT
@@ -24,12 +24,12 @@ SELECT
 
 $f = () -> {
     RETURN () -> {
-        RETURN AsDict(AsTuple("foo", AsList(AsStruct(AsTuple(1) AS bar))));
+        RETURN AsDict(AsTuple('foo', AsList(AsStruct(AsTuple(1) AS bar))));
     };
 };
 
 SELECT
-    $f()()["foo"][0].bar.0
+    $f()()['foo'][0].bar.0
 ;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-lds_literal_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-lds_literal_/formatted.sql
index dd84360071..831c664380 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-lds_literal_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-lds_literal_/formatted.sql
@@ -8,5 +8,5 @@ SELECT
     {},
     {,},
     {1, 1,},
-    {"a": 1, "a": 2}
+    {'a': 1, 'a': 2}
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-lds_types_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-lds_types_/formatted.sql
index 147b7a2648..d1b1e6cce8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-lds_types_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-lds_types_/formatted.sql
@@ -3,12 +3,12 @@
 SELECT
     FormatType(EmptyList),
     TypeKind(TypeHandle(EmptyList)),
-    FormatType(ParseType("EmptyList")),
+    FormatType(ParseType('EmptyList')),
     EmptyList(),
     FormatType(EvaluateType(EmptyListTypeHandle())),
     FormatType(EmptyDict),
     TypeKind(TypeHandle(EmptyDict)),
-    FormatType(ParseType("EmptyDict")),
+    FormatType(ParseType('EmptyDict')),
     EmptyDict(),
     FormatType(EvaluateType(EmptyDictTypeHandle()))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-len_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-len_/formatted.sql
index 0fe39b025a..a31d0bc180 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-len_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-len_/formatted.sql
@@ -1,7 +1,7 @@
 USE plato;
 
 SELECT
-    LEN("My String")
+    LEN('My String')
 ;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-length_of_optional_set_intesection_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-length_of_optional_set_intesection_/formatted.sql
index 0db5ef8c0a..61c7c2059b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-length_of_optional_set_intesection_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-length_of_optional_set_intesection_/formatted.sql
@@ -1,3 +1,3 @@
 SELECT
-    ListLength(SetIntersection(ToSet(AsList("1", "2")), ToSet(Just(AsList("2", "3", "4", "5")))))
+    ListLength(SetIntersection(ToSet(AsList('1', '2')), ToSet(Just(AsList('2', '3', '4', '5')))))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_builtins_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_builtins_/formatted.sql
index 1c2a9ea3ad..377b9e49ac 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_builtins_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_builtins_/formatted.sql
@@ -79,14 +79,14 @@ SELECT
             }
         )
     ) AS concat,
-    ListExtract($struct_list, "two") AS extract,
+    ListExtract($struct_list, 'two') AS extract,
     ListMap(
         $list, ($item) -> {
             RETURN CAST($item AS Double);
         }
     ),
     ListCreate(Tuple<Int64, Double>),
-    ListCreate(TypeOf("foo")),
+    ListCreate(TypeOf('foo')),
     ListFold($list, 6, $lambdaSum),
     ListFold([], 3, $lambdaSum),
     ListFold(Just($list), 6, $lambdaSum),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_builtins_opt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_builtins_opt_/formatted.sql
index 853d8321a1..31c982c433 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_builtins_opt_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_builtins_opt_/formatted.sql
@@ -1,16 +1,16 @@
 /* postgres can not */
 /* syntax version 1 */
-$list0 = AsList("a", "b");
-$list1 = AsList(Just("a"), "b", Nothing(ParseType("String?")));
-$list2 = Just(AsList("a", "b"));
-$list3 = Just(AsList(Just("a"), "b", Nothing(ParseType("String?"))));
-$list_empty0 = ListCreate(ParseType("String"));
-$list_empty1 = ListCreate(ParseType("String?"));
-$list_empty2 = Just(ListCreate(ParseType("String")));
-$list_empty3 = Just(ListCreate(ParseType("String?")));
-$list_null0 = Just(AsList(Nothing(ParseType("String?"))));
-$list_null1 = Nothing(ParseType("List<String?>?"));
-$list_min = Just(AsList(Just(Just(Just("a"))), "b"));
+$list0 = AsList('a', 'b');
+$list1 = AsList(Just('a'), 'b', Nothing(ParseType('String?')));
+$list2 = Just(AsList('a', 'b'));
+$list3 = Just(AsList(Just('a'), 'b', Nothing(ParseType('String?'))));
+$list_empty0 = ListCreate(ParseType('String'));
+$list_empty1 = ListCreate(ParseType('String?'));
+$list_empty2 = Just(ListCreate(ParseType('String')));
+$list_empty3 = Just(ListCreate(ParseType('String?')));
+$list_null0 = Just(AsList(Nothing(ParseType('String?'))));
+$list_null1 = Nothing(ParseType('List<String?>?'));
+$list_min = Just(AsList(Just(Just(Just('a'))), 'b'));
 
 SELECT
     ListConcat($list0) AS list0,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_concat_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_concat_/formatted.sql
index 8dbbaace4e..d267ac14b7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_concat_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_concat_/formatted.sql
@@ -1,13 +1,13 @@
 /* postgres can not */
 /* syntax version 1 */
-$list = ["one", "two", "three", "four", "five"];
+$list = ['one', 'two', 'three', 'four', 'five'];
 
 SELECT
-    ListConcat([], "."),
+    ListConcat([], '.'),
     ListConcat($list),
-    ListConcat($list, ";"),
-    ListConcat($list, Just(", ")),
+    ListConcat($list, ';'),
+    ListConcat($list, Just(', ')),
     ListConcat($list, NULL),
     ListConcat($list, Nothing(String?)),
-    ListConcat(["single"], "tail")
+    ListConcat(['single'], 'tail')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_extend_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_extend_/formatted.sql
index efb73f5dc0..d87164dd07 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_extend_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_extend_/formatted.sql
@@ -1,11 +1,11 @@
 /* postgres can not */
 /* syntax version 1 */
-PRAGMA warning("disable", "1107");
+PRAGMA warning('disable', '1107');
 
 SELECT
     ListExtend([2u], [3s], [4l]),
-    ListExtend(1, "String", 123, NULL),
-    ListExtendStrict(1, "String", 123, NULL),
+    ListExtend(1, 'String', 123, NULL),
+    ListExtendStrict(1, 'String', 123, NULL),
     ListExtend([3s], [4], Just([5l])),
     ListExtend([1u], [2u], Nothing(List<Int32>?)),
     ListExtendStrict([1u], [2u], Nothing(List<UInt32>?)),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_from_range_opt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_from_range_opt_/formatted.sql
index 9c2c71064f..307da18444 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_from_range_opt_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_from_range_opt_/formatted.sql
@@ -20,9 +20,9 @@ SELECT
     ListFromRange(1, 1.2, NULL),
     ListFromRange(1, NULL, NULL),
     ListFromRange(NULL, NULL, NULL),
-    ListFromRange(Interval("PT1S"), Interval("PT1S")),
-    ListFromRange(Interval("PT1M"), Just(Interval("PT1M"))),
-    ListFromRange(Interval("PT1M"), Interval("PT2M"), Just(Interval("PT10S"))),
-    ListFromRange(Interval("PT1S"), Interval("PT1M"), NULL),
-    ListFromRange(Interval("PT1S"), Interval("PT4S"), Nothing(Interval?))
+    ListFromRange(Interval('PT1S'), Interval('PT1S')),
+    ListFromRange(Interval('PT1M'), Just(Interval('PT1M'))),
+    ListFromRange(Interval('PT1M'), Interval('PT2M'), Just(Interval('PT10S'))),
+    ListFromRange(Interval('PT1S'), Interval('PT1M'), NULL),
+    ListFromRange(Interval('PT1S'), Interval('PT4S'), Nothing(Interval?))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_replicate_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_replicate_/formatted.sql
index 29bf1089ad..ec1d6ff6cc 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_replicate_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_replicate_/formatted.sql
@@ -2,6 +2,6 @@
 SELECT
     ListReplicate(-1, 10),
     ListReplicate(AsTuple(1, 2), 3),
-    ListReplicate("foo", 2),
+    ListReplicate('foo', 2),
     ListReplicate(TRUE, 0)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_sample_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_sample_/formatted.sql
index e931d3ad55..7023bd9673 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_sample_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_sample_/formatted.sql
@@ -12,10 +12,10 @@ $test = ($probability, $dependsOn) -> {
 
 SELECT
     ListSample(NULL, 1.0) IS NULL AS mustBeTrue1,
-    ListSample(Nothing(OptionalType(ListType(DataType("Uint64")))), 1.0) IS NULL AS mustBeTrue2,
+    ListSample(Nothing(OptionalType(ListType(DataType('Uint64')))), 1.0) IS NULL AS mustBeTrue2,
     ListSample([], 1.0) == [] AS mustBeTrue3,
     ListSample($list, NULL) == $list AS mustBeTrue4,
-    ListSample($list, Nothing(OptionalType(DataType("Double")))) == $list AS mustBeTrue5,
+    ListSample($list, Nothing(OptionalType(DataType('Double')))) == $list AS mustBeTrue5,
     ListSample($list, 0.5, 123) == ListSample($list, 0.5, 123) AS mustBeTrue6,
     $test(0.2, 1) AS result1,
     $test(0.2, 2) AS result2,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_sample_n_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_sample_n_/formatted.sql
index f9058637a8..503431f909 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_sample_n_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_sample_n_/formatted.sql
@@ -12,10 +12,10 @@ $test = ($n, $dependsOn) -> {
 
 SELECT
     ListSampleN(NULL, 1ul) IS NULL AS mustBeTrue1,
-    ListSampleN(Nothing(OptionalType(ListType(DataType("Uint64")))), 1ul) IS NULL AS mustBeTrue2,
+    ListSampleN(Nothing(OptionalType(ListType(DataType('Uint64')))), 1ul) IS NULL AS mustBeTrue2,
     ListSampleN([], 1ul) == [] AS mustBeTrue3,
     ListSampleN($list, NULL) == $list AS mustBeTrue4,
-    ListSampleN($list, Nothing(OptionalType(DataType("Uint64")))) == $list AS mustBeTrue5,
+    ListSampleN($list, Nothing(OptionalType(DataType('Uint64')))) == $list AS mustBeTrue5,
     ListSampleN($list, 25ul, 123) == ListSampleN($list, 25ul, 123) AS mustBeTrue6,
     $test(5ul, 1) AS result1,
     $test(10ul, 2) AS result2,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_shuffle_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_shuffle_/formatted.sql
index 73d04fe202..c08ca14a5c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_shuffle_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_shuffle_/formatted.sql
@@ -8,7 +8,7 @@ $test = ($c) -> {
 
 SELECT
     ListShuffle(NULL) IS NULL AS mustBeTrue1,
-    ListShuffle(Nothing(OptionalType(ListType(DataType("Uint64"))))) IS NULL AS mustBeTrue2,
+    ListShuffle(Nothing(OptionalType(ListType(DataType('Uint64'))))) IS NULL AS mustBeTrue2,
     ListShuffle([]) == [] AS mustBeTrue3,
     ListShuffle($list, 123) == ListShuffle($list, 123) AS mustBeTrue4,
     $test(1) AS result1,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_uniq_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_uniq_/formatted.sql
index 16f701f6c4..33e832af07 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_uniq_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_uniq_/formatted.sql
@@ -4,7 +4,7 @@ SELECT
     ListUniqStable([]),
     ListUniqStable([1, 2, 1, 3, 4, 2, 4]),
     ListUniqStable([1, 2, 3, NULL, 1, 7, 4, 3]),
-    ListUniqStable(["a", "b", "c", "a", "ab", "ac", "ab"]),
-    ListUniqStable(Just(["a", "b", "c", "a", "ab", "ac", "ab"])),
+    ListUniqStable(['a', 'b', 'c', 'a', 'ab', 'ac', 'ab']),
+    ListUniqStable(Just(['a', 'b', 'c', 'a', 'ab', 'ac', 'ab'])),
     ListUniqStable(NULL)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-literal_strings_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-literal_strings_/formatted.sql
index a513a002f1..1193c9af17 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-literal_strings_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-literal_strings_/formatted.sql
@@ -2,8 +2,8 @@
 SELECT
     '@@@@',
     '\'',
-    "@@@@",
-    "\"",
+    '@@@@',
+    '\"',
     @@ '@ @@,
     @@
 "@ @@@@
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-longint_builtins_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-longint_builtins_/formatted.sql
index 5bc13d52a6..c6e9a9b425 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-longint_builtins_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-longint_builtins_/formatted.sql
@@ -1,14 +1,14 @@
 /* postgres can not */
 -- not supported on windows
-$value = "1000000000000";
+$value = '1000000000000';
 $negative = -1000000000000;
-$longint = YQL::StrictFromString($value, AsAtom("Decimal"), AsAtom("32"), AsAtom("0"));
+$longint = YQL::StrictFromString($value, AsAtom('Decimal'), AsAtom('32'), AsAtom('0'));
 $negative_longint = CAST($negative AS Decimal (32, 0));
-$add = $longint + CAST("1111111111111111111111111111111" AS Decimal (32, 0));
+$add = $longint + CAST('1111111111111111111111111111111' AS Decimal (32, 0));
 $div = $longint / CAST(1111 AS Decimal (32, 0));
 $mod = $longint % CAST(1111 AS Decimal (32, 0));
 $mul = $longint * CAST(333333333333333333 AS Decimal (32, 0));
-$sub = $longint - CAST("1111111111111111111111111111111" AS Decimal (32, 0));
+$sub = $longint - CAST('1111111111111111111111111111111' AS Decimal (32, 0));
 
 SELECT
     $longint AS binary,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_group_by_column_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_group_by_column_fail_/formatted.sql
index 7a4f2ba870..940483677a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_group_by_column_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_group_by_column_fail_/formatted.sql
@@ -1,5 +1,5 @@
 /* custom error:Expected hashable and equatable type for key column: key, but got: Resource<'MTRand'>*/
-PRAGMA Warning("error", '1104');
+PRAGMA Warning('error', '1104');
 
 USE plato;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_group_by_having_some_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_group_by_having_some_fail_/formatted.sql
index 2e19c29c4b..85ac11d7e2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_group_by_having_some_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_group_by_having_some_fail_/formatted.sql
@@ -1,5 +1,5 @@
 /* custom error:Persistable required*/
-PRAGMA Warning("error", '1104');
+PRAGMA Warning('error', '1104');
 
 USE plato;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_group_by_some_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_group_by_some_fail_/formatted.sql
index 0d4ceec444..bf2996afcd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_group_by_some_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_group_by_some_fail_/formatted.sql
@@ -1,5 +1,5 @@
 /* custom error:Persistable required*/
-PRAGMA Warning("error", '1104');
+PRAGMA Warning('error', '1104');
 
 USE plato;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_inner_select_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_inner_select_fail_/formatted.sql
index 9ea3c81d60..5e86ad5b84 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_inner_select_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_inner_select_fail_/formatted.sql
@@ -1,5 +1,5 @@
 /* custom error:Persistable required*/
-PRAGMA Warning("error", '1104');
+PRAGMA Warning('error', '1104');
 
 USE plato;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_insert_into_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_insert_into_fail_/formatted.sql
index e52d93427b..6e0ce96964 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_insert_into_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_insert_into_fail_/formatted.sql
@@ -1,5 +1,5 @@
 /* custom error:Persistable required*/
-PRAGMA Warning("error", '1104');
+PRAGMA Warning('error', '1104');
 
 USE plato;
 
@@ -8,5 +8,5 @@ INSERT INTO Output (
     value
 )
 VALUES
-    ("foo", YQL::NewMTRand(1))
+    ('foo', YQL::NewMTRand(1))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_order_by_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_order_by_fail_/formatted.sql
index 1d015a2d41..1223d7ec05 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_order_by_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_order_by_fail_/formatted.sql
@@ -1,5 +1,5 @@
 /* custom error:Persistable required*/
-PRAGMA Warning("error", '1104');
+PRAGMA Warning('error', '1104');
 
 USE plato;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-opt_try_member_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-opt_try_member_/formatted.sql
index 1e786350d5..943238694a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-opt_try_member_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-opt_try_member_/formatted.sql
@@ -2,20 +2,20 @@
 /* kikimr can not */
 /* syntax version 1 */
 SELECT
-    TryMember(Just(<|x: 1|>), "x", 0),
-    TryMember(Just(<|x: 1|>), "y", 0),
-    TryMember(Just(<|x: Just(1)|>), "x", Just(0)),
-    TryMember(Just(<|x: Just(1)|>), "y", Just(0)),
-    TryMember(Just(<|x: Nothing(Int32?)|>), "x", Just(0)),
-    TryMember(Just(<|x: Nothing(Int32?)|>), "y", Just(0)),
-    TryMember(Just(<|x: 1|>), "x", NULL),
-    TryMember(Just(<|x: 1|>), "y", NULL),
-    TryMember(Just(<|x: Just(1)|>), "x", NULL),
-    TryMember(Just(<|x: Just(1)|>), "y", NULL),
-    TryMember(Just(<|x: Nothing(Int32?)|>), "x", NULL),
-    TryMember(Just(<|x: Nothing(Int32?)|>), "y", NULL),
-    TryMember(Nothing(Struct<x: Int32>?), "x", 0),
-    TryMember(Nothing(Struct<x: Int32>?), "x", NULL),
-    TryMember(Nothing(Struct<x: Int32?>?), "x", Just(0)),
-    TryMember(Nothing(Struct<x: Int32?>?), "x", NULL)
+    TryMember(Just(<|x: 1|>), 'x', 0),
+    TryMember(Just(<|x: 1|>), 'y', 0),
+    TryMember(Just(<|x: Just(1)|>), 'x', Just(0)),
+    TryMember(Just(<|x: Just(1)|>), 'y', Just(0)),
+    TryMember(Just(<|x: Nothing(Int32?)|>), 'x', Just(0)),
+    TryMember(Just(<|x: Nothing(Int32?)|>), 'y', Just(0)),
+    TryMember(Just(<|x: 1|>), 'x', NULL),
+    TryMember(Just(<|x: 1|>), 'y', NULL),
+    TryMember(Just(<|x: Just(1)|>), 'x', NULL),
+    TryMember(Just(<|x: Just(1)|>), 'y', NULL),
+    TryMember(Just(<|x: Nothing(Int32?)|>), 'x', NULL),
+    TryMember(Just(<|x: Nothing(Int32?)|>), 'y', NULL),
+    TryMember(Nothing(Struct<x: Int32>?), 'x', 0),
+    TryMember(Nothing(Struct<x: Int32>?), 'x', NULL),
+    TryMember(Nothing(Struct<x: Int32?>?), 'x', Just(0)),
+    TryMember(Nothing(Struct<x: Int32?>?), 'x', NULL)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-pg_try_member_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-pg_try_member_/formatted.sql
index cfa43d0121..952d6dd795 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-pg_try_member_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-pg_try_member_/formatted.sql
@@ -7,19 +7,19 @@ $es = Nothing(Struct<a: PgInt>?);
 
 -- fully equivalent to <struct>.<name>
 SELECT
-    TryMember($s, "a", NULL),
-    TryMember($js, "a", NULL),
-    TryMember($es, "a", NULL),
+    TryMember($s, 'a', NULL),
+    TryMember($js, 'a', NULL),
+    TryMember($es, 'a', NULL),
 ;
 
 -- TypeOf TryMember is type of third argument
 -- field type should either match third type exactly, or (if the third type is optional) 
 -- Optional(field) should be equal to third type
 SELECT
-    TryMember($s, "a", 999p),
-    TryMember($s, "a", Just(999p)),
-    TryMember($js, "a", 999p),
-    TryMember($js, "a", Just(999p)),
-    TryMember($es, "a", 999p),
-    TryMember($es, "a", Just(999p)),
+    TryMember($s, 'a', 999p),
+    TryMember($s, 'a', Just(999p)),
+    TryMember($js, 'a', 999p),
+    TryMember($js, 'a', Just(999p)),
+    TryMember($es, 'a', 999p),
+    TryMember($es, 'a', Just(999p)),
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-replace_member_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-replace_member_/formatted.sql
index 11b8baafdc..03d3ef85cf 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-replace_member_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-replace_member_/formatted.sql
@@ -26,5 +26,5 @@ $V = ($value) -> (
 );
 
 SELECT
-    $F("x", $E(0, $F("y", $V(3))))($data)
+    $F('x', $E(0, $F('y', $V(3))))($data)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-sets_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-sets_/formatted.sql
index 622ade4692..5e5ca62c5b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-sets_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-sets_/formatted.sql
@@ -38,8 +38,8 @@ SELECT
 SELECT
     $nd(
         SetIntersection(
-            AsDict(AsTuple(1, "foo"), AsTuple(3, "bar")),
-            AsDict(AsTuple(1, "baz"), AsTuple(2, "qwe")),
+            AsDict(AsTuple(1, 'foo'), AsTuple(3, 'bar')),
+            AsDict(AsTuple(1, 'baz'), AsTuple(2, 'qwe')),
             ($_k, $a, $b) -> {
                 RETURN AsTuple($a, $b);
             }
@@ -78,8 +78,8 @@ SELECT
 SELECT
     $nd(
         SetUnion(
-            AsDict(AsTuple(1, "foo"), AsTuple(3, "bar")),
-            AsDict(AsTuple(1, "baz"), AsTuple(2, "qwe")),
+            AsDict(AsTuple(1, 'foo'), AsTuple(3, 'bar')),
+            AsDict(AsTuple(1, 'baz'), AsTuple(2, 'qwe')),
             ($_k, $a, $b) -> {
                 RETURN AsTuple($a, $b);
             }
@@ -94,8 +94,8 @@ SELECT
 SELECT
     $nd(
         SetSymmetricDifference(
-            AsDict(AsTuple(1, "foo"), AsTuple(3, "bar")),
-            AsDict(AsTuple(1, "baz"), AsTuple(2, "qwe")),
+            AsDict(AsTuple(1, 'foo'), AsTuple(3, 'bar')),
+            AsDict(AsTuple(1, 'baz'), AsTuple(2, 'qwe')),
             ($_k, $a, $b) -> {
                 RETURN AsTuple($a, $b);
             }
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-static_fold_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-static_fold_/formatted.sql
index 428d75f9ee..60c34387fc 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-static_fold_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-static_fold_/formatted.sql
@@ -1,22 +1,22 @@
 /* syntax version 1 */
-$st_many = <|a: "one", b: "two", c: "three", d: "four"|>;
-$st_single = <|a: "zero"|>;
+$st_many = <|a: 'one', b: 'two', c: 'three', d: 'four'|>;
+$st_single = <|a: 'zero'|>;
 $st_empty = <||>;
-$tup = AsTuple("first", "second");
+$tup = AsTuple('first', 'second');
 
 $concat = ($item, $state) -> {
     RETURN $state || $item;
 };
 
 $start = ($value) -> {
-    RETURN "(" || $value || ")";
+    RETURN '(' || $value || ')';
 };
 
 SELECT
-    StaticFold($st_many, "->", $concat),
-    StaticFold($st_single, "->", $concat),
-    CAST(StaticFold($st_empty, "->", $concat) AS Optional<String>),
-    StaticFold($tup, "->", $concat)
+    StaticFold($st_many, '->', $concat),
+    StaticFold($st_single, '->', $concat),
+    CAST(StaticFold($st_empty, '->', $concat) AS Optional<String>),
+    StaticFold($tup, '->', $concat)
 ;
 
 SELECT
@@ -32,11 +32,11 @@ $puk = ($row_struct) -> {
         $row_struct,
         0,
         ($item, $sum?) -> {
-            RETURN $sum + IF($item IS NULL, 0, 1)
+            RETURN $sum + IF($item IS NULL, 0, 1);
         }
-    )
+    );
 };
 
 SELECT
-    $puk(Unwrap(CAST(<|one: "8912", two: 42|> AS Struct<one: Int64, two: Int64>)))
+    $puk(Unwrap(CAST(<|one: '8912', two: 42|> AS Struct<one: Int64, two: Int64>)))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-static_zip_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-static_zip_/formatted.sql
index 45f62f4256..7c2f5d4411 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-static_zip_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-static_zip_/formatted.sql
@@ -1,11 +1,11 @@
 /* postgres can not */
 /* syntax version 1 */
-$s1 = AsStruct(1 AS k1, "2" AS k2, ["3", "4"] AS k3);
-$s2 = AsStruct("10" AS k1, [20, 30] AS k2, 40 AS k3);
-$s3 = AsStruct([100, 200] AS k1, 300 AS k2, "400" AS k3);
-$t1 = AsTuple(1, "2", ["3", "4"]);
-$t2 = AsTuple("10", [20, 30], 40);
-$t3 = AsTuple([100, 200], 300, "400");
+$s1 = AsStruct(1 AS k1, '2' AS k2, ['3', '4'] AS k3);
+$s2 = AsStruct('10' AS k1, [20, 30] AS k2, 40 AS k3);
+$s3 = AsStruct([100, 200] AS k1, 300 AS k2, '400' AS k3);
+$t1 = AsTuple(1, '2', ['3', '4']);
+$t2 = AsTuple('10', [20, 30], 40);
+$t3 = AsTuple([100, 200], 300, '400');
 
 SELECT
     StaticZip($s1, $s2, $s3) AS structs,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-struct_builtins_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-struct_builtins_/formatted.sql
index 2629f77b45..823fadb1e7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-struct_builtins_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-struct_builtins_/formatted.sql
@@ -6,13 +6,13 @@ $b = AsStruct(2 AS b);
 $c_name = 'c';
 
 SELECT
-    TryMember($ad, $c_name, "foo") AS c,
-    TryMember($ad, "d", NULL) AS d,
+    TryMember($ad, $c_name, 'foo') AS c,
+    TryMember($ad, 'd', NULL) AS d,
     AddMember($ad, $c_name, 3) AS acd,
-    ReplaceMember($ad, "a", 5) AS a5,
+    ReplaceMember($ad, 'a', 5) AS a5,
     RemoveMember($ad, 'd') AS a,
     ForceRemoveMember($ad, $c_name) AS ad,
     ExpandStruct($b, 1 AS a) AS ab,
     CombineMembers($ad, $b) AS abd,
-    FlattenMembers(AsTuple("fo" || "o", $ad), AsTuple("bar", $b)) AS foobar
+    FlattenMembers(AsTuple('fo' || 'o', $ad), AsTuple('bar', $b)) AS foobar
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-struct_gather_spread_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-struct_gather_spread_/formatted.sql
index 1ea4c27b1b..499b3a22ea 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-struct_gather_spread_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-struct_gather_spread_/formatted.sql
@@ -8,19 +8,19 @@ SELECT
     GatherMembers(<|a: 1, b: 2|>),
     GatherMembers(Just(<|a: 1, b: 2|>)),
     GatherMembers(NULL),
-    RenameMembers(<|a: 1, c: 2|>, [("a", "b")]),
-    RenameMembers(<|a: 1, c: 2|>, [("a", "b"), ("a", "d")]),
-    ForceRenameMembers(<|a: 1, c: 2|>, [("a", "b")]),
-    ForceRenameMembers(<|a: 1, c: 2|>, [("d", "d")]),
-    RenameMembers(Just(<|a: 1, c: 2|>), [("a", "b")]),
-    RenameMembers(NULL, [("a", "b")]),
-    SpreadMembers([("a", 1)], ["a", "b"]),
-    SpreadMembers([("a", 1), ("b", 2)], ["a", "b"]),
-    SpreadMembers([("a", Just(1))], ["a", "b"]),
-    SpreadMembers([("a", 1), ("a", 2)], ["a", "b"]),
-    SpreadMembers([], ["a", "b"]),
-    SpreadMembers(Just([("a", 1)]), ["a", "b"]),
-    SpreadMembers(NULL, ["a", "b"]),
-    ForceSpreadMembers([("a", 1)], ["a", "b"]),
-    ForceSpreadMembers([("c", 1)], ["a", "b"])
+    RenameMembers(<|a: 1, c: 2|>, [('a', 'b')]),
+    RenameMembers(<|a: 1, c: 2|>, [('a', 'b'), ('a', 'd')]),
+    ForceRenameMembers(<|a: 1, c: 2|>, [('a', 'b')]),
+    ForceRenameMembers(<|a: 1, c: 2|>, [('d', 'd')]),
+    RenameMembers(Just(<|a: 1, c: 2|>), [('a', 'b')]),
+    RenameMembers(NULL, [('a', 'b')]),
+    SpreadMembers([('a', 1)], ['a', 'b']),
+    SpreadMembers([('a', 1), ('b', 2)], ['a', 'b']),
+    SpreadMembers([('a', Just(1))], ['a', 'b']),
+    SpreadMembers([('a', 1), ('a', 2)], ['a', 'b']),
+    SpreadMembers([], ['a', 'b']),
+    SpreadMembers(Just([('a', 1)]), ['a', 'b']),
+    SpreadMembers(NULL, ['a', 'b']),
+    ForceSpreadMembers([('a', 1)], ['a', 'b']),
+    ForceSpreadMembers([('c', 1)], ['a', 'b'])
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-struct_literal_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-struct_literal_/formatted.sql
index c9818cebd1..3d184237bd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-struct_literal_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-struct_literal_/formatted.sql
@@ -6,7 +6,7 @@ SELECT
     <|
         CAST(Unicode::ToUpper("a"u) AS String): Unicode::ToUpper("b"u),
         c: FALSE,
-        "e": 7,
+        'e': 7,
         `g`: 2.0,
     |>
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-struct_literal_bind_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-struct_literal_bind_/formatted.sql
index 50f8edf141..4273f320a6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-struct_literal_bind_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-struct_literal_bind_/formatted.sql
@@ -1,6 +1,6 @@
 /* syntax version 1 */
 /* postgres can not */
-$s = <|x: 1, y: "2"|>;
+$s = <|x: 1, y: '2'|>;
 
 SELECT
     $s
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-struct_slice_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-struct_slice_/formatted.sql
index ec63189e9f..3126520eb4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-struct_slice_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-struct_slice_/formatted.sql
@@ -1,7 +1,7 @@
 /* postgres can not */
 /* syntax version 1 */
 $s = <|a: 1, b: 2, c: 3, d: 4|>;
-$list = ["a", "b"];
+$list = ['a', 'b'];
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-tagged_runtime_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-tagged_runtime_/formatted.sql
index 8884415b18..5ef8e69a28 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-tagged_runtime_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-tagged_runtime_/formatted.sql
@@ -5,11 +5,11 @@ INSERT INTO @tmp
 SELECT
     Just(
         (
-            AsTagged(1, "A"),
-            AsTagged(just(2), "B"),
-            AsTagged(NULL, "C"),
-            AsTagged(Nothing(Int32?), "D"),
-            AsTagged(Nothing(pgint4?), "E")
+            AsTagged(1, 'A'),
+            AsTagged(just(2), 'B'),
+            AsTagged(NULL, 'C'),
+            AsTagged(Nothing(Int32?), 'D'),
+            AsTagged(Nothing(pgint4?), 'E')
         )
     ) AS x
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_dict_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_dict_key_/formatted.sql
index 7b21c952d9..7ec03e6617 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_dict_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_dict_key_/formatted.sql
@@ -7,14 +7,14 @@ $second = ($x) -> {
     RETURN $x.1;
 };
 
-$i = AsDict(AsTuple(1, "A"), AsTuple(2, "B"));
-$j = AsDict(AsTuple(1, "A"), AsTuple(2, "C"));
-$k = AsDict(AsTuple(1, "A"), AsTuple(2, "D"));
+$i = AsDict(AsTuple(1, 'A'), AsTuple(2, 'B'));
+$j = AsDict(AsTuple(1, 'A'), AsTuple(2, 'C'));
+$k = AsDict(AsTuple(1, 'A'), AsTuple(2, 'D'));
 
 $l = AsList(
-    AsTuple($i, "foo"),
-    AsTuple($i, "bar"),
-    AsTuple($j, "baz")
+    AsTuple($i, 'foo'),
+    AsTuple($i, 'bar'),
+    AsTuple($j, 'baz')
 );
 
 $d = ToDict($l);
@@ -93,7 +93,7 @@ SELECT
     DictContains($d, $k)
 ;
 
-$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("One")));
+$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom('Compact'), AsAtom('Hashed'), AsAtom('One')));
 
 SELECT
     ListSort(
@@ -131,7 +131,7 @@ SELECT
     DictContains($d, $k)
 ;
 
-$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("Many")));
+$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom('Compact'), AsAtom('Hashed'), AsAtom('Many')));
 
 SELECT
     ListSort(
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_list_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_list_key_/formatted.sql
index 30e9744d6e..3f6e1808a6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_list_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_list_key_/formatted.sql
@@ -8,9 +8,9 @@ $second = ($x) -> {
 };
 
 $l = AsList(
-    AsTuple(AsList(1, 2, 3), "foo"),
-    AsTuple(AsList(1, 2), "bar"),
-    AsTuple(AsList(1, 2), "baz")
+    AsTuple(AsList(1, 2, 3), 'foo'),
+    AsTuple(AsList(1, 2), 'bar'),
+    AsTuple(AsList(1, 2), 'baz')
 );
 
 $d = ToDict($l);
@@ -49,7 +49,7 @@ SELECT
     DictContains($d, AsList(1, 3))
 ;
 
-$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("One")));
+$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom('Compact'), AsAtom('Hashed'), AsAtom('One')));
 
 SELECT
     DictKeys($d),
@@ -67,7 +67,7 @@ SELECT
     DictContains($d, AsList(1, 3))
 ;
 
-$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("Many")));
+$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom('Compact'), AsAtom('Hashed'), AsAtom('Many')));
 
 SELECT
     DictKeys($d),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_tuple_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_tuple_key_/formatted.sql
index 5313656fbd..4baaa8490b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_tuple_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_tuple_key_/formatted.sql
@@ -8,9 +8,9 @@ $second = ($x) -> {
 };
 
 $l = AsList(
-    AsTuple(AsTuple(), "foo"),
-    AsTuple(AsTuple(), "bar"),
-    AsTuple(AsTuple(), "baz")
+    AsTuple(AsTuple(), 'foo'),
+    AsTuple(AsTuple(), 'bar'),
+    AsTuple(AsTuple(), 'baz')
 );
 
 $d = ToDict($l);
@@ -45,7 +45,7 @@ SELECT
     DictContains($d, AsTuple())
 ;
 
-$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("One")));
+$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom('Compact'), AsAtom('Hashed'), AsAtom('One')));
 
 SELECT
     DictKeys($d),
@@ -61,7 +61,7 @@ SELECT
     DictContains($d, AsTuple())
 ;
 
-$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("Many")));
+$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom('Compact'), AsAtom('Hashed'), AsAtom('Many')));
 
 SELECT
     DictKeys($d),
@@ -78,9 +78,9 @@ SELECT
 ;
 
 $l = AsList(
-    AsTuple(AsTuple(1), "foo"),
-    AsTuple(AsTuple(2), "bar"),
-    AsTuple(AsTuple(2), "baz")
+    AsTuple(AsTuple(1), 'foo'),
+    AsTuple(AsTuple(2), 'bar'),
+    AsTuple(AsTuple(2), 'baz')
 );
 
 $d = ToDict($l);
@@ -119,7 +119,7 @@ SELECT
     DictContains($d, AsTuple(3))
 ;
 
-$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("One")));
+$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom('Compact'), AsAtom('Hashed'), AsAtom('One')));
 
 SELECT
     DictKeys($d),
@@ -137,7 +137,7 @@ SELECT
     DictContains($d, AsTuple(3))
 ;
 
-$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("Many")));
+$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom('Compact'), AsAtom('Hashed'), AsAtom('Many')));
 
 SELECT
     DictKeys($d),
@@ -156,9 +156,9 @@ SELECT
 ;
 
 $l = AsList(
-    AsTuple(AsTuple(1, 2), "foo"),
-    AsTuple(AsTuple(1, 3), "bar"),
-    AsTuple(AsTuple(1, 3), "baz")
+    AsTuple(AsTuple(1, 2), 'foo'),
+    AsTuple(AsTuple(1, 3), 'bar'),
+    AsTuple(AsTuple(1, 3), 'baz')
 );
 
 $d = ToDict($l);
@@ -197,7 +197,7 @@ SELECT
     DictContains($d, AsTuple(1, 4))
 ;
 
-$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("One")));
+$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom('Compact'), AsAtom('Hashed'), AsAtom('One')));
 
 SELECT
     DictKeys($d),
@@ -215,7 +215,7 @@ SELECT
     DictContains($d, AsTuple(1, 4))
 ;
 
-$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("Many")));
+$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom('Compact'), AsAtom('Hashed'), AsAtom('Many')));
 
 SELECT
     DictKeys($d),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_varstruct_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_varstruct_key_/formatted.sql
index a3c8b2c2af..50c62b3cfd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_varstruct_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_varstruct_key_/formatted.sql
@@ -7,15 +7,15 @@ $second = ($x) -> {
     RETURN $x.1;
 };
 
-$vt = ParseType("Variant<a:Int32,b:Uint32>");
-$v1 = VARIANT (1, "a", $vt);
-$v2 = VARIANT (2u, "b", $vt);
-$v3 = VARIANT (2, "a", $vt);
+$vt = ParseType('Variant<a:Int32,b:Uint32>');
+$v1 = VARIANT (1, 'a', $vt);
+$v2 = VARIANT (2u, 'b', $vt);
+$v3 = VARIANT (2, 'a', $vt);
 
 $l = AsList(
-    AsTuple($v1, "foo"),
-    AsTuple($v2, "bar"),
-    AsTuple($v2, "baz")
+    AsTuple($v1, 'foo'),
+    AsTuple($v2, 'bar'),
+    AsTuple($v2, 'baz')
 );
 
 $d = ToDict($l);
@@ -54,7 +54,7 @@ SELECT
     DictContains($d, $v3)
 ;
 
-$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("One")));
+$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom('Compact'), AsAtom('Hashed'), AsAtom('One')));
 
 SELECT
     DictKeys($d),
@@ -72,7 +72,7 @@ SELECT
     DictContains($d, $v3)
 ;
 
-$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("Many")));
+$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom('Compact'), AsAtom('Hashed'), AsAtom('Many')));
 
 SELECT
     DictKeys($d),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_vartuple_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_vartuple_key_/formatted.sql
index a63d1716fd..23da2805b8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_vartuple_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_vartuple_key_/formatted.sql
@@ -7,15 +7,15 @@ $second = ($x) -> {
     RETURN $x.1;
 };
 
-$vt = ParseType("Variant<Int32,Uint32>");
-$v1 = VARIANT (1, "0", $vt);
-$v2 = VARIANT (2u, "1", $vt);
-$v3 = VARIANT (2, "0", $vt);
+$vt = ParseType('Variant<Int32,Uint32>');
+$v1 = VARIANT (1, '0', $vt);
+$v2 = VARIANT (2u, '1', $vt);
+$v3 = VARIANT (2, '0', $vt);
 
 $l = AsList(
-    AsTuple($v1, "foo"),
-    AsTuple($v2, "bar"),
-    AsTuple($v2, "baz")
+    AsTuple($v1, 'foo'),
+    AsTuple($v2, 'bar'),
+    AsTuple($v2, 'baz')
 );
 
 $d = ToDict($l);
@@ -54,7 +54,7 @@ SELECT
     DictContains($d, $v3)
 ;
 
-$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("One")));
+$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom('Compact'), AsAtom('Hashed'), AsAtom('One')));
 
 SELECT
     DictKeys($d),
@@ -72,7 +72,7 @@ SELECT
     DictContains($d, $v3)
 ;
 
-$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("Many")));
+$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom('Compact'), AsAtom('Hashed'), AsAtom('Many')));
 
 SELECT
     DictKeys($d),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_dict_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_dict_key_/formatted.sql
index a2bbe8b84d..b79222695e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_dict_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_dict_key_/formatted.sql
@@ -7,9 +7,9 @@ $second = ($x) -> {
     RETURN $x.1;
 };
 
-$i = AsDict(AsTuple(1, "A"), AsTuple(2, "B"));
-$j = AsDict(AsTuple(1, "A"), AsTuple(2, "C"));
-$k = AsDict(AsTuple(1, "A"), AsTuple(2, "D"));
+$i = AsDict(AsTuple(1, 'A'), AsTuple(2, 'B'));
+$j = AsDict(AsTuple(1, 'A'), AsTuple(2, 'C'));
+$k = AsDict(AsTuple(1, 'A'), AsTuple(2, 'D'));
 
 $l = AsList(
     AsTuple($i, Void()),
@@ -51,7 +51,7 @@ SELECT
     DictContains($d, $k)
 ;
 
-$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("One")));
+$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom('Compact'), AsAtom('Hashed'), AsAtom('One')));
 
 SELECT
     ListSort(
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_list_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_list_key_/formatted.sql
index 7b2fab5956..d0d09bcfd1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_list_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_list_key_/formatted.sql
@@ -31,7 +31,7 @@ SELECT
     DictContains($d, AsList(1, 3))
 ;
 
-$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("One")));
+$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom('Compact'), AsAtom('Hashed'), AsAtom('One')));
 
 SELECT
     DictKeys($d),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_tuple_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_tuple_key_/formatted.sql
index 1deb80e2f3..be40156172 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_tuple_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_tuple_key_/formatted.sql
@@ -29,7 +29,7 @@ SELECT
     DictContains($d, AsTuple())
 ;
 
-$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("One")));
+$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom('Compact'), AsAtom('Hashed'), AsAtom('One')));
 
 SELECT
     ListSort(DictItems($d)),
@@ -69,7 +69,7 @@ SELECT
     DictContains($d, AsTuple(3))
 ;
 
-$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("One")));
+$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom('Compact'), AsAtom('Hashed'), AsAtom('One')));
 
 SELECT
     ListSort(DictItems($d)),
@@ -111,7 +111,7 @@ SELECT
     DictContains($d, AsTuple(1, 4))
 ;
 
-$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("One")));
+$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom('Compact'), AsAtom('Hashed'), AsAtom('One')));
 
 SELECT
     ListSort(DictItems($d)),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_varstruct_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_varstruct_key_/formatted.sql
index 3c50b351c0..9a3cfb26b6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_varstruct_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_varstruct_key_/formatted.sql
@@ -7,10 +7,10 @@ $second = ($x) -> {
     RETURN $x.1;
 };
 
-$vt = ParseType("Variant<a:Int32,b:Uint32>");
-$v1 = VARIANT (1, "a", $vt);
-$v2 = VARIANT (2u, "b", $vt);
-$v3 = VARIANT (2, "a", $vt);
+$vt = ParseType('Variant<a:Int32,b:Uint32>');
+$v1 = VARIANT (1, 'a', $vt);
+$v2 = VARIANT (2u, 'b', $vt);
+$v3 = VARIANT (2, 'a', $vt);
 
 $l = AsList(
     AsTuple($v1, Void()),
@@ -36,7 +36,7 @@ SELECT
     DictContains($d, $v3)
 ;
 
-$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("One")));
+$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom('Compact'), AsAtom('Hashed'), AsAtom('One')));
 
 SELECT
     ListSort(DictItems($d)),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_vartuple_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_vartuple_key_/formatted.sql
index 19d22cc8e6..f63606a84c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_vartuple_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_vartuple_key_/formatted.sql
@@ -7,10 +7,10 @@ $second = ($x) -> {
     RETURN $x.1;
 };
 
-$vt = ParseType("Variant<Int32,Uint32>");
-$v1 = VARIANT (1, "0", $vt);
-$v2 = VARIANT (2u, "1", $vt);
-$v3 = VARIANT (2, "0", $vt);
+$vt = ParseType('Variant<Int32,Uint32>');
+$v1 = VARIANT (1, '0', $vt);
+$v2 = VARIANT (2u, '1', $vt);
+$v3 = VARIANT (2, '0', $vt);
 
 $l = AsList(
     AsTuple($v1, Void()),
@@ -36,7 +36,7 @@ SELECT
     DictContains($d, $v3)
 ;
 
-$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("One")));
+$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom('Compact'), AsAtom('Hashed'), AsAtom('One')));
 
 SELECT
     ListSort(DictItems($d)),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_dict_list_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_dict_list_key_/formatted.sql
index ef802f53ab..c588494141 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_dict_list_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_dict_list_key_/formatted.sql
@@ -1,8 +1,8 @@
 /* postgres can not */
 $l = AsList(
-    AsTuple(AsList(1, 2, 3), "foo"),
-    AsTuple(AsList(1, 2), "bar"),
-    AsTuple(AsList(1, 2), "baz")
+    AsTuple(AsList(1, 2, 3), 'foo'),
+    AsTuple(AsList(1, 2), 'bar'),
+    AsTuple(AsList(1, 2), 'baz')
 );
 
 $d = ToSortedDict($l);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_dict_tuple_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_dict_tuple_key_/formatted.sql
index 24aa9b2208..8761ec94bc 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_dict_tuple_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_dict_tuple_key_/formatted.sql
@@ -1,8 +1,8 @@
 /* postgres can not */
 $l = AsList(
-    AsTuple(AsTuple(), "foo"),
-    AsTuple(AsTuple(), "bar"),
-    AsTuple(AsTuple(), "baz")
+    AsTuple(AsTuple(), 'foo'),
+    AsTuple(AsTuple(), 'bar'),
+    AsTuple(AsTuple(), 'baz')
 );
 
 $d = ToSortedDict($l);
@@ -38,9 +38,9 @@ SELECT
 ;
 
 $l = AsList(
-    AsTuple(AsTuple(1), "foo"),
-    AsTuple(AsTuple(2), "bar"),
-    AsTuple(AsTuple(2), "baz")
+    AsTuple(AsTuple(1), 'foo'),
+    AsTuple(AsTuple(2), 'bar'),
+    AsTuple(AsTuple(2), 'baz')
 );
 
 $d = ToSortedDict($l);
@@ -80,9 +80,9 @@ SELECT
 ;
 
 $l = AsList(
-    AsTuple(AsTuple(1, 2), "foo"),
-    AsTuple(AsTuple(1, 3), "bar"),
-    AsTuple(AsTuple(1, 3), "baz")
+    AsTuple(AsTuple(1, 2), 'foo'),
+    AsTuple(AsTuple(1, 3), 'bar'),
+    AsTuple(AsTuple(1, 3), 'baz')
 );
 
 $d = ToSortedDict($l);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_dict_vartuple_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_dict_vartuple_key_/formatted.sql
index 8994b675db..d002bd3136 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_dict_vartuple_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_dict_vartuple_key_/formatted.sql
@@ -1,12 +1,12 @@
 /* postgres can not */
-$vt = ParseType("Variant<Int32,Uint32>");
-$v1 = VARIANT (1, "0", $vt);
-$v2 = VARIANT (2u, "1", $vt);
-$v3 = VARIANT (2, "0", $vt);
+$vt = ParseType('Variant<Int32,Uint32>');
+$v1 = VARIANT (1, '0', $vt);
+$v2 = VARIANT (2u, '1', $vt);
+$v3 = VARIANT (2, '0', $vt);
 
 $l = AsList(
-    AsTuple($v1, "foo"),
-    AsTuple($v2, "bar"),
+    AsTuple($v1, 'foo'),
+    AsTuple($v2, 'bar'),
 );
 
 $d = ToSortedDict($l);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_set_vartuple_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_set_vartuple_key_/formatted.sql
index 83f5f79977..dfe6e3b1b6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_set_vartuple_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_set_vartuple_key_/formatted.sql
@@ -1,8 +1,8 @@
 /* postgres can not */
-$vt = ParseType("Variant<Int32,Uint32>");
-$v1 = VARIANT (1, "0", $vt);
-$v2 = VARIANT (2u, "1", $vt);
-$v3 = VARIANT (2, "0", $vt);
+$vt = ParseType('Variant<Int32,Uint32>');
+$v1 = VARIANT (1, '0', $vt);
+$v2 = VARIANT (2u, '1', $vt);
+$v3 = VARIANT (2, '0', $vt);
 
 $l = AsList(
     AsTuple($v1, Void()),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-try_member_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-try_member_/formatted.sql
index 10c87994a5..4966d12741 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-try_member_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-try_member_/formatted.sql
@@ -8,39 +8,39 @@ $es = Nothing(Struct<a: Int32, b: Uint32?, c: Int32??>?);
 -- result of TryMember() when member is not present is third argument
 -- (optional third arg if struct is optional, but third arg is not)
 SELECT
-    TryMember($s, "z", 'qqq'),
-    TryMember($js, "z", NULL),
-    TryMember($es, "z", Just(Just('qqq'))),
-    TryMember($js, "z", 'zzz'),
+    TryMember($s, 'z', 'qqq'),
+    TryMember($js, 'z', NULL),
+    TryMember($es, 'z', Just(Just('qqq'))),
+    TryMember($js, 'z', 'zzz'),
 ;
 
 -- fully equivalent to <struct>.<name>
 SELECT
-    TryMember($s, "a", NULL),
-    TryMember($s, "b", NULL),
-    TryMember($s, "c", NULL),
-    TryMember($js, "a", NULL),
-    TryMember($js, "b", NULL),
-    TryMember($js, "c", NULL),
-    TryMember($es, "a", NULL),
-    TryMember($es, "b", NULL),
-    TryMember($es, "c", NULL),
+    TryMember($s, 'a', NULL),
+    TryMember($s, 'b', NULL),
+    TryMember($s, 'c', NULL),
+    TryMember($js, 'a', NULL),
+    TryMember($js, 'b', NULL),
+    TryMember($js, 'c', NULL),
+    TryMember($es, 'a', NULL),
+    TryMember($es, 'b', NULL),
+    TryMember($es, 'c', NULL),
 ;
 
 -- TypeOf TryMember is type of third argument
 -- field type should either match third type exactly, or (if the third type is optional) 
 -- Optional(field) should be equal to third type
 SELECT
-    TryMember($s, "a", 999),
-    TryMember($s, "a", Just(999)),
-    TryMember($s, "b", Just(999u)),
-    TryMember($s, "c", Just(Just(999))),
-    TryMember($js, "a", 999),
-    TryMember($js, "a", Just(999)),
-    TryMember($js, "b", Just(999u)),
-    TryMember($js, "c", Just(Just(999))),
-    TryMember($es, "a", 999),
-    TryMember($es, "a", Just(999)),
-    TryMember($es, "b", Just(999u)),
-    TryMember($es, "c", Just(Just(999))),
+    TryMember($s, 'a', 999),
+    TryMember($s, 'a', Just(999)),
+    TryMember($s, 'b', Just(999u)),
+    TryMember($s, 'c', Just(Just(999))),
+    TryMember($js, 'a', 999),
+    TryMember($js, 'a', Just(999)),
+    TryMember($js, 'b', Just(999u)),
+    TryMember($js, 'c', Just(Just(999))),
+    TryMember($es, 'a', 999),
+    TryMember($es, 'a', Just(999)),
+    TryMember($es, 'b', Just(999u)),
+    TryMember($es, 'c', Just(Just(999))),
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-tzdate_result_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-tzdate_result_/formatted.sql
index 1d25da6789..55e91703d6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-tzdate_result_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-tzdate_result_/formatted.sql
@@ -1,6 +1,6 @@
 /* syntax version 1 */
 /* postgres can not */
-$parse = DateTime::Parse("%Y-%m-%d,%Z");
+$parse = DateTime::Parse('%Y-%m-%d,%Z');
 $date_string = '2020-05-30,Europe/Moscow';
 $date = $parse($date_string);
 
@@ -13,7 +13,7 @@ SELECT
     EvaluateExpr(DateTime::MakeTzDate($date))
 ;
 
-$parse = DateTime::Parse("%Y-%m-%d,%Z");
+$parse = DateTime::Parse('%Y-%m-%d,%Z');
 $date_string = '2020-05-30,America/Los_Angeles';
 $date = $parse($date_string);
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-udaf_with_list_zip_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-udaf_with_list_zip_/formatted.sql
index 3e4afc0e97..af07c3933e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-udaf_with_list_zip_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-udaf_with_list_zip_/formatted.sql
@@ -5,7 +5,7 @@ $lists_2sum = ($l1, $l2) -> (
 );
 
 $perelement_sum = AGGREGATION_FACTORY(
-    "UDAF",
+    'UDAF',
     ($item, $_parent) -> ($item),
     ($state, $item, $_parent) -> ($lists_2sum($state, $item)),
     ($state1, $state2) -> ($lists_2sum($state1, $state2))
@@ -15,11 +15,11 @@ SELECT
     AGGREGATE_BY(list_col, $perelement_sum) AS cnt1,
 FROM
     AS_TABLE([
-        <|"list_col": [4, 5, 6]|>,
-        <|"list_col": [4, 5, 6]|>,
-        <|"list_col": [4, 5, 6]|>,
-        <|"list_col": [4, 5, 6]|>,
-        <|"list_col": [4, 5, 6]|>,
-        <|"list_col": [4, 5, 6]|>
+        <|'list_col': [4, 5, 6]|>,
+        <|'list_col': [4, 5, 6]|>,
+        <|'list_col': [4, 5, 6]|>,
+        <|'list_col': [4, 5, 6]|>,
+        <|'list_col': [4, 5, 6]|>,
+        <|'list_col': [4, 5, 6]|>
     ])
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-unicode_literals_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-unicode_literals_/formatted.sql
index 6b2874f1eb..a839bd9b0d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-unicode_literals_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-unicode_literals_/formatted.sql
@@ -5,7 +5,7 @@ $f = () -> {
     RETURN (
         "a"s,
         "b"u,
-        "c"
+        'c'
     );
 };
 
@@ -20,7 +20,7 @@ $g = () -> {
     RETURN (
         "a"s,
         "b"u,
-        "c"
+        'c'
     );
 };
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-unwrap_runtime_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-unwrap_runtime_fail_/formatted.sql
index d90a416a0e..1e1466c698 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-unwrap_runtime_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-unwrap_runtime_fail_/formatted.sql
@@ -1,5 +1,5 @@
 /* postgres can not */
 /* custom error:message*/
 SELECT
-    Unwrap(NULL, "message")
+    Unwrap(NULL, 'message')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_builtins_opt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_builtins_opt_/formatted.sql
index e4aa4de0a1..dc9dcc86c4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_builtins_opt_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_builtins_opt_/formatted.sql
@@ -1,15 +1,15 @@
 $vartype = Variant<a: Optional<String>, b: Optional<String>>;
 
 $handle_a = ($x) -> {
-    RETURN CAST(($x || "1") AS Uint32);
+    RETURN CAST(($x || '1') AS Uint32);
 };
 
 $handle_b = ($x) -> {
-    RETURN CAST(($x || "2") AS Uint32);
+    RETURN CAST(($x || '2') AS Uint32);
 };
 
-$var_a = VARIANT ("5", "a", $vartype);
-$var_b = VARIANT ("6", "b", $vartype);
+$var_a = VARIANT ('5', 'a', $vartype);
+$var_b = VARIANT ('6', 'b', $vartype);
 
 SELECT
     Visit(Just($var_a), $handle_a AS a, $handle_b AS b),
@@ -19,8 +19,8 @@ SELECT
 ;
 
 $vartype_t = Variant<Optional<String>, Optional<String>>;
-$var_1 = VARIANT ("7", "0", $vartype_t);
-$var_2 = VARIANT ("8", "1", $vartype_t);
+$var_1 = VARIANT ('7', '0', $vartype_t);
+$var_2 = VARIANT ('8', '1', $vartype_t);
 
 SELECT
     Visit(Just($var_1), $handle_a, $handle_b),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_list_sort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_list_sort_/formatted.sql
index e53782cc8c..2c6e3419ad 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_list_sort_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_list_sort_/formatted.sql
@@ -1,6 +1,6 @@
 /* syntax version 1 */
 /* postgres can not */
-$list = [AsVariant(1, "int"), AsVariant(1.f, "float"), AsVariant(1.0, "double"), AsVariant(1u, "unsigned")];
+$list = [AsVariant(1, 'int'), AsVariant(1.f, 'float'), AsVariant(1.0, 'double'), AsVariant(1u, 'unsigned')];
 
 SELECT
     ListSortAsc($list) AS asc,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_struct_builtins_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_struct_builtins_/formatted.sql
index 1192a90d9b..348a43c801 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_struct_builtins_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_struct_builtins_/formatted.sql
@@ -17,9 +17,9 @@ $visitor = ($var) -> {
 };
 
 SELECT
-    $visitor(VARIANT (5, "num", $vartype)),
-    $visitor(Just(VARIANT (TRUE, "flag", $vartype))),
-    $visitor(Just(VARIANT ("somestr", "str", $vartype))),
+    $visitor(VARIANT (5, 'num', $vartype)),
+    $visitor(Just(VARIANT (TRUE, 'flag', $vartype))),
+    $visitor(Just(VARIANT ('somestr', 'str', $vartype))),
     $visitor(Nothing(OptionalType($vartype))),
     $visitor(NULL)
 ;
@@ -29,9 +29,9 @@ $visitor_def = ($var) -> {
 };
 
 SELECT
-    $visitor_def(VARIANT (5, "num", $vartype)),
-    $visitor_def(Just(VARIANT (TRUE, "flag", $vartype))),
-    $visitor_def(Just(VARIANT ("somestr", "str", $vartype))),
+    $visitor_def(VARIANT (5, 'num', $vartype)),
+    $visitor_def(Just(VARIANT (TRUE, 'flag', $vartype))),
+    $visitor_def(Just(VARIANT ('somestr', 'str', $vartype))),
     $visitor_def(Nothing(OptionalType($vartype))),
     $visitor_def(NULL)
 ;
@@ -39,8 +39,8 @@ SELECT
 $vartype1 = Variant<num1: Int32, num2: Int32, num3: Int32>;
 
 SELECT
-    VariantItem(VARIANT (7, "num2", $vartype1)),
-    VariantItem(Just(VARIANT (5, "num1", $vartype1))),
+    VariantItem(VARIANT (7, 'num2', $vartype1)),
+    VariantItem(Just(VARIANT (5, 'num1', $vartype1))),
     VariantItem(Nothing(OptionalType($vartype1))),
     VariantItem(NULL)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_struct_comp_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_struct_comp_/formatted.sql
index 06bd2e6036..23fd83cd89 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_struct_comp_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_struct_comp_/formatted.sql
@@ -8,71 +8,71 @@ $id = ($x) -> {
     RETURN $f();
 };
 
-$vt1 = ParseType("Variant<a:Int32,b:Uint32?>");
-$vt2 = ParseType("Variant<b:Int64,c:Uint32>");
+$vt1 = ParseType('Variant<a:Int32,b:Uint32?>');
+$vt2 = ParseType('Variant<b:Int64,c:Uint32>');
 
 SELECT
     AsTuple(
-        VARIANT (1, "a", $vt1) == VARIANT ($id(1u), "b", $vt2),
-        VARIANT (1, "b", $vt1) == VARIANT ($id(1u), "b", $vt2),
-        VARIANT (1, "b", $vt1) == VARIANT ($id(2u), "b", $vt2),
-        VARIANT (1, "b", $vt1) == VARIANT ($id(1u), "c", $vt2),
-        VARIANT (1u / 0u, "b", $vt1) == VARIANT ($id(1u), "c", $vt2),
-        VARIANT (1u / 0u, "b", $vt1) == VARIANT ($id(1u), "b", $vt2)
+        VARIANT (1, 'a', $vt1) == VARIANT ($id(1u), 'b', $vt2),
+        VARIANT (1, 'b', $vt1) == VARIANT ($id(1u), 'b', $vt2),
+        VARIANT (1, 'b', $vt1) == VARIANT ($id(2u), 'b', $vt2),
+        VARIANT (1, 'b', $vt1) == VARIANT ($id(1u), 'c', $vt2),
+        VARIANT (1u / 0u, 'b', $vt1) == VARIANT ($id(1u), 'c', $vt2),
+        VARIANT (1u / 0u, 'b', $vt1) == VARIANT ($id(1u), 'b', $vt2)
     )
 ;
 
 SELECT
     AsTuple(
-        VARIANT (1, "a", $vt1) != VARIANT ($id(1u), "b", $vt2),
-        VARIANT (1, "b", $vt1) != VARIANT ($id(1u), "b", $vt2),
-        VARIANT (1, "b", $vt1) != VARIANT ($id(2u), "b", $vt2),
-        VARIANT (1, "b", $vt1) != VARIANT ($id(1u), "c", $vt2),
-        VARIANT (1u / 0u, "b", $vt1) != VARIANT ($id(1u), "c", $vt2),
-        VARIANT (1u / 0u, "b", $vt1) != VARIANT ($id(1u), "b", $vt2)
+        VARIANT (1, 'a', $vt1) != VARIANT ($id(1u), 'b', $vt2),
+        VARIANT (1, 'b', $vt1) != VARIANT ($id(1u), 'b', $vt2),
+        VARIANT (1, 'b', $vt1) != VARIANT ($id(2u), 'b', $vt2),
+        VARIANT (1, 'b', $vt1) != VARIANT ($id(1u), 'c', $vt2),
+        VARIANT (1u / 0u, 'b', $vt1) != VARIANT ($id(1u), 'c', $vt2),
+        VARIANT (1u / 0u, 'b', $vt1) != VARIANT ($id(1u), 'b', $vt2)
     )
 ;
 
 SELECT
     AsTuple(
-        VARIANT (1, "a", $vt1) < VARIANT ($id(1u), "b", $vt2),
-        VARIANT (1, "b", $vt1) < VARIANT ($id(1u), "b", $vt2),
-        VARIANT (1, "b", $vt1) < VARIANT ($id(2u), "b", $vt2),
-        VARIANT (1, "b", $vt1) < VARIANT ($id(1u), "c", $vt2),
-        VARIANT (1u / 0u, "b", $vt1) < VARIANT ($id(1u), "c", $vt2),
-        VARIANT (1u / 0u, "b", $vt1) < VARIANT ($id(1u), "b", $vt2)
+        VARIANT (1, 'a', $vt1) < VARIANT ($id(1u), 'b', $vt2),
+        VARIANT (1, 'b', $vt1) < VARIANT ($id(1u), 'b', $vt2),
+        VARIANT (1, 'b', $vt1) < VARIANT ($id(2u), 'b', $vt2),
+        VARIANT (1, 'b', $vt1) < VARIANT ($id(1u), 'c', $vt2),
+        VARIANT (1u / 0u, 'b', $vt1) < VARIANT ($id(1u), 'c', $vt2),
+        VARIANT (1u / 0u, 'b', $vt1) < VARIANT ($id(1u), 'b', $vt2)
     )
 ;
 
 SELECT
     AsTuple(
-        VARIANT (1, "a", $vt1) <= VARIANT ($id(1u), "b", $vt2),
-        VARIANT (1, "b", $vt1) <= VARIANT ($id(1u), "b", $vt2),
-        VARIANT (1, "b", $vt1) <= VARIANT ($id(2u), "b", $vt2),
-        VARIANT (1, "b", $vt1) <= VARIANT ($id(1u), "c", $vt2),
-        VARIANT (1u / 0u, "b", $vt1) <= VARIANT ($id(1u), "c", $vt2),
-        VARIANT (1u / 0u, "b", $vt1) <= VARIANT ($id(1u), "b", $vt2)
+        VARIANT (1, 'a', $vt1) <= VARIANT ($id(1u), 'b', $vt2),
+        VARIANT (1, 'b', $vt1) <= VARIANT ($id(1u), 'b', $vt2),
+        VARIANT (1, 'b', $vt1) <= VARIANT ($id(2u), 'b', $vt2),
+        VARIANT (1, 'b', $vt1) <= VARIANT ($id(1u), 'c', $vt2),
+        VARIANT (1u / 0u, 'b', $vt1) <= VARIANT ($id(1u), 'c', $vt2),
+        VARIANT (1u / 0u, 'b', $vt1) <= VARIANT ($id(1u), 'b', $vt2)
     )
 ;
 
 SELECT
     AsTuple(
-        VARIANT (1, "a", $vt1) > VARIANT ($id(1u), "b", $vt2),
-        VARIANT (1, "b", $vt1) > VARIANT ($id(1u), "b", $vt2),
-        VARIANT (1, "b", $vt1) > VARIANT ($id(2u), "b", $vt2),
-        VARIANT (1, "b", $vt1) > VARIANT ($id(1u), "c", $vt2),
-        VARIANT (1u / 0u, "b", $vt1) > VARIANT ($id(1u), "c", $vt2),
-        VARIANT (1u / 0u, "b", $vt1) > VARIANT ($id(1u), "b", $vt2)
+        VARIANT (1, 'a', $vt1) > VARIANT ($id(1u), 'b', $vt2),
+        VARIANT (1, 'b', $vt1) > VARIANT ($id(1u), 'b', $vt2),
+        VARIANT (1, 'b', $vt1) > VARIANT ($id(2u), 'b', $vt2),
+        VARIANT (1, 'b', $vt1) > VARIANT ($id(1u), 'c', $vt2),
+        VARIANT (1u / 0u, 'b', $vt1) > VARIANT ($id(1u), 'c', $vt2),
+        VARIANT (1u / 0u, 'b', $vt1) > VARIANT ($id(1u), 'b', $vt2)
     )
 ;
 
 SELECT
     AsTuple(
-        VARIANT (1, "a", $vt1) >= VARIANT ($id(1u), "b", $vt2),
-        VARIANT (1, "b", $vt1) >= VARIANT ($id(1u), "b", $vt2),
-        VARIANT (1, "b", $vt1) >= VARIANT ($id(2u), "b", $vt2),
-        VARIANT (1, "b", $vt1) >= VARIANT ($id(1u), "c", $vt2),
-        VARIANT (1u / 0u, "b", $vt1) >= VARIANT ($id(1u), "c", $vt2),
-        VARIANT (1u / 0u, "b", $vt1) >= VARIANT ($id(1u), "b", $vt2)
+        VARIANT (1, 'a', $vt1) >= VARIANT ($id(1u), 'b', $vt2),
+        VARIANT (1, 'b', $vt1) >= VARIANT ($id(1u), 'b', $vt2),
+        VARIANT (1, 'b', $vt1) >= VARIANT ($id(2u), 'b', $vt2),
+        VARIANT (1, 'b', $vt1) >= VARIANT ($id(1u), 'c', $vt2),
+        VARIANT (1u / 0u, 'b', $vt1) >= VARIANT ($id(1u), 'c', $vt2),
+        VARIANT (1u / 0u, 'b', $vt1) >= VARIANT ($id(1u), 'b', $vt2)
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_tuple_builtins_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_tuple_builtins_/formatted.sql
index bdca3d25be..941de3f0a7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_tuple_builtins_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_tuple_builtins_/formatted.sql
@@ -17,9 +17,9 @@ $visitor = ($var) -> {
 };
 
 SELECT
-    $visitor(VARIANT (5, "0", $vartype)),
-    $visitor(Just(VARIANT (TRUE, "1", $vartype))),
-    $visitor(Just(VARIANT ("somestr", "2", $vartype))),
+    $visitor(VARIANT (5, '0', $vartype)),
+    $visitor(Just(VARIANT (TRUE, '1', $vartype))),
+    $visitor(Just(VARIANT ('somestr', '2', $vartype))),
     $visitor(Nothing(OptionalType($vartype))),
     $visitor(NULL)
 ;
@@ -29,9 +29,9 @@ $visitor_def = ($var) -> {
 };
 
 SELECT
-    $visitor_def(VARIANT (5, "0", $vartype)),
-    $visitor_def(Just(VARIANT (TRUE, "1", $vartype))),
-    $visitor_def(Just(VARIANT ("somestr", "2", $vartype))),
+    $visitor_def(VARIANT (5, '0', $vartype)),
+    $visitor_def(Just(VARIANT (TRUE, '1', $vartype))),
+    $visitor_def(Just(VARIANT ('somestr', '2', $vartype))),
     $visitor_def(Nothing(OptionalType($vartype))),
     $visitor_def(NULL)
 ;
@@ -39,8 +39,8 @@ SELECT
 $vartype1 = Variant<Int32, Int32, Int32>;
 
 SELECT
-    VariantItem(VARIANT (7, "1", $vartype1)),
-    VariantItem(Just(VARIANT (5, "0", $vartype1))),
+    VariantItem(VARIANT (7, '1', $vartype1)),
+    VariantItem(Just(VARIANT (5, '0', $vartype1))),
     VariantItem(Nothing(OptionalType($vartype1))),
     VariantItem(NULL)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_tuple_comp_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_tuple_comp_/formatted.sql
index b286737c6d..6c8229f064 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_tuple_comp_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_tuple_comp_/formatted.sql
@@ -8,83 +8,83 @@ $id = ($x) -> {
     RETURN $f();
 };
 
-$vt1 = ParseType("Variant<Int32,Uint32?>");
-$vt2 = ParseType("Variant<Int64,Uint32>");
+$vt1 = ParseType('Variant<Int32,Uint32?>');
+$vt2 = ParseType('Variant<Int64,Uint32>');
 
 SELECT
     AsTuple(
-        VARIANT (1, "0", $vt1) < VARIANT ($id(1u), "0", $vt2),
-        VARIANT (1, "0", $vt1) < VARIANT (2u, "0", $vt2),
-        VARIANT (1, "0", $vt1) < VARIANT (1u, "1", $vt2),
-        VARIANT (1, "1", $vt1) < VARIANT ($id(1u), "1", $vt2),
-        VARIANT (1, "1", $vt1) < VARIANT (2u, "1", $vt2),
-        VARIANT (2, "1", $vt1) < VARIANT (1u, "1", $vt2),
-        VARIANT (1, "1", $vt1) < VARIANT ($id(1u), "0", $vt2),
-        VARIANT (2u / 0u, "1", $vt1) < VARIANT (1u, "1", $vt2)
+        VARIANT (1, '0', $vt1) < VARIANT ($id(1u), '0', $vt2),
+        VARIANT (1, '0', $vt1) < VARIANT (2u, '0', $vt2),
+        VARIANT (1, '0', $vt1) < VARIANT (1u, '1', $vt2),
+        VARIANT (1, '1', $vt1) < VARIANT ($id(1u), '1', $vt2),
+        VARIANT (1, '1', $vt1) < VARIANT (2u, '1', $vt2),
+        VARIANT (2, '1', $vt1) < VARIANT (1u, '1', $vt2),
+        VARIANT (1, '1', $vt1) < VARIANT ($id(1u), '0', $vt2),
+        VARIANT (2u / 0u, '1', $vt1) < VARIANT (1u, '1', $vt2)
     )
 ;
 
 SELECT
     AsTuple(
-        VARIANT (1, "0", $vt1) <= VARIANT ($id(1u), "0", $vt2),
-        VARIANT (1, "0", $vt1) <= VARIANT (2u, "0", $vt2),
-        VARIANT (1, "0", $vt1) <= VARIANT (1u, "1", $vt2),
-        VARIANT (1, "1", $vt1) <= VARIANT ($id(1u), "1", $vt2),
-        VARIANT (1, "1", $vt1) <= VARIANT (2u, "1", $vt2),
-        VARIANT (2, "1", $vt1) <= VARIANT (1u, "1", $vt2),
-        VARIANT (1, "1", $vt1) <= VARIANT ($id(1u), "0", $vt2),
-        VARIANT (2u / 0u, "1", $vt1) <= VARIANT (1u, "1", $vt2)
+        VARIANT (1, '0', $vt1) <= VARIANT ($id(1u), '0', $vt2),
+        VARIANT (1, '0', $vt1) <= VARIANT (2u, '0', $vt2),
+        VARIANT (1, '0', $vt1) <= VARIANT (1u, '1', $vt2),
+        VARIANT (1, '1', $vt1) <= VARIANT ($id(1u), '1', $vt2),
+        VARIANT (1, '1', $vt1) <= VARIANT (2u, '1', $vt2),
+        VARIANT (2, '1', $vt1) <= VARIANT (1u, '1', $vt2),
+        VARIANT (1, '1', $vt1) <= VARIANT ($id(1u), '0', $vt2),
+        VARIANT (2u / 0u, '1', $vt1) <= VARIANT (1u, '1', $vt2)
     )
 ;
 
 SELECT
     AsTuple(
-        VARIANT (1, "0", $vt1) == VARIANT ($id(1u), "0", $vt2),
-        VARIANT (1, "0", $vt1) == VARIANT (2u, "0", $vt2),
-        VARIANT (1, "0", $vt1) == VARIANT (1u, "1", $vt2),
-        VARIANT (1, "1", $vt1) == VARIANT ($id(1u), "1", $vt2),
-        VARIANT (1, "1", $vt1) == VARIANT (2u, "1", $vt2),
-        VARIANT (2, "1", $vt1) == VARIANT (1u, "1", $vt2),
-        VARIANT (1, "1", $vt1) == VARIANT ($id(1u), "0", $vt2),
-        VARIANT (2u / 0u, "1", $vt1) == VARIANT (1u, "1", $vt2)
+        VARIANT (1, '0', $vt1) == VARIANT ($id(1u), '0', $vt2),
+        VARIANT (1, '0', $vt1) == VARIANT (2u, '0', $vt2),
+        VARIANT (1, '0', $vt1) == VARIANT (1u, '1', $vt2),
+        VARIANT (1, '1', $vt1) == VARIANT ($id(1u), '1', $vt2),
+        VARIANT (1, '1', $vt1) == VARIANT (2u, '1', $vt2),
+        VARIANT (2, '1', $vt1) == VARIANT (1u, '1', $vt2),
+        VARIANT (1, '1', $vt1) == VARIANT ($id(1u), '0', $vt2),
+        VARIANT (2u / 0u, '1', $vt1) == VARIANT (1u, '1', $vt2)
     )
 ;
 
 SELECT
     AsTuple(
-        VARIANT (1, "0", $vt1) != VARIANT ($id(1u), "0", $vt2),
-        VARIANT (1, "0", $vt1) != VARIANT (2u, "0", $vt2),
-        VARIANT (1, "0", $vt1) != VARIANT (1u, "1", $vt2),
-        VARIANT (1, "1", $vt1) != VARIANT ($id(1u), "1", $vt2),
-        VARIANT (1, "1", $vt1) != VARIANT (2u, "1", $vt2),
-        VARIANT (2, "1", $vt1) != VARIANT (1u, "1", $vt2),
-        VARIANT (1, "1", $vt1) != VARIANT ($id(1u), "0", $vt2),
-        VARIANT (2u / 0u, "1", $vt1) != VARIANT (1u, "1", $vt2)
+        VARIANT (1, '0', $vt1) != VARIANT ($id(1u), '0', $vt2),
+        VARIANT (1, '0', $vt1) != VARIANT (2u, '0', $vt2),
+        VARIANT (1, '0', $vt1) != VARIANT (1u, '1', $vt2),
+        VARIANT (1, '1', $vt1) != VARIANT ($id(1u), '1', $vt2),
+        VARIANT (1, '1', $vt1) != VARIANT (2u, '1', $vt2),
+        VARIANT (2, '1', $vt1) != VARIANT (1u, '1', $vt2),
+        VARIANT (1, '1', $vt1) != VARIANT ($id(1u), '0', $vt2),
+        VARIANT (2u / 0u, '1', $vt1) != VARIANT (1u, '1', $vt2)
     )
 ;
 
 SELECT
     AsTuple(
-        VARIANT (1, "0", $vt1) > VARIANT ($id(1u), "0", $vt2),
-        VARIANT (1, "0", $vt1) > VARIANT (2u, "0", $vt2),
-        VARIANT (1, "0", $vt1) > VARIANT (1u, "1", $vt2),
-        VARIANT (1, "1", $vt1) > VARIANT ($id(1u), "1", $vt2),
-        VARIANT (1, "1", $vt1) > VARIANT (2u, "1", $vt2),
-        VARIANT (2, "1", $vt1) > VARIANT (1u, "1", $vt2),
-        VARIANT (1, "1", $vt1) > VARIANT ($id(1u), "0", $vt2),
-        VARIANT (2u / 0u, "1", $vt1) > VARIANT (1u, "1", $vt2)
+        VARIANT (1, '0', $vt1) > VARIANT ($id(1u), '0', $vt2),
+        VARIANT (1, '0', $vt1) > VARIANT (2u, '0', $vt2),
+        VARIANT (1, '0', $vt1) > VARIANT (1u, '1', $vt2),
+        VARIANT (1, '1', $vt1) > VARIANT ($id(1u), '1', $vt2),
+        VARIANT (1, '1', $vt1) > VARIANT (2u, '1', $vt2),
+        VARIANT (2, '1', $vt1) > VARIANT (1u, '1', $vt2),
+        VARIANT (1, '1', $vt1) > VARIANT ($id(1u), '0', $vt2),
+        VARIANT (2u / 0u, '1', $vt1) > VARIANT (1u, '1', $vt2)
     )
 ;
 
 SELECT
     AsTuple(
-        VARIANT (1, "0", $vt1) >= VARIANT ($id(1u), "0", $vt2),
-        VARIANT (1, "0", $vt1) >= VARIANT (2u, "0", $vt2),
-        VARIANT (1, "0", $vt1) >= VARIANT (1u, "1", $vt2),
-        VARIANT (1, "1", $vt1) >= VARIANT ($id(1u), "1", $vt2),
-        VARIANT (1, "1", $vt1) >= VARIANT (2u, "1", $vt2),
-        VARIANT (2, "1", $vt1) >= VARIANT (1u, "1", $vt2),
-        VARIANT (1, "1", $vt1) >= VARIANT ($id(1u), "0", $vt2),
-        VARIANT (2u / 0u, "1", $vt1) >= VARIANT (1u, "1", $vt2)
+        VARIANT (1, '0', $vt1) >= VARIANT ($id(1u), '0', $vt2),
+        VARIANT (1, '0', $vt1) >= VARIANT (2u, '0', $vt2),
+        VARIANT (1, '0', $vt1) >= VARIANT (1u, '1', $vt2),
+        VARIANT (1, '1', $vt1) >= VARIANT ($id(1u), '1', $vt2),
+        VARIANT (1, '1', $vt1) >= VARIANT (2u, '1', $vt2),
+        VARIANT (2, '1', $vt1) >= VARIANT (1u, '1', $vt2),
+        VARIANT (1, '1', $vt1) >= VARIANT ($id(1u), '0', $vt2),
+        VARIANT (2u / 0u, '1', $vt1) >= VARIANT (1u, '1', $vt2)
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-with_optional_args_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-with_optional_args_/formatted.sql
index 6c9226cd93..2593f6a496 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-with_optional_args_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-with_optional_args_/formatted.sql
@@ -1,6 +1,6 @@
 /* syntax version 1 */
 /* postgres can not */
-$f = Yql::WithOptionalArgs(($x, $y, $z) -> ($x + ($y ?? 0) + ($z ?? 0)), AsAtom("2"));
+$f = Yql::WithOptionalArgs(($x, $y, $z) -> ($x + ($y ?? 0) + ($z ?? 0)), AsAtom('2'));
 
 SELECT
     $f(1),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-yql-10180_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-yql-10180_/formatted.sql
index 382484a498..911d64e6dc 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-yql-10180_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-yql-10180_/formatted.sql
@@ -1,8 +1,8 @@
 /* syntax version 1 */
 USE plato;
 
-$logs_path = "//logs/antirobot-daemon-log2/1d";
-$results_path = "//home/antispam/antirobot/sharding_daily";
+$logs_path = '//logs/antirobot-daemon-log2/1d';
+$results_path = '//home/antispam/antirobot/sharding_daily';
 $logs_per_run = 10;
 
 DEFINE SUBQUERY $last_tables($path, $limit) AS
@@ -10,11 +10,11 @@ DEFINE SUBQUERY $last_tables($path, $limit) AS
         AGGREGATE_LIST(Name)
     FROM (
         SELECT
-            ListLast(String::SplitToList(Path, "/")) AS Name
+            ListLast(String::SplitToList(Path, '/')) AS Name
         FROM
             FOLDER($path)
         WHERE
-            Type == "table"
+            Type == 'table'
         ORDER BY
             Name DESC
         LIMIT $limit
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-file_constness_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-file_constness_/formatted.sql
index 3d6a183e1d..f759b31786 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-file_constness_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-file_constness_/formatted.sql
@@ -2,8 +2,8 @@
 /* syntax version 1 */
 SELECT
     key,
-    FileContent("keyid.lst") AS content,
-    ListCollect(ParseFile('int32', "keyid.lst")) AS content_list,
+    FileContent('keyid.lst') AS content,
+    ListCollect(ParseFile('int32', 'keyid.lst')) AS content_list,
 FROM
     plato.Input
 GROUP BY
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-file_list_bools_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-file_list_bools_/formatted.sql
index d955184e36..8cf7112eb9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-file_list_bools_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-file_list_bools_/formatted.sql
@@ -1,4 +1,4 @@
 /* postgres can not */
 SELECT
-    ParseFile('bool', "bools.lst")
+    ParseFile('bool', 'bools.lst')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-file_list_simple_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-file_list_simple_/formatted.sql
index c1f4552527..629b44879a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-file_list_simple_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-file_list_simple_/formatted.sql
@@ -6,5 +6,5 @@ SELECT
 FROM
     plato.Input
 WHERE
-    key IN String::SplitToList(FileContent("keyid.lst"), "\n", TRUE)
+    key IN String::SplitToList(FileContent('keyid.lst'), '\n', TRUE)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-file_skip_take_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-file_skip_take_/formatted.sql
index ff090a8138..bdee05fe50 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-file_skip_take_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-file_skip_take_/formatted.sql
@@ -1,6 +1,6 @@
 /* postgres can not */
 /* syntax version 1 */
-$file = ParseFile("String", "keyid.lst");
+$file = ParseFile('String', 'keyid.lst');
 $file = ListTake(ListSkip($file, 3ul), 2ul);
 $file = EvaluateExpr($file);
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-parse_file_bad_type_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-parse_file_bad_type_fail_/formatted.sql
index f7551ceff2..f8ef89059b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-parse_file_bad_type_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-parse_file_bad_type_fail_/formatted.sql
@@ -1,5 +1,5 @@
 /* postgres can not */
 /* custom error:User type Uuid is not supported*/
 SELECT
-    ParseFile('uuid', "keyid.lst")
+    ParseFile('uuid', 'keyid.lst')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-parse_file_in_select_as_int_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-parse_file_in_select_as_int_/formatted.sql
index 9303ec7930..b64ee6e3a5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-parse_file_in_select_as_int_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-parse_file_in_select_as_int_/formatted.sql
@@ -2,7 +2,7 @@
 SELECT
     key,
     value,
-    CAST(key AS int32) ?? 0 IN ParseFile('int32', "keyid.lst") AS privilege
+    CAST(key AS int32) ?? 0 IN ParseFile('int32', 'keyid.lst') AS privilege
 FROM
     plato.Input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-parse_file_in_select_as_str_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-parse_file_in_select_as_str_/formatted.sql
index cf22d45d0c..26d7091839 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-parse_file_in_select_as_str_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-parse_file_in_select_as_str_/formatted.sql
@@ -2,7 +2,7 @@
 SELECT
     key,
     value,
-    key IN ParseFile('string', "keyid.lst") AS privilege
+    key IN ParseFile('string', 'keyid.lst') AS privilege
 FROM
     plato.Input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-parse_file_in_select_as_uint64_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-parse_file_in_select_as_uint64_/formatted.sql
index 731fd4666a..74c02c4b85 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-parse_file_in_select_as_uint64_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-parse_file_in_select_as_uint64_/formatted.sql
@@ -2,7 +2,7 @@
 SELECT
     key,
     value,
-    CAST(key AS int32) IN ParseFile('uint64', "keyid.lst") AS privilege
+    CAST(key AS int32) IN ParseFile('uint64', 'keyid.lst') AS privilege
 FROM
     plato.Input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-second_pass_parse_file_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-second_pass_parse_file_fail_/formatted.sql
index 26b025cc20..1a35a3926b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-second_pass_parse_file_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-second_pass_parse_file_fail_/formatted.sql
@@ -1,6 +1,6 @@
 /* postgres can not */
 /* custom error:The file iterator was already created. To scan file data multiple times please use ListCollect either over ParseFile or over some lazy function over it, e.g. ListMap*/
-$list = ParseFile("int32", "keyid.lst");
+$list = ParseFile('int32', 'keyid.lst');
 
 SELECT
     ListExtend(
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-where_key_in_file_content_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-where_key_in_file_content_/formatted.sql
index 924fa4f7dc..d3c7e14b51 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-where_key_in_file_content_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-where_key_in_file_content_/formatted.sql
@@ -4,5 +4,5 @@ SELECT
 FROM
     plato.Input
 WHERE
-    key IN ParseFile('String', "keyid.lst")
+    key IN ParseFile('String', 'keyid.lst')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-where_key_in_file_content_typed_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-where_key_in_file_content_typed_/formatted.sql
index 0c81bc81b5..fc835c608c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-where_key_in_file_content_typed_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-where_key_in_file_content_typed_/formatted.sql
@@ -4,5 +4,5 @@ SELECT
 FROM
     plato.Input
 WHERE
-    CAST(key AS Uint32) IN ParseFile('uint32', "keyid.lst")
+    CAST(key AS Uint32) IN ParseFile('uint32', 'keyid.lst')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-where_key_in_get_file_content_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-where_key_in_get_file_content_/formatted.sql
index c1f4552527..629b44879a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-where_key_in_get_file_content_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_file-where_key_in_get_file_content_/formatted.sql
@@ -6,5 +6,5 @@ SELECT
 FROM
     plato.Input
 WHERE
-    key IN String::SplitToList(FileContent("keyid.lst"), "\n", TRUE)
+    key IN String::SplitToList(FileContent('keyid.lst'), '\n', TRUE)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_columns_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_columns_/formatted.sql
index 562ff61a25..91cf3e5dfb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_columns_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_columns_/formatted.sql
@@ -6,7 +6,7 @@ SELECT
 FROM (
     SELECT
         AsStruct(key AS key, subkey AS subkey),
-        AsStruct("value: " || value AS value)
+        AsStruct('value: ' || value AS value)
     FROM
         Input
 )
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_expr_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_expr_/formatted.sql
index e515dcfb66..903d71be0b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_expr_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_expr_/formatted.sql
@@ -2,9 +2,9 @@
 /* postgres can not */
 $data =
     SELECT
-        "a,b,c,d" AS a,
-        "e,f,g,h" AS b,
-        "x" AS c
+        'a,b,c,d' AS a,
+        'e,f,g,h' AS b,
+        'x' AS c
 ;
 
 SELECT
@@ -14,8 +14,8 @@ SELECT
 FROM
     $data
     FLATTEN BY (
-        String::SplitToList(a, ",") AS a,
-        String::SplitToList(b, ",") AS bb
+        String::SplitToList(a, ',') AS a,
+        String::SplitToList(b, ',') AS bb
     )
 ORDER BY
     a,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_expr_groupby_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_expr_groupby_/formatted.sql
index b5f2bf134f..d516819cd8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_expr_groupby_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_expr_groupby_/formatted.sql
@@ -2,9 +2,9 @@
 /* postgres can not */
 $data =
     SELECT
-        "a,b,c,d" AS a,
-        "e,f,g,h" AS b,
-        "x" AS c
+        'a,b,c,d' AS a,
+        'e,f,g,h' AS b,
+        'x' AS c
 ;
 
 SELECT
@@ -13,8 +13,8 @@ SELECT
 FROM
     $data
     FLATTEN BY (
-        String::SplitToList(a, ",") AS a,
-        String::SplitToList(b, ",") AS bb
+        String::SplitToList(a, ',') AS a,
+        String::SplitToList(b, ',') AS bb
     )
 GROUP BY
     bb
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_expr_join_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_expr_join_/formatted.sql
index fa946b8300..b1017652fd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_expr_join_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_expr_join_/formatted.sql
@@ -4,8 +4,8 @@ USE plato;
 
 $data =
     SELECT
-        "075,020,075,020" AS a,
-        "x" AS c
+        '075,020,075,020' AS a,
+        'x' AS c
 ;
 
 SELECT
@@ -13,7 +13,7 @@ SELECT
 FROM ANY
     $data AS x
     FLATTEN BY (
-        String::SplitToList(a, ",") AS aa
+        String::SplitToList(a, ',') AS aa
     )
 JOIN
     Input AS y
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_expr_where_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_expr_where_/formatted.sql
index f212fe06ab..3549696157 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_expr_where_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_expr_where_/formatted.sql
@@ -2,9 +2,9 @@
 /* postgres can not */
 $data =
     SELECT
-        "a,b,c,d" AS a,
-        "e,f,g,h" AS b,
-        "x" AS c
+        'a,b,c,d' AS a,
+        'e,f,g,h' AS b,
+        'x' AS c
 ;
 
 SELECT
@@ -14,11 +14,11 @@ SELECT
 FROM
     $data
     FLATTEN BY (
-        String::SplitToList(a, ",") AS a,
-        String::SplitToList(b, ",") AS bb
+        String::SplitToList(a, ',') AS a,
+        String::SplitToList(b, ',') AS bb
     )
 WHERE
-    bb != "h"
+    bb != 'h'
 ORDER BY
     a,
     bb
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_mode_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_mode_/formatted.sql
index 71b43d50cd..e30681f8f4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_mode_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_mode_/formatted.sql
@@ -45,7 +45,7 @@ ORDER BY
     x
 ;
 
-$dct = AsDict(AsTuple(1, "foo"), AsTuple(2, "bar"), AsTuple(3, "baz"));
+$dct = AsDict(AsTuple(1, 'foo'), AsTuple(2, 'bar'), AsTuple(3, 'baz'));
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-functions_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-functions_/formatted.sql
index 27bf0e780c..e06a8f9a59 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-functions_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-functions_/formatted.sql
@@ -4,7 +4,7 @@
 /* dqfile can not */
 /* yt can not */
 PRAGMA FlexibleTypes;
-PRAGMA warning("disable", "4510");
+PRAGMA warning('disable', '4510');
 
 $x1 = () -> (Int32);
 $x2 = () -> (Tuple<Int32>);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-group_by2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-group_by2_/formatted.sql
index 3e45fde8f8..d1497f6a59 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-group_by2_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-group_by2_/formatted.sql
@@ -7,12 +7,12 @@ PRAGMA FlexibleTypes;
 
 $groupsrc =
     SELECT
-        "1" AS key,
-        "2" AS String
+        '1' AS key,
+        '2' AS String
     UNION ALL
     SELECT
-        "1" AS key,
-        "3" AS String
+        '1' AS key,
+        '3' AS String
 ;
 
 $foo = ($k, $t) -> (FormatType($t) || '_' || $k);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-inside_evaluate_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-inside_evaluate_/formatted.sql
index cb656aa60f..3e548d7299 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-inside_evaluate_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-inside_evaluate_/formatted.sql
@@ -3,7 +3,7 @@ $do_safe_cast = ($x, $type) -> {
     $cast_code = EvaluateCode(
         LambdaCode(
             ($x_code) -> {
-                RETURN FuncCode("SafeCast", $x_code, $type_code);
+                RETURN FuncCode('SafeCast', $x_code, $type_code);
             }
         )
     );
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-text_and_bytes_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-text_and_bytes_/formatted.sql
index b373859ecf..d95af2c787 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-text_and_bytes_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-text_and_bytes_/formatted.sql
@@ -7,8 +7,8 @@ PRAGMA FlexibleTypes;
 
 $src =
     SELECT
-        Text("test_text, привет") AS text,
-        Bytes("binary\x00\xff") AS bytes
+        Text('test_text, привет') AS text,
+        Bytes('binary\x00\xff') AS bytes
 ;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-with_typeof_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-with_typeof_/formatted.sql
index 27764945ab..fb5ec30922 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-with_typeof_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-with_typeof_/formatted.sql
@@ -7,11 +7,11 @@ PRAGMA FlexibleTypes;
 
 $src =
     SELECT
-        Date("2022-01-01") AS int32,
+        Date('2022-01-01') AS int32,
         2 AS value
     UNION ALL
     SELECT
-        Date("2021-12-31") AS int32,
+        Date('2021-12-31') AS int32,
         1 AS value
 ;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-double_input_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-double_input_/formatted.sql
index daab5143a8..3889607492 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-double_input_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-double_input_/formatted.sql
@@ -5,25 +5,25 @@ SELECT
 FROM (
     SELECT
         key,
-        value || "a" AS value
+        value || 'a' AS value
     FROM
         plato.Input
     UNION ALL
     SELECT
         key,
-        "1" AS value
+        '1' AS value
     FROM
         plato.Input
     UNION ALL
     SELECT
         key,
-        "1" AS value
+        '1' AS value
     FROM
         plato.Input
     UNION ALL
     SELECT
         key,
-        "3" AS value
+        '3' AS value
     FROM
         plato.Input
 ) AS x
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-empty_out_hor_join_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-empty_out_hor_join_/formatted.sql
index 41b92ad920..2e5b9dc3b2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-empty_out_hor_join_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-empty_out_hor_join_/formatted.sql
@@ -7,7 +7,7 @@ $i = (
     FROM
         Input
     WHERE
-        key == "0"
+        key == '0'
     ORDER BY
         key
     LIMIT 100
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-filters_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-filters_/formatted.sql
index 144fc0705a..bdf9f84cd0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-filters_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-filters_/formatted.sql
@@ -9,7 +9,7 @@ FROM (
     FROM
         plato.Input1
     WHERE
-        key > "010"
+        key > '010'
     UNION ALL
     SELECT
         key,
@@ -17,7 +17,7 @@ FROM (
     FROM
         plato.Input2
     WHERE
-        key > "020"
+        key > '020'
 ) AS x
 ORDER BY
     key,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-fuse_multi_outs1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-fuse_multi_outs1_/formatted.sql
index ce7d14605b..cbce09773e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-fuse_multi_outs1_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-fuse_multi_outs1_/formatted.sql
@@ -37,7 +37,7 @@ SELECT
 FROM
     $i
 WHERE
-    key > "100"
+    key > '100'
 ORDER BY
     key
 ;
@@ -55,7 +55,7 @@ SELECT
 FROM
     $i
 WHERE
-    key > "200"
+    key > '200'
 ;
 
 INSERT INTO @c
@@ -64,5 +64,5 @@ SELECT
 FROM
     $j
 WHERE
-    key > "300"
+    key > '300'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-fuse_multi_outs2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-fuse_multi_outs2_/formatted.sql
index 8db6ccc75d..570689e458 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-fuse_multi_outs2_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-fuse_multi_outs2_/formatted.sql
@@ -37,7 +37,7 @@ SELECT
 FROM
     $i
 WHERE
-    key > "100"
+    key > '100'
 ORDER BY
     key
 ;
@@ -55,5 +55,5 @@ SELECT
 FROM
     $j
 WHERE
-    key > "200"
+    key > '200'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-fuse_multi_usage_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-fuse_multi_usage_/formatted.sql
index 44fe7fc09a..d5bf54de2b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-fuse_multi_usage_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-fuse_multi_usage_/formatted.sql
@@ -16,7 +16,7 @@ SELECT
 FROM
     $input
 WHERE
-    subkey > "0"
+    subkey > '0'
 ORDER BY
     key
 ;
@@ -28,7 +28,7 @@ SELECT
 FROM
     $input AS t
 WHERE
-    value > "a"
+    value > 'a'
 ;
 
 INSERT INTO @b
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-max_in_tables_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-max_in_tables_/formatted.sql
index 337c2ffb7e..16dd418573 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-max_in_tables_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-max_in_tables_/formatted.sql
@@ -1,6 +1,6 @@
 /* postgres can not */
 /* kikimr can not */
-PRAGMA yt.MaxInputTables = "3";
+PRAGMA yt.MaxInputTables = '3';
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-max_outtables_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-max_outtables_/formatted.sql
index ea62c0ec3e..dd4ada898e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-max_outtables_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-max_outtables_/formatted.sql
@@ -1,7 +1,7 @@
 /* syntax version 1 */
 /* postgres can not */
 /* kikimr can not */
-PRAGMA yt.MaxOutputTables = "3";
+PRAGMA yt.MaxOutputTables = '3';
 
 $i1 = (
     SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_hor_join_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_hor_join_/formatted.sql
index 971a6a4ec1..3e5e9fdf72 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_hor_join_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_hor_join_/formatted.sql
@@ -7,7 +7,7 @@ $i = (
     FROM
         Input
     WHERE
-        key < "900"
+        key < '900'
 );
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_max_outtables_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_max_outtables_/formatted.sql
index 6b74b03164..4ea438b2e7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_max_outtables_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_max_outtables_/formatted.sql
@@ -1,7 +1,7 @@
 /* postgres can not */
 /* kikimr can not */
-PRAGMA yt.MaxOutputTables = "3";
-PRAGMA yt.DisableOptimizers = "HorizontalJoin,MultiHorizontalJoin";
+PRAGMA yt.MaxOutputTables = '3';
+PRAGMA yt.DisableOptimizers = 'HorizontalJoin,MultiHorizontalJoin';
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_mem_limit_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_mem_limit_/formatted.sql
index d25cbdffdd..a89857d96c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_mem_limit_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_mem_limit_/formatted.sql
@@ -2,8 +2,8 @@
 /* kikimr can not - yt pragma */
 USE plato;
 
-PRAGMA yt.MaxExtraJobMemoryToFuseOperations = "550m";
-PRAGMA yt.CombineCoreLimit = "128m";
+PRAGMA yt.MaxExtraJobMemoryToFuseOperations = '550m';
+PRAGMA yt.CombineCoreLimit = '128m';
 
 $i = (
     SELECT
@@ -11,7 +11,7 @@ $i = (
     FROM
         Input
     WHERE
-        key < "900"
+        key < '900'
 );
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_range_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_range_/formatted.sql
index 67e0bf71ea..963ae9dcbb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_range_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_range_/formatted.sql
@@ -19,7 +19,7 @@ SELECT
 FROM
     Input
 WHERE
-    key > "100"
+    key > '100'
 GROUP BY
     key
 ORDER BY
@@ -33,7 +33,7 @@ SELECT
 FROM
     Input
 WHERE
-    key > "100"
+    key > '100'
 GROUP BY
     key
 ORDER BY
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_table_record_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_table_record_/formatted.sql
index db78d9d7e4..ff216b0d4a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_table_record_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_table_record_/formatted.sql
@@ -2,7 +2,7 @@
 /* postgres can not */
 USE plato;
 
-PRAGMA yt.DisableOptimizers = "HorizontalJoin,MultiHorizontalJoin";
+PRAGMA yt.DisableOptimizers = 'HorizontalJoin,MultiHorizontalJoin';
 
 SELECT
     *
@@ -17,7 +17,7 @@ FROM (
     SELECT
         key,
         TableRecordIndex() AS record,
-        "d" AS path
+        'd' AS path
     FROM
         Input
 ) AS x
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-sorted_out_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-sorted_out_/formatted.sql
index 077c7287f9..5f5cc7441c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-sorted_out_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-sorted_out_/formatted.sql
@@ -1,37 +1,37 @@
 /* postgres can not */
 /* kikimr can not */
-PRAGMA yt.DisableOptimizers = "UnorderedOuts";
+PRAGMA yt.DisableOptimizers = 'UnorderedOuts';
 
 SELECT
     *
 FROM (
     SELECT
         key,
-        value || "a" AS value
+        value || 'a' AS value
     FROM
         plato.Input1
     UNION ALL
     SELECT
         key,
-        "1" AS value
+        '1' AS value
     FROM
         plato.Input2
     UNION ALL
     SELECT
         key,
-        "2" AS value
+        '2' AS value
     FROM
         plato.Input3
     UNION ALL
     SELECT
         key,
-        "3" AS value
+        '3' AS value
     FROM
         plato.Input4
     UNION ALL
     SELECT
         key,
-        "4" AS value
+        '4' AS value
     FROM
         plato.Input5
 ) AS x
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-sorted_out_mix_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-sorted_out_mix_/formatted.sql
index 0bd427f80c..5c2e64e055 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-sorted_out_mix_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-sorted_out_mix_/formatted.sql
@@ -1,12 +1,12 @@
 /* syntax version 1 */
 /* postgres can not */
 /* kikimr can not */
-PRAGMA yt.DisableOptimizers = "UnorderedOuts";
+PRAGMA yt.DisableOptimizers = 'UnorderedOuts';
 
 $i1 = (
     SELECT
         key,
-        value || "a" AS value1
+        value || 'a' AS value1
     FROM
         plato.Input1
 );
@@ -14,7 +14,7 @@ $i1 = (
 $i2 = (
     SELECT
         key,
-        "1" AS value2
+        '1' AS value2
     FROM
         plato.Input2
 );
@@ -22,7 +22,7 @@ $i2 = (
 $i3 = (
     SELECT
         key,
-        "2" AS value3
+        '2' AS value3
     FROM
         plato.Input3
 );
@@ -31,14 +31,14 @@ $udf = ($x) -> {
     RETURN AsStruct(
         Yql::Visit(
             $x,
-            AsAtom("0"), ($i) -> {
-                RETURN Yql::Member($i, AsAtom("key"));
+            AsAtom('0'), ($i) -> {
+                RETURN Yql::Member($i, AsAtom('key'));
             },
-            AsAtom("1"), ($i) -> {
-                RETURN Yql::Member($i, AsAtom("key"));
+            AsAtom('1'), ($i) -> {
+                RETURN Yql::Member($i, AsAtom('key'));
             },
-            AsAtom("2"), ($i) -> {
-                RETURN Yql::Member($i, AsAtom("key"));
+            AsAtom('2'), ($i) -> {
+                RETURN Yql::Member($i, AsAtom('key'));
             }
         ) AS key
     );
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-table_record_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-table_record_/formatted.sql
index 41fdc67fa6..8356d80132 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-table_record_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-table_record_/formatted.sql
@@ -15,7 +15,7 @@ FROM (
     SELECT
         key,
         TableRecordIndex() AS record,
-        "d" AS path
+        'd' AS path
     FROM
         Input2
 ) AS x
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yield_off_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yield_off_/formatted.sql
index c238103f66..b0ec7bde4c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yield_off_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yield_off_/formatted.sql
@@ -2,7 +2,7 @@
 /* postgres can not */
 USE plato;
 
-PRAGMA config.flags("UdfSupportsYield", "false");
+PRAGMA config.flags('UdfSupportsYield', 'false');
 
 $s = @@
 import yql
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yield_on_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yield_on_/formatted.sql
index 2e04478597..9118eb21d5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yield_on_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yield_on_/formatted.sql
@@ -2,7 +2,7 @@
 /* postgres can not */
 USE plato;
 
-PRAGMA config.flags("UdfSupportsYield", "true");
+PRAGMA config.flags('UdfSupportsYield', 'true');
 
 $s = @@
 def f(input, a):
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yql-12610_old_table_props_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yql-12610_old_table_props_/formatted.sql
index 55721a663a..221ca960eb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yql-12610_old_table_props_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yql-12610_old_table_props_/formatted.sql
@@ -3,7 +3,7 @@
 /* kikimr can not - yt pragma */
 USE plato;
 
-PRAGMA yt.UseSystemColumns = "0";
+PRAGMA yt.UseSystemColumns = '0';
 
 SELECT
     *
@@ -18,7 +18,7 @@ FROM (
     SELECT
         key,
         TableRecordIndex() AS record,
-        "d" AS path
+        'd' AS path
     FROM
         Input
 ) AS x
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yql-6477_table_path_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yql-6477_table_path_/formatted.sql
index 0961f6f190..afb93891d2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yql-6477_table_path_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yql-6477_table_path_/formatted.sql
@@ -3,7 +3,7 @@
 /* kikimr can not - yt pragma */
 USE plato;
 
-PRAGMA yt.MaxExtraJobMemoryToFuseOperations = "512M";
+PRAGMA yt.MaxExtraJobMemoryToFuseOperations = '512M';
 
 $udfScript = @@
 def AsIs(s):
@@ -22,5 +22,5 @@ SELECT
 FROM
     Input
 WHERE
-    $udf(key) > "080"
+    $udf(key) > '080'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yql19332_aux_cols_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yql19332_aux_cols_/formatted.sql
index fdbef9e7a4..d0bf6e3a14 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yql19332_aux_cols_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yql19332_aux_cols_/formatted.sql
@@ -2,7 +2,7 @@
 USE plato;
 
 PRAGMA DisableSimpleColumns;
-PRAGMA yt.JoinMergeTablesLimit = "10";
+PRAGMA yt.JoinMergeTablesLimit = '10';
 
 $i =
     SELECT
@@ -10,7 +10,7 @@ $i =
     FROM
         concat(Input2, Input3)
     WHERE
-        value != "1"
+        value != '1'
 ;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-basic_in_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-basic_in_/formatted.sql
index a1f7582729..04bc48f7d5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-basic_in_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-basic_in_/formatted.sql
@@ -2,7 +2,7 @@
 SELECT
     1 IN (1, 2),
     3 NOT IN (1, 2),
-    "1" IN (key, subkey, value),
+    '1' IN (key, subkey, value),
     key NOT IN (key, subkey, value),
     key NOT IN AsList(subkey),
     CAST(subkey AS Int32) IN (1, 2) AS optional_key_i32,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_dict_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_dict_/formatted.sql
index f6a65c2952..58fa13a5a2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_dict_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_dict_/formatted.sql
@@ -3,18 +3,18 @@
 PRAGMA AnsiInForEmptyOrNullableItemsCollections;
 
 SELECT
-    1 IN AsDict((2, "x"), (3, "y"), (NULL, "z")), -- Nothing<Bool?>
+    1 IN AsDict((2, 'x'), (3, 'y'), (NULL, 'z')), -- Nothing<Bool?>
     NULL IN DictCreate(Int32, String?), -- false?
-    NULL IN AsDict((NULL, "foo")), -- Nothing<Bool?>
-    NULL IN AsDict((1, "bar")), -- Nothing<Bool?>
-    (1, NULL) IN AsDict(((1, 1), NULL), ((2, 2), "foo")), -- Nothing<Bool?>
-    (1, NULL) IN AsDict(((2, 2), "foo"), ((3, 3), "bar")), -- false?
-    (1, 2) IN AsDict(((1, NULL), "foo"), ((2, 2), "bar")), -- Nothing<Bool?>
-    (1, 2) IN AsDict(((NULL, 1), "foo"), ((2, 1), NULL)), -- false?
-    (1, 2) IN AsDict(((1, NULL), "foo"), ((2, 1), "bar")), -- Nothing<Bool?>
+    NULL IN AsDict((NULL, 'foo')), -- Nothing<Bool?>
+    NULL IN AsDict((1, 'bar')), -- Nothing<Bool?>
+    (1, NULL) IN AsDict(((1, 1), NULL), ((2, 2), 'foo')), -- Nothing<Bool?>
+    (1, NULL) IN AsDict(((2, 2), 'foo'), ((3, 3), 'bar')), -- false?
+    (1, 2) IN AsDict(((1, NULL), 'foo'), ((2, 2), 'bar')), -- Nothing<Bool?>
+    (1, 2) IN AsDict(((NULL, 1), 'foo'), ((2, 1), NULL)), -- false?
+    (1, 2) IN AsDict(((1, NULL), 'foo'), ((2, 1), 'bar')), -- Nothing<Bool?>
 ;
 
 SELECT
-    Just(1) IN AsDict((1, "foo"), (2, "bar"), (3, NULL)), -- true?
-    1 IN AsDict((Just(2), NULL), (Just(3), "bar")), -- false?
+    Just(1) IN AsDict((1, 'foo'), (2, 'bar'), (3, NULL)), -- true?
+    1 IN AsDict((Just(2), NULL), (Just(3), 'bar')), -- false?
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_empty_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_empty_/formatted.sql
index 92810d8027..fe4a98a309 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_empty_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_empty_/formatted.sql
@@ -11,5 +11,5 @@ SELECT
     1 IN (), -- false
     NULL IN Nothing(EmptyList?), -- Nothing<Bool?>
     NULL IN Nothing(EmptyDict?), -- Nothing<Bool?>
-    NULL IN Nothing(ParseType("Tuple<>?")), -- Nothing<Bool?>
+    NULL IN Nothing(ParseType('Tuple<>?')), -- Nothing<Bool?>
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_variant_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_variant_/formatted.sql
index 36479aac54..cec311c38b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_variant_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_variant_/formatted.sql
@@ -3,26 +3,26 @@
 PRAGMA AnsiInForEmptyOrNullableItemsCollections;
 
 SELECT
-    ENUM ("foo", Enum<"foo", "bar">) IN (
-        AsEnum("foo")
+    ENUM ('foo', Enum<'foo', 'bar'>) IN (
+        AsEnum('foo')
     ),
-    ENUM ("foo", Enum<"foo", "bar">) IN (
-        AsEnum("bar")
+    ENUM ('foo', Enum<'foo', 'bar'>) IN (
+        AsEnum('bar')
     ),
-    ENUM ("foo", Enum<"foo", "bar">) IN (
-        AsEnum("foo"),
-        AsEnum("bar")
+    ENUM ('foo', Enum<'foo', 'bar'>) IN (
+        AsEnum('foo'),
+        AsEnum('bar')
     ),
-    ENUM ("foo", Enum<"foo", "bar">) IN (
-        AsEnum("bar"),
-        AsEnum("baz")
+    ENUM ('foo', Enum<'foo', 'bar'>) IN (
+        AsEnum('bar'),
+        AsEnum('baz')
     ),
-    ENUM ("foo", Enum<"foo", "bar">) IN [
-        AsEnum("foo"),
-        AsEnum("bar")
+    ENUM ('foo', Enum<'foo', 'bar'>) IN [
+        AsEnum('foo'),
+        AsEnum('bar')
     ],
-    ENUM ("foo", Enum<"foo", "bar">) IN {
-        AsEnum("bar"),
-        AsEnum("baz")
+    ENUM ('foo', Enum<'foo', 'bar'>) IN {
+        AsEnum('bar'),
+        AsEnum('baz')
     }
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_enum_single0_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_enum_single0_/formatted.sql
index e90e6759bd..9147a9ad4d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_enum_single0_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_enum_single0_/formatted.sql
@@ -3,5 +3,5 @@ SELECT
 FROM
     plato.Input
 WHERE
-    key IN ("023")
+    key IN ('023')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_immediate_subquery_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_immediate_subquery_/formatted.sql
index 3fade02a9d..22f5be9c82 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_immediate_subquery_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_immediate_subquery_/formatted.sql
@@ -8,7 +8,7 @@ FROM
 WHERE
     subkey NOT IN (
         SELECT
-            key || "0"
+            key || '0'
         FROM
             Input4
     )
@@ -24,7 +24,7 @@ FROM
 WHERE
     subkey IN COMPACT (
         SELECT
-            key || "0"
+            key || '0'
         FROM
             Input4
     )
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_noansi_empty_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_noansi_empty_/formatted.sql
index f7ed9d7991..f93cb18e39 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_noansi_empty_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_noansi_empty_/formatted.sql
@@ -11,5 +11,5 @@ SELECT
     1 IN (), -- false
     NULL IN Nothing(EmptyList?), -- Nothing<Bool?>
     NULL IN Nothing(EmptyDict?), -- Nothing<Bool?>
-    NULL IN Nothing(ParseType("Tuple<>?")), -- Nothing<Bool?>
+    NULL IN Nothing(ParseType('Tuple<>?')), -- Nothing<Bool?>
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_scalar_vector_subquery_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_scalar_vector_subquery_/formatted.sql
index 25b6018ebb..4644923449 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_scalar_vector_subquery_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_scalar_vector_subquery_/formatted.sql
@@ -3,36 +3,36 @@ USE plato;
 
 $bar = (
     SELECT
-        "1"
+        '1'
     UNION ALL
     SELECT
-        "2"
+        '2'
 );
 
 $barr = (
     SELECT
-        "1" AS subkey
+        '1' AS subkey
     UNION ALL
     SELECT
-        "2" AS subkey
+        '2' AS subkey
 );
 
 SELECT
-    "1" IN $bar,
-    "2" IN $bar
+    '1' IN $bar,
+    '2' IN $bar
 ;
 
 SELECT
-    "3" IN $bar
+    '3' IN $bar
 ;
 
 SELECT
-    "1" IN AsList($barr),
-    "2" IN AsList($barr)
+    '1' IN AsList($barr),
+    '2' IN AsList($barr)
 ;
 
 SELECT
-    "3" IN AsList($barr)
+    '3' IN AsList($barr)
 ;
 
 SELECT
@@ -62,7 +62,7 @@ $baz = (
     FROM
         Input
     WHERE
-        subkey == "1" OR subkey == "2"
+        subkey == '1' OR subkey == '2'
 );
 
 $bazz = (
@@ -71,28 +71,28 @@ $bazz = (
     FROM
         Input
     WHERE
-        subkey < "3"
+        subkey < '3'
     ORDER BY
         subkey ASC
     LIMIT 1
 );
 
 SELECT
-    "1" IN $baz,
-    "2" IN $baz
+    '1' IN $baz,
+    '2' IN $baz
 ;
 
 SELECT
-    "3" IN $baz
+    '3' IN $baz
 ;
 
 SELECT
-    "1" IN AsList($bazz),
-    "2" IN AsList($bazz)
+    '1' IN AsList($bazz),
+    '2' IN AsList($bazz)
 ;
 
 SELECT
-    "3" IN AsList($bazz)
+    '3' IN AsList($bazz)
 ;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_sorted_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_sorted_/formatted.sql
index a9c93602db..ef929789f3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_sorted_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_sorted_/formatted.sql
@@ -8,7 +8,7 @@ $in =
     FROM
         InputSorted
     WHERE
-        key < "100"
+        key < '100'
 ;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_with_nulls_and_optionals_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_with_nulls_and_optionals_/formatted.sql
index 0dd4c12f0c..1ad29e6f98 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_with_nulls_and_optionals_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_with_nulls_and_optionals_/formatted.sql
@@ -1,6 +1,6 @@
 /* postgres can not */
 $pt = AsTuple(1, 2, 3);
-$et = Nothing(ParseType("Tuple<Int32, Int32, Int32>?"));
+$et = Nothing(ParseType('Tuple<Int32, Int32, Int32>?'));
 
 SELECT
     1 IN $pt, -- true
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-yql-10038_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-yql-10038_/formatted.sql
index 7662ea7674..945c3d23a3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-yql-10038_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-yql-10038_/formatted.sql
@@ -3,8 +3,8 @@ USE plato;
 
 INSERT INTO @input
 SELECT
-    "foo" AS reqid,
-    "touch" AS ui,
+    'foo' AS reqid,
+    'touch' AS ui,
     AsList(1, 2, 236273) AS test_ids
 ;
 
@@ -12,7 +12,7 @@ COMMIT;
 
 $dict = (
     SELECT
-        "foo" AS reqid
+        'foo' AS reqid
 );
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-yql-14677_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-yql-14677_/formatted.sql
index 1bbbd516c5..b2207d0a2e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-yql-14677_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-yql-14677_/formatted.sql
@@ -1,7 +1,7 @@
 /* postgres can not */
 USE plato;
 
-PRAGMA yt.MapJoinLimit = "1m";
+PRAGMA yt.MapJoinLimit = '1m';
 
 $l1 =
     SELECT
@@ -16,6 +16,6 @@ FROM
     Input
 WHERE
     TRUE
-    AND value != ""
+    AND value != ''
     AND key IN $l1
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-anonymous_tables_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-anonymous_tables_/formatted.sql
index 80565b0edd..414b3dc2d8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-anonymous_tables_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-anonymous_tables_/formatted.sql
@@ -1,7 +1,7 @@
 /* postgres can not */
 USE plato;
 
-PRAGMA yt.MapJoinLimit = "1M";
+PRAGMA yt.MapJoinLimit = '1M';
 
 INSERT INTO @a
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-double_append_to_anonymous_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-double_append_to_anonymous_/formatted.sql
index 2e92956f45..9284a900a9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-double_append_to_anonymous_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-double_append_to_anonymous_/formatted.sql
@@ -4,7 +4,7 @@ USE plato;
 INSERT INTO @tmp
 SELECT
     1 AS id,
-    "qwer" AS val
+    'qwer' AS val
 ;
 
 COMMIT;
@@ -12,7 +12,7 @@ COMMIT;
 INSERT INTO @tmp
 SELECT
     2 AS id,
-    "asdf" AS val
+    'asdf' AS val
 ;
 
 COMMIT;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-from_two_sorted_by_calc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-from_two_sorted_by_calc_/formatted.sql
index 2319c67291..e6ead60fb5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-from_two_sorted_by_calc_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-from_two_sorted_by_calc_/formatted.sql
@@ -7,7 +7,7 @@ SELECT
 FROM
     Input
 ORDER BY
-    key || "1"
+    key || '1'
 ;
 
 INSERT INTO @f2
@@ -16,7 +16,7 @@ SELECT
 FROM
     Input
 ORDER BY
-    key || "2"
+    key || '2'
 ;
 
 COMMIT;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-insert_relabeled_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-insert_relabeled_/formatted.sql
index c735da63ee..614c74b7cd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-insert_relabeled_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-insert_relabeled_/formatted.sql
@@ -10,7 +10,7 @@ SELECT
     key,
     subkey,
     value AS new_value,
-    "x"
+    'x'
 FROM
     plato.Input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-literals_to_string_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-literals_to_string_/formatted.sql
index 0ade68bd6a..ab89c534c6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-literals_to_string_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-literals_to_string_/formatted.sql
@@ -6,5 +6,5 @@ INSERT INTO plato.Output (
     value
 )
 VALUES
-    (YQL::ToString(1), YQL::ToString(2), "3")
+    (YQL::ToString(1), YQL::ToString(2), '3')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-merge_publish_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-merge_publish_/formatted.sql
index eda9f13211..260d84afcd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-merge_publish_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-merge_publish_/formatted.sql
@@ -3,11 +3,11 @@
 /* ignore plan diff */
 USE plato;
 
-PRAGMA yt.ScriptCpu = "1.0";
+PRAGMA yt.ScriptCpu = '1.0';
 
 INSERT INTO Output1
 SELECT
-    "1" AS key,
+    '1' AS key,
     subkey,
     value
 FROM
@@ -16,7 +16,7 @@ FROM
 
 INSERT INTO Output2
 SELECT
-    "2" AS key,
+    '2' AS key,
     subkey,
     value
 FROM
@@ -25,7 +25,7 @@ FROM
 
 INSERT INTO Output2
 SELECT
-    "3" AS key,
+    '3' AS key,
     subkey,
     value
 FROM
@@ -34,18 +34,18 @@ FROM
 
 INSERT INTO Output1
 SELECT
-    "4" AS key,
+    '4' AS key,
     subkey,
     value
 FROM
     Input
 ;
 
-PRAGMA yt.ScriptCpu = "2.0";
+PRAGMA yt.ScriptCpu = '2.0';
 
 INSERT INTO Output1
 SELECT
-    "5" AS key,
+    '5' AS key,
     subkey,
     value
 FROM
@@ -54,7 +54,7 @@ FROM
 
 INSERT INTO Output1
 SELECT
-    "6" AS key,
+    '6' AS key,
     subkey,
     value
 FROM
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-replace_inferred_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-replace_inferred_/formatted.sql
index 2f66f4e84c..4d193e4c22 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-replace_inferred_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-replace_inferred_/formatted.sql
@@ -3,7 +3,7 @@
 USE plato;
 
 PRAGMA yt.InferSchema;
-PRAGMA yt.InferSchemaTableCountThreshold = "100000";
+PRAGMA yt.InferSchemaTableCountThreshold = '100000';
 
 INSERT INTO Output WITH truncate
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-replace_inferred_op_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-replace_inferred_op_/formatted.sql
index 6f17c70ac6..67a6af50c0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-replace_inferred_op_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-replace_inferred_op_/formatted.sql
@@ -3,7 +3,7 @@
 USE plato;
 
 PRAGMA yt.InferSchema;
-PRAGMA yt.InferSchemaTableCountThreshold = "0";
+PRAGMA yt.InferSchemaTableCountThreshold = '0';
 
 INSERT INTO Output WITH truncate
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_after_insert_relabeled_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_after_insert_relabeled_/formatted.sql
index 2888e0e326..94584a4a5d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_after_insert_relabeled_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_after_insert_relabeled_/formatted.sql
@@ -11,7 +11,7 @@ SELECT
     key,
     subkey,
     value AS new_value,
-    "x"
+    'x'
 FROM
     plato.Input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_after_replace_unwrap_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_after_replace_unwrap_/formatted.sql
index 1c226fe452..42744ec6b0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_after_replace_unwrap_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_after_replace_unwrap_/formatted.sql
@@ -17,9 +17,9 @@ FROM
 COMMIT;
 
 SELECT
-    coalesce(key, ""),
-    coalesce(subkey, ""),
-    coalesce(value, "")
+    coalesce(key, ''),
+    coalesce(subkey, ''),
+    coalesce(value, '')
 FROM
     plato.Output
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_operate_with_columns_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_operate_with_columns_/formatted.sql
index a22a6ef1f6..73a60fd078 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_operate_with_columns_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_operate_with_columns_/formatted.sql
@@ -2,7 +2,7 @@
 INSERT INTO plato.Output WITH truncate
 SELECT
     a + b + c AS a,
-    coalesce(d, "") AS b,
+    coalesce(d, '') AS b,
     f AS f,
     CAST(coalesce(e, TRUE) AS varchar) AS e
 FROM
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_relabel_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_relabel_/formatted.sql
index 8475205ea7..91bc169495 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_relabel_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_relabel_/formatted.sql
@@ -8,7 +8,7 @@ INSERT INTO plato.Output WITH truncate (
 SELECT
     key,
     subkey,
-    "1" AS value
+    '1' AS value
 FROM
     plato.Input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-trivial_literals_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-trivial_literals_/formatted.sql
index b7ee5efd2d..fecfb6789c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-trivial_literals_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-trivial_literals_/formatted.sql
@@ -5,5 +5,5 @@ INSERT INTO plato.Output (
     value
 )
 VALUES
-    ("1", "2", "3")
+    ('1', '2', '3')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-trivial_literals_multirow_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-trivial_literals_multirow_/formatted.sql
index f3f95f099f..05475d0e3f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-trivial_literals_multirow_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-trivial_literals_multirow_/formatted.sql
@@ -6,7 +6,7 @@ INSERT INTO plato.Output (
     value
 )
 VALUES
-    ("1", "2", "3"),
-    ("4", "5", "6"),
-    ("7", "8", "9")
+    ('1', '2', '3'),
+    ('4', '5', '6'),
+    ('7', '8', '9')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-udf_empty_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-udf_empty_/formatted.sql
index 5b2e22a564..3e403a398c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-udf_empty_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-udf_empty_/formatted.sql
@@ -6,5 +6,5 @@ INSERT INTO plato.Output (
     value
 )
 VALUES
-    (SimpleUdf::ReturnNull(""), SimpleUdf::ReturnVoid(""), coalesce(SimpleUdf::ReturnEmpty(""), "!"))
+    (SimpleUdf::ReturnNull(''), SimpleUdf::ReturnVoid(''), coalesce(SimpleUdf::ReturnEmpty(''), '!'))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-yql-13083_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-yql-13083_/formatted.sql
index 749e642216..c9c3e47b3f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-yql-13083_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-yql-13083_/formatted.sql
@@ -4,12 +4,12 @@ USE plato;
 INSERT INTO Output1
 SELECT
     key AS key,
-    "" AS subkey,
-    "value:" || value AS value
+    '' AS subkey,
+    'value:' || value AS value
 FROM
     Input
 WHERE
-    key < "100"
+    key < '100'
 ORDER BY
     key
 ;
@@ -17,12 +17,12 @@ ORDER BY
 INSERT INTO Output2
 SELECT
     key AS key,
-    "" AS subkey,
-    "value:" || value AS value
+    '' AS subkey,
+    'value:' || value AS value
 FROM
     Input
 WHERE
-    key < "200"
+    key < '200'
 ORDER BY
     key
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-yql-14538_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-yql-14538_/formatted.sql
index d401945da6..824c0a73c7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-yql-14538_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-yql-14538_/formatted.sql
@@ -3,12 +3,12 @@ USE plato;
 INSERT INTO Output
 SELECT
     key AS key,
-    "" AS subkey,
-    "value:" || value AS value
+    '' AS subkey,
+    'value:' || value AS value
 FROM
     Input
 WHERE
-    key < "100"
+    key < '100'
 ORDER BY
     key
 LIMIT 5;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-aggr_diff_order_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-aggr_diff_order_/formatted.sql
index c9e46caf35..88d7636fe2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-aggr_diff_order_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-aggr_diff_order_/formatted.sql
@@ -1,7 +1,7 @@
 USE plato;
 
-PRAGMA yt.JoinMergeForce = "1";
-PRAGMA yt.JoinMergeTablesLimit = "10";
+PRAGMA yt.JoinMergeForce = '1';
+PRAGMA yt.JoinMergeTablesLimit = '10';
 
 SELECT
     key1,
@@ -16,7 +16,7 @@ FROM (
         FROM
             Input8
         WHERE
-            subkey != "bar"
+            subkey != 'bar'
     ) AS a
     JOIN ANY (
         SELECT
@@ -24,7 +24,7 @@ FROM (
         FROM
             Input8
         WHERE
-            subkey != "foo"
+            subkey != 'foo'
     ) AS b
     ON
         a.key == b.key AND a.subkey == b.subkey
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_merge_nodup_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_merge_nodup_/formatted.sql
index 9f90112ec3..6a2b490d07 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_merge_nodup_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_merge_nodup_/formatted.sql
@@ -3,7 +3,7 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
+PRAGMA yt.JoinMergeTablesLimit = '10';
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-cbo_4tables_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-cbo_4tables_/formatted.sql
index 79e2d29e8d..37e8cecb5a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-cbo_4tables_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-cbo_4tables_/formatted.sql
@@ -1,15 +1,15 @@
 /* ytfile can not */
 USE plato;
 
-PRAGMA warning("disable", "8001");
+PRAGMA warning('disable', '8001');
 
 -- CBO_MISSING_TABLE_STATS
-PRAGMA CostBasedOptimizer = "native";
-PRAGMA yt.MapJoinLimit = "1000";
-PRAGMA yt.LookupJoinLimit = "1000";
-PRAGMA yt.LookupJoinMaxRows = "100";
-PRAGMA yt.ExtendedStatsMaxChunkCount = "0";
-PRAGMA yt.JoinMergeTablesLimit = "100";
+PRAGMA CostBasedOptimizer = 'native';
+PRAGMA yt.MapJoinLimit = '1000';
+PRAGMA yt.LookupJoinLimit = '1000';
+PRAGMA yt.LookupJoinMaxRows = '100';
+PRAGMA yt.ExtendedStatsMaxChunkCount = '0';
+PRAGMA yt.JoinMergeTablesLimit = '100';
 
 SELECT
     InputA.Key1,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-cbo_4tables_only_sorted_merge_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-cbo_4tables_only_sorted_merge_/formatted.sql
index 5f6c388ecb..59a75e45c9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-cbo_4tables_only_sorted_merge_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-cbo_4tables_only_sorted_merge_/formatted.sql
@@ -1,16 +1,16 @@
 /* ytfile can not */
 USE plato;
 
-PRAGMA warning("disable", "8001");
+PRAGMA warning('disable', '8001');
 
 -- CBO_MISSING_TABLE_STATS
-PRAGMA CostBasedOptimizer = "native";
-PRAGMA yt.MapJoinLimit = "1000";
-PRAGMA yt.LookupJoinLimit = "1000";
-PRAGMA yt.LookupJoinMaxRows = "100";
-PRAGMA yt.ExtendedStatsMaxChunkCount = "0";
-PRAGMA yt.JoinMergeTablesLimit = "100";
-PRAGMA yt.JoinMergeForce = "true";
+PRAGMA CostBasedOptimizer = 'native';
+PRAGMA yt.MapJoinLimit = '1000';
+PRAGMA yt.LookupJoinLimit = '1000';
+PRAGMA yt.LookupJoinMaxRows = '100';
+PRAGMA yt.ExtendedStatsMaxChunkCount = '0';
+PRAGMA yt.JoinMergeTablesLimit = '100';
+PRAGMA yt.JoinMergeForce = 'true';
 
 SELECT
     InputA.Key1,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-convert_check_key_mem2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-convert_check_key_mem2_/formatted.sql
index 1662d325d5..9b9bfd32dc 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-convert_check_key_mem2_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-convert_check_key_mem2_/formatted.sql
@@ -8,9 +8,9 @@ $a = AsList(
 );
 
 $b = AsList(
-    AsStruct(Int8("-1") AS K, 1 AS V),
-    AsStruct(Int8("127") AS K, 2 AS V),
-    AsStruct(Int8("0") AS K, 3 AS V)
+    AsStruct(Int8('-1') AS K, 1 AS V),
+    AsStruct(Int8('127') AS K, 2 AS V),
+    AsStruct(Int8('0') AS K, 3 AS V)
 );
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-convert_check_key_mem_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-convert_check_key_mem_/formatted.sql
index 3a8c0df775..0469844464 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-convert_check_key_mem_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-convert_check_key_mem_/formatted.sql
@@ -8,23 +8,23 @@ $a = AsList(
 );
 
 $b = AsList(
-    AsStruct(Int8("-1") AS K, 1u AS V),
-    AsStruct(Int8("127") AS K, 2u AS V),
-    AsStruct(Int8("0") AS K, 3u AS V)
+    AsStruct(Int8('-1') AS K, 1u AS V),
+    AsStruct(Int8('127') AS K, 2u AS V),
+    AsStruct(Int8('0') AS K, 3u AS V)
 );
 
 $aopt = AsList(
     AsStruct(Just(255ut) AS K, 1 AS V),
     AsStruct(Just(127ut) AS K, 2 AS V),
     AsStruct(Just(0ut) AS K, 3 AS V),
-    AsStruct(Nothing(ParseType("Uint8?")) AS K, 2 AS V)
+    AsStruct(Nothing(ParseType('Uint8?')) AS K, 2 AS V)
 );
 
 $bopt = AsList(
-    AsStruct(Just(Int8("-1")) AS K, 1u AS V),
-    AsStruct(Just(Int8("127")) AS K, 2u AS V),
-    AsStruct(Just(Int8("0")) AS K, 3u AS V),
-    AsStruct(Nothing(ParseType("Int8?")) AS K, 2u AS V)
+    AsStruct(Just(Int8('-1')) AS K, 1u AS V),
+    AsStruct(Just(Int8('127')) AS K, 2u AS V),
+    AsStruct(Just(Int8('0')) AS K, 3u AS V),
+    AsStruct(Nothing(ParseType('Int8?')) AS K, 2u AS V)
 );
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-convert_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-convert_key_/formatted.sql
index 7f016b0a25..db4092e7b6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-convert_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-convert_key_/formatted.sql
@@ -2,7 +2,7 @@
 USE plato;
 
 PRAGMA SimpleColumns;
-PRAGMA yt.MapJoinLimit = "1m";
+PRAGMA yt.MapJoinLimit = '1m';
 
 $join_result = (
     SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-count_bans_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-count_bans_/formatted.sql
index 7bd2ea6375..ae675b94c0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-count_bans_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-count_bans_/formatted.sql
@@ -20,7 +20,7 @@ $results = (
     FROM
         $records
     WHERE
-        host IS NOT NULL AND recordType == "RESULT"
+        host IS NOT NULL AND recordType == 'RESULT'
     GROUP BY
         ip,
         host
@@ -34,7 +34,7 @@ $bans = (
     FROM
         $records
     WHERE
-        host IS NOT NULL AND recordType == "BAN_DETECTED"
+        host IS NOT NULL AND recordType == 'BAN_DETECTED'
     GROUP BY
         ip,
         host
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-do_not_suppres_equijoin_input_sorts_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-do_not_suppres_equijoin_input_sorts_/formatted.sql
index ecfb6a38ec..05ee9500a4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-do_not_suppres_equijoin_input_sorts_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-do_not_suppres_equijoin_input_sorts_/formatted.sql
@@ -1,6 +1,6 @@
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
+PRAGMA yt.JoinMergeTablesLimit = '10';
 PRAGMA DisableSimpleColumns;
 
 SELECT
@@ -10,5 +10,5 @@ FROM
 CROSS JOIN
     Input2 AS t2
 WHERE
-    t1.k1 == t2.k1 AND t1.k1 < "zzz"
+    t1.k1 == t2.k1 AND t1.k1 < 'zzz'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-flatten_columns1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-flatten_columns1_/formatted.sql
index 08ceeecd00..0b1543786e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-flatten_columns1_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-flatten_columns1_/formatted.sql
@@ -8,7 +8,7 @@ SELECT
 FROM (
     SELECT
         AsStruct(key AS key, subkey AS subkey),
-        AsStruct("value: " || value AS value)
+        AsStruct('value: ' || value AS value)
     FROM
         Input1
 ) AS a
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-flatten_columns2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-flatten_columns2_/formatted.sql
index f91c358e22..cf9e36436c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-flatten_columns2_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-flatten_columns2_/formatted.sql
@@ -8,7 +8,7 @@ SELECT
 FROM (
     SELECT
         AsStruct(key AS key, subkey AS subkey),
-        AsStruct("value1: " || value AS value)
+        AsStruct('value1: ' || value AS value)
     FROM
         Input1
 ) AS a
@@ -16,7 +16,7 @@ FROM (
 JOIN (
     SELECT
         AsStruct(key AS key, subkey AS subkey),
-        AsStruct("value2: " || value AS value)
+        AsStruct('value2: ' || value AS value)
     FROM
         Input2
 ) AS b
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-force_merge_join_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-force_merge_join_/formatted.sql
index bf7f755535..cb34b12cd6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-force_merge_join_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-force_merge_join_/formatted.sql
@@ -1,7 +1,7 @@
 USE plato;
 
-PRAGMA yt.JoinMergeForce = "1";
-PRAGMA yt.JoinMergeTablesLimit = "10";
+PRAGMA yt.JoinMergeForce = '1';
+PRAGMA yt.JoinMergeTablesLimit = '10';
 
 SELECT
     a.key AS key1
@@ -11,7 +11,7 @@ FROM (
     FROM
         plato.Input1
     WHERE
-        subkey != "bar"
+        subkey != 'bar'
 ) AS a
 JOIN (
     SELECT
@@ -19,10 +19,10 @@ JOIN (
     FROM
         plato.Input1
     WHERE
-        subkey != "foo"
+        subkey != 'foo'
 ) AS b
 ON
     a.key == b.key
 WHERE
-    a.key != "1" OR b.key != "2"
+    a.key != '1' OR b.key != '2'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-full_trivial_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-full_trivial_/formatted.sql
index 0e835e5332..a457a62b3f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-full_trivial_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-full_trivial_/formatted.sql
@@ -1,9 +1,9 @@
 PRAGMA DisableSimpleColumns;
 
 SELECT
-    coalesce(Input1.key, "_null") AS a,
-    coalesce(Input1.subkey, "_null") AS b,
-    coalesce(Input3.value, "_null") AS c
+    coalesce(Input1.key, '_null') AS a,
+    coalesce(Input1.subkey, '_null') AS b,
+    coalesce(Input3.value, '_null') AS c
 FROM
     plato.Input1
 FULL JOIN
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-full_trivial_udf_call_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-full_trivial_udf_call_/formatted.sql
index acf2bdcd98..b55661f60e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-full_trivial_udf_call_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-full_trivial_udf_call_/formatted.sql
@@ -4,7 +4,7 @@ PRAGMA DisableSimpleColumns;
 SELECT
     Input1.key,
     Input1.subkey,
-    SimpleUdf::Concat(coalesce(Input1.value, ""), coalesce(Input3.value, "")) AS value
+    SimpleUdf::Concat(coalesce(Input1.value, ''), coalesce(Input3.value, '')) AS value
 FROM
     plato.Input1
 FULL JOIN
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-grace_join1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-grace_join1_/formatted.sql
index b1192a9d83..c57315b2b4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-grace_join1_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-grace_join1_/formatted.sql
@@ -12,5 +12,5 @@ JOIN
 ON
     cntr.country_id == cust.country_id
 WHERE
-    cntr.country_id == "11"
+    cntr.country_id == '11'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-group_compact_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-group_compact_by_/formatted.sql
index 286293f75e..ba8663a005 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-group_compact_by_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-group_compact_by_/formatted.sql
@@ -1,7 +1,7 @@
 USE plato;
 
-PRAGMA yt.JoinMergeForce = "1";
-PRAGMA yt.JoinMergeTablesLimit = "10";
+PRAGMA yt.JoinMergeForce = '1';
+PRAGMA yt.JoinMergeTablesLimit = '10';
 
 SELECT
     key1,
@@ -16,7 +16,7 @@ FROM (
         FROM
             Input
         WHERE
-            subkey != "bar"
+            subkey != 'bar'
     ) AS a
     JOIN (
         SELECT
@@ -24,7 +24,7 @@ FROM (
         FROM
             Input
         WHERE
-            subkey != "foo"
+            subkey != 'foo'
     ) AS b
     ON
         a.key == b.key AND a.subkey == b.subkey
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_by_uncomparable_structs_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_by_uncomparable_structs_/formatted.sql
index 34eb8d2033..f83fd09348 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_by_uncomparable_structs_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_by_uncomparable_structs_/formatted.sql
@@ -1,12 +1,12 @@
 /* syntax version 1 */
 $l = [
-    <|Key: <|a: 1, b: 2, c: NULL|>, Lhs: "1,2,#"|>,
-    <|Key: <|a: 2, b: 3, c: NULL|>, Lhs: "4,5,#"|>,
+    <|Key: <|a: 1, b: 2, c: NULL|>, Lhs: '1,2,#'|>,
+    <|Key: <|a: 2, b: 3, c: NULL|>, Lhs: '4,5,#'|>,
 ];
 
 $r = [
-    <|Key: <|a: 1, b: 2, c: 3|>, Rhs: "1,2,3"|>,
-    <|Key: <|a: 4, b: 5, c: 6|>, Rhs: "4,5,6"|>,
+    <|Key: <|a: 1, b: 2, c: 3|>, Rhs: '1,2,3'|>,
+    <|Key: <|a: 4, b: 5, c: 6|>, Rhs: '4,5,6'|>,
 ];
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_by_uncomparable_tuples_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_by_uncomparable_tuples_/formatted.sql
index 76ede21529..323b094496 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_by_uncomparable_tuples_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_by_uncomparable_tuples_/formatted.sql
@@ -1,12 +1,12 @@
 /* syntax version 1 */
 $l = AsList(
-    AsStruct(AsTuple(1, 2, 3) AS Key, "1,2,3" AS Lhs),
-    AsStruct(AsTuple(1, 2, 4) AS Key, "1,2,4" AS Lhs)
+    AsStruct(AsTuple(1, 2, 3) AS Key, '1,2,3' AS Lhs),
+    AsStruct(AsTuple(1, 2, 4) AS Key, '1,2,4' AS Lhs)
 );
 
 $r = AsList(
-    AsStruct(AsTuple(1, 2) AS Key, "1,2" AS Rhs),
-    AsStruct(AsTuple(2, 3) AS Key, "2,3" AS Rhs)
+    AsStruct(AsTuple(1, 2) AS Key, '1,2' AS Rhs),
+    AsStruct(AsTuple(2, 3) AS Key, '2,3' AS Rhs)
 );
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_with_set_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_with_set_key_/formatted.sql
index a1c5746556..14c5de55f2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_with_set_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_with_set_key_/formatted.sql
@@ -1,8 +1,8 @@
 /* syntax version 1 */
 PRAGMA DisableSimpleColumns;
 
-$one = [<|'a': {"1"}, 'b': 2|>, <|'a': {"2"}, 'b': 3|>, <|'a': {"3"}, 'b': 4|>, <|'a': {"1"}, 'b': 8|>];
-$two = [<|'c': {Just("1")}, 'd': 2|>, <|'c': {}, 'd': 3|>, <|'c': NULL, 'd': 4|>, <|'c': {Just("1")}, 'd': 9|>];
+$one = [<|'a': {'1'}, 'b': 2|>, <|'a': {'2'}, 'b': 3|>, <|'a': {'3'}, 'b': 4|>, <|'a': {'1'}, 'b': 8|>];
+$two = [<|'c': {Just('1')}, 'd': 2|>, <|'c': {}, 'd': 3|>, <|'c': NULL, 'd': 4|>, <|'c': {Just('1')}, 'd': 9|>];
 $foo = [<|'e': {"1"u}, 'f': -2|>, <|'e': {"1"u, "2"u}, 'f': -3|>, <|'e': NULL, 'f': -4|>, <|'e': {"1"u}, 'f': -9|>];
 $bar = [<|'g': {Just("1"u)}, 'h': 1.|>, <|'g': {}, 'h': 2.2|>, <|'g': {Just("1"u), Just("2"u)}, 'h': 3.3|>, <|'g': {Just("1"u)}, 'h': 4.4|>];
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_with_set_key_any_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_with_set_key_any_/formatted.sql
index 6a39b53592..9bda9c5f8e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_with_set_key_any_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_with_set_key_any_/formatted.sql
@@ -1,8 +1,8 @@
 /* syntax version 1 */
 PRAGMA DisableSimpleColumns;
 
-$one = [<|'a': {"1"}, 'b': 2|>, <|'a': {"2"}, 'b': 3|>, <|'a': {"3"}, 'b': 4|>, <|'a': {"1"}, 'b': 8|>];
-$two = [<|'c': {Just("1")}, 'd': 2|>, <|'c': {}, 'd': 3|>, <|'c': NULL, 'd': 4|>, <|'c': {Just("1")}, 'd': 9|>];
+$one = [<|'a': {'1'}, 'b': 2|>, <|'a': {'2'}, 'b': 3|>, <|'a': {'3'}, 'b': 4|>, <|'a': {'1'}, 'b': 8|>];
+$two = [<|'c': {Just('1')}, 'd': 2|>, <|'c': {}, 'd': 3|>, <|'c': NULL, 'd': 4|>, <|'c': {Just('1')}, 'd': 9|>];
 $foo = [<|'e': {"1"u}, 'f': -2|>, <|'e': {"1"u, "2"u}, 'f': -3|>, <|'e': NULL, 'f': -4|>, <|'e': {"1"u}, 'f': -9|>];
 $bar = [<|'g': {Just("1"u)}, 'h': 1.|>, <|'g': {}, 'h': 2.2|>, <|'g': {Just("1"u), Just("2"u)}, 'h': 3.3|>, <|'g': {Just("1"u)}, 'h': 4.4|>];
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_cbo_3_tables_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_cbo_3_tables_/formatted.sql
index 29ca503a07..ecbc9980f9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_cbo_3_tables_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_cbo_3_tables_/formatted.sql
@@ -1,9 +1,9 @@
 USE plato;
 
-PRAGMA warning("disable", "8001");
+PRAGMA warning('disable', '8001');
 
 -- CBO_MISSING_TABLE_STATS
-PRAGMA CostBasedOptimizer = "pg";
+PRAGMA CostBasedOptimizer = 'pg';
 
 SELECT
     i1.value,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_comp_inmem_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_comp_inmem_/formatted.sql
index 95c9de17ea..47593d5bcd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_comp_inmem_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_comp_inmem_/formatted.sql
@@ -3,12 +3,12 @@ PRAGMA DisableSimpleColumns;
 /* postgres can not */
 $i = (
     SELECT
-        AsList("foo") AS x
+        AsList('foo') AS x
 );
 
 $j = (
     SELECT
-        Just(AsList("foo")) AS y
+        Just(AsList('foo')) AS y
 );
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_comp_map_table_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_comp_map_table_/formatted.sql
index 554ed34ef6..420028e663 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_comp_map_table_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_comp_map_table_/formatted.sql
@@ -1,7 +1,7 @@
 PRAGMA DisableSimpleColumns;
 
 /* postgres can not */
-PRAGMA yt.MapJoinLimit = "1m";
+PRAGMA yt.MapJoinLimit = '1m';
 
 USE plato;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_left_cbo_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_left_cbo_/formatted.sql
index db413031ed..e3287b0ccb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_left_cbo_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_left_cbo_/formatted.sql
@@ -1,9 +1,9 @@
 USE plato;
 
-PRAGMA warning("disable", "8001");
+PRAGMA warning('disable', '8001');
 
 -- CBO_MISSING_TABLE_STATS
-PRAGMA CostBasedOptimizer = "PG";
+PRAGMA CostBasedOptimizer = 'PG';
 
 SELECT
     i1.value,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_right_cbo_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_right_cbo_/formatted.sql
index 51987f23bf..89c9d30704 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_right_cbo_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_right_cbo_/formatted.sql
@@ -1,9 +1,9 @@
 USE plato;
 
-PRAGMA warning("disable", "8001");
+PRAGMA warning('disable', '8001');
 
 -- CBO_MISSING_TABLE_STATS
-PRAGMA CostBasedOptimizer = "PG";
+PRAGMA CostBasedOptimizer = 'PG';
 
 SELECT
     i1.value,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_with_duplicate_keys_on_sorted_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_with_duplicate_keys_on_sorted_/formatted.sql
index 63b94cc356..850af1b983 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_with_duplicate_keys_on_sorted_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_with_duplicate_keys_on_sorted_/formatted.sql
@@ -2,8 +2,8 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
-PRAGMA yt.JoinMergeUnsortedFactor = "3.0";
+PRAGMA yt.JoinMergeTablesLimit = '10';
+PRAGMA yt.JoinMergeUnsortedFactor = '3.0';
 
 FROM
     SortedByKeySubkey AS a
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-late_mergejoin_on_empty_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-late_mergejoin_on_empty_/formatted.sql
index 88b441524b..8f3a91e350 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-late_mergejoin_on_empty_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-late_mergejoin_on_empty_/formatted.sql
@@ -1,7 +1,7 @@
 USE plato;
 
 PRAGMA DisableSimpleColumns;
-PRAGMA yt.JoinMergeTablesLimit = "100";
+PRAGMA yt.JoinMergeTablesLimit = '100';
 
 SELECT
     *
@@ -11,7 +11,7 @@ FROM (
     FROM
         Input
     WHERE
-        key < "020"
+        key < '020'
 ) AS a
 LEFT ONLY JOIN (
     SELECT
@@ -19,7 +19,7 @@ LEFT ONLY JOIN (
     FROM
         Input
     WHERE
-        key < "010"
+        key < '010'
 ) AS b
 ON
     a.subkey == b.subkey
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_null_column_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_null_column_/formatted.sql
index 2fce2e7420..0588d22ebb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_null_column_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_null_column_/formatted.sql
@@ -2,7 +2,7 @@
 /* postgres can not */
 USE plato;
 
-$t = [<|"x": "150", "y": 1, "z": NULL|>, <|"x": "150", "y": 2, "z": NULL|>];
+$t = [<|'x': '150', 'y': 1, 'z': NULL|>, <|'x': '150', 'y': 2, 'z': NULL|>];
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_right_pushdown_simple_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_right_pushdown_simple_/formatted.sql
index d070fd82bc..46c6fa6a16 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_right_pushdown_simple_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_right_pushdown_simple_/formatted.sql
@@ -12,5 +12,5 @@ LEFT JOIN
 ON
     a.value == b.value
 WHERE
-    b.value >= "ddd"
+    b.value >= 'ddd'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_null_literal_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_null_literal_/formatted.sql
index ee0410e0c1..6a378e1df3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_null_literal_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_null_literal_/formatted.sql
@@ -1,8 +1,8 @@
 /* syntax version 1 */
 USE plato;
 
-$foo = [<|"x": 1|>];
-$bar = [<|"x": 1, "y": NULL|>];
+$foo = [<|'x': 1|>];
+$bar = [<|'x': 1, 'y': NULL|>];
 
 INSERT INTO Output
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_bug7646_csee_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_bug7646_csee_/formatted.sql
index 779f51f46a..2b9a67dd87 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_bug7646_csee_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_bug7646_csee_/formatted.sql
@@ -2,8 +2,8 @@
 USE plato;
 
 PRAGMA DisableSimpleColumns;
-PRAGMA yt.LookupJoinLimit = "64k";
-PRAGMA yt.LookupJoinMaxRows = "100";
+PRAGMA yt.LookupJoinLimit = '64k';
+PRAGMA yt.LookupJoinMaxRows = '100';
 
 $campaigns_data = AsList(
     AsStruct(Just(1) AS id),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_bug7646_subst_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_bug7646_subst_/formatted.sql
index 921e1afc3a..bbe94fc8b4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_bug7646_subst_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_bug7646_subst_/formatted.sql
@@ -1,8 +1,8 @@
 USE plato;
 
 PRAGMA DisableSimpleColumns;
-PRAGMA yt.LookupJoinLimit = "64k";
-PRAGMA yt.LookupJoinMaxRows = "100";
+PRAGMA yt.LookupJoinLimit = '64k';
+PRAGMA yt.LookupJoinMaxRows = '100';
 
 $campaigns_data = AsList(
     AsStruct(Just(1) AS id),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_bug8533_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_bug8533_/formatted.sql
index db0bc4ba83..4bbba6e502 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_bug8533_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_bug8533_/formatted.sql
@@ -3,8 +3,8 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.LookupJoinLimit = "64k";
-PRAGMA yt.LookupJoinMaxRows = "100";
+PRAGMA yt.LookupJoinLimit = '64k';
+PRAGMA yt.LookupJoinMaxRows = '100';
 
 -- tables should be swapped (Input1 is bigger)
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_/formatted.sql
index ca2f4862ca..5eeaafeb31 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_/formatted.sql
@@ -2,8 +2,8 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.LookupJoinLimit = "64k";
-PRAGMA yt.LookupJoinMaxRows = "100";
+PRAGMA yt.LookupJoinLimit = '64k';
+PRAGMA yt.LookupJoinMaxRows = '100';
 
 -- tables should be swapped (Input1 is bigger)
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_1o2o_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_1o2o_/formatted.sql
index ca2f4862ca..5eeaafeb31 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_1o2o_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_1o2o_/formatted.sql
@@ -2,8 +2,8 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.LookupJoinLimit = "64k";
-PRAGMA yt.LookupJoinMaxRows = "100";
+PRAGMA yt.LookupJoinLimit = '64k';
+PRAGMA yt.LookupJoinMaxRows = '100';
 
 -- tables should be swapped (Input1 is bigger)
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_1o_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_1o_/formatted.sql
index ca2f4862ca..5eeaafeb31 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_1o_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_1o_/formatted.sql
@@ -2,8 +2,8 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.LookupJoinLimit = "64k";
-PRAGMA yt.LookupJoinMaxRows = "100";
+PRAGMA yt.LookupJoinLimit = '64k';
+PRAGMA yt.LookupJoinMaxRows = '100';
 
 -- tables should be swapped (Input1 is bigger)
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_2o_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_2o_/formatted.sql
index ca2f4862ca..5eeaafeb31 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_2o_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_2o_/formatted.sql
@@ -2,8 +2,8 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.LookupJoinLimit = "64k";
-PRAGMA yt.LookupJoinMaxRows = "100";
+PRAGMA yt.LookupJoinLimit = '64k';
+PRAGMA yt.LookupJoinMaxRows = '100';
 
 -- tables should be swapped (Input1 is bigger)
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_empty_subq_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_empty_subq_/formatted.sql
index 42dc20fde9..239a9852f1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_empty_subq_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_empty_subq_/formatted.sql
@@ -2,8 +2,8 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.LookupJoinLimit = "64k";
-PRAGMA yt.LookupJoinMaxRows = "100";
+PRAGMA yt.LookupJoinLimit = '64k';
+PRAGMA yt.LookupJoinMaxRows = '100';
 
 SELECT
     *
@@ -15,7 +15,7 @@ INNER JOIN (
     FROM
         Input2
     WHERE
-        k2 == "not_existent"
+        k2 == 'not_existent'
 ) AS b
 ON
     a.k1 == b.k2
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_not_selected_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_not_selected_/formatted.sql
index 181cf26661..741e20bc9b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_not_selected_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_not_selected_/formatted.sql
@@ -2,8 +2,8 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.LookupJoinLimit = "64k";
-PRAGMA yt.LookupJoinMaxRows = "100";
+PRAGMA yt.LookupJoinLimit = '64k';
+PRAGMA yt.LookupJoinMaxRows = '100';
 
 -- no lookup join in this case
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_/formatted.sql
index 9f1b8b92b7..f3833091b0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_/formatted.sql
@@ -2,8 +2,8 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.LookupJoinLimit = "64k";
-PRAGMA yt.LookupJoinMaxRows = "100";
+PRAGMA yt.LookupJoinLimit = '64k';
+PRAGMA yt.LookupJoinMaxRows = '100';
 
 -- prefix of sort keys
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_1o2o_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_1o2o_/formatted.sql
index 9f1b8b92b7..f3833091b0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_1o2o_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_1o2o_/formatted.sql
@@ -2,8 +2,8 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.LookupJoinLimit = "64k";
-PRAGMA yt.LookupJoinMaxRows = "100";
+PRAGMA yt.LookupJoinLimit = '64k';
+PRAGMA yt.LookupJoinMaxRows = '100';
 
 -- prefix of sort keys
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_1o_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_1o_/formatted.sql
index 9f1b8b92b7..f3833091b0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_1o_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_1o_/formatted.sql
@@ -2,8 +2,8 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.LookupJoinLimit = "64k";
-PRAGMA yt.LookupJoinMaxRows = "100";
+PRAGMA yt.LookupJoinLimit = '64k';
+PRAGMA yt.LookupJoinMaxRows = '100';
 
 -- prefix of sort keys
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_2o_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_2o_/formatted.sql
index 9f1b8b92b7..f3833091b0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_2o_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_2o_/formatted.sql
@@ -2,8 +2,8 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.LookupJoinLimit = "64k";
-PRAGMA yt.LookupJoinMaxRows = "100";
+PRAGMA yt.LookupJoinLimit = '64k';
+PRAGMA yt.LookupJoinMaxRows = '100';
 
 -- prefix of sort keys
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_empty_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_empty_/formatted.sql
index 9f1b8b92b7..f3833091b0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_empty_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_empty_/formatted.sql
@@ -2,8 +2,8 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.LookupJoinLimit = "64k";
-PRAGMA yt.LookupJoinMaxRows = "100";
+PRAGMA yt.LookupJoinLimit = '64k';
+PRAGMA yt.LookupJoinMaxRows = '100';
 
 -- prefix of sort keys
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_subq_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_subq_/formatted.sql
index ea7daa1384..7884e50d33 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_subq_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_subq_/formatted.sql
@@ -2,8 +2,8 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.LookupJoinLimit = "64k";
-PRAGMA yt.LookupJoinMaxRows = "100";
+PRAGMA yt.LookupJoinLimit = '64k';
+PRAGMA yt.LookupJoinMaxRows = '100';
 
 -- prefix of sort keys
 SELECT
@@ -16,7 +16,7 @@ LEFT SEMI JOIN (
     FROM
         Input2
     WHERE
-        k2 != "ccc"
+        k2 != 'ccc'
 ) AS b
 ON
     a.k1 == b.k2
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_take_skip_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_take_skip_/formatted.sql
index 82a0b3ea6d..2a6fe8b109 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_take_skip_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_take_skip_/formatted.sql
@@ -1,6 +1,6 @@
 USE plato;
 
-PRAGMA yt.LookupJoinMaxRows = "3";
+PRAGMA yt.LookupJoinMaxRows = '3';
 PRAGMA yt.LookupJoinLimit = '10M';
 
 INSERT INTO @big
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_unused_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_unused_keys_/formatted.sql
index fa98f9394f..cfd39baeab 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_unused_keys_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_unused_keys_/formatted.sql
@@ -1,8 +1,8 @@
 /* syntax version 1 */
 USE plato;
 
-PRAGMA yt.LookupJoinLimit = "64k";
-PRAGMA yt.LookupJoinMaxRows = "100";
+PRAGMA yt.LookupJoinLimit = '64k';
+PRAGMA yt.LookupJoinMaxRows = '100';
 
 SELECT
     v3
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_with_cache_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_with_cache_/formatted.sql
index b3bf40b7ca..8fd733fa44 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_with_cache_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_with_cache_/formatted.sql
@@ -3,10 +3,10 @@
 USE plato;
 
 PRAGMA DisableSimpleColumns;
-PRAGMA yt.LookupJoinLimit = "64k";
-PRAGMA yt.LookupJoinMaxRows = "100";
-PRAGMA yt.QueryCacheMode = "normal";
-PRAGMA yt.QueryCacheUseForCalc = "true";
+PRAGMA yt.LookupJoinLimit = '64k';
+PRAGMA yt.LookupJoinMaxRows = '100';
+PRAGMA yt.QueryCacheMode = 'normal';
+PRAGMA yt.QueryCacheUseForCalc = 'true';
 
 INSERT INTO @tmp WITH truncate
 SELECT
@@ -14,7 +14,7 @@ SELECT
 FROM
     Input
 WHERE
-    subkey == "bbb"
+    subkey == 'bbb'
 ORDER BY
     key
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_dup_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_dup_key_/formatted.sql
index 0f68e20bbd..bd260e3dac 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_dup_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_dup_key_/formatted.sql
@@ -3,7 +3,7 @@ USE plato;
 /* postgres can not */
 /* kikimr can not */
 PRAGMA DisableSimpleColumns;
-PRAGMA yt.MapJoinLimit = "1m";
+PRAGMA yt.MapJoinLimit = '1m';
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_early_rewrite_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_early_rewrite_/formatted.sql
index 1d001f769b..c8408c5ae1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_early_rewrite_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_early_rewrite_/formatted.sql
@@ -2,7 +2,7 @@
 USE plato;
 
 PRAGMA DisableSimpleColumns;
-PRAGMA yt.MapJoinLimit = "1m";
+PRAGMA yt.MapJoinLimit = '1m';
 
 $subq = (
     SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_early_rewrite_sequence_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_early_rewrite_sequence_/formatted.sql
index 374ad0da19..90182c1c94 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_early_rewrite_sequence_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_early_rewrite_sequence_/formatted.sql
@@ -2,7 +2,7 @@
 USE plato;
 
 PRAGMA DisableSimpleColumns;
-PRAGMA yt.MapJoinLimit = "1m";
+PRAGMA yt.MapJoinLimit = '1m';
 
 $subq = (
     SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_early_rewrite_star_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_early_rewrite_star_/formatted.sql
index f98fdfd2ac..0b7e907a85 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_early_rewrite_star_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_early_rewrite_star_/formatted.sql
@@ -2,8 +2,8 @@
 USE plato;
 
 PRAGMA DisableSimpleColumns;
-PRAGMA yt.MapJoinLimit = "1m";
-PRAGMA yt.JoinEnableStarJoin = "true";
+PRAGMA yt.MapJoinLimit = '1m';
+PRAGMA yt.JoinEnableStarJoin = 'true';
 
 $subq = (
     SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_left_null_column_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_left_null_column_/formatted.sql
index 599d5a9bae..e5bd3022d7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_left_null_column_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_left_null_column_/formatted.sql
@@ -1,10 +1,10 @@
 /* syntax version 1 */
 /* postgres can not */
-PRAGMA yt.MapJoinLimit = "1m";
+PRAGMA yt.MapJoinLimit = '1m';
 
 USE plato;
 
-$t = [<|"x": "150", "y": 1, "z": NULL|>, <|"x": "150", "y": 2, "z": NULL|>];
+$t = [<|'x': '150', 'y': 1, 'z': NULL|>, <|'x': '150', 'y': 2, 'z': NULL|>];
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_non_optional_left_only_single_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_non_optional_left_only_single_/formatted.sql
index 2451e73c92..611572585b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_non_optional_left_only_single_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_non_optional_left_only_single_/formatted.sql
@@ -2,7 +2,7 @@
 /* postgres can not */
 USE plato;
 
-$t = [<|"key1": "1", "subkey1": "a", "key": "1", "subkey": "a", "value": "value2_1"|>, <|"key1": "4", "subkey1": "d", "key": "4", "subkey": "d", "value": "value2_4"|>, <|"key1": "-5", "subkey1": "e", "key": "-5", "subkey": "e", "value": "value2_5"|>];
+$t = [<|'key1': '1', 'subkey1': 'a', 'key': '1', 'subkey': 'a', 'value': 'value2_1'|>, <|'key1': '4', 'subkey1': 'd', 'key': '4', 'subkey': 'd', 'value': 'value2_4'|>, <|'key1': '-5', 'subkey1': 'e', 'key': '-5', 'subkey': 'e', 'value': 'value2_5'|>];
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_optional_left_only_single_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_optional_left_only_single_/formatted.sql
index 36ab687215..a5585aa376 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_optional_left_only_single_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_optional_left_only_single_/formatted.sql
@@ -2,7 +2,7 @@
 /* postgres can not */
 USE plato;
 
-$t = [<|"key": "1", "subkey": "a", "value": "value2_1"|>, <|"key": "4", "subkey": "d", "value": "value2_4"|>, <|"key": "-5", "subkey": "e", "value": "value2_5"|>];
+$t = [<|'key': '1', 'subkey': 'a', 'value': 'value2_1'|>, <|'key': '4', 'subkey': 'd', 'value': 'value2_4'|>, <|'key': '-5', 'subkey': 'e', 'value': 'value2_5'|>];
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_optional_left_semi_many_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_optional_left_semi_many_/formatted.sql
index de2d5fe588..802601c1c1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_optional_left_semi_many_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_optional_left_semi_many_/formatted.sql
@@ -2,7 +2,7 @@
 /* postgres can not */
 USE plato;
 
-$t = [<|"key1": "1", "subkey1": "a", "key": "1", "subkey": "a", "value": "value2_1"|>, <|"key1": "4", "subkey1": "d", "key": "4", "subkey": "d", "value": "value2_4"|>, <|"key1": "-5", "subkey1": "e", "key": "-5", "subkey": "e", "value": "value2_5"|>];
+$t = [<|'key1': '1', 'subkey1': 'a', 'key': '1', 'subkey': 'a', 'value': 'value2_1'|>, <|'key1': '4', 'subkey1': 'd', 'key': '4', 'subkey': 'd', 'value': 'value2_4'|>, <|'key1': '-5', 'subkey1': 'e', 'key': '-5', 'subkey': 'e', 'value': 'value2_5'|>];
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_optional_left_semi_single_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_optional_left_semi_single_/formatted.sql
index 109adb6bf6..3384c05b6d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_optional_left_semi_single_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_optional_left_semi_single_/formatted.sql
@@ -2,7 +2,7 @@
 /* postgres can not */
 USE plato;
 
-$t = [<|"key": "1", "subkey": "a", "value": "value2_1"|>, <|"key": "4", "subkey": "d", "value": "value2_4"|>, <|"key": "-5", "subkey": "e", "value": "value2_5"|>];
+$t = [<|'key': '1', 'subkey': 'a', 'value': 'value2_1'|>, <|'key': '4', 'subkey': 'd', 'value': 'value2_4'|>, <|'key': '-5', 'subkey': 'e', 'value': 'value2_5'|>];
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_tablerecord_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_tablerecord_/formatted.sql
index ea64deaa0b..78db9451b9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_tablerecord_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_tablerecord_/formatted.sql
@@ -1,6 +1,6 @@
 USE plato;
 
-PRAGMA yt.MapJoinLimit = "1M";
+PRAGMA yt.MapJoinLimit = '1M';
 
 $i =
     SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_very_complex_type_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_very_complex_type_/formatted.sql
index eba52c133e..2bbb4c09b6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_very_complex_type_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_very_complex_type_/formatted.sql
@@ -2,7 +2,7 @@
 /* postgres can not */
 USE plato;
 
-$t = [<|"key1": "1", "subkey1": "a", "key": "1", "subkey": "a", "value": "value2_1"|>, <|"key1": "4", "subkey1": "d", "key": "4", "subkey": "d", "value": "value2_4"|>, <|"key1": "-5", "subkey1": "e", "key": "-5", "subkey": "e", "value": "value2_5"|>];
+$t = [<|'key1': '1', 'subkey1': 'a', 'key': '1', 'subkey': 'a', 'value': 'value2_1'|>, <|'key1': '4', 'subkey1': 'd', 'key': '4', 'subkey': 'd', 'value': 'value2_4'|>, <|'key1': '-5', 'subkey1': 'e', 'key': '-5', 'subkey': 'e', 'value': 'value2_5'|>];
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_opt_vs_2xopt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_opt_vs_2xopt_/formatted.sql
index 92791b73c2..3b1d5a17ab 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_opt_vs_2xopt_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_opt_vs_2xopt_/formatted.sql
@@ -1,6 +1,6 @@
 USE plato;
 
-PRAGMA yt.MapJoinLimit = "1m";
+PRAGMA yt.MapJoinLimit = '1m';
 
 $t1 = AsList(
     AsStruct(Just(1) AS Key),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_partial_uniq_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_partial_uniq_keys_/formatted.sql
index 9c71e0b2b7..8b16367aa4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_partial_uniq_keys_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_partial_uniq_keys_/formatted.sql
@@ -5,7 +5,7 @@ PRAGMA DisableSimpleColumns;
 /* ignore runonopt plan diff */
 USE plato;
 
-PRAGMA yt.MapJoinLimit = "1m";
+PRAGMA yt.MapJoinLimit = '1m';
 
 -- YQL-5582
 $join = (
@@ -19,7 +19,7 @@ $join = (
         FROM
             Input
         WHERE
-            value > "bbb"
+            value > 'bbb'
     ) AS a
     LEFT JOIN
         Input AS b
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_sharded_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_sharded_/formatted.sql
index bd7fb80214..dfbf2622e3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_sharded_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_sharded_/formatted.sql
@@ -6,8 +6,8 @@ PRAGMA DisableSimpleColumns;
 
 /* yt_local_var: MAP_JOIN_LIMIT = 30 */
 /* yqlrun_var: MAP_JOIN_LIMIT = 1000 */
-PRAGMA yt.MapJoinLimit = "MAP_JOIN_LIMIT";
-PRAGMA yt.MapJoinShardCount = "10";
+PRAGMA yt.MapJoinLimit = 'MAP_JOIN_LIMIT';
+PRAGMA yt.MapJoinShardCount = '10';
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_unused_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_unused_keys_/formatted.sql
index 2dfbf792ca..42f4694898 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_unused_keys_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_unused_keys_/formatted.sql
@@ -1,8 +1,8 @@
 /* syntax version 1 */
 USE plato;
 
-PRAGMA yt.MapJoinLimit = "1m";
-PRAGMA yt.DisableOptimizers = "PhysicalOptimizer-FuseInnerMap";
+PRAGMA yt.MapJoinLimit = '1m';
+PRAGMA yt.DisableOptimizers = 'PhysicalOptimizer-FuseInnerMap';
 
 SELECT
     v3
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_with_anonymous_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_with_anonymous_/formatted.sql
index 009bdb679b..d8c4efd09f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_with_anonymous_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_with_anonymous_/formatted.sql
@@ -3,7 +3,7 @@
 USE plato;
 
 PRAGMA DisableSimpleColumns;
-PRAGMA yt.MapJoinLimit = "1m";
+PRAGMA yt.MapJoinLimit = '1m';
 
 INSERT INTO @tmp
 SELECT
@@ -11,7 +11,7 @@ SELECT
 FROM
     Input
 WHERE
-    key > "100"
+    key > '100'
 ;
 
 COMMIT;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_with_empty_read_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_with_empty_read_/formatted.sql
index 9285c76511..3ea65f928a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_with_empty_read_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_with_empty_read_/formatted.sql
@@ -4,7 +4,7 @@ PRAGMA DisableSimpleColumns;
 /* kikimr can not */
 USE plato;
 
-PRAGMA yt.mapjoinlimit = "1m";
+PRAGMA yt.mapjoinlimit = '1m';
 
 $cnt = (
     SELECT
@@ -21,7 +21,7 @@ $in1 = (
     FROM
         Input
     WHERE
-        key != ""
+        key != ''
     ORDER BY
         key
     LIMIT 10 OFFSET $offset
@@ -45,7 +45,7 @@ $in2 = (
     FROM
         Input
     WHERE
-        key != ""
+        key != ''
     LIMIT $limit
 );
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_with_empty_struct_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_with_empty_struct_/formatted.sql
index 427d62108a..2b4b5aae21 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_with_empty_struct_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_with_empty_struct_/formatted.sql
@@ -5,7 +5,7 @@ PRAGMA DisableSimpleColumns;
 /* ignore yt detailed plan diff */
 USE plato;
 
-PRAGMA yt.MapJoinLimit = "10M";
+PRAGMA yt.MapJoinLimit = '10M';
 
 $sizes = (
     SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_any_no_join_reduce_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_any_no_join_reduce_/formatted.sql
index 1f8415de30..7c48ea50de 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_any_no_join_reduce_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_any_no_join_reduce_/formatted.sql
@@ -1,7 +1,7 @@
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
-PRAGMA yt.JoinMergeUnsortedFactor = "2";
+PRAGMA yt.JoinMergeTablesLimit = '10';
+PRAGMA yt.JoinMergeUnsortedFactor = '2';
 
 SELECT
     *
@@ -10,12 +10,12 @@ FROM
 WHERE
     key IN (
         SELECT
-            "023" AS key
+            '023' AS key
         UNION ALL
         SELECT
-            "911" AS key
+            '911' AS key
         UNION ALL
         SELECT
-            "911" AS key
+            '911' AS key
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_big_primary_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_big_primary_/formatted.sql
index e22e85e809..d3a3db733c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_big_primary_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_big_primary_/formatted.sql
@@ -2,9 +2,9 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
-PRAGMA yt.JoinAllowColumnRenames = "true";
-PRAGMA yt.JoinMergeUseSmallAsPrimary = "false";
+PRAGMA yt.JoinMergeTablesLimit = '10';
+PRAGMA yt.JoinAllowColumnRenames = 'true';
+PRAGMA yt.JoinMergeUseSmallAsPrimary = 'false';
 
 -- Input2 is smaller than Input1
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_big_primary_unique_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_big_primary_unique_/formatted.sql
index bef94f53c6..ce3551233b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_big_primary_unique_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_big_primary_unique_/formatted.sql
@@ -2,9 +2,9 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
-PRAGMA yt.JoinAllowColumnRenames = "true";
-PRAGMA yt.JoinMergeUseSmallAsPrimary = "false";
+PRAGMA yt.JoinMergeTablesLimit = '10';
+PRAGMA yt.JoinAllowColumnRenames = 'true';
+PRAGMA yt.JoinMergeUseSmallAsPrimary = 'false';
 
 -- Input2 is smaller than Input1, but Input1 has unique keys
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_choose_primary_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_choose_primary_/formatted.sql
index 1e5ceea0e8..80d9dbf54d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_choose_primary_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_choose_primary_/formatted.sql
@@ -2,8 +2,8 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
-PRAGMA yt.JoinAllowColumnRenames = "true";
+PRAGMA yt.JoinMergeTablesLimit = '10';
+PRAGMA yt.JoinAllowColumnRenames = 'true';
 
 -- Input2 is smaller than Input1
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_choose_primary_with_retry_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_choose_primary_with_retry_/formatted.sql
index 8e2ebdbc82..cfdc510b36 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_choose_primary_with_retry_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_choose_primary_with_retry_/formatted.sql
@@ -2,11 +2,11 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
-PRAGMA yt.JoinAllowColumnRenames = "true";
+PRAGMA yt.JoinMergeTablesLimit = '10';
+PRAGMA yt.JoinAllowColumnRenames = 'true';
 
 -- emulate monsters in big table
-PRAGMA yt.JoinMergeReduceJobMaxSize = "1";
+PRAGMA yt.JoinMergeReduceJobMaxSize = '1';
 
 -- Input2 is smaller than Input1
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_align1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_align1_/formatted.sql
index 2a8e3a0548..272df28af1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_align1_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_align1_/formatted.sql
@@ -2,7 +2,7 @@
 /* postgres can not */
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "100";
+PRAGMA yt.JoinMergeTablesLimit = '100';
 PRAGMA yt.JoinMergeForce;
 
 INSERT INTO @t1
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_align2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_align2_/formatted.sql
index 688aa3e138..692a9a0f5e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_align2_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_align2_/formatted.sql
@@ -2,7 +2,7 @@
 /* postgres can not */
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "100";
+PRAGMA yt.JoinMergeTablesLimit = '100';
 
 INSERT INTO @t1
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_align3_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_align3_/formatted.sql
index 9b1ca577b4..db5502b78f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_align3_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_align3_/formatted.sql
@@ -2,7 +2,7 @@
 /* postgres can not */
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "100";
+PRAGMA yt.JoinMergeTablesLimit = '100';
 PRAGMA yt.JoinMergeForce;
 
 INSERT INTO @t1
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_no_sorted_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_no_sorted_/formatted.sql
index aa0557dda2..ac110f078d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_no_sorted_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_no_sorted_/formatted.sql
@@ -1,7 +1,7 @@
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
-PRAGMA yt.JoinMergeForce = "true";
+PRAGMA yt.JoinMergeTablesLimit = '10';
+PRAGMA yt.JoinMergeForce = 'true';
 
 SELECT
     a.key AS key
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_one_sorted_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_one_sorted_/formatted.sql
index 2bff64278d..a3c1c18568 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_one_sorted_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_one_sorted_/formatted.sql
@@ -1,8 +1,8 @@
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
-PRAGMA yt.JoinMergeForce = "true";
-PRAGMA yt.JoinMergeUnsortedFactor = "0";
+PRAGMA yt.JoinMergeTablesLimit = '10';
+PRAGMA yt.JoinMergeForce = 'true';
+PRAGMA yt.JoinMergeUnsortedFactor = '0';
 
 SELECT
     a.key AS key
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_per_link_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_per_link_/formatted.sql
index a7d005cfff..0f2a244134 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_per_link_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_per_link_/formatted.sql
@@ -2,7 +2,7 @@
 /* postgres can not */
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
+PRAGMA yt.JoinMergeTablesLimit = '10';
 
 SELECT
     a.key AS k1,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_left_null_column_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_left_null_column_/formatted.sql
index 1c1b0df9d7..277431b2f8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_left_null_column_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_left_null_column_/formatted.sql
@@ -1,12 +1,12 @@
 /* syntax version 1 */
 /* postgres can not */
-PRAGMA yt.JoinMergeTablesLimit = "10";
-PRAGMA yt.JoinAllowColumnRenames = "true";
-PRAGMA yt.JoinMergeUnsortedFactor = "5.0";
+PRAGMA yt.JoinMergeTablesLimit = '10';
+PRAGMA yt.JoinAllowColumnRenames = 'true';
+PRAGMA yt.JoinMergeUnsortedFactor = '5.0';
 
 USE plato;
 
-$t = [<|"x": "bbb", "y": 1, "z": NULL|>, <|"x": "bbb", "y": 2, "z": NULL|>];
+$t = [<|'x': 'bbb', 'y': 1, 'z': NULL|>, <|'x': 'bbb', 'y': 2, 'z': NULL|>];
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_narrows_output_sort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_narrows_output_sort_/formatted.sql
index b9b9d706b4..ba02729592 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_narrows_output_sort_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_narrows_output_sort_/formatted.sql
@@ -1,8 +1,8 @@
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
-PRAGMA yt.JoinMergeUnsortedFactor = "3";
-PRAGMA yt.JoinAllowColumnRenames = "true";
+PRAGMA yt.JoinMergeTablesLimit = '10';
+PRAGMA yt.JoinMergeUnsortedFactor = '3';
+PRAGMA yt.JoinAllowColumnRenames = 'true';
 PRAGMA SimpleColumns;
 
 FROM
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_/formatted.sql
index 1b639c3e80..7d21cdbb90 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_/formatted.sql
@@ -2,10 +2,10 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
-PRAGMA yt.JoinMergeUnsortedFactor = "0";
-PRAGMA yt.JoinAllowColumnRenames = "true";
-PRAGMA yt.JoinMergeSetTopLevelFullSort = "true";
+PRAGMA yt.JoinMergeTablesLimit = '10';
+PRAGMA yt.JoinMergeUnsortedFactor = '0';
+PRAGMA yt.JoinAllowColumnRenames = 'true';
+PRAGMA yt.JoinMergeSetTopLevelFullSort = 'true';
 
 FROM
     SortedBySubkeyValue AS a
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_cross_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_cross_/formatted.sql
index 1a3e0ff406..e8f30665ef 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_cross_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_cross_/formatted.sql
@@ -2,10 +2,10 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
-PRAGMA yt.JoinMergeUnsortedFactor = "0";
-PRAGMA yt.JoinAllowColumnRenames = "true";
-PRAGMA yt.JoinMergeSetTopLevelFullSort = "true";
+PRAGMA yt.JoinMergeTablesLimit = '10';
+PRAGMA yt.JoinMergeUnsortedFactor = '0';
+PRAGMA yt.JoinAllowColumnRenames = 'true';
+PRAGMA yt.JoinMergeSetTopLevelFullSort = 'true';
 
 FROM
     Input1 AS a
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_nested_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_nested_/formatted.sql
index 0022581d55..e8fdd1da1c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_nested_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_nested_/formatted.sql
@@ -3,9 +3,9 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
-PRAGMA yt.JoinMergeUnsortedFactor = "0";
-PRAGMA yt.JoinAllowColumnRenames = "true";
+PRAGMA yt.JoinMergeTablesLimit = '10';
+PRAGMA yt.JoinMergeUnsortedFactor = '0';
+PRAGMA yt.JoinAllowColumnRenames = 'true';
 
 FROM
     Input1 AS a
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_unmatched_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_unmatched_/formatted.sql
index 254d1a1880..ca86f0b986 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_unmatched_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_unmatched_/formatted.sql
@@ -3,9 +3,9 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
-PRAGMA yt.JoinMergeUnsortedFactor = "0";
-PRAGMA yt.JoinAllowColumnRenames = "true";
+PRAGMA yt.JoinMergeTablesLimit = '10';
+PRAGMA yt.JoinMergeUnsortedFactor = '0';
+PRAGMA yt.JoinAllowColumnRenames = 'true';
 
 FROM
     Input1 AS a
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_semi_composite_to_inner_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_semi_composite_to_inner_/formatted.sql
index f966b81faa..8c8bae6c77 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_semi_composite_to_inner_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_semi_composite_to_inner_/formatted.sql
@@ -1,9 +1,9 @@
 /* syntax version 1 */
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
-PRAGMA yt.JoinMergeUnsortedFactor = "3";
-PRAGMA yt.JoinAllowColumnRenames = "true";
+PRAGMA yt.JoinMergeTablesLimit = '10';
+PRAGMA yt.JoinMergeUnsortedFactor = '3';
+PRAGMA yt.JoinAllowColumnRenames = 'true';
 
 $semi =
     SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_semi_to_inner_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_semi_to_inner_/formatted.sql
index f61f8f6189..71745f4af6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_semi_to_inner_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_semi_to_inner_/formatted.sql
@@ -1,9 +1,9 @@
 /* syntax version 1 */
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
-PRAGMA yt.JoinMergeUnsortedFactor = "0";
-PRAGMA yt.JoinAllowColumnRenames = "true";
+PRAGMA yt.JoinMergeTablesLimit = '10';
+PRAGMA yt.JoinMergeUnsortedFactor = '0';
+PRAGMA yt.JoinAllowColumnRenames = 'true';
 
 FROM
     Input1 AS a
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_small_primary_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_small_primary_/formatted.sql
index 71ee5f5981..50be1e6346 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_small_primary_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_small_primary_/formatted.sql
@@ -2,9 +2,9 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
-PRAGMA yt.JoinAllowColumnRenames = "true";
-PRAGMA yt.JoinMergeUseSmallAsPrimary = "true";
+PRAGMA yt.JoinMergeTablesLimit = '10';
+PRAGMA yt.JoinAllowColumnRenames = 'true';
+PRAGMA yt.JoinMergeUseSmallAsPrimary = 'true';
 
 -- Input2 is smaller than Input1
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_inner_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_inner_/formatted.sql
index a5e8b2e705..f06bcfa9ea 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_inner_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_inner_/formatted.sql
@@ -3,8 +3,8 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
-PRAGMA yt.JoinAllowColumnRenames = "true";
+PRAGMA yt.JoinMergeTablesLimit = '10';
+PRAGMA yt.JoinAllowColumnRenames = 'true';
 
 $inner = (
     FROM
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_left_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_left_/formatted.sql
index 33965836b8..07b6c56ae0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_left_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_left_/formatted.sql
@@ -2,8 +2,8 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
-PRAGMA yt.JoinAllowColumnRenames = "true";
+PRAGMA yt.JoinMergeTablesLimit = '10';
+PRAGMA yt.JoinAllowColumnRenames = 'true';
 
 $left = (
     FROM
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_nomatch_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_nomatch_/formatted.sql
index 34eedc619f..5aae004c78 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_nomatch_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_nomatch_/formatted.sql
@@ -3,8 +3,8 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
-PRAGMA yt.JoinAllowColumnRenames = "true";
+PRAGMA yt.JoinMergeTablesLimit = '10';
+PRAGMA yt.JoinAllowColumnRenames = 'true';
 
 FROM
     Input1 AS a
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_right_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_right_/formatted.sql
index 22dbeaa348..5da64ac7e6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_right_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_right_/formatted.sql
@@ -2,8 +2,8 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
-PRAGMA yt.JoinAllowColumnRenames = "true";
+PRAGMA yt.JoinMergeTablesLimit = '10';
+PRAGMA yt.JoinAllowColumnRenames = 'true';
 
 $right = (
     FROM
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_unused_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_unused_keys_/formatted.sql
index b5f176336b..96145be7ab 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_unused_keys_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_unused_keys_/formatted.sql
@@ -1,7 +1,7 @@
 /* syntax version 1 */
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
+PRAGMA yt.JoinMergeTablesLimit = '10';
 
 SELECT
     v3
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_/formatted.sql
index e45ce41607..d4f7bad4a9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_/formatted.sql
@@ -2,9 +2,9 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
-PRAGMA yt.JoinMergeUnsortedFactor = "3.0";
-PRAGMA yt.JoinAllowColumnRenames = "true";
+PRAGMA yt.JoinMergeTablesLimit = '10';
+PRAGMA yt.JoinMergeUnsortedFactor = '3.0';
+PRAGMA yt.JoinAllowColumnRenames = 'true';
 
 FROM
     SortedBySubkeyValue AS a
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_nested_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_nested_/formatted.sql
index a927f11148..55c8715030 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_nested_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_nested_/formatted.sql
@@ -3,9 +3,9 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
-PRAGMA yt.JoinMergeUnsortedFactor = "3.0";
-PRAGMA yt.JoinAllowColumnRenames = "true";
+PRAGMA yt.JoinMergeTablesLimit = '10';
+PRAGMA yt.JoinMergeUnsortedFactor = '3.0';
+PRAGMA yt.JoinAllowColumnRenames = 'true';
 
 FROM
     Input AS a
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_nonsorted_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_nonsorted_/formatted.sql
index f28374edd2..cc84351bc4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_nonsorted_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_nonsorted_/formatted.sql
@@ -2,9 +2,9 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
-PRAGMA yt.JoinMergeUnsortedFactor = "100.0";
-PRAGMA yt.JoinAllowColumnRenames = "true";
+PRAGMA yt.JoinMergeTablesLimit = '10';
+PRAGMA yt.JoinMergeUnsortedFactor = '100.0';
+PRAGMA yt.JoinAllowColumnRenames = 'true';
 
 $unsorted = (
     SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_norename_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_norename_/formatted.sql
index d331d59dfe..9530c00255 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_norename_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_norename_/formatted.sql
@@ -2,9 +2,9 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
-PRAGMA yt.JoinMergeUnsortedFactor = "3.0";
-PRAGMA yt.JoinAllowColumnRenames = "false";
+PRAGMA yt.JoinMergeTablesLimit = '10';
+PRAGMA yt.JoinMergeUnsortedFactor = '3.0';
+PRAGMA yt.JoinAllowColumnRenames = 'false';
 
 FROM
     SortedBySubkeyValue AS a
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_reverse_key_order_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_reverse_key_order_/formatted.sql
index 1a15c5297e..92d1a2033b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_reverse_key_order_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_reverse_key_order_/formatted.sql
@@ -2,8 +2,8 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
-PRAGMA yt.JoinMergeUnsortedFactor = "3.0";
+PRAGMA yt.JoinMergeTablesLimit = '10';
+PRAGMA yt.JoinMergeUnsortedFactor = '3.0';
 
 SELECT
     pd.Text
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_table_range_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_table_range_/formatted.sql
index 31e0d0ad2b..7cfb66f5ce 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_table_range_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_table_range_/formatted.sql
@@ -2,15 +2,15 @@ PRAGMA DisableSimpleColumns;
 
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
-PRAGMA yt.JoinMergeUnsortedFactor = "3.0";
+PRAGMA yt.JoinMergeTablesLimit = '10';
+PRAGMA yt.JoinMergeUnsortedFactor = '3.0';
 
 SELECT
     *
 FROM
-    CONCAT("Left1", "Left2") AS a
+    CONCAT('Left1', 'Left2') AS a
 INNER JOIN
-    CONCAT("Right1", "Right2") AS b
+    CONCAT('Right1', 'Right2') AS b
 USING (key)
 ORDER BY
     a.value,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_inner_filter_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_inner_filter_/formatted.sql
index c74beca2d7..0696d6fb78 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_inner_filter_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_inner_filter_/formatted.sql
@@ -11,7 +11,7 @@ FROM (
     FROM
         Input1
     WHERE
-        value != "ddd"
+        value != 'ddd'
 ) AS a
 JOIN
     Input2 AS b
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_map_cross_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_map_cross_/formatted.sql
index 385d63b881..1650438519 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_map_cross_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_map_cross_/formatted.sql
@@ -3,7 +3,7 @@ PRAGMA DisablePullUpFlatMapOverJoin;
 
 USE plato;
 
-PRAGMA yt.MapJoinLimit = "1m";
+PRAGMA yt.MapJoinLimit = '1m';
 
 FROM (
     SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_map_inner_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_map_inner_/formatted.sql
index bc038ff8e1..418c0e4b8d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_map_inner_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_map_inner_/formatted.sql
@@ -3,7 +3,7 @@ PRAGMA DisablePullUpFlatMapOverJoin;
 
 USE plato;
 
-PRAGMA yt.MapJoinLimit = "1m";
+PRAGMA yt.MapJoinLimit = '1m';
 
 FROM (
     SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_map_semi_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_map_semi_/formatted.sql
index e7e79dc378..a3bec21fd8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_map_semi_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_map_semi_/formatted.sql
@@ -3,7 +3,7 @@ PRAGMA DisablePullUpFlatMapOverJoin;
 
 USE plato;
 
-PRAGMA yt.MapJoinLimit = "1m";
+PRAGMA yt.MapJoinLimit = '1m';
 
 FROM (
     SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_extrasort1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_extrasort1_/formatted.sql
index d19cf69325..714bd78466 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_extrasort1_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_extrasort1_/formatted.sql
@@ -3,8 +3,8 @@ PRAGMA DisablePullUpFlatMapOverJoin;
 
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
-PRAGMA yt.JoinMergeUnsortedFactor = "3.0";
+PRAGMA yt.JoinMergeTablesLimit = '10';
+PRAGMA yt.JoinMergeUnsortedFactor = '3.0';
 
 SELECT
     pd.Text,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_extrasort2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_extrasort2_/formatted.sql
index 1e1bc620db..28e4da5516 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_extrasort2_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_extrasort2_/formatted.sql
@@ -3,8 +3,8 @@ PRAGMA DisablePullUpFlatMapOverJoin;
 
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
-PRAGMA yt.JoinMergeUnsortedFactor = "3.0";
+PRAGMA yt.JoinMergeTablesLimit = '10';
+PRAGMA yt.JoinMergeUnsortedFactor = '3.0';
 
 SELECT
     pd.Text,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_inner_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_inner_/formatted.sql
index c1146bdafd..6c462cd12e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_inner_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_inner_/formatted.sql
@@ -3,7 +3,7 @@ PRAGMA DisablePullUpFlatMapOverJoin;
 
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
+PRAGMA yt.JoinMergeTablesLimit = '10';
 
 FROM (
     SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_with_remap_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_with_remap_/formatted.sql
index eb001c98f9..06a1001456 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_with_remap_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_with_remap_/formatted.sql
@@ -3,8 +3,8 @@ PRAGMA DisablePullUpFlatMapOverJoin;
 
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "10";
-PRAGMA yt.JoinMergeUnsortedFactor = "3.0";
+PRAGMA yt.JoinMergeTablesLimit = '10';
+PRAGMA yt.JoinMergeUnsortedFactor = '3.0';
 
 INSERT INTO @inp2
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_no_premap_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_no_premap_/formatted.sql
index 5095ec4eb3..392e071ed0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_no_premap_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_no_premap_/formatted.sql
@@ -27,7 +27,7 @@ ORDER BY
 FROM (
     SELECT
         key,
-        "aaa" AS subkey,
+        'aaa' AS subkey,
         value
     FROM
         Input1
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_cross_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_cross_/formatted.sql
index b8eb3b8f42..3c43608a3a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_cross_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_cross_/formatted.sql
@@ -6,7 +6,7 @@ FROM (
     SELECT
         key,
         subkey || key AS subkey,
-        value || "v" AS value
+        value || 'v' AS value
     FROM
         Input1
 ) AS a
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_random_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_random_/formatted.sql
index af2203a903..4b8a284550 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_random_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_random_/formatted.sql
@@ -8,7 +8,7 @@ FROM (
         key,
         subkey || key AS subkey,
         value,
-        RANDOM(value || "x") <= 1.0 AS rn
+        RANDOM(value || 'x') <= 1.0 AS rn
     FROM
         Input1
 ) AS a
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-right_trivial_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-right_trivial_/formatted.sql
index 3f8405e62e..a69f37fe21 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-right_trivial_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-right_trivial_/formatted.sql
@@ -1,9 +1,9 @@
 PRAGMA DisableSimpleColumns;
 
 SELECT
-    coalesce(Input1.key, "_null") AS a,
-    coalesce(Input1.subkey, "_null") AS b,
-    coalesce(Input3.value, "_null") AS c
+    coalesce(Input1.key, '_null') AS a,
+    coalesce(Input1.subkey, '_null') AS b,
+    coalesce(Input3.value, '_null') AS c
 FROM
     plato.Input1
 RIGHT JOIN
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-selfjoin_on_sorted_with_filter_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-selfjoin_on_sorted_with_filter_/formatted.sql
index 3c68987291..8ce968ca3b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-selfjoin_on_sorted_with_filter_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-selfjoin_on_sorted_with_filter_/formatted.sql
@@ -7,7 +7,7 @@ $in = (
     FROM
         plato.Input
     WHERE
-        key > "100"
+        key > '100'
 );
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-split_to_list_as_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-split_to_list_as_key_/formatted.sql
index 9332166f01..67d08483aa 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-split_to_list_as_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-split_to_list_as_key_/formatted.sql
@@ -8,7 +8,7 @@ FROM
 JOIN
     Input2 AS b
 ON
-    a.key == String::SplitToList(b.key, "_")[0]
+    a.key == String::SplitToList(b.key, '_')[0]
 SELECT
     *
 ORDER BY
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_/formatted.sql
index a3909fc0b8..79d9dbe00e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_/formatted.sql
@@ -1,7 +1,7 @@
 /* syntax version 1 */
 USE plato;
 
-PRAGMA yt.JoinEnableStarJoin = "true";
+PRAGMA yt.JoinEnableStarJoin = 'true';
 
 $rightSemi =
     SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_inners_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_inners_/formatted.sql
index d3a2bec669..02d16ac092 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_inners_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_inners_/formatted.sql
@@ -1,7 +1,7 @@
 /* syntax version 1 */
 USE plato;
 
-PRAGMA yt.JoinEnableStarJoin = "true";
+PRAGMA yt.JoinEnableStarJoin = 'true';
 
 FROM ANY
     Input2 AS b
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_inners_premap_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_inners_premap_/formatted.sql
index f673178b8e..99f19b8284 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_inners_premap_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_inners_premap_/formatted.sql
@@ -1,7 +1,7 @@
 /* syntax version 1 */
 USE plato;
 
-PRAGMA yt.JoinEnableStarJoin = "true";
+PRAGMA yt.JoinEnableStarJoin = 'true';
 PRAGMA DisablePullUpFlatMapOverJoin;
 
 $a =
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_inners_vk_sorted_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_inners_vk_sorted_/formatted.sql
index d3a2bec669..02d16ac092 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_inners_vk_sorted_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_inners_vk_sorted_/formatted.sql
@@ -1,7 +1,7 @@
 /* syntax version 1 */
 USE plato;
 
-PRAGMA yt.JoinEnableStarJoin = "true";
+PRAGMA yt.JoinEnableStarJoin = 'true';
 
 FROM ANY
     Input2 AS b
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_mirror_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_mirror_/formatted.sql
index 549bb194c2..d3eb7faaca 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_mirror_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_mirror_/formatted.sql
@@ -1,7 +1,7 @@
 /* syntax version 1 */
 USE plato;
 
-PRAGMA yt.JoinEnableStarJoin = "true";
+PRAGMA yt.JoinEnableStarJoin = 'true';
 
 $leftSemi =
     SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_multi_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_multi_/formatted.sql
index 9372b0c74c..d57798de60 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_multi_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_multi_/formatted.sql
@@ -1,7 +1,7 @@
 /* syntax version 1 */
 USE plato;
 
-PRAGMA yt.JoinEnableStarJoin = "true";
+PRAGMA yt.JoinEnableStarJoin = 'true';
 
 -- first Star JOIN chain 
 $rightSemi =
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_semionly_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_semionly_/formatted.sql
index 0ffa2aef09..79f7b3c546 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_semionly_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_semionly_/formatted.sql
@@ -1,7 +1,7 @@
 /* syntax version 1 */
 USE plato;
 
-PRAGMA yt.JoinEnableStarJoin = "true";
+PRAGMA yt.JoinEnableStarJoin = 'true';
 
 FROM
     Input1 AS a
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_semionly_premap_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_semionly_premap_/formatted.sql
index 839f627994..feb152b8f7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_semionly_premap_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_semionly_premap_/formatted.sql
@@ -1,7 +1,7 @@
 /* syntax version 1 */
 USE plato;
 
-PRAGMA yt.JoinEnableStarJoin = "true";
+PRAGMA yt.JoinEnableStarJoin = 'true';
 PRAGMA DisablePullUpFlatMapOverJoin;
 
 $a =
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_with_diff_complex_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_with_diff_complex_key_/formatted.sql
index 3faed88c6c..dbf08acb6f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_with_diff_complex_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_with_diff_complex_key_/formatted.sql
@@ -1,7 +1,7 @@
 /* syntax version 1 */
 USE plato;
 
-PRAGMA yt.JoinEnableStarJoin = "true";
+PRAGMA yt.JoinEnableStarJoin = 'true';
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-starjoin_unused_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-starjoin_unused_keys_/formatted.sql
index 6a1065653d..c9e0d55408 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-starjoin_unused_keys_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-starjoin_unused_keys_/formatted.sql
@@ -1,7 +1,7 @@
 /* syntax version 1 */
 USE plato;
 
-PRAGMA yt.JoinEnableStarJoin = "true";
+PRAGMA yt.JoinEnableStarJoin = 'true';
 
 SELECT
     v3
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-two_aggrs_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-two_aggrs_/formatted.sql
index a793d59a3a..c507b60ce0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-two_aggrs_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-two_aggrs_/formatted.sql
@@ -1,7 +1,7 @@
 USE plato;
 
-PRAGMA yt.JoinMergeForce = "1";
-PRAGMA yt.JoinMergeTablesLimit = "10";
+PRAGMA yt.JoinMergeForce = '1';
+PRAGMA yt.JoinMergeTablesLimit = '10';
 
 $join =
     SELECT
@@ -13,7 +13,7 @@ $join =
         FROM
             Input8
         WHERE
-            subkey != "bar"
+            subkey != 'bar'
     ) AS a
     JOIN (
         SELECT
@@ -21,7 +21,7 @@ $join =
         FROM
             Input8
         WHERE
-            subkey != "foo"
+            subkey != 'foo'
     ) AS b
     ON
         a.key == b.key AND a.subkey == b.subkey
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-12022_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-12022_/formatted.sql
index 3ea33ab060..d366737f0d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-12022_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-12022_/formatted.sql
@@ -13,11 +13,11 @@ END DEFINE;
 SELECT
     a.key
 FROM
-    $sub("Input") AS a
+    $sub('Input') AS a
 INNER JOIN
     Input AS b
 ON
     a.key == b.key
 WHERE
-    JoinTableRow().`a.subkey` == "wat"
+    JoinTableRow().`a.subkey` == 'wat'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-14829_left_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-14829_left_/formatted.sql
index 249cce7575..103116ff63 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-14829_left_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-14829_left_/formatted.sql
@@ -1,6 +1,6 @@
 USE plato;
 
-PRAGMA yt.JoinEnableStarJoin = "true";
+PRAGMA yt.JoinEnableStarJoin = 'true';
 
 INSERT INTO @x
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-14829_leftonly_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-14829_leftonly_/formatted.sql
index 9b2c43b641..7df5664266 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-14829_leftonly_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-14829_leftonly_/formatted.sql
@@ -1,6 +1,6 @@
 USE plato;
 
-PRAGMA yt.JoinEnableStarJoin = "true";
+PRAGMA yt.JoinEnableStarJoin = 'true';
 
 INSERT INTO @x
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-14847_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-14847_/formatted.sql
index c87ab28ef9..0a9858e0a8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-14847_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-14847_/formatted.sql
@@ -1,6 +1,6 @@
 USE plato;
 
-PRAGMA yt.MapJoinLimit = "1M";
+PRAGMA yt.MapJoinLimit = '1M';
 
 $t = (
     SELECT
@@ -21,5 +21,5 @@ FROM
 LEFT JOIN
     Input3 AS r
 ON
-    l.key == coalesce("" || r.key, "")
+    l.key == coalesce('' || r.key, '')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-16011_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-16011_/formatted.sql
index 090aa7a08a..6576a9f27e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-16011_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-16011_/formatted.sql
@@ -1,9 +1,9 @@
 USE plato;
 
-PRAGMA AnsiInForEmptyOrNullableItemsCollections = "true";
-PRAGMA yt.MapJoinLimit = "1m";
-PRAGMA yt.LookupJoinLimit = "64k";
-PRAGMA yt.LookupJoinMaxRows = "100";
+PRAGMA AnsiInForEmptyOrNullableItemsCollections = 'true';
+PRAGMA yt.MapJoinLimit = '1m';
+PRAGMA yt.LookupJoinLimit = '64k';
+PRAGMA yt.LookupJoinMaxRows = '100';
 
 INSERT INTO @T1
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-19081_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-19081_/formatted.sql
index e74e76a679..d93921318e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-19081_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-19081_/formatted.sql
@@ -1,8 +1,8 @@
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "100";
-PRAGMA yt.MapJoinLimit = "10M";
-PRAGMA yt.MaxReplicationFactorToFuseOperations = "1";
+PRAGMA yt.JoinMergeTablesLimit = '100';
+PRAGMA yt.MapJoinLimit = '10M';
+PRAGMA yt.MaxReplicationFactorToFuseOperations = '1';
 
 SELECT
     a.key,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-8125_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-8125_/formatted.sql
index 253f23e9c6..cff276f460 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-8125_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-8125_/formatted.sql
@@ -1,6 +1,6 @@
 USE plato;
 
-PRAGMA yt.JoinCollectColumnarStatistics = "async";
+PRAGMA yt.JoinCollectColumnarStatistics = 'async';
 
 INSERT INTO @yang_ids
 SELECT
@@ -8,7 +8,7 @@ SELECT
 FROM
     Input
 WHERE
-    subkey <= "3"
+    subkey <= '3'
 LIMIT 100;
 
 COMMIT;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-8131_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-8131_/formatted.sql
index 1439605d75..878d31c2d8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-8131_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-8131_/formatted.sql
@@ -2,9 +2,9 @@
 USE plato;
 
 PRAGMA DisableSimpleColumns;
-PRAGMA yt.JoinCollectColumnarStatistics = "async";
-PRAGMA yt.MinTempAvgChunkSize = "0";
-PRAGMA yt.MapJoinLimit = "1";
+PRAGMA yt.JoinCollectColumnarStatistics = 'async';
+PRAGMA yt.MinTempAvgChunkSize = '0';
+PRAGMA yt.MapJoinLimit = '1';
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-8980_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-8980_/formatted.sql
index 06209f3ccd..2048d019f5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-8980_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-8980_/formatted.sql
@@ -4,7 +4,7 @@ $foo = (
     SELECT
         key,
         subkey,
-        value IN ("wat", "bar") AS value
+        value IN ('wat', 'bar') AS value
     FROM
         Input
 );
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql_465_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql_465_/formatted.sql
index 5eb471f39c..57e1f77630 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql_465_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql_465_/formatted.sql
@@ -10,7 +10,7 @@ FROM (
     FROM
         a
     WHERE
-        a.key > "zzz"
+        a.key > 'zzz'
 ) AS a
 JOIN
     b
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-combination_nested_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-combination_nested_/formatted.sql
index 9a9e10e787..92999114e5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-combination_nested_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-combination_nested_/formatted.sql
@@ -19,13 +19,13 @@ SELECT
             JSON_QUERY (
                 JSON_QUERY (
                     $json,
-                    "strict $.a"
+                    'strict $.a'
                 ),
-                "strict $.b"
+                'strict $.b'
             ),
-            "strict $.c"
+            'strict $.c'
         ),
-        "strict $.d"
+        'strict $.d'
     )
 ;
 
@@ -35,13 +35,13 @@ SELECT
             JSON_QUERY (
                 JSON_QUERY (
                     $json,
-                    "strict $.a"
+                    'strict $.a'
                 ),
-                "strict $.b"
+                'strict $.b'
             ),
-            "strict $.c"
+            'strict $.c'
         ),
-        "strict $.d"
+        'strict $.d'
     )
 ;
 
@@ -50,10 +50,10 @@ SELECT
         JSON_QUERY (
             JSON_QUERY (
                 $json,
-                "strict $.a"
+                'strict $.a'
             ),
-            "strict $.b"
+            'strict $.b'
         ),
-        "strict $.c"
+        'strict $.c'
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-combination_unwrapped_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-combination_unwrapped_/formatted.sql
index aaf596f439..461542e745 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-combination_unwrapped_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-combination_unwrapped_/formatted.sql
@@ -3,7 +3,7 @@
 $json = Unwrap(CAST(@@{"x": 1}@@ AS Json));
 
 SELECT
-    JSON_EXISTS ($json, "strict $.x"),
-    JSON_VALUE ($json, "strict $.x"),
-    JSON_QUERY ($json, "strict $")
+    JSON_EXISTS ($json, 'strict $.x'),
+    JSON_VALUE ($json, 'strict $.x'),
+    JSON_QUERY ($json, 'strict $')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_exists_common_syntax_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_exists_common_syntax_/formatted.sql
index 4686525c3f..23ba1cf965 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_exists_common_syntax_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_exists_common_syntax_/formatted.sql
@@ -2,13 +2,13 @@
 /* postgres can not */
 -- Null handling
 SELECT
-    JSON_EXISTS (NULL, "strict $.key"),
-    JSON_EXISTS (Nothing(Json?), "strict $.key")
+    JSON_EXISTS (NULL, 'strict $.key'),
+    JSON_EXISTS (Nothing(Json?), 'strict $.key')
 ;
 
 -- Casual select
 $json = CAST(@@{"key": 128}@@ AS Json);
 
 SELECT
-    JSON_EXISTS ($json, "strict $.key")
+    JSON_EXISTS ($json, 'strict $.key')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_exists_on_error_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_exists_on_error_/formatted.sql
index 9fc928a464..78d7ec91c8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_exists_on_error_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_exists_on_error_/formatted.sql
@@ -1,11 +1,11 @@
 /* syntax version 1 */
 /* postgres can not */
 -- Accessing absent object member will cause jsonpath error in strict mode
-$json = CAST("{}" AS Json);
+$json = CAST('{}' AS Json);
 
 SELECT
-    JSON_EXISTS ($json, "strict $.key"), -- defaults to FALSE ON ERROR
-    JSON_EXISTS ($json, "strict $.key" FALSE ON ERROR),
-    JSON_EXISTS ($json, "strict $.key" TRUE ON ERROR),
-    JSON_EXISTS ($json, "strict $.key" UNKNOWN ON ERROR)
+    JSON_EXISTS ($json, 'strict $.key'), -- defaults to FALSE ON ERROR
+    JSON_EXISTS ($json, 'strict $.key' FALSE ON ERROR),
+    JSON_EXISTS ($json, 'strict $.key' TRUE ON ERROR),
+    JSON_EXISTS ($json, 'strict $.key' UNKNOWN ON ERROR)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_exists_on_error_exception_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_exists_on_error_exception_/formatted.sql
index 1534b0a258..0aab4e847b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_exists_on_error_exception_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_exists_on_error_exception_/formatted.sql
@@ -1,7 +1,7 @@
 /* custom error:Member not found*/
 -- Accessing absent object member will cause jsonpath error in strict mode
-$json = CAST("{}" AS Json);
+$json = CAST('{}' AS Json);
 
 SELECT
-    JSON_EXISTS ($json, "strict $.key" ERROR ON ERROR)
+    JSON_EXISTS ($json, 'strict $.key' ERROR ON ERROR)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_exists_passing_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_exists_passing_/formatted.sql
index 181a56c319..bd094829f8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_exists_passing_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_exists_passing_/formatted.sql
@@ -11,7 +11,7 @@ SELECT
     -- Numeric types
     JSON_EXISTS (
         $json,
-        "strict $var1 + $var2 + $var3 + $var4 + $var5 + $var6 + $var7 + $var8 + $var9 + $var10" PASSING CAST(1 AS Int8) AS var1,
+        'strict $var1 + $var2 + $var3 + $var4 + $var5 + $var6 + $var7 + $var8 + $var9 + $var10' PASSING CAST(1 AS Int8) AS var1,
         CAST(2 AS Uint8) AS var2,
         CAST(3 AS Int16) AS var3,
         CAST(4 AS Uint16) AS var4,
@@ -26,60 +26,60 @@ SELECT
     -- Time types
     JSON_EXISTS (
         $json,
-        "strict $var" PASSING CAST(1582044622 AS Datetime) AS var
+        'strict $var' PASSING CAST(1582044622 AS Datetime) AS var
     ),
     JSON_EXISTS (
         $json,
-        "strict $var" PASSING CAST(1582044622 AS Timestamp) AS var
+        'strict $var' PASSING CAST(1582044622 AS Timestamp) AS var
     ),
     JSON_EXISTS (
         $json,
-        "strict $var" PASSING CAST("2020-02-18" AS Date) AS var
+        'strict $var' PASSING CAST('2020-02-18' AS Date) AS var
     ),
 
     -- Utf8
     JSON_EXISTS (
         $json,
-        "strict $var" PASSING CAST("привет" AS Utf8) AS var
+        'strict $var' PASSING CAST('привет' AS Utf8) AS var
     ),
 
     -- Bool
     JSON_EXISTS (
         $json,
-        "strict $var" PASSING TRUE AS var
+        'strict $var' PASSING TRUE AS var
     ),
 
     -- Json
     JSON_EXISTS (
         $json,
-        "strict $var" PASSING $json AS var
+        'strict $var' PASSING $json AS var
     ),
 
     -- Nulls
     JSON_EXISTS (
         $json,
-        "strict $var" PASSING Nothing(Int64?) AS var
+        'strict $var' PASSING Nothing(Int64?) AS var
     ),
     JSON_EXISTS (
         $json,
-        "strict $var" PASSING NULL AS var
+        'strict $var' PASSING NULL AS var
     )
 ;
 
 -- Check various ways to pass variable name
 SELECT
     JSON_EXISTS (
-        $json, "strict $var1" PASSING 123 AS var1
+        $json, 'strict $var1' PASSING 123 AS var1
     ),
 
     -- NOTE: VaR1 is not casted to upper-case VAR1 as standard expects
     JSON_EXISTS (
-        $json, "strict $VaR1" PASSING 123 AS VaR1
+        $json, 'strict $VaR1' PASSING 123 AS VaR1
     ),
     JSON_EXISTS (
-        $json, "strict $var1" PASSING 123 AS "var1"
+        $json, 'strict $var1' PASSING 123 AS 'var1'
     ),
     JSON_EXISTS (
-        $json, "strict $VaR1" PASSING 123 AS "VaR1"
+        $json, 'strict $VaR1' PASSING 123 AS 'VaR1'
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_exists_passing_exception_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_exists_passing_exception_/formatted.sql
index a394846a4c..58b4e09b70 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_exists_passing_exception_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_exists_passing_exception_/formatted.sql
@@ -8,6 +8,6 @@ $json = CAST(
 -- Tuple type is not supported for variables
 SELECT
     JSON_EXISTS (
-        $json, "strict $var" PASSING AsTuple(1, 2) AS var
+        $json, 'strict $var' PASSING AsTuple(1, 2) AS var
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_common_syntax_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_common_syntax_/formatted.sql
index 0cf5b81473..bbb180b527 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_common_syntax_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_common_syntax_/formatted.sql
@@ -2,13 +2,13 @@
 /* postgres can not */
 -- Null handling
 SELECT
-    JSON_QUERY (NULL, "strict $.key"),
-    JSON_QUERY (Nothing(Json?), "strict $.key")
+    JSON_QUERY (NULL, 'strict $.key'),
+    JSON_QUERY (Nothing(Json?), 'strict $.key')
 ;
 
 -- Casual select
 $json = CAST(@@{"key": [1, 2, 3]}@@ AS Json);
 
 SELECT
-    JSON_QUERY ($json, "strict $.key")
+    JSON_QUERY ($json, 'strict $.key')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_example_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_example_/formatted.sql
index 9509c14a2a..088ead11f2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_example_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_example_/formatted.sql
@@ -38,25 +38,25 @@ FROM
 $J2 = CAST(@@{ "a": "[1,2]", "b": [1,2], "c": "hi"}@@ AS Json);
 
 SELECT
-    JSON_VALUE ($J2, "strict $.a"),
-    JSON_VALUE ($J2, "strict $.b" NULL ON ERROR),
-    JSON_VALUE ($J2, "strict $.c")
+    JSON_VALUE ($J2, 'strict $.a'),
+    JSON_VALUE ($J2, 'strict $.b' NULL ON ERROR),
+    JSON_VALUE ($J2, 'strict $.c')
 ;
 
 SELECT
-    JSON_QUERY ($J2, "strict $.a" WITHOUT ARRAY WRAPPER NULL ON ERROR),
-    JSON_QUERY ($J2, "strict $.b" WITHOUT ARRAY WRAPPER),
-    JSON_QUERY ($J2, "strict $.c" WITHOUT ARRAY WRAPPER NULL ON ERROR)
+    JSON_QUERY ($J2, 'strict $.a' WITHOUT ARRAY WRAPPER NULL ON ERROR),
+    JSON_QUERY ($J2, 'strict $.b' WITHOUT ARRAY WRAPPER),
+    JSON_QUERY ($J2, 'strict $.c' WITHOUT ARRAY WRAPPER NULL ON ERROR)
 ;
 
 SELECT
-    JSON_QUERY ($J2, "strict $.a" WITH UNCONDITIONAL ARRAY WRAPPER),
-    JSON_QUERY ($J2, "strict $.b" WITH UNCONDITIONAL ARRAY WRAPPER),
-    JSON_QUERY ($J2, "strict $.c" WITH UNCONDITIONAL ARRAY WRAPPER)
+    JSON_QUERY ($J2, 'strict $.a' WITH UNCONDITIONAL ARRAY WRAPPER),
+    JSON_QUERY ($J2, 'strict $.b' WITH UNCONDITIONAL ARRAY WRAPPER),
+    JSON_QUERY ($J2, 'strict $.c' WITH UNCONDITIONAL ARRAY WRAPPER)
 ;
 
 SELECT
-    JSON_QUERY ($J2, "strict $.a" WITH CONDITIONAL ARRAY WRAPPER),
-    JSON_QUERY ($J2, "strict $.b" WITH CONDITIONAL ARRAY WRAPPER),
-    JSON_QUERY ($J2, "strict $.c" WITH CONDITIONAL ARRAY WRAPPER)
+    JSON_QUERY ($J2, 'strict $.a' WITH CONDITIONAL ARRAY WRAPPER),
+    JSON_QUERY ($J2, 'strict $.b' WITH CONDITIONAL ARRAY WRAPPER),
+    JSON_QUERY ($J2, 'strict $.c' WITH CONDITIONAL ARRAY WRAPPER)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_on_empty_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_on_empty_/formatted.sql
index 715fe9df0c..587ea964db 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_on_empty_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_on_empty_/formatted.sql
@@ -1,11 +1,11 @@
 /* syntax version 1 */
 /* postgres can not */
 -- Accessing absent object member will cause empty result in lax mode
-$json = CAST("{}" AS Json);
+$json = CAST('{}' AS Json);
 
 SELECT
-    JSON_QUERY ($json, "lax $.key"), -- defaults to NULL ON EMPTY
-    JSON_QUERY ($json, "lax $.key" NULL ON EMPTY),
-    JSON_QUERY ($json, "lax $.key" EMPTY ARRAY ON EMPTY),
-    JSON_QUERY ($json, "lax $.key" EMPTY OBJECT ON EMPTY)
+    JSON_QUERY ($json, 'lax $.key'), -- defaults to NULL ON EMPTY
+    JSON_QUERY ($json, 'lax $.key' NULL ON EMPTY),
+    JSON_QUERY ($json, 'lax $.key' EMPTY ARRAY ON EMPTY),
+    JSON_QUERY ($json, 'lax $.key' EMPTY OBJECT ON EMPTY)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_on_empty_exception_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_on_empty_exception_/formatted.sql
index 339978f5ef..7269b444c7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_on_empty_exception_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_on_empty_exception_/formatted.sql
@@ -1,7 +1,7 @@
 /* custom error:Empty result*/
 -- Accessing absent object member will cause empty result in lax mode
-$json = CAST("{}" AS Json);
+$json = CAST('{}' AS Json);
 
 SELECT
-    JSON_QUERY ($json, "lax $.key" ERROR ON EMPTY)
+    JSON_QUERY ($json, 'lax $.key' ERROR ON EMPTY)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_on_error_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_on_error_/formatted.sql
index ea2979b68f..f886af86d9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_on_error_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_on_error_/formatted.sql
@@ -1,11 +1,11 @@
 /* syntax version 1 */
 /* postgres can not */
 -- Accessing absent object member will cause jsonpath error in strict mode
-$json = CAST("{}" AS Json);
+$json = CAST('{}' AS Json);
 
 SELECT
-    JSON_QUERY ($json, "strict $.key"), -- defaults to NULL ON ERROR
-    JSON_QUERY ($json, "strict $.key" NULL ON ERROR),
-    JSON_QUERY ($json, "strict $.key" EMPTY ARRAY ON ERROR),
-    JSON_QUERY ($json, "strict $.key" EMPTY OBJECT ON ERROR)
+    JSON_QUERY ($json, 'strict $.key'), -- defaults to NULL ON ERROR
+    JSON_QUERY ($json, 'strict $.key' NULL ON ERROR),
+    JSON_QUERY ($json, 'strict $.key' EMPTY ARRAY ON ERROR),
+    JSON_QUERY ($json, 'strict $.key' EMPTY OBJECT ON ERROR)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_on_error_exception_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_on_error_exception_/formatted.sql
index 2e17a1081d..d7c7fba5fe 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_on_error_exception_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_on_error_exception_/formatted.sql
@@ -1,7 +1,7 @@
 /* custom error:Member not found*/
 -- Accessing absent object member will cause jsonpath error in strict mode
-$json = CAST("{}" AS Json);
+$json = CAST('{}' AS Json);
 
 SELECT
-    JSON_QUERY ($json, "strict $.key" ERROR ON ERROR)
+    JSON_QUERY ($json, 'strict $.key' ERROR ON ERROR)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_passing_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_passing_/formatted.sql
index b12a9d9264..f267dbdc98 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_passing_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_passing_/formatted.sql
@@ -11,7 +11,7 @@ SELECT
     -- Numeric types
     JSON_QUERY (
         $json,
-        "strict $var1 + $var2 + $var3 + $var4 + $var5 + $var6 + $var7 + $var8 + $var9 + $var10" PASSING CAST(1 AS Int8) AS var1,
+        'strict $var1 + $var2 + $var3 + $var4 + $var5 + $var6 + $var7 + $var8 + $var9 + $var10' PASSING CAST(1 AS Int8) AS var1,
         CAST(2 AS Uint8) AS var2,
         CAST(3 AS Int16) AS var3,
         CAST(4 AS Uint16) AS var4,
@@ -26,60 +26,60 @@ SELECT
     -- Time types
     JSON_QUERY (
         $json,
-        "strict $var" PASSING CAST(1582044622 AS Datetime) AS var WITH UNCONDITIONAL ARRAY WRAPPER
+        'strict $var' PASSING CAST(1582044622 AS Datetime) AS var WITH UNCONDITIONAL ARRAY WRAPPER
     ),
     JSON_QUERY (
         $json,
-        "strict $var" PASSING CAST(1582044622 AS Timestamp) AS var WITH UNCONDITIONAL ARRAY WRAPPER
+        'strict $var' PASSING CAST(1582044622 AS Timestamp) AS var WITH UNCONDITIONAL ARRAY WRAPPER
     ),
     JSON_QUERY (
         $json,
-        "strict $var" PASSING CAST("2020-02-18" AS Date) AS var WITH UNCONDITIONAL ARRAY WRAPPER
+        'strict $var' PASSING CAST('2020-02-18' AS Date) AS var WITH UNCONDITIONAL ARRAY WRAPPER
     ),
 
     -- Utf8
     JSON_QUERY (
         $json,
-        "strict $var" PASSING CAST("привет" AS Utf8) AS var WITH UNCONDITIONAL ARRAY WRAPPER
+        'strict $var' PASSING CAST('привет' AS Utf8) AS var WITH UNCONDITIONAL ARRAY WRAPPER
     ),
 
     -- Bool
     JSON_QUERY (
         $json,
-        "strict $var" PASSING TRUE AS var WITH UNCONDITIONAL ARRAY WRAPPER
+        'strict $var' PASSING TRUE AS var WITH UNCONDITIONAL ARRAY WRAPPER
     ),
 
     -- Json
     JSON_QUERY (
         $json,
-        "strict $var" PASSING $json AS var
+        'strict $var' PASSING $json AS var
     ),
 
     -- Nulls
     JSON_QUERY (
         $json,
-        "strict $var" PASSING Nothing(Int64?) AS var WITH UNCONDITIONAL ARRAY WRAPPER
+        'strict $var' PASSING Nothing(Int64?) AS var WITH UNCONDITIONAL ARRAY WRAPPER
     ),
     JSON_QUERY (
         $json,
-        "strict $var" PASSING NULL AS var WITH UNCONDITIONAL ARRAY WRAPPER
+        'strict $var' PASSING NULL AS var WITH UNCONDITIONAL ARRAY WRAPPER
     )
 ;
 
 -- Check various ways to pass variable name
 SELECT
     JSON_QUERY (
-        $json, "strict $var1" PASSING 123 AS var1 WITH UNCONDITIONAL ARRAY WRAPPER
+        $json, 'strict $var1' PASSING 123 AS var1 WITH UNCONDITIONAL ARRAY WRAPPER
     ),
 
     -- NOTE: VaR1 is not casted to upper-case VAR1 as standard expects
     JSON_QUERY (
-        $json, "strict $VaR1" PASSING 123 AS VaR1 WITH UNCONDITIONAL ARRAY WRAPPER
+        $json, 'strict $VaR1' PASSING 123 AS VaR1 WITH UNCONDITIONAL ARRAY WRAPPER
     ),
     JSON_QUERY (
-        $json, "strict $var1" PASSING 123 AS "var1" WITH UNCONDITIONAL ARRAY WRAPPER
+        $json, 'strict $var1' PASSING 123 AS 'var1' WITH UNCONDITIONAL ARRAY WRAPPER
     ),
     JSON_QUERY (
-        $json, "strict $VaR1" PASSING 123 AS "VaR1" WITH UNCONDITIONAL ARRAY WRAPPER
+        $json, 'strict $VaR1' PASSING 123 AS 'VaR1' WITH UNCONDITIONAL ARRAY WRAPPER
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_passing_exception_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_passing_exception_/formatted.sql
index 8207b57185..bb45336dee 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_passing_exception_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_passing_exception_/formatted.sql
@@ -10,6 +10,6 @@ $json = CAST(
 -- Tuple type is not supported for variables
 SELECT
     JSON_QUERY (
-        $json, "strict $var" PASSING AsTuple(1, 2) AS var WITH UNCONDITIONAL ARRAY WRAPPER
+        $json, 'strict $var' PASSING AsTuple(1, 2) AS var WITH UNCONDITIONAL ARRAY WRAPPER
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_wrapper_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_wrapper_/formatted.sql
index f209dd4ae1..11b80c4504 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_wrapper_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_wrapper_/formatted.sql
@@ -11,48 +11,48 @@ $json = CAST(
 
 -- Check JSON_QUERY without wrapper
 SELECT
-    JSON_QUERY ($json, "strict $.array"), -- defaults to WITHOUT ARRAY WRAPPER
-    JSON_QUERY ($json, "strict $.array" WITHOUT WRAPPER),
-    JSON_QUERY ($json, "strict $.array" WITHOUT ARRAY WRAPPER),
-    JSON_QUERY ($json, "strict $.object"), -- defaults to WITHOUT ARRAY WRAPPER
-    JSON_QUERY ($json, "strict $.object" WITHOUT WRAPPER),
-    JSON_QUERY ($json, "strict $.object" WITHOUT ARRAY WRAPPER)
+    JSON_QUERY ($json, 'strict $.array'), -- defaults to WITHOUT ARRAY WRAPPER
+    JSON_QUERY ($json, 'strict $.array' WITHOUT WRAPPER),
+    JSON_QUERY ($json, 'strict $.array' WITHOUT ARRAY WRAPPER),
+    JSON_QUERY ($json, 'strict $.object'), -- defaults to WITHOUT ARRAY WRAPPER
+    JSON_QUERY ($json, 'strict $.object' WITHOUT WRAPPER),
+    JSON_QUERY ($json, 'strict $.object' WITHOUT ARRAY WRAPPER)
 ;
 
 -- Check UNCONDITIONAL wrapper
 SELECT
-    JSON_QUERY ($json, "strict $.array" WITH WRAPPER), -- default to WITH UNCONDITIONAL WRAPPER
-    JSON_QUERY ($json, "strict $.array" WITH ARRAY WRAPPER),
-    JSON_QUERY ($json, "strict $.array" WITH UNCONDITIONAL WRAPPER),
-    JSON_QUERY ($json, "strict $.array" WITH UNCONDITIONAL ARRAY WRAPPER),
-    JSON_QUERY ($json, "strict $.object" WITH WRAPPER), -- default to WITH UNCONDITIONAL WRAPPER
-    JSON_QUERY ($json, "strict $.object" WITH ARRAY WRAPPER),
-    JSON_QUERY ($json, "strict $.object" WITH UNCONDITIONAL WRAPPER),
-    JSON_QUERY ($json, "strict $.object" WITH UNCONDITIONAL ARRAY WRAPPER),
-    JSON_QUERY ($json, "strict $.array[*]" WITH WRAPPER), -- default to WITH UNCONDITIONAL WRAPPER
-    JSON_QUERY ($json, "strict $.array[*]" WITH ARRAY WRAPPER),
-    JSON_QUERY ($json, "strict $.array[*]" WITH UNCONDITIONAL WRAPPER),
-    JSON_QUERY ($json, "strict $.array[*]" WITH UNCONDITIONAL ARRAY WRAPPER),
-    JSON_QUERY ($json, "strict $.multi_array[*]" WITH WRAPPER), -- default to WITH UNCONDITIONAL WRAPPER
-    JSON_QUERY ($json, "strict $.multi_array[*]" WITH ARRAY WRAPPER),
-    JSON_QUERY ($json, "strict $.multi_array[*]" WITH UNCONDITIONAL WRAPPER),
-    JSON_QUERY ($json, "strict $.multi_array[*]" WITH UNCONDITIONAL ARRAY WRAPPER),
-    JSON_QUERY ($json, "strict $.multi_object[*]" WITH WRAPPER), -- default to WITH UNCONDITIONAL WRAPPER
-    JSON_QUERY ($json, "strict $.multi_object[*]" WITH ARRAY WRAPPER),
-    JSON_QUERY ($json, "strict $.multi_object[*]" WITH UNCONDITIONAL WRAPPER),
-    JSON_QUERY ($json, "strict $.multi_object[*]" WITH UNCONDITIONAL ARRAY WRAPPER)
+    JSON_QUERY ($json, 'strict $.array' WITH WRAPPER), -- default to WITH UNCONDITIONAL WRAPPER
+    JSON_QUERY ($json, 'strict $.array' WITH ARRAY WRAPPER),
+    JSON_QUERY ($json, 'strict $.array' WITH UNCONDITIONAL WRAPPER),
+    JSON_QUERY ($json, 'strict $.array' WITH UNCONDITIONAL ARRAY WRAPPER),
+    JSON_QUERY ($json, 'strict $.object' WITH WRAPPER), -- default to WITH UNCONDITIONAL WRAPPER
+    JSON_QUERY ($json, 'strict $.object' WITH ARRAY WRAPPER),
+    JSON_QUERY ($json, 'strict $.object' WITH UNCONDITIONAL WRAPPER),
+    JSON_QUERY ($json, 'strict $.object' WITH UNCONDITIONAL ARRAY WRAPPER),
+    JSON_QUERY ($json, 'strict $.array[*]' WITH WRAPPER), -- default to WITH UNCONDITIONAL WRAPPER
+    JSON_QUERY ($json, 'strict $.array[*]' WITH ARRAY WRAPPER),
+    JSON_QUERY ($json, 'strict $.array[*]' WITH UNCONDITIONAL WRAPPER),
+    JSON_QUERY ($json, 'strict $.array[*]' WITH UNCONDITIONAL ARRAY WRAPPER),
+    JSON_QUERY ($json, 'strict $.multi_array[*]' WITH WRAPPER), -- default to WITH UNCONDITIONAL WRAPPER
+    JSON_QUERY ($json, 'strict $.multi_array[*]' WITH ARRAY WRAPPER),
+    JSON_QUERY ($json, 'strict $.multi_array[*]' WITH UNCONDITIONAL WRAPPER),
+    JSON_QUERY ($json, 'strict $.multi_array[*]' WITH UNCONDITIONAL ARRAY WRAPPER),
+    JSON_QUERY ($json, 'strict $.multi_object[*]' WITH WRAPPER), -- default to WITH UNCONDITIONAL WRAPPER
+    JSON_QUERY ($json, 'strict $.multi_object[*]' WITH ARRAY WRAPPER),
+    JSON_QUERY ($json, 'strict $.multi_object[*]' WITH UNCONDITIONAL WRAPPER),
+    JSON_QUERY ($json, 'strict $.multi_object[*]' WITH UNCONDITIONAL ARRAY WRAPPER)
 ;
 
 -- Check CONDITIONAL wrapper
 SELECT
-    JSON_QUERY ($json, "strict $.array" WITH CONDITIONAL WRAPPER),
-    JSON_QUERY ($json, "strict $.array" WITH CONDITIONAL ARRAY WRAPPER),
-    JSON_QUERY ($json, "strict $.object" WITH CONDITIONAL WRAPPER),
-    JSON_QUERY ($json, "strict $.object" WITH CONDITIONAL ARRAY WRAPPER),
-    JSON_QUERY ($json, "strict $.array[*]" WITH CONDITIONAL WRAPPER),
-    JSON_QUERY ($json, "strict $.array[*]" WITH CONDITIONAL ARRAY WRAPPER),
-    JSON_QUERY ($json, "strict $.multi_array[*]" WITH CONDITIONAL WRAPPER),
-    JSON_QUERY ($json, "strict $.multi_array[*]" WITH CONDITIONAL ARRAY WRAPPER),
-    JSON_QUERY ($json, "strict $.multi_object[*]" WITH CONDITIONAL WRAPPER),
-    JSON_QUERY ($json, "strict $.multi_object[*]" WITH CONDITIONAL ARRAY WRAPPER)
+    JSON_QUERY ($json, 'strict $.array' WITH CONDITIONAL WRAPPER),
+    JSON_QUERY ($json, 'strict $.array' WITH CONDITIONAL ARRAY WRAPPER),
+    JSON_QUERY ($json, 'strict $.object' WITH CONDITIONAL WRAPPER),
+    JSON_QUERY ($json, 'strict $.object' WITH CONDITIONAL ARRAY WRAPPER),
+    JSON_QUERY ($json, 'strict $.array[*]' WITH CONDITIONAL WRAPPER),
+    JSON_QUERY ($json, 'strict $.array[*]' WITH CONDITIONAL ARRAY WRAPPER),
+    JSON_QUERY ($json, 'strict $.multi_array[*]' WITH CONDITIONAL WRAPPER),
+    JSON_QUERY ($json, 'strict $.multi_array[*]' WITH CONDITIONAL ARRAY WRAPPER),
+    JSON_QUERY ($json, 'strict $.multi_object[*]' WITH CONDITIONAL WRAPPER),
+    JSON_QUERY ($json, 'strict $.multi_object[*]' WITH CONDITIONAL ARRAY WRAPPER)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_common_syntax_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_common_syntax_/formatted.sql
index fb527875eb..15450bf535 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_common_syntax_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_common_syntax_/formatted.sql
@@ -2,13 +2,13 @@
 /* postgres can not */
 -- Null handling
 SELECT
-    JSON_VALUE (NULL, "strict $.key"),
-    JSON_VALUE (Nothing(Json?), "strict $.key")
+    JSON_VALUE (NULL, 'strict $.key'),
+    JSON_VALUE (Nothing(Json?), 'strict $.key')
 ;
 
 -- Casual select
 $json = CAST(@@{"key": 128}@@ AS Json);
 
 SELECT
-    JSON_VALUE ($json, "strict $.key")
+    JSON_VALUE ($json, 'strict $.key')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_empty_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_empty_/formatted.sql
index 1ea6893ffe..659248e298 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_empty_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_empty_/formatted.sql
@@ -1,23 +1,23 @@
 /* syntax version 1 */
 /* postgres can not */
 -- Accessing absent object member will cause empty result in lax mode
-$json = CAST("{}" AS Json);
+$json = CAST('{}' AS Json);
 
 SELECT
-    JSON_VALUE ($json, "lax $.key"), -- defaults to NULL ON EMPTY
-    JSON_VALUE ($json, "lax $.key" NULL ON EMPTY),
-    JSON_VALUE ($json, "lax $.key" DEFAULT "*** empty ***" ON EMPTY)
+    JSON_VALUE ($json, 'lax $.key'), -- defaults to NULL ON EMPTY
+    JSON_VALUE ($json, 'lax $.key' NULL ON EMPTY),
+    JSON_VALUE ($json, 'lax $.key' DEFAULT '*** empty ***' ON EMPTY)
 ;
 
 -- Null as a default value
 SELECT
-    JSON_VALUE ($json, "lax $.key" RETURNING Uint16 DEFAULT NULL ON EMPTY)
+    JSON_VALUE ($json, 'lax $.key' RETURNING Uint16 DEFAULT NULL ON EMPTY)
 ;
 
 -- Check that default value is casted to the target type
 SELECT
-    JSON_VALUE ($json, "lax $.key" RETURNING Int16 DEFAULT "123" ON EMPTY),
-    JSON_VALUE ($json, "lax $.key" RETURNING Int16 DEFAULT 123.456 ON EMPTY)
+    JSON_VALUE ($json, 'lax $.key' RETURNING Int16 DEFAULT '123' ON EMPTY),
+    JSON_VALUE ($json, 'lax $.key' RETURNING Int16 DEFAULT 123.456 ON EMPTY)
 ;
 
 -- Here JsonPath engine returns empty result and ON EMPTY section must be used.
@@ -26,6 +26,6 @@ SELECT
 SELECT
     JSON_VALUE (
         $json,
-        "lax $.key" RETURNING Uint16 DEFAULT -123 ON EMPTY DEFAULT 456 ON ERROR
+        'lax $.key' RETURNING Uint16 DEFAULT -123 ON EMPTY DEFAULT 456 ON ERROR
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_empty_cast_default_exception_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_empty_cast_default_exception_/formatted.sql
index 39232f888e..74bb4cb572 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_empty_cast_default_exception_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_empty_cast_default_exception_/formatted.sql
@@ -1,6 +1,6 @@
 /* custom error:Failed to cast default value from ON EMPTY clause to target type Optional<Uint32>*/
-$json = CAST("{}" AS Json);
+$json = CAST('{}' AS Json);
 
 SELECT
-    JSON_VALUE ($json, "lax $.key" RETURNING Uint32 DEFAULT -2 ON EMPTY ERROR ON ERROR)
+    JSON_VALUE ($json, 'lax $.key' RETURNING Uint32 DEFAULT -2 ON EMPTY ERROR ON ERROR)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_empty_exception_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_empty_exception_/formatted.sql
index 06a3917bff..e13bb7e803 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_empty_exception_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_empty_exception_/formatted.sql
@@ -1,6 +1,6 @@
 /* custom error:Result is empty*/
-$json = CAST("{}" AS Json);
+$json = CAST('{}' AS Json);
 
 SELECT
-    JSON_VALUE ($json, "lax $.key" ERROR ON EMPTY)
+    JSON_VALUE ($json, 'lax $.key' ERROR ON EMPTY)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_error_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_error_/formatted.sql
index c0880717e4..9b1b361fb7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_error_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_error_/formatted.sql
@@ -1,23 +1,23 @@
 /* syntax version 1 */
 /* postgres can not */
 -- Accessing absent object member will cause jsonpath error in strict mode
-$json = CAST("{}" AS Json);
+$json = CAST('{}' AS Json);
 
 SELECT
-    JSON_VALUE ($json, "strict $.key"), -- defaults to NULL ON ERROR
-    JSON_VALUE ($json, "strict $.key" NULL ON ERROR),
-    JSON_VALUE ($json, "strict $.key" DEFAULT "*** error ***" ON ERROR)
+    JSON_VALUE ($json, 'strict $.key'), -- defaults to NULL ON ERROR
+    JSON_VALUE ($json, 'strict $.key' NULL ON ERROR),
+    JSON_VALUE ($json, 'strict $.key' DEFAULT '*** error ***' ON ERROR)
 ;
 
 -- Null as a default value
 SELECT
-    JSON_VALUE ($json, "strict $.key" RETURNING Uint16 DEFAULT NULL ON ERROR)
+    JSON_VALUE ($json, 'strict $.key' RETURNING Uint16 DEFAULT NULL ON ERROR)
 ;
 
 -- Check that default value is casted to the target type
 SELECT
-    JSON_VALUE ($json, "strict $.key" RETURNING Int16 DEFAULT "123" ON ERROR),
-    JSON_VALUE ($json, "strict $.key" RETURNING Int16 DEFAULT 123.456 ON ERROR)
+    JSON_VALUE ($json, 'strict $.key' RETURNING Int16 DEFAULT '123' ON ERROR),
+    JSON_VALUE ($json, 'strict $.key' RETURNING Int16 DEFAULT 123.456 ON ERROR)
 ;
 
 -- Here values retrieved from JSON cannot be casted to the target type Int16.
@@ -30,6 +30,6 @@ $invalid_types_json = CAST(
 );
 
 SELECT
-    JSON_VALUE ($invalid_types_json, "strict $.key" RETURNING Int16 DEFAULT 456 ON ERROR),
-    JSON_VALUE ($invalid_types_json, "strict $.another_key" RETURNING Uint16 DEFAULT 456 ON ERROR)
+    JSON_VALUE ($invalid_types_json, 'strict $.key' RETURNING Int16 DEFAULT 456 ON ERROR),
+    JSON_VALUE ($invalid_types_json, 'strict $.another_key' RETURNING Uint16 DEFAULT 456 ON ERROR)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_error_cast_default_exception_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_error_cast_default_exception_/formatted.sql
index 7ca82e15a1..70d3ecb14c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_error_cast_default_exception_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_error_cast_default_exception_/formatted.sql
@@ -2,8 +2,8 @@
 -- Here JsonPath engine returns error result and ON ERROR section must be used.
 -- But default value in ON ERROR section is -123 and casting it to Uint16 will fail.
 -- In this case exception must be raised.
-$json = CAST("{}" AS Json);
+$json = CAST('{}' AS Json);
 
 SELECT
-    JSON_VALUE ($json, "strict $.key" RETURNING Uint16 DEFAULT -123 ON ERROR)
+    JSON_VALUE ($json, 'strict $.key' RETURNING Uint16 DEFAULT -123 ON ERROR)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_error_cast_udf_exception_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_error_cast_udf_exception_/formatted.sql
index 603455022d..01125c0c18 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_error_cast_udf_exception_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_error_cast_udf_exception_/formatted.sql
@@ -8,5 +8,5 @@ $json = CAST(
 );
 
 SELECT
-    JSON_VALUE ($json, "strict $.key" RETURNING Uint16 ERROR ON ERROR)
+    JSON_VALUE ($json, 'strict $.key' RETURNING Uint16 ERROR ON ERROR)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_error_cast_value_exception_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_error_cast_value_exception_/formatted.sql
index b76d0b72f2..5791c4c843 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_error_cast_value_exception_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_error_cast_value_exception_/formatted.sql
@@ -8,5 +8,5 @@ $json = CAST(
 );
 
 SELECT
-    JSON_VALUE ($json, "strict $.key" RETURNING Uint16 ERROR ON ERROR)
+    JSON_VALUE ($json, 'strict $.key' RETURNING Uint16 ERROR ON ERROR)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_error_jsonpath_exception_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_error_jsonpath_exception_/formatted.sql
index 749859cc8e..be8039d8a1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_error_jsonpath_exception_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_error_jsonpath_exception_/formatted.sql
@@ -1,6 +1,6 @@
 /* custom error:Member not found*/
-$json = CAST("{}" AS Json);
+$json = CAST('{}' AS Json);
 
 SELECT
-    JSON_VALUE ($json, "strict $.key" ERROR ON ERROR)
+    JSON_VALUE ($json, 'strict $.key' ERROR ON ERROR)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_passing_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_passing_/formatted.sql
index 87612417f8..59454d9157 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_passing_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_passing_/formatted.sql
@@ -11,7 +11,7 @@ SELECT
     -- Numeric types
     JSON_VALUE (
         $json,
-        "strict $var1 + $var2 + $var3 + $var4 + $var5 + $var6 + $var7 + $var8 + $var9 + $var10" PASSING CAST(1 AS Int8) AS var1,
+        'strict $var1 + $var2 + $var3 + $var4 + $var5 + $var6 + $var7 + $var8 + $var9 + $var10' PASSING CAST(1 AS Int8) AS var1,
         CAST(2 AS Uint8) AS var2,
         CAST(3 AS Int16) AS var3,
         CAST(4 AS Uint16) AS var4,
@@ -26,60 +26,60 @@ SELECT
     -- Time types
     JSON_VALUE (
         $json,
-        "strict $var" PASSING CAST(1582044622 AS Datetime) AS var
+        'strict $var' PASSING CAST(1582044622 AS Datetime) AS var
     ),
     JSON_VALUE (
         $json,
-        "strict $var" PASSING CAST(1582044622 AS Timestamp) AS var
+        'strict $var' PASSING CAST(1582044622 AS Timestamp) AS var
     ),
     JSON_VALUE (
         $json,
-        "strict $var" PASSING CAST("2020-02-18" AS Date) AS var
+        'strict $var' PASSING CAST('2020-02-18' AS Date) AS var
     ),
 
     -- Utf8
     JSON_VALUE (
         $json,
-        "strict $var" PASSING CAST("привет" AS Utf8) AS var
+        'strict $var' PASSING CAST('привет' AS Utf8) AS var
     ),
 
     -- Bool
     JSON_VALUE (
         $json,
-        "strict $var" PASSING TRUE AS var
+        'strict $var' PASSING TRUE AS var
     ),
 
     -- Json
     JSON_VALUE (
         $json,
-        "strict $var.key" PASSING $json AS var
+        'strict $var.key' PASSING $json AS var
     ),
 
     -- Nulls
     JSON_VALUE (
         $json,
-        "strict $var" PASSING Nothing(Int64?) AS var
+        'strict $var' PASSING Nothing(Int64?) AS var
     ),
     JSON_VALUE (
         $json,
-        "strict $var" PASSING NULL AS var
+        'strict $var' PASSING NULL AS var
     )
 ;
 
 -- Check various ways to pass variable name
 SELECT
     JSON_VALUE (
-        $json, "strict $var1" PASSING 123 AS var1
+        $json, 'strict $var1' PASSING 123 AS var1
     ),
 
     -- NOTE: VaR1 is not casted to upper-case VAR1 as standard expects
     JSON_VALUE (
-        $json, "strict $VaR1" PASSING 123 AS VaR1
+        $json, 'strict $VaR1' PASSING 123 AS VaR1
     ),
     JSON_VALUE (
-        $json, "strict $var1" PASSING 123 AS "var1"
+        $json, 'strict $var1' PASSING 123 AS 'var1'
     ),
     JSON_VALUE (
-        $json, "strict $VaR1" PASSING 123 AS "VaR1"
+        $json, 'strict $VaR1' PASSING 123 AS 'VaR1'
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_passing_exception_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_passing_exception_/formatted.sql
index bba1a81823..d8eedd4038 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_passing_exception_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_passing_exception_/formatted.sql
@@ -10,6 +10,6 @@ $json = CAST(
 -- Tuple type is not supported for variables
 SELECT
     JSON_VALUE (
-        $json, "strict $var" PASSING AsTuple(1, 2) AS var
+        $json, 'strict $var' PASSING AsTuple(1, 2) AS var
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_returning_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_returning_/formatted.sql
index 105d50eb3a..8278116660 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_returning_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_returning_/formatted.sql
@@ -8,8 +8,8 @@ $bool_json = CAST(
 );
 
 SELECT
-    JSON_VALUE ($bool_json, "strict $.key"), -- defaults to RETURNING Utf8 with cast to string value
-    JSON_VALUE ($bool_json, "strict $.key" RETURNING Bool)
+    JSON_VALUE ($bool_json, 'strict $.key'), -- defaults to RETURNING Utf8 with cast to string value
+    JSON_VALUE ($bool_json, 'strict $.key' RETURNING Bool)
 ;
 
 $string_json = CAST(
@@ -19,8 +19,8 @@ $string_json = CAST(
 );
 
 SELECT
-    JSON_VALUE ($string_json, "strict $.key"), -- defaults to RETURNING Utf8 with cast to string value
-    JSON_VALUE ($string_json, "strict $.key" RETURNING Utf8)
+    JSON_VALUE ($string_json, 'strict $.key'), -- defaults to RETURNING Utf8 with cast to string value
+    JSON_VALUE ($string_json, 'strict $.key' RETURNING Utf8)
 ;
 
 $int64_json = CAST(
@@ -30,8 +30,8 @@ $int64_json = CAST(
 );
 
 SELECT
-    JSON_VALUE ($int64_json, "strict $.key"), -- defaults to RETURNING Utf8 with cast to string value
-    JSON_VALUE ($int64_json, "strict $.key" RETURNING Int64)
+    JSON_VALUE ($int64_json, 'strict $.key'), -- defaults to RETURNING Utf8 with cast to string value
+    JSON_VALUE ($int64_json, 'strict $.key' RETURNING Int64)
 ;
 
 $double_json = CAST(
@@ -41,35 +41,35 @@ $double_json = CAST(
 );
 
 SELECT
-    JSON_VALUE ($double_json, "strict $.key"), -- defaults to RETURNING Utf8 with cast to string value
-    JSON_VALUE ($double_json, "strict $.key" RETURNING Double)
+    JSON_VALUE ($double_json, 'strict $.key'), -- defaults to RETURNING Utf8 with cast to string value
+    JSON_VALUE ($double_json, 'strict $.key' RETURNING Double)
 ;
 
 -- Casting of result value to different types
 -- From integer to various numeric types
 SELECT
-    JSON_VALUE ($int64_json, "strict $.key" RETURNING Int8),
-    JSON_VALUE ($int64_json, "strict $.key" RETURNING Uint8),
-    JSON_VALUE ($int64_json, "strict $.key" RETURNING Int16),
-    JSON_VALUE ($int64_json, "strict $.key" RETURNING Uint16),
-    JSON_VALUE ($int64_json, "strict $.key" RETURNING Int32),
-    JSON_VALUE ($int64_json, "strict $.key" RETURNING Uint32),
-    JSON_VALUE ($int64_json, "strict $.key" RETURNING Int64),
-    JSON_VALUE ($int64_json, "strict $.key" RETURNING Uint64),
-    JSON_VALUE ($int64_json, "strict $.key" RETURNING Double),
-    JSON_VALUE ($int64_json, "strict $.key" RETURNING Float)
+    JSON_VALUE ($int64_json, 'strict $.key' RETURNING Int8),
+    JSON_VALUE ($int64_json, 'strict $.key' RETURNING Uint8),
+    JSON_VALUE ($int64_json, 'strict $.key' RETURNING Int16),
+    JSON_VALUE ($int64_json, 'strict $.key' RETURNING Uint16),
+    JSON_VALUE ($int64_json, 'strict $.key' RETURNING Int32),
+    JSON_VALUE ($int64_json, 'strict $.key' RETURNING Uint32),
+    JSON_VALUE ($int64_json, 'strict $.key' RETURNING Int64),
+    JSON_VALUE ($int64_json, 'strict $.key' RETURNING Uint64),
+    JSON_VALUE ($int64_json, 'strict $.key' RETURNING Double),
+    JSON_VALUE ($int64_json, 'strict $.key' RETURNING Float)
 ;
 
 -- From double to Double and Float
 SELECT
-    JSON_VALUE ($double_json, "strict $.key" RETURNING Double),
-    JSON_VALUE ($double_json, "strict $.key" RETURNING Float)
+    JSON_VALUE ($double_json, 'strict $.key' RETURNING Double),
+    JSON_VALUE ($double_json, 'strict $.key' RETURNING Float)
 ;
 
 -- From string to Utf8 and String
 SELECT
-    JSON_VALUE ($string_json, "strict $.key" RETURNING Utf8),
-    JSON_VALUE ($string_json, "strict $.key" RETURNING String)
+    JSON_VALUE ($string_json, 'strict $.key' RETURNING Utf8),
+    JSON_VALUE ($string_json, 'strict $.key' RETURNING String)
 ;
 
 -- From timestamp to Datetime, Timestamp and Date
@@ -82,9 +82,9 @@ $date_json = CAST(
 );
 
 SELECT
-    JSON_VALUE ($date_json, "strict $.date" RETURNING Date),
-    JSON_VALUE ($date_json, "strict $.datetime" RETURNING Datetime),
-    JSON_VALUE ($date_json, "strict $.timestamp" RETURNING Timestamp)
+    JSON_VALUE ($date_json, 'strict $.date' RETURNING Date),
+    JSON_VALUE ($date_json, 'strict $.datetime' RETURNING Datetime),
+    JSON_VALUE ($date_json, 'strict $.timestamp' RETURNING Timestamp)
 ;
 
 -- Null result form jsonpath
@@ -95,11 +95,11 @@ $_null_json = CAST(
 );
 
 SELECT
-    JSON_VALUE ($date_json, "strict $.key" RETURNING Int16)
+    JSON_VALUE ($date_json, 'strict $.key' RETURNING Int16)
 ;
 
 -- Error case
 -- Must return NULL because NULL ON ERROR is default
 SELECT
-    JSON_VALUE ($int64_json, "strict $.key" RETURNING String)
+    JSON_VALUE ($int64_json, 'strict $.key' RETURNING String)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-jsondocument_json_exists_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-jsondocument_json_exists_/formatted.sql
index 1eea54c83f..d918448025 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-jsondocument_json_exists_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-jsondocument_json_exists_/formatted.sql
@@ -3,8 +3,8 @@
 $json = JsonDocument(@@{"a": {"b": 1}, "c": 2}@@);
 
 SELECT
-    JSON_EXISTS ($json, "$.a"),
-    JSON_EXISTS ($json, "$.b"),
-    JSON_EXISTS ($json, "$.c"),
-    JSON_EXISTS (CAST(NULL AS JsonDocument), "$.a")
+    JSON_EXISTS ($json, '$.a'),
+    JSON_EXISTS ($json, '$.b'),
+    JSON_EXISTS ($json, '$.c'),
+    JSON_EXISTS (CAST(NULL AS JsonDocument), '$.a')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-jsondocument_json_query_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-jsondocument_json_query_/formatted.sql
index 0ab40eac12..279564f525 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-jsondocument_json_query_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-jsondocument_json_query_/formatted.sql
@@ -3,8 +3,8 @@
 $json = JsonDocument(@@{"a": {"b": 1}, "c": 2}@@);
 
 SELECT
-    JSON_QUERY ($json, "$.a"),
-    JSON_QUERY ($json, "$.b"),
-    JSON_QUERY ($json, "$.c"),
-    JSON_QUERY (CAST(NULL AS JsonDocument), "$.a")
+    JSON_QUERY ($json, '$.a'),
+    JSON_QUERY ($json, '$.b'),
+    JSON_QUERY ($json, '$.c'),
+    JSON_QUERY (CAST(NULL AS JsonDocument), '$.a')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-jsondocument_json_value_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-jsondocument_json_value_/formatted.sql
index ebec12767c..b40640488e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-jsondocument_json_value_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-jsondocument_json_value_/formatted.sql
@@ -3,8 +3,8 @@
 $json = JsonDocument(@@{"a": {"b": 1}, "c": 2}@@);
 
 SELECT
-    JSON_VALUE ($json, "$.c"),
-    JSON_VALUE ($json, "$.b"),
-    JSON_VALUE ($json, "$.a"),
-    JSON_VALUE (CAST(NULL AS JsonDocument), "$.a")
+    JSON_VALUE ($json, '$.c'),
+    JSON_VALUE ($json, '$.b'),
+    JSON_VALUE ($json, '$.a'),
+    JSON_VALUE (CAST(NULL AS JsonDocument), '$.a')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-between_with_key_filter_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-between_with_key_filter_/formatted.sql
index e8cf75e589..9af3d4ceaa 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-between_with_key_filter_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-between_with_key_filter_/formatted.sql
@@ -9,7 +9,7 @@ FROM (
         plato.Input
 ) AS x
 WHERE
-    key == "test" AND subkey BETWEEN 1 AND 3
+    key == 'test' AND subkey BETWEEN 1 AND 3
 ORDER BY
     key,
     subkey
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-calc_dependent_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-calc_dependent_/formatted.sql
index 8b3d842724..8a0260e56e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-calc_dependent_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-calc_dependent_/formatted.sql
@@ -1,8 +1,8 @@
 /* postgres can not */
 USE plato;
 
-$k1 = "3" || "23";
-$k2 = "0" || SUBSTRING($k1, 1);
+$k1 = '3' || '23';
+$k2 = '0' || SUBSTRING($k1, 1);
 
 SELECT
     key
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-complex_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-complex_/formatted.sql
index 6ca84bd478..740f409b34 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-complex_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-complex_/formatted.sql
@@ -3,7 +3,7 @@ SELECT
 FROM
     plato.Input
 WHERE
-    key IN ("023", "075", "150") AND (subkey == "1" OR subkey == "3") AND value >= "aaa" AND value <= "zzz"
+    key IN ('023', '075', '150') AND (subkey == '1' OR subkey == '3') AND value >= 'aaa' AND value <= 'zzz'
 ORDER BY
     key,
     subkey
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-contains_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-contains_/formatted.sql
index ca49f8a6c0..f039aea811 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-contains_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-contains_/formatted.sql
@@ -3,7 +3,7 @@ SELECT
 FROM
     plato.Input
 WHERE
-    key IN ("075", "023", "037")
+    key IN ('075', '023', '037')
 ORDER BY
     key
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-contains_optional_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-contains_optional_/formatted.sql
index 297386d55d..0b54f6e078 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-contains_optional_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-contains_optional_/formatted.sql
@@ -3,7 +3,7 @@ SELECT
 FROM
     plato.Input
 WHERE
-    key IN ("075", "023")
+    key IN ('075', '023')
 ORDER BY
     key
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-contains_tuples_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-contains_tuples_/formatted.sql
index a9739243f9..06f949efae 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-contains_tuples_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-contains_tuples_/formatted.sql
@@ -5,8 +5,8 @@ FROM
     plato.Input
 WHERE
     AsTuple(key) IN (
-        AsTuple("075"),
-        AsTuple("037")
+        AsTuple('075'),
+        AsTuple('037')
     )
 ORDER BY
     key
@@ -18,8 +18,8 @@ FROM
     plato.Input
 WHERE
     AsTuple(key, subkey) IN (
-        AsTuple("075", "1"),
-        AsTuple("023", "3")
+        AsTuple('075', '1'),
+        AsTuple('023', '3')
     )
 ORDER BY
     key
@@ -31,8 +31,8 @@ FROM
     plato.Input
 WHERE
     AsTuple(key, subkey, 1 + 2, value) IN (
-        AsTuple("075", "1", 3u, "abc"),
-        AsTuple("023", "3", 1 + 1 + 1, "aaa")
+        AsTuple('075', '1', 3u, 'abc'),
+        AsTuple('023', '3', 1 + 1 + 1, 'aaa')
     )
 ORDER BY
     key
@@ -44,8 +44,8 @@ FROM
     plato.Input
 WHERE
     AsTuple(subkey, AsTuple(key, 1), value, key) IN (
-        AsTuple("1", AsTuple("075", 1), "abc", "075"),
-        AsTuple("3", AsTuple("023", 1), "aaa", "023")
+        AsTuple('1', AsTuple('075', 1), 'abc', '075'),
+        AsTuple('3', AsTuple('023', 1), 'aaa', '023')
     )
 ORDER BY
     key
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-contains_tuples_no_keyfilter_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-contains_tuples_no_keyfilter_/formatted.sql
index a0e7d8b30b..4e7aa4e66a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-contains_tuples_no_keyfilter_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-contains_tuples_no_keyfilter_/formatted.sql
@@ -6,7 +6,7 @@ FROM
     plato.Input
 WHERE
     AsTuple(key) IN (
-        AsTuple("075"),
+        AsTuple('075'),
         AsTuple(key)
     )
 ORDER BY
@@ -21,8 +21,8 @@ FROM
     plato.Input
 WHERE
     AsTuple(subkey, value) IN (
-        AsTuple("1", "aaa"),
-        AsTuple("3", "aaa")
+        AsTuple('1', 'aaa'),
+        AsTuple('3', 'aaa')
     )
 ORDER BY
     key,
@@ -35,9 +35,9 @@ SELECT
 FROM
     plato.Input
 WHERE
-    AsTuple(subkey, AsTuple(key, 1), value, key || "x") IN (
-        AsTuple("1", AsTuple("075", 1), "abc", "075x"),
-        AsTuple("3", AsTuple("023", 1), "aaa", "023x")
+    AsTuple(subkey, AsTuple(key, 1), value, key || 'x') IN (
+        AsTuple('1', AsTuple('075', 1), 'abc', '075x'),
+        AsTuple('3', AsTuple('023', 1), 'aaa', '023x')
     )
 ORDER BY
     key,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-decimal_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-decimal_/formatted.sql
index a9287b671b..1c8ffe23b4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-decimal_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-decimal_/formatted.sql
@@ -29,49 +29,49 @@ FROM (
     FROM
         @decimal
     WHERE
-        value < Decimal("4.1", 15, 10) AND value > Decimal("10.5", 15, 10) -- empty
+        value < Decimal('4.1', 15, 10) AND value > Decimal('10.5', 15, 10) -- empty
     UNION ALL
     SELECT
         *
     FROM
         @decimal
     WHERE
-        value > Decimal("inf", 15, 10) -- empty
+        value > Decimal('inf', 15, 10) -- empty
     UNION ALL
     SELECT
         *
     FROM
         @decimal
     WHERE
-        value < Decimal("-inf", 15, 10) -- empty
+        value < Decimal('-inf', 15, 10) -- empty
     UNION ALL
     SELECT
         *
     FROM
         @decimal
     WHERE
-        value == Decimal("nan", 15, 10) -- empty
+        value == Decimal('nan', 15, 10) -- empty
     UNION ALL
     SELECT
         *
     FROM
         @decimal
     WHERE
-        value == Decimal("inf", 15, 10)
+        value == Decimal('inf', 15, 10)
     UNION ALL
     SELECT
         *
     FROM
         @decimal
     WHERE
-        value == Decimal("-inf", 15, 10)
+        value == Decimal('-inf', 15, 10)
     UNION ALL
     SELECT
         *
     FROM
         @decimal
     WHERE
-        value > Decimal("3.3", 15, 10) OR value >= Decimal("3.30001", 15, 10)
+        value > Decimal('3.3', 15, 10) OR value >= Decimal('3.30001', 15, 10)
 )
 ORDER BY
     value
@@ -83,7 +83,7 @@ SELECT
 FROM
     @decimal
 WHERE
-    value == CAST("6.6" AS Decimal (15, 10))
+    value == CAST('6.6' AS Decimal (15, 10))
 ;
 
 -- Safe key filter calc
@@ -92,7 +92,7 @@ SELECT
 FROM
     @decimal
 WHERE
-    value == CAST($asIs("3.3") AS Decimal (15, 10))
+    value == CAST($asIs('3.3') AS Decimal (15, 10))
 ;
 
 -- Unsafe key filter calc
@@ -101,6 +101,6 @@ SELECT
 FROM
     @decimal
 WHERE
-    value == CAST($asIs("bad") AS Decimal (15, 10))
+    value == CAST($asIs('bad') AS Decimal (15, 10))
 ;
 -- Unsafe key filter calc
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-dict_contains_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-dict_contains_/formatted.sql
index fe028ea719..ef59f715eb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-dict_contains_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-dict_contains_/formatted.sql
@@ -4,7 +4,7 @@ SELECT
 FROM
     plato.Input
 WHERE
-    key IN YQL::DictFromKeys(ParseType("String"), AsTuple("075", "023", "037"))
+    key IN YQL::DictFromKeys(ParseType('String'), AsTuple('075', '023', '037'))
 ORDER BY
     key
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-dict_contains_optional_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-dict_contains_optional_/formatted.sql
index a4f907533e..91ebcfa095 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-dict_contains_optional_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-dict_contains_optional_/formatted.sql
@@ -4,7 +4,7 @@ SELECT
 FROM
     plato.Input
 WHERE
-    key IN YQL::DictFromKeys(ParseType("String"), AsTuple("075", "023"))
+    key IN YQL::DictFromKeys(ParseType('String'), AsTuple('075', '023'))
 ORDER BY
     key
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-empty_range_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-empty_range_/formatted.sql
index 7017fbd5a2..970e65cac0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-empty_range_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-empty_range_/formatted.sql
@@ -85,7 +85,7 @@ SELECT
 FROM
     InputString
 WHERE
-    value < "a" AND value > "c"
+    value < 'a' AND value > 'c'
 ;
 
 SELECT
@@ -93,5 +93,5 @@ SELECT
 FROM
     InputOptString
 WHERE
-    value < "a" AND value > "c"
+    value < 'a' AND value > 'c'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-empty_range_over_dynamic_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-empty_range_over_dynamic_/formatted.sql
index 5470d6f471..18b4eefeb3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-empty_range_over_dynamic_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-empty_range_over_dynamic_/formatted.sql
@@ -3,5 +3,5 @@ SELECT
 FROM
     plato.Input
 WHERE
-    key < "030" AND key > "200"
+    key < '030' AND key > '200'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-extend_over_map_with_same_schema_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-extend_over_map_with_same_schema_/formatted.sql
index b80d7a839e..1d5d8bb9c8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-extend_over_map_with_same_schema_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-extend_over_map_with_same_schema_/formatted.sql
@@ -2,40 +2,40 @@ SELECT
     *
 FROM (
     SELECT
-        "x023" AS key,
+        'x023' AS key,
         subkey,
         value
     FROM
         plato.Input
     WHERE
-        key == "023"
+        key == '023'
     UNION ALL
     SELECT
-        "x037" AS key,
+        'x037' AS key,
         subkey,
         value
     FROM
         plato.Input
     WHERE
-        key == "037"
+        key == '037'
     UNION ALL
     SELECT
-        "x075" AS key,
+        'x075' AS key,
         subkey,
         value
     FROM
         plato.Input
     WHERE
-        key == "075"
+        key == '075'
     UNION ALL
     SELECT
-        "x150" AS key,
+        'x150' AS key,
         subkey,
         value
     FROM
         plato.Input
     WHERE
-        key == "150"
+        key == '150'
 ) AS x
 ORDER BY
     key,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-is_null_or_data_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-is_null_or_data_/formatted.sql
index 852dfa51d6..d5fa45f36e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-is_null_or_data_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-is_null_or_data_/formatted.sql
@@ -3,5 +3,5 @@ SELECT
 FROM
     plato.Input
 WHERE
-    key IS NULL OR key == "023"
+    key IS NULL OR key == '023'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-is_null_with_condition_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-is_null_with_condition_/formatted.sql
index c21d8f0f59..ee1f1e6dae 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-is_null_with_condition_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-is_null_with_condition_/formatted.sql
@@ -3,5 +3,5 @@ SELECT
 FROM
     plato.Input
 WHERE
-    key IS NULL AND subkey >= "0" AND subkey <= "9"
+    key IS NULL AND subkey >= '0' AND subkey <= '9'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-key_double_opt_suffix_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-key_double_opt_suffix_/formatted.sql
index 32810fb79b..e62740142a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-key_double_opt_suffix_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-key_double_opt_suffix_/formatted.sql
@@ -3,7 +3,7 @@ USE plato;
 INSERT INTO Output
 SELECT
     1 AS key,
-    Just(Just("x")) AS subkey,
+    Just(Just('x')) AS subkey,
 UNION ALL
 SELECT
     2 AS key,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-lambda_with_null_filter_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-lambda_with_null_filter_/formatted.sql
index ec0d0a359b..c694c07c91 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-lambda_with_null_filter_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-lambda_with_null_filter_/formatted.sql
@@ -10,10 +10,10 @@ INNER JOIN (
     FROM
         plato.Input
     WHERE
-        key == "075"
+        key == '075'
 ) AS b
 ON
     a.subkey == b.subkey
 WHERE
-    b.value != ""
+    b.value != ''
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-mixed_opt_bounds_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-mixed_opt_bounds_/formatted.sql
index 9df2bbe6c6..316a0e339e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-mixed_opt_bounds_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-mixed_opt_bounds_/formatted.sql
@@ -16,7 +16,7 @@ SELECT
 FROM
     plato.Input
 WHERE
-    key >= $makeOpt("030", TRUE) AND key <= "100"
+    key >= $makeOpt('030', TRUE) AND key <= '100'
 ;
 
 SELECT
@@ -24,5 +24,5 @@ SELECT
 FROM
     plato.Input
 WHERE
-    key >= $makeOpt("030", FALSE) AND key <= "100"
+    key >= $makeOpt('030', FALSE) AND key <= '100'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-mixed_sort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-mixed_sort_/formatted.sql
index d91ba49c59..4233d2c2a6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-mixed_sort_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-mixed_sort_/formatted.sql
@@ -6,7 +6,7 @@ SELECT
 FROM
     concat(Input, Input1, Input2, Input3)
 WHERE
-    key == "150" AND subkey == "1" AND value >= "aaa"
+    key == '150' AND subkey == '1' AND value >= 'aaa'
 ;
 
 SELECT
@@ -14,5 +14,5 @@ SELECT
 FROM
     concat(Input, Input1, Input2, Input3)
 WHERE
-    subkey == "1" AND value >= "aaa"
+    subkey == '1' AND value >= 'aaa'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-multiusage_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-multiusage_/formatted.sql
index 8af64f9101..d5c144dd68 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-multiusage_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-multiusage_/formatted.sql
@@ -10,7 +10,7 @@ $l = (
         CONCAT(Input1, Input2) AS t
     WHERE
         key == '023'
-        AND subkey == "3"
+        AND subkey == '3'
 );
 
 $r = (
@@ -21,7 +21,7 @@ $r = (
         CONCAT(Input1, Input2) AS t
     WHERE
         key == '150'
-        AND subkey == "3"
+        AND subkey == '3'
 );
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-nile_pred_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-nile_pred_/formatted.sql
index 11666b381e..a193a6657a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-nile_pred_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-nile_pred_/formatted.sql
@@ -3,7 +3,7 @@ SELECT
 FROM
     plato.Input
 WHERE
-    (key > "023") IS NOT NULL AND Unwrap(key > "023")
+    (key > '023') IS NOT NULL AND Unwrap(key > '023')
 ORDER BY
     key,
     subkey
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-no_bypass_merge_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-no_bypass_merge_/formatted.sql
index 859e1b8df3..0f89333c7c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-no_bypass_merge_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-no_bypass_merge_/formatted.sql
@@ -9,7 +9,7 @@ $src =
     FROM
         Input
     WHERE
-        key == "1" || "5" || "0"
+        key == '1' || '5' || '0'
 ;
 
 SELECT
@@ -25,5 +25,5 @@ SELECT
 FROM
     $src
 WHERE
-    key >= "000" AND key < "999" AND len(value) > 0
+    key >= '000' AND key < '999' AND len(value) > 0
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-part_key_over_dynamic_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-part_key_over_dynamic_/formatted.sql
index ebf5c271fd..9a2dcdc1d9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-part_key_over_dynamic_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-part_key_over_dynamic_/formatted.sql
@@ -9,5 +9,5 @@ FROM (
         Input
 ) AS a
 WHERE
-    key >= "030" AND key <= "200"
+    key >= '030' AND key <= '200'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-pushdown_keyextract_passthrough_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-pushdown_keyextract_passthrough_/formatted.sql
index 57d4fe476a..7847b261ae 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-pushdown_keyextract_passthrough_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-pushdown_keyextract_passthrough_/formatted.sql
@@ -5,7 +5,7 @@ USE plato;
 $src =
     SELECT
         key,
-        "ZZZ" || key AS subkey,
+        'ZZZ' || key AS subkey,
         value,
     FROM
         Input AS u
@@ -18,7 +18,7 @@ SELECT
 FROM
     $src
 WHERE
-    key < "075" OR key > "075"
+    key < '075' OR key > '075'
 ORDER BY
     key,
     subkey,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-pushdown_keyextract_type_adjust_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-pushdown_keyextract_type_adjust_/formatted.sql
index e36814bace..19c37bd418 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-pushdown_keyextract_type_adjust_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-pushdown_keyextract_type_adjust_/formatted.sql
@@ -5,7 +5,7 @@ USE plato;
 $src =
     SELECT
         Just(key) AS key,
-        "ZZZ" || subkey AS subkey,
+        'ZZZ' || subkey AS subkey,
         value
     FROM
         Input AS u
@@ -20,7 +20,7 @@ SELECT
 FROM
     $src
 WHERE
-    key > "023" AND key < "150"
+    key > '023' AND key < '150'
 ORDER BY
     key
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-range_union_lower_excluded_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-range_union_lower_excluded_/formatted.sql
index a3f5dd3048..edc359ec99 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-range_union_lower_excluded_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-range_union_lower_excluded_/formatted.sql
@@ -3,7 +3,7 @@ SELECT
 FROM
     plato.Input
 WHERE
-    key > "075" OR (key == "075" AND subkey == "1" AND value == "abc")
+    key > '075' OR (key == '075' AND subkey == '1' AND value == 'abc')
 ORDER BY
     key,
     subkey,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-ranges_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-ranges_/formatted.sql
index c35dcbe837..dc8bdb9eec 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-ranges_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-ranges_/formatted.sql
@@ -7,21 +7,21 @@ FROM (
     FROM
         plato.Input
     WHERE
-        key <= "037" AND key >= "037"
+        key <= '037' AND key >= '037'
     UNION ALL
     SELECT
         *
     FROM
         plato.Input
     WHERE
-        key >= "037" AND key <= "037"
+        key >= '037' AND key <= '037'
     UNION ALL
     SELECT
         *
     FROM
         plato.Input
     WHERE
-        key BETWEEN "037" AND "037"
+        key BETWEEN '037' AND '037'
 )
 ORDER BY
     key,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-split_input_with_key_filter1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-split_input_with_key_filter1_/formatted.sql
index 7a07b59d11..e2f2bad7d9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-split_input_with_key_filter1_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-split_input_with_key_filter1_/formatted.sql
@@ -1,13 +1,13 @@
 USE plato;
 
-PRAGMA yt.MaxInputTables = "2";
+PRAGMA yt.MaxInputTables = '2';
 
 SELECT
     key AS key,
-    "" AS subkey,
-    "value:" || value AS value
+    '' AS subkey,
+    'value:' || value AS value
 FROM
     concat(Input, Input, Input, Input)
 WHERE
-    key == "07" || "5"
+    key == '07' || '5'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-split_input_with_key_filter2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-split_input_with_key_filter2_/formatted.sql
index 9213fe5279..9fb15e89cf 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-split_input_with_key_filter2_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-split_input_with_key_filter2_/formatted.sql
@@ -1,13 +1,13 @@
 USE plato;
 
-PRAGMA yt.MaxInputTables = "2";
+PRAGMA yt.MaxInputTables = '2';
 
 SELECT
     key AS key,
-    "" AS subkey,
-    "value:" || value AS value
+    '' AS subkey,
+    'value:' || value AS value
 FROM
     concat(Input, Input, Input)
 WHERE
-    key == "07" || "5"
+    key == '07' || '5'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-string_with_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-string_with_/formatted.sql
index 356fa8ccc8..bf8f564ddd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-string_with_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-string_with_/formatted.sql
@@ -5,5 +5,5 @@ SELECT
 FROM
     plato.Input
 WHERE
-    StartsWith(key, "0") AND EndsWith(key, "5")
+    StartsWith(key, '0') AND EndsWith(key, '5')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-string_with_ff_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-string_with_ff_/formatted.sql
index 500f646a6e..e9d97bf071 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-string_with_ff_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-string_with_ff_/formatted.sql
@@ -4,7 +4,7 @@ USE plato;
 
 INSERT INTO @src
 SELECT
-    "\xff\xff" || key AS key
+    '\xff\xff' || key AS key
 FROM
     Input
 ORDER BY
@@ -21,5 +21,5 @@ FROM (
     FROM
         @src
     WHERE
-        StartsWith(key, "\xff\xff") AND EndsWith(key, "5")
+        StartsWith(key, '\xff\xff') AND EndsWith(key, '5')
 );
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-string_with_legacy_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-string_with_legacy_/formatted.sql
index 0e53c12b52..38619c4fc3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-string_with_legacy_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-string_with_legacy_/formatted.sql
@@ -1,13 +1,13 @@
 /* syntax version 1 */
 /* postgres can not */
-PRAGMA yt.UseNewPredicateExtraction = "false";
+PRAGMA yt.UseNewPredicateExtraction = 'false';
 
 SELECT
     key
 FROM
     plato.Input
 WHERE
-    StartsWith(key, String("150"))
+    StartsWith(key, String('150'))
 ORDER BY
     key
 ;
@@ -17,7 +17,7 @@ SELECT
 FROM
     plato.Input
 WHERE
-    StartsWith(key, Utf8("15")) OR StartsWith(key, Utf8("150"))
+    StartsWith(key, Utf8('15')) OR StartsWith(key, Utf8('150'))
 ORDER BY
     key
 ;
@@ -27,7 +27,7 @@ SELECT
 FROM
     plato.Input
 WHERE
-    StartsWith(key, Utf8("тест")) OR StartsWith(key, String("тест\xff"))
+    StartsWith(key, Utf8('тест')) OR StartsWith(key, String('тест\xff'))
 ORDER BY
     key
 ;
@@ -37,7 +37,7 @@ SELECT
 FROM
     plato.Input
 WHERE
-    StartsWith(key, String("\xff"))
+    StartsWith(key, String('\xff'))
 ORDER BY
     key
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-tzdate_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-tzdate_/formatted.sql
index d8acea3be6..db97e0a135 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-tzdate_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-tzdate_/formatted.sql
@@ -29,42 +29,42 @@ FROM (
     FROM
         @tzdate
     WHERE
-        value < TzDate("1999-01-01,Europe/Moscow") AND value > TzDate("2011-01-01,Europe/Moscow") -- empty
+        value < TzDate('1999-01-01,Europe/Moscow') AND value > TzDate('2011-01-01,Europe/Moscow') -- empty
     UNION ALL
     SELECT
         *
     FROM
         @tzdate
     WHERE
-        value > TzDate("2105-12-30,posixrules") -- empty
+        value > TzDate('2105-12-30,posixrules') -- empty
     UNION ALL
     SELECT
         *
     FROM
         @tzdate
     WHERE
-        value < TzDate("1970-01-01,GMT") -- empty
+        value < TzDate('1970-01-01,GMT') -- empty
     UNION ALL
     SELECT
         *
     FROM
         @tzdate
     WHERE
-        value == TzDate("2018-02-01,GMT")
+        value == TzDate('2018-02-01,GMT')
     UNION ALL
     SELECT
         *
     FROM
         @tzdate
     WHERE
-        value > TzDate("1999-01-01,GMT") OR value >= TzDate("1999-01-01,Europe/Moscow")
+        value > TzDate('1999-01-01,GMT') OR value >= TzDate('1999-01-01,Europe/Moscow')
     UNION ALL
     SELECT
         *
     FROM
         @tzdate
     WHERE
-        value >= TzDate("2018-02-01,Europe/Moscow") AND value <= TzDate("2105-12-30,America/Los_Angeles") -- Should include 2018-02-01,GMT and 2105-12-31,posixrules
+        value >= TzDate('2018-02-01,Europe/Moscow') AND value <= TzDate('2105-12-30,America/Los_Angeles') -- Should include 2018-02-01,GMT and 2105-12-31,posixrules
 )
 ORDER BY
     value
@@ -76,7 +76,7 @@ SELECT
 FROM
     @tzdate
 WHERE
-    value == CAST("1999-01-01,Europe/Moscow" AS TzDate)
+    value == CAST('1999-01-01,Europe/Moscow' AS TzDate)
 ;
 
 -- Safe key filter calc
@@ -85,7 +85,7 @@ SELECT
 FROM
     @tzdate
 WHERE
-    value == CAST($asIs("2105-12-30,America/Los_Angeles") AS TzDate)
+    value == CAST($asIs('2105-12-30,America/Los_Angeles') AS TzDate)
 ;
 
 -- Unsafe key filter calc
@@ -94,6 +94,6 @@ SELECT
 FROM
     @tzdate
 WHERE
-    value == CAST($asIs("bad") AS TzDate)
+    value == CAST($asIs('bad') AS TzDate)
 ;
 -- Unsafe key filter calc
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-utf8_with_legacy_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-utf8_with_legacy_/formatted.sql
index fcb40b4476..972a6fa77b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-utf8_with_legacy_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-utf8_with_legacy_/formatted.sql
@@ -1,13 +1,13 @@
 /* syntax version 1 */
 /* postgres can not */
-PRAGMA yt.UseNewPredicateExtraction = "false";
+PRAGMA yt.UseNewPredicateExtraction = 'false';
 
 SELECT
     key
 FROM
     plato.Input
 WHERE
-    StartsWith(key, String("150"))
+    StartsWith(key, String('150'))
 ORDER BY
     key
 ;
@@ -17,7 +17,7 @@ SELECT
 FROM
     plato.Input
 WHERE
-    StartsWith(key, String("15")) OR StartsWith(key, String("150"))
+    StartsWith(key, String('15')) OR StartsWith(key, String('150'))
 ORDER BY
     key
 ;
@@ -27,7 +27,7 @@ SELECT
 FROM
     plato.Input
 WHERE
-    StartsWith(key, String("\xf5"))
+    StartsWith(key, String('\xf5'))
 ORDER BY
     key
 ;
@@ -37,7 +37,7 @@ SELECT
 FROM
     plato.Input
 WHERE
-    StartsWith(key, Utf8("тест\xf4\x8f\xbf\xbf"))
+    StartsWith(key, Utf8('тест\xf4\x8f\xbf\xbf'))
 ORDER BY
     key
 ;
@@ -47,7 +47,7 @@ SELECT
 FROM
     plato.Input
 WHERE
-    StartsWith(key, Utf8("тест")) OR StartsWith(key, Utf8("тест\xf4\x8f\xbf\xbf"))
+    StartsWith(key, Utf8('тест')) OR StartsWith(key, Utf8('тест\xf4\x8f\xbf\xbf'))
 ORDER BY
     key
 ;
@@ -57,7 +57,7 @@ SELECT
 FROM
     plato.Input
 WHERE
-    StartsWith(key, Utf8("\xf4\x8f\xbf\xbf"))
+    StartsWith(key, Utf8('\xf4\x8f\xbf\xbf'))
 ORDER BY
     key
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-uuid_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-uuid_/formatted.sql
index 4a7107ba36..b4fc19dd85 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-uuid_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-uuid_/formatted.sql
@@ -29,63 +29,63 @@ FROM (
     FROM
         @uuid
     WHERE
-        value < Uuid("00000000-0000-0000-0000-100000000000") AND value > Uuid("00000000-0000-0000-0000-400000000000") -- empty
+        value < Uuid('00000000-0000-0000-0000-100000000000') AND value > Uuid('00000000-0000-0000-0000-400000000000') -- empty
     UNION ALL
     SELECT
         *
     FROM
         @uuid
     WHERE
-        value > Uuid("FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFF") -- empty
+        value > Uuid('FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFF') -- empty
     UNION ALL
     SELECT
         *
     FROM
         @uuid
     WHERE
-        value < Uuid("00000000-0000-0000-0000-000000000000") -- empty
+        value < Uuid('00000000-0000-0000-0000-000000000000') -- empty
     UNION ALL
     SELECT
         *
     FROM
         @uuid
     WHERE
-        value > Uuid("00000000-0000-0000-0000-100000000000") OR value >= Uuid("00000000-0000-0000-0000-200000000000") --(00000000-0000-0000-0000-100000000000,)
+        value > Uuid('00000000-0000-0000-0000-100000000000') OR value >= Uuid('00000000-0000-0000-0000-200000000000') --(00000000-0000-0000-0000-100000000000,)
     UNION ALL
     SELECT
         *
     FROM
         @uuid
     WHERE
-        value >= Uuid("00000000-0000-0000-0000-100000000000") OR value > Uuid("00000000-0000-0000-0000-200000000000") --[00000000-0000-0000-0000-100000000000,)
+        value >= Uuid('00000000-0000-0000-0000-100000000000') OR value > Uuid('00000000-0000-0000-0000-200000000000') --[00000000-0000-0000-0000-100000000000,)
     UNION ALL
     SELECT
         *
     FROM
         @uuid
     WHERE
-        value == Uuid("00000000-0000-0000-0000-100000000000") OR value < Uuid("00000000-0000-0000-0000-200000000000") --(,00000000-0000-0000-0000-200000000000)
+        value == Uuid('00000000-0000-0000-0000-100000000000') OR value < Uuid('00000000-0000-0000-0000-200000000000') --(,00000000-0000-0000-0000-200000000000)
     UNION ALL
     SELECT
         *
     FROM
         @uuid
     WHERE
-        value < Uuid("00000000-0000-0000-0000-100000000000") OR value <= Uuid("00000000-0000-0000-0000-200000000000") --(,00000000-0000-0000-0000-200000000000]
+        value < Uuid('00000000-0000-0000-0000-100000000000') OR value <= Uuid('00000000-0000-0000-0000-200000000000') --(,00000000-0000-0000-0000-200000000000]
     UNION ALL
     SELECT
         *
     FROM
         @uuid
     WHERE
-        value < Uuid("00000000-0000-0000-0000-100000000000") OR value <= Uuid("00000000-0000-0000-0000-200000000000") --(,00000000-0000-0000-0000-200000000000]
+        value < Uuid('00000000-0000-0000-0000-100000000000') OR value <= Uuid('00000000-0000-0000-0000-200000000000') --(,00000000-0000-0000-0000-200000000000]
     UNION ALL
     SELECT
         *
     FROM
         @uuid
     WHERE
-        value > Uuid("00000000-0000-0000-0000-100000000000") AND value <= Uuid("00000000-0000-0000-0000-400000000000") --(00000000-0000-0000-0000-100000000000,00000000-0000-0000-0000-400000000000]
+        value > Uuid('00000000-0000-0000-0000-100000000000') AND value <= Uuid('00000000-0000-0000-0000-400000000000') --(00000000-0000-0000-0000-100000000000,00000000-0000-0000-0000-400000000000]
 )
 ORDER BY
     value
@@ -97,7 +97,7 @@ SELECT
 FROM
     @uuid
 WHERE
-    value == CAST("00000000-0000-0000-0000-100000000000" AS Uuid)
+    value == CAST('00000000-0000-0000-0000-100000000000' AS Uuid)
 ;
 
 -- Safe key filter calc
@@ -106,7 +106,7 @@ SELECT
 FROM
     @uuid
 WHERE
-    value == CAST($asIs("00000000-0000-0000-0000-200000000000") AS Uuid)
+    value == CAST($asIs('00000000-0000-0000-0000-200000000000') AS Uuid)
 ;
 
 -- Unsafe key filter calc
@@ -115,6 +115,6 @@ SELECT
 FROM
     @uuid
 WHERE
-    value == CAST($asIs("bad") AS Uuid)
+    value == CAST($asIs('bad') AS Uuid)
 ;
 -- Unsafe key filter calc
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-yql-14157_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-yql-14157_/formatted.sql
index 8da68a6ff1..63760f74d3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-yql-14157_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-yql-14157_/formatted.sql
@@ -6,16 +6,16 @@ SELECT
     v1,
     v2
 FROM
-    RANGE("", "Input1", "Input2")
+    RANGE('', 'Input1', 'Input2')
 WHERE
-    key == "037"
+    key == '037'
 ;
 
 SELECT
     v1,
     v2
 FROM
-    RANGE("", "Input1", "Input2")
+    RANGE('', 'Input1', 'Input2')
 WHERE
-    key == "150" AND subkey == "1"
+    key == '150' AND subkey == '1'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-yql-8117-table_key_filter_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-yql-8117-table_key_filter_/formatted.sql
index d89e452d6e..9835f76f5f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-yql-8117-table_key_filter_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-yql-8117-table_key_filter_/formatted.sql
@@ -6,16 +6,16 @@ FROM (
     SELECT
         value
     FROM
-        RANGE("", "InputA", "InputC")
+        RANGE('', 'InputA', 'InputC')
     WHERE
-        (key == "023" OR key == "037") AND value != ""
+        (key == '023' OR key == '037') AND value != ''
     UNION ALL
     SELECT
         value
     FROM
-        RANGE("", "InputA", "InputC")
+        RANGE('', 'InputA', 'InputC')
     WHERE
-        (key == "075" OR key == "150") AND value != ""
+        (key == '075' OR key == '150') AND value != ''
 )
 ORDER BY
     value
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-yql-8663-dedup_ranges_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-yql-8663-dedup_ranges_/formatted.sql
index 74b67b8367..3339945940 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-yql-8663-dedup_ranges_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-yql-8663-dedup_ranges_/formatted.sql
@@ -4,5 +4,5 @@ FROM
     plato.Input
 WHERE
     key == '023'
-    AND (value == "aaa" OR subkey == "3")
+    AND (value == 'aaa' OR subkey == '3')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-yql_5895_or_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-yql_5895_or_/formatted.sql
index e50bf2662e..1ebf44dd8b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-yql_5895_or_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-yql_5895_or_/formatted.sql
@@ -3,5 +3,5 @@ SELECT
 FROM
     plato.Input
 WHERE
-    key > "023" OR key > "075" OR key < "075"
+    key > '023' OR key > '075' OR key < '075'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_with_tie_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_with_tie_/formatted.sql
index eadd99b5f6..daf485e7a1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_with_tie_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_with_tie_/formatted.sql
@@ -3,7 +3,7 @@ USE plato;
 
 $func = ($x, $y) -> {
     $y, $x = AsTuple($x, $y);
-    RETURN $x || "_" || $y;
+    RETURN $x || '_' || $y;
 };
 
 --INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_with_tie_bad_count_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_with_tie_bad_count_fail_/formatted.sql
index add3f0feb0..eb92b21378 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_with_tie_bad_count_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_with_tie_bad_count_fail_/formatted.sql
@@ -3,7 +3,7 @@ USE plato;
 
 $func = ($x, $y) -> {
     $y, $x = AsTuple($x, $y, $x);
-    RETURN $x || "_" || $y;
+    RETURN $x || '_' || $y;
 };
 
 --INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-list_aggregate_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-list_aggregate_/formatted.sql
index 58eca01007..58afeafdea 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-list_aggregate_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-list_aggregate_/formatted.sql
@@ -10,11 +10,11 @@ $subst = ($names, $indices) -> {
 
 $table = (
     SELECT
-        AsList("a", "b") AS names,
+        AsList('a', 'b') AS names,
         AsList(0, 0, 1) AS indices
     UNION ALL
     SELECT
-        AsList("c", "d") AS names,
+        AsList('c', 'd') AS names,
         AsList(0, 1, 1) AS indices
 );
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-list_aggregate_flatmap_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-list_aggregate_flatmap_/formatted.sql
index 22c14ff6bf..956c4a7a05 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-list_aggregate_flatmap_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-list_aggregate_flatmap_/formatted.sql
@@ -10,11 +10,11 @@ $subst = ($names, $indices) -> {
 
 $table = (
     SELECT
-        AsList("a", "b") AS names,
+        AsList('a', 'b') AS names,
         AsList(0, 0, 1) AS indices
     UNION ALL
     SELECT
-        AsList("c", "d") AS names,
+        AsList('c', 'd') AS names,
         AsList(0, 1, 1) AS indices
 );
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-forward_import_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-forward_import_/formatted.sql
index a76e69c0a7..1991e92ede 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-forward_import_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-forward_import_/formatted.sql
@@ -1,7 +1,7 @@
 /* postgres can not */
 /* syntax version 1 */
-PRAGMA Library("agg.sql");
-PRAGMA Library("lib.sql");
+PRAGMA Library('agg.sql');
+PRAGMA Library('lib.sql');
 
 IMPORT lib SYMBOLS $Square, $Agg_sum, $Agg_max;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_/formatted.sql
index 7faf17fa73..1480c84ea6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_/formatted.sql
@@ -1,7 +1,7 @@
 /* postgres can not */
 /* kikimr can not - range not supported */
-PRAGMA library("lib1.sql");
-PRAGMA library("lib2.sql");
+PRAGMA library('lib1.sql');
+PRAGMA library('lib2.sql');
 
 IMPORT lib1 SYMBOLS $sqr;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_alias_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_alias_/formatted.sql
index cb5bd876ed..eb76c4b3c9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_alias_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_alias_/formatted.sql
@@ -1,5 +1,5 @@
 /* postgres can not */
-PRAGMA library("lib2.sql");
+PRAGMA library('lib2.sql');
 
 IMPORT lib2 SYMBOLS $mul AS $multiply;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_udf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_udf_/formatted.sql
index 26551822c8..1b50fb964b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_udf_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_udf_/formatted.sql
@@ -1,6 +1,6 @@
 /* postgres can not */
 /* kikimr can not - range not supported */
-PRAGMA Library("udf.sql");
+PRAGMA Library('udf.sql');
 
 IMPORT udf SYMBOLS $f;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_via_http_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_via_http_/formatted.sql
index 7faf17fa73..1480c84ea6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_via_http_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_via_http_/formatted.sql
@@ -1,7 +1,7 @@
 /* postgres can not */
 /* kikimr can not - range not supported */
-PRAGMA library("lib1.sql");
-PRAGMA library("lib2.sql");
+PRAGMA library('lib1.sql');
+PRAGMA library('lib2.sql');
 
 IMPORT lib1 SYMBOLS $sqr;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_yqls_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_yqls_/formatted.sql
index 84fd1a4451..1a3f884e15 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_yqls_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_yqls_/formatted.sql
@@ -1,4 +1,4 @@
-PRAGMA library("lib1.yqls");
+PRAGMA library('lib1.yqls');
 
 IMPORT lib1 SYMBOLS $sqr;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-package_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-package_/formatted.sql
index b3dee1d057..9484645e96 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-package_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-package_/formatted.sql
@@ -1,7 +1,7 @@
 /* ytfile can not */
 DECLARE $cluster AS String;
 
-PRAGMA package("project.package", "yt://{$cluster}/package");
+PRAGMA package('project.package', 'yt://{$cluster}/package');
 
 IMPORT pkg.project.package.total SYMBOLS $do_total;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-package_override_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-package_override_/formatted.sql
index 0ba347415e..f2a2785899 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-package_override_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-package_override_/formatted.sql
@@ -1,6 +1,6 @@
 /* ytfile can not */
-PRAGMA package("project.package", "yt://plato/package");
-PRAGMA override_library("project/package/detail/bar.sql");
+PRAGMA package('project.package', 'yt://plato/package');
+PRAGMA override_library('project/package/detail/bar.sql');
 
 IMPORT pkg.project.package.total SYMBOLS $do_total;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_like-ilike_clause_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_like-ilike_clause_/formatted.sql
index 042e74849e..6856e4749e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_like-ilike_clause_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_like-ilike_clause_/formatted.sql
@@ -5,5 +5,5 @@ SELECT
 FROM
     plato.Input
 WHERE
-    value ILIKE "q_Z" OR value ILIKE "%Q"
+    value ILIKE 'q_Z' OR value ILIKE '%Q'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_like-like_clause_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_like-like_clause_/formatted.sql
index 4f0fe8b44b..13225aef8a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_like-like_clause_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_like-like_clause_/formatted.sql
@@ -5,5 +5,5 @@ SELECT
 FROM
     plato.Input
 WHERE
-    value LIKE "q_z" OR value LIKE "%q"
+    value LIKE 'q_z' OR value LIKE '%q'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_like-like_clause_escape_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_like-like_clause_escape_/formatted.sql
index f926bb52dd..44efabd2e4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_like-like_clause_escape_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_like-like_clause_escape_/formatted.sql
@@ -5,7 +5,7 @@ SELECT
 FROM
     plato.Input
 WHERE
-    value LIKE "!%z" ESCAPE "!"
-    OR value || "_" LIKE "_?_" ESCAPE "?"
-    OR value || "!" LIKE "ddd!!" ESCAPE "!"
+    value LIKE '!%z' ESCAPE '!'
+    OR value || '_' LIKE '_?_' ESCAPE '?'
+    OR value || '!' LIKE 'ddd!!' ESCAPE '!'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_like-like_clause_no_pattern_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_like-like_clause_no_pattern_/formatted.sql
index e8cd26e25b..3c0b9ec32f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_like-like_clause_no_pattern_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_like-like_clause_no_pattern_/formatted.sql
@@ -1,8 +1,8 @@
 SELECT
     value,
     CASE
-        WHEN value LIKE "abc" THEN "true"
-        ELSE "false"
+        WHEN value LIKE 'abc' THEN 'true'
+        ELSE 'false'
     END AS is_abc
 FROM
     plato.Input
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_like-like_multiline_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_like-like_multiline_/formatted.sql
index f2e049e38d..d44eacd746 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_like-like_multiline_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_like-like_multiline_/formatted.sql
@@ -1,4 +1,4 @@
 SELECT
-    "abc\ndef" LIKE "%f" AS match,
-    "abc\ndef" LIKE "%a" AS no_match
+    'abc\ndef' LIKE '%f' AS match,
+    'abc\ndef' LIKE '%a' AS no_match
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_like-regexp_clause_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_like-regexp_clause_/formatted.sql
index 04f25703e1..d5b35c5cf6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_like-regexp_clause_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_like-regexp_clause_/formatted.sql
@@ -7,5 +7,5 @@ SELECT
 FROM
     plato.Input
 WHERE
-    value REGEXP "^a"
+    value REGEXP '^a'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-dynamic_sort_limit_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-dynamic_sort_limit_/formatted.sql
index 6338fb1312..f144cb4038 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-dynamic_sort_limit_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-dynamic_sort_limit_/formatted.sql
@@ -8,7 +8,7 @@ def f(s):
 @@;
 
 $callable = Python::f(Callable<(String) -> Uint64?>, $script);
-$i = unwrap($callable("2"));
+$i = unwrap($callable('2'));
 
 SELECT
     key,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-empty_input_after_limit_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-empty_input_after_limit_/formatted.sql
index 296124f3ab..65db278233 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-empty_input_after_limit_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-empty_input_after_limit_/formatted.sql
@@ -5,14 +5,14 @@ $in = (
     FROM
         plato.Input
     WHERE
-        key == "150"
+        key == '150'
     UNION ALL
     SELECT
         *
     FROM
         plato.Input
     WHERE
-        key == "075"
+        key == '075'
 );
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-limit_over_sort_desc_in_subquery_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-limit_over_sort_desc_in_subquery_/formatted.sql
index 835112ffc8..ed1f06dcb8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-limit_over_sort_desc_in_subquery_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-limit_over_sort_desc_in_subquery_/formatted.sql
@@ -20,5 +20,5 @@ SELECT
 FROM
     $in
 WHERE
-    value LIKE "a%"
+    value LIKE 'a%'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-many_top_sorts_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-many_top_sorts_/formatted.sql
index d76b634149..158d71b9ed 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-many_top_sorts_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-many_top_sorts_/formatted.sql
@@ -9,7 +9,7 @@ $i = (
     FROM
         Input
     WHERE
-        key > "100"
+        key > '100'
 );
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-yql-8046_empty_sorted_desc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-yql-8046_empty_sorted_desc_/formatted.sql
index 70e3067fd5..e0363f5767 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-yql-8046_empty_sorted_desc_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-yql-8046_empty_sorted_desc_/formatted.sql
@@ -9,7 +9,7 @@ $visitors = (
     FROM
         Input
     WHERE
-        subkey != ""
+        subkey != ''
 );
 
 $over_threshold = (
@@ -20,7 +20,7 @@ $over_threshold = (
     FROM
         $visitors
     WHERE
-        key > "070"
+        key > '070'
 );
 
 $clean = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-yql-8611_calc_peephole_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-yql-8611_calc_peephole_/formatted.sql
index 4a9412f109..cb9001a214 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-yql-8611_calc_peephole_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-yql-8611_calc_peephole_/formatted.sql
@@ -1,8 +1,8 @@
 USE plato;
 
 $tableList = AsList(
-    AsStruct(Yson('{"row_count"=9}') AS Attributes, "Input1" AS Path, "table" AS Type),
-    AsStruct(Yson('{"row_count"=19}') AS Attributes, "Input2" AS Path, "table" AS Type)
+    AsStruct(Yson('{"row_count"=9}') AS Attributes, 'Input1' AS Path, 'table' AS Type),
+    AsStruct(Yson('{"row_count"=19}') AS Attributes, 'Input2' AS Path, 'table' AS Type)
 );
 
 -- $bucket_size = 1000000;
@@ -10,18 +10,18 @@ $buckets = ASLIST(0, 1, 2, 3);
 
 $row_count = (
     SELECT
-        Yson::LookupInt64(Attributes, "row_count")
+        Yson::LookupInt64(Attributes, 'row_count')
     FROM
         AS_TABLE($tableList)
     WHERE
-        Type == "table"
+        Type == 'table'
 );
 
 $bucket_size = unwrap(CAST($row_count / ListLength($buckets) AS Uint64));
 
 DEFINE ACTION $make_bucket($bucket_number) AS
     $offset = unwrap(CAST($bucket_number AS UInt8)) * $bucket_size;
-    $dst = "Output" || $bucket_number;
+    $dst = 'Output' || $bucket_number;
 
     INSERT INTO $dst
     (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-yql-9617_empty_lambda_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-yql-9617_empty_lambda_/formatted.sql
index 5d422f1c98..591cca5e38 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-yql-9617_empty_lambda_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-yql-9617_empty_lambda_/formatted.sql
@@ -6,7 +6,7 @@ SELECT
 FROM
     Input
 WHERE
-    key > "999"
+    key > '999'
 GROUP BY
     key
 ORDER BY
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-zero_limit_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-zero_limit_/formatted.sql
index 1813186e2e..7deeb63631 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-zero_limit_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-zero_limit_/formatted.sql
@@ -16,5 +16,5 @@ SELECT
 FROM
     $x
 WHERE
-    key > "000"
+    key > '000'
 LIMIT coalesce(CAST(0.1 * 0 AS Uint64), 0);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-if_struct_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-if_struct_/formatted.sql
index 4bef7a531f..a219094684 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-if_struct_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-if_struct_/formatted.sql
@@ -3,7 +3,7 @@ SELECT
     *
 FROM (
     SELECT
-        IF(key == "foo", CombineMembers(RemoveMembers(LAG(data) OVER w, ["key"]), ChooseMembers(data, ["key"])), data)
+        IF(key == 'foo', CombineMembers(RemoveMembers(LAG(data) OVER w, ['key']), ChooseMembers(data, ['key'])), data)
     FROM (
         SELECT
             TableRow() AS data,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-member_over_if_struct_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-member_over_if_struct_/formatted.sql
index d99a5214e4..d1b3cd9f58 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-member_over_if_struct_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-member_over_if_struct_/formatted.sql
@@ -3,7 +3,7 @@ SELECT
     *
 FROM (
     SELECT
-        IF(key == "foo", LAG(data) OVER w, data)
+        IF(key == 'foo', LAG(data) OVER w, data)
     FROM (
         SELECT
             TableRow() AS data,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-nested_lambda_fields_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-nested_lambda_fields_/formatted.sql
index 3730b7bf4d..a876393c67 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-nested_lambda_fields_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-nested_lambda_fields_/formatted.sql
@@ -1,7 +1,7 @@
 USE plato;
 
 $v = ($x) -> {
-    RETURN ListFilter(["a", "b"], ($y) -> ($y == $x));
+    RETURN ListFilter(['a', 'b'], ($y) -> ($y == $x));
 };
 
 $k = ($x) -> {
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-with_inline_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-with_inline_/formatted.sql
index 64ac45929e..9b04e109df 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-with_inline_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-with_inline_/formatted.sql
@@ -3,8 +3,8 @@ USE plato;
 INSERT INTO Output
 SELECT
     key AS key,
-    "" AS subkey,
-    "value:" || value AS value
+    '' AS subkey,
+    'value:' || value AS value
 FROM
     Input WITH INLINE
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-after_match_skip_past_last_row_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-after_match_skip_past_last_row_/formatted.sql
index 7cf0700888..42999779fe 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-after_match_skip_past_last_row_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-after_match_skip_past_last_row_/formatted.sql
@@ -1,5 +1,5 @@
-PRAGMA FeatureR010 = "prototype";
-PRAGMA config.flags("MatchRecognizeStream", "disable");
+PRAGMA FeatureR010 = 'prototype';
+PRAGMA config.flags('MatchRecognizeStream', 'disable');
 
 $input =
     SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-alerts-streaming_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-alerts-streaming_/formatted.sql
index 28d63923cf..3675101c69 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-alerts-streaming_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-alerts-streaming_/formatted.sql
@@ -1,21 +1,21 @@
 $osquery_data = [
-    <|dt: 1688910000, host: "fqdn1", ev_type: "someEv", ev_status: "", user: "", vpn: FALSE,|>,
-    <|dt: 1688910050, host: "fqdn2", ev_type: "login", ev_status: "success", user: "", vpn: TRUE,|>,
-    <|dt: 1688910100, host: "fqdn1", ev_type: "login", ev_status: "success", user: "", vpn: TRUE,|>,
-    <|dt: 1688910220, host: "fqdn1", ev_type: "login", ev_status: "success", user: "", vpn: FALSE,|>,
-    <|dt: 1688910300, host: "fqdn1", ev_type: "delete_all", ev_status: "", user: "", vpn: FALSE,|>,
-    <|dt: 1688910400, host: "fqdn2", ev_type: "delete_all", ev_status: "", user: "", vpn: FALSE,|>,
-    <|dt: 1688910500, host: "fqdn1", ev_type: "login", ev_status: "failed", user: "user1", vpn: FALSE,|>,
-    <|dt: 1688910500, host: "fqdn1", ev_type: "login", ev_status: "failed", user: "user2", vpn: FALSE,|>,
-    <|dt: 1688910600, host: "fqdn", ev_type: "someEv", ev_status: "", user: "user1", vpn: FALSE,|>,
-    <|dt: 1688910800, host: "fqdn2", ev_type: "login", ev_status: "failed", user: "user1", vpn: FALSE,|>,
-    <|dt: 1688910900, host: "fqdn2", ev_type: "login", ev_status: "failed", user: "user2", vpn: FALSE,|>,
-    <|dt: 1688911000, host: "fqdn2", ev_type: "login", ev_status: "success", user: "user1", vpn: FALSE,|>,
-    <|dt: 1688911001, host: "fqdn2", ev_type: "login", ev_status: "success", user: "user1", vpn: FALSE,|>,
+    <|dt: 1688910000, host: 'fqdn1', ev_type: 'someEv', ev_status: '', user: '', vpn: FALSE,|>,
+    <|dt: 1688910050, host: 'fqdn2', ev_type: 'login', ev_status: 'success', user: '', vpn: TRUE,|>,
+    <|dt: 1688910100, host: 'fqdn1', ev_type: 'login', ev_status: 'success', user: '', vpn: TRUE,|>,
+    <|dt: 1688910220, host: 'fqdn1', ev_type: 'login', ev_status: 'success', user: '', vpn: FALSE,|>,
+    <|dt: 1688910300, host: 'fqdn1', ev_type: 'delete_all', ev_status: '', user: '', vpn: FALSE,|>,
+    <|dt: 1688910400, host: 'fqdn2', ev_type: 'delete_all', ev_status: '', user: '', vpn: FALSE,|>,
+    <|dt: 1688910500, host: 'fqdn1', ev_type: 'login', ev_status: 'failed', user: 'user1', vpn: FALSE,|>,
+    <|dt: 1688910500, host: 'fqdn1', ev_type: 'login', ev_status: 'failed', user: 'user2', vpn: FALSE,|>,
+    <|dt: 1688910600, host: 'fqdn', ev_type: 'someEv', ev_status: '', user: 'user1', vpn: FALSE,|>,
+    <|dt: 1688910800, host: 'fqdn2', ev_type: 'login', ev_status: 'failed', user: 'user1', vpn: FALSE,|>,
+    <|dt: 1688910900, host: 'fqdn2', ev_type: 'login', ev_status: 'failed', user: 'user2', vpn: FALSE,|>,
+    <|dt: 1688911000, host: 'fqdn2', ev_type: 'login', ev_status: 'success', user: 'user1', vpn: FALSE,|>,
+    <|dt: 1688911001, host: 'fqdn2', ev_type: 'login', ev_status: 'success', user: 'user1', vpn: FALSE,|>,
 ];
 
-PRAGMA FeatureR010 = "prototype";
-PRAGMA config.flags("MatchRecognizeStream", "force");
+PRAGMA FeatureR010 = 'prototype';
+PRAGMA config.flags('MatchRecognizeStream', 'force');
 
 SELECT
     *
@@ -35,23 +35,23 @@ FROM
         AFTER MATCH SKIP TO NEXT ROW
         PATTERN (LOGIN_SUCCESS_REMOTE ANY_ROW1 * SUSPICIOUS_ACTION_SOON | (LOGIN_FAILED_SAME_USER ANY_ROW2 *) {2,} LOGIN_SUCCESS_SAME_USER)
         DEFINE
-            LOGIN_SUCCESS_REMOTE AS LOGIN_SUCCESS_REMOTE.ev_type == "login"
-            AND LOGIN_SUCCESS_REMOTE.ev_status == "success"
+            LOGIN_SUCCESS_REMOTE AS LOGIN_SUCCESS_REMOTE.ev_type == 'login'
+            AND LOGIN_SUCCESS_REMOTE.ev_status == 'success'
             AND LOGIN_SUCCESS_REMOTE.vpn == TRUE
             AND COALESCE(LOGIN_SUCCESS_REMOTE.dt - FIRST(LOGIN_FAILED_SAME_USER.dt) <= 500, TRUE),
             ANY_ROW1 AS COALESCE(ANY_ROW1.dt - FIRST(LOGIN_SUCCESS_REMOTE.dt) <= 500, TRUE),
             SUSPICIOUS_ACTION_SOON AS SUSPICIOUS_ACTION_SOON.host == LAST(LOGIN_SUCCESS_REMOTE.host)
-            AND SUSPICIOUS_ACTION_SOON.ev_type == "delete_all"
+            AND SUSPICIOUS_ACTION_SOON.ev_type == 'delete_all'
             AND COALESCE(SUSPICIOUS_ACTION_SOON.dt - FIRST(LOGIN_SUCCESS_REMOTE.dt) <= 500, TRUE),
-            LOGIN_FAILED_SAME_USER AS LOGIN_FAILED_SAME_USER.ev_type == "login"
-            AND LOGIN_FAILED_SAME_USER.ev_status != "success"
+            LOGIN_FAILED_SAME_USER AS LOGIN_FAILED_SAME_USER.ev_type == 'login'
+            AND LOGIN_FAILED_SAME_USER.ev_status != 'success'
             AND (
                 LAST(LOGIN_FAILED_SAME_USER.user) IS NULL
                 OR LAST(LOGIN_FAILED_SAME_USER.user) == LOGIN_FAILED_SAME_USER.user
             ) AND COALESCE(LOGIN_FAILED_SAME_USER.dt - FIRST(LOGIN_FAILED_SAME_USER.dt) <= 500, TRUE),
             ANY_ROW2 AS COALESCE(ANY_ROW2.dt - FIRST(LOGIN_FAILED_SAME_USER.dt) <= 500, TRUE),
-            LOGIN_SUCCESS_SAME_USER AS LOGIN_SUCCESS_SAME_USER.ev_type == "login"
-            AND LOGIN_SUCCESS_SAME_USER.ev_status == "success"
+            LOGIN_SUCCESS_SAME_USER AS LOGIN_SUCCESS_SAME_USER.ev_type == 'login'
+            AND LOGIN_SUCCESS_SAME_USER.ev_status == 'success'
             AND LOGIN_SUCCESS_SAME_USER.user == LAST(LOGIN_FAILED_SAME_USER.user)
             AND COALESCE(LOGIN_SUCCESS_SAME_USER.dt - FIRST(LOGIN_FAILED_SAME_USER.dt) <= 500, TRUE)
     ) AS MATCHED
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-alerts_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-alerts_/formatted.sql
index ea91539f37..c1fddaefd7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-alerts_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-alerts_/formatted.sql
@@ -1,21 +1,21 @@
 $osquery_data = [
-    <|dt: 1688910000, host: "fqdn1", ev_type: "someEv", ev_status: "", user: "", vpn: FALSE,|>,
-    <|dt: 1688910050, host: "fqdn2", ev_type: "login", ev_status: "success", user: "", vpn: TRUE,|>,
-    <|dt: 1688910100, host: "fqdn1", ev_type: "login", ev_status: "success", user: "", vpn: TRUE,|>,
-    <|dt: 1688910220, host: "fqdn1", ev_type: "login", ev_status: "success", user: "", vpn: FALSE,|>,
-    <|dt: 1688910300, host: "fqdn1", ev_type: "delete_all", ev_status: "", user: "", vpn: FALSE,|>,
-    <|dt: 1688910400, host: "fqdn2", ev_type: "delete_all", ev_status: "", user: "", vpn: FALSE,|>,
-    <|dt: 1688910500, host: "fqdn1", ev_type: "login", ev_status: "failed", user: "user1", vpn: FALSE,|>,
-    <|dt: 1688910500, host: "fqdn1", ev_type: "login", ev_status: "failed", user: "user2", vpn: FALSE,|>,
-    <|dt: 1688910600, host: "fqdn", ev_type: "someEv", ev_status: "", user: "user1", vpn: FALSE,|>,
-    <|dt: 1688910800, host: "fqdn2", ev_type: "login", ev_status: "failed", user: "user1", vpn: FALSE,|>,
-    <|dt: 1688910900, host: "fqdn2", ev_type: "login", ev_status: "failed", user: "user2", vpn: FALSE,|>,
-    <|dt: 1688911000, host: "fqdn2", ev_type: "login", ev_status: "success", user: "user1", vpn: FALSE,|>,
-    <|dt: 1688911001, host: "fqdn2", ev_type: "login", ev_status: "success", user: "user1", vpn: FALSE,|>,
+    <|dt: 1688910000, host: 'fqdn1', ev_type: 'someEv', ev_status: '', user: '', vpn: FALSE,|>,
+    <|dt: 1688910050, host: 'fqdn2', ev_type: 'login', ev_status: 'success', user: '', vpn: TRUE,|>,
+    <|dt: 1688910100, host: 'fqdn1', ev_type: 'login', ev_status: 'success', user: '', vpn: TRUE,|>,
+    <|dt: 1688910220, host: 'fqdn1', ev_type: 'login', ev_status: 'success', user: '', vpn: FALSE,|>,
+    <|dt: 1688910300, host: 'fqdn1', ev_type: 'delete_all', ev_status: '', user: '', vpn: FALSE,|>,
+    <|dt: 1688910400, host: 'fqdn2', ev_type: 'delete_all', ev_status: '', user: '', vpn: FALSE,|>,
+    <|dt: 1688910500, host: 'fqdn1', ev_type: 'login', ev_status: 'failed', user: 'user1', vpn: FALSE,|>,
+    <|dt: 1688910500, host: 'fqdn1', ev_type: 'login', ev_status: 'failed', user: 'user2', vpn: FALSE,|>,
+    <|dt: 1688910600, host: 'fqdn', ev_type: 'someEv', ev_status: '', user: 'user1', vpn: FALSE,|>,
+    <|dt: 1688910800, host: 'fqdn2', ev_type: 'login', ev_status: 'failed', user: 'user1', vpn: FALSE,|>,
+    <|dt: 1688910900, host: 'fqdn2', ev_type: 'login', ev_status: 'failed', user: 'user2', vpn: FALSE,|>,
+    <|dt: 1688911000, host: 'fqdn2', ev_type: 'login', ev_status: 'success', user: 'user1', vpn: FALSE,|>,
+    <|dt: 1688911001, host: 'fqdn2', ev_type: 'login', ev_status: 'success', user: 'user1', vpn: FALSE,|>,
 ];
 
-PRAGMA FeatureR010 = "prototype";
-PRAGMA config.flags("MatchRecognizeStream", "disable");
+PRAGMA FeatureR010 = 'prototype';
+PRAGMA config.flags('MatchRecognizeStream', 'disable');
 
 SELECT
     *
@@ -35,23 +35,23 @@ FROM
         AFTER MATCH SKIP TO NEXT ROW
         PATTERN (LOGIN_SUCCESS_REMOTE ANY_ROW1 * SUSPICIOUS_ACTION_SOON | (LOGIN_FAILED_SAME_USER ANY_ROW2 *) {2,} LOGIN_SUCCESS_SAME_USER)
         DEFINE
-            LOGIN_SUCCESS_REMOTE AS LOGIN_SUCCESS_REMOTE.ev_type == "login"
-            AND LOGIN_SUCCESS_REMOTE.ev_status == "success"
+            LOGIN_SUCCESS_REMOTE AS LOGIN_SUCCESS_REMOTE.ev_type == 'login'
+            AND LOGIN_SUCCESS_REMOTE.ev_status == 'success'
             AND LOGIN_SUCCESS_REMOTE.vpn == TRUE
             AND COALESCE(LOGIN_SUCCESS_REMOTE.dt - FIRST(LOGIN_FAILED_SAME_USER.dt) <= 500, TRUE),
             ANY_ROW1 AS COALESCE(ANY_ROW1.dt - FIRST(LOGIN_SUCCESS_REMOTE.dt) <= 500, TRUE),
             SUSPICIOUS_ACTION_SOON AS SUSPICIOUS_ACTION_SOON.host == LAST(LOGIN_SUCCESS_REMOTE.host)
-            AND SUSPICIOUS_ACTION_SOON.ev_type == "delete_all"
+            AND SUSPICIOUS_ACTION_SOON.ev_type == 'delete_all'
             AND COALESCE(SUSPICIOUS_ACTION_SOON.dt - FIRST(LOGIN_SUCCESS_REMOTE.dt) <= 500, TRUE),
-            LOGIN_FAILED_SAME_USER AS LOGIN_FAILED_SAME_USER.ev_type == "login"
-            AND LOGIN_FAILED_SAME_USER.ev_status != "success"
+            LOGIN_FAILED_SAME_USER AS LOGIN_FAILED_SAME_USER.ev_type == 'login'
+            AND LOGIN_FAILED_SAME_USER.ev_status != 'success'
             AND (
                 LAST(LOGIN_FAILED_SAME_USER.user) IS NULL
                 OR LAST(LOGIN_FAILED_SAME_USER.user) == LOGIN_FAILED_SAME_USER.user
             ) AND COALESCE(LOGIN_FAILED_SAME_USER.dt - FIRST(LOGIN_FAILED_SAME_USER.dt) <= 500, TRUE),
             ANY_ROW2 AS COALESCE(ANY_ROW2.dt - FIRST(LOGIN_FAILED_SAME_USER.dt) <= 500, TRUE),
-            LOGIN_SUCCESS_SAME_USER AS LOGIN_SUCCESS_SAME_USER.ev_type == "login"
-            AND LOGIN_SUCCESS_SAME_USER.ev_status == "success"
+            LOGIN_SUCCESS_SAME_USER AS LOGIN_SUCCESS_SAME_USER.ev_type == 'login'
+            AND LOGIN_SUCCESS_SAME_USER.ev_status == 'success'
             AND LOGIN_SUCCESS_SAME_USER.user == LAST(LOGIN_FAILED_SAME_USER.user)
             AND COALESCE(LOGIN_SUCCESS_SAME_USER.dt - FIRST(LOGIN_FAILED_SAME_USER.dt) <= 500, TRUE)
     ) AS MATCHED
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-alerts_without_order_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-alerts_without_order_/formatted.sql
index 4d30431160..8ef4903e4c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-alerts_without_order_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-alerts_without_order_/formatted.sql
@@ -1,21 +1,21 @@
 $osquery_data = [
-    <|dt: 1688910000, host: "fqdn1", ev_type: "someEv", ev_status: "", user: "", vpn: FALSE,|>,
-    <|dt: 1688910050, host: "fqdn2", ev_type: "login", ev_status: "success", user: "", vpn: TRUE,|>,
-    <|dt: 1688910100, host: "fqdn1", ev_type: "login", ev_status: "success", user: "", vpn: TRUE,|>,
-    <|dt: 1688910220, host: "fqdn1", ev_type: "login", ev_status: "success", user: "", vpn: FALSE,|>,
-    <|dt: 1688910300, host: "fqdn1", ev_type: "delete_all", ev_status: "", user: "", vpn: FALSE,|>,
-    <|dt: 1688910400, host: "fqdn2", ev_type: "delete_all", ev_status: "", user: "", vpn: FALSE,|>,
-    <|dt: 1688910500, host: "fqdn1", ev_type: "login", ev_status: "failed", user: "user1", vpn: FALSE,|>,
-    <|dt: 1688910500, host: "fqdn1", ev_type: "login", ev_status: "failed", user: "user2", vpn: FALSE,|>,
-    <|dt: 1688910600, host: "fqdn", ev_type: "someEv", ev_status: "", user: "user1", vpn: FALSE,|>,
-    <|dt: 1688910800, host: "fqdn2", ev_type: "login", ev_status: "failed", user: "user1", vpn: FALSE,|>,
-    <|dt: 1688910900, host: "fqdn2", ev_type: "login", ev_status: "failed", user: "user2", vpn: FALSE,|>,
-    <|dt: 1688911000, host: "fqdn2", ev_type: "login", ev_status: "success", user: "user1", vpn: FALSE,|>,
-    <|dt: 1688911001, host: "fqdn2", ev_type: "login", ev_status: "success", user: "user1", vpn: FALSE,|>,
+    <|dt: 1688910000, host: 'fqdn1', ev_type: 'someEv', ev_status: '', user: '', vpn: FALSE,|>,
+    <|dt: 1688910050, host: 'fqdn2', ev_type: 'login', ev_status: 'success', user: '', vpn: TRUE,|>,
+    <|dt: 1688910100, host: 'fqdn1', ev_type: 'login', ev_status: 'success', user: '', vpn: TRUE,|>,
+    <|dt: 1688910220, host: 'fqdn1', ev_type: 'login', ev_status: 'success', user: '', vpn: FALSE,|>,
+    <|dt: 1688910300, host: 'fqdn1', ev_type: 'delete_all', ev_status: '', user: '', vpn: FALSE,|>,
+    <|dt: 1688910400, host: 'fqdn2', ev_type: 'delete_all', ev_status: '', user: '', vpn: FALSE,|>,
+    <|dt: 1688910500, host: 'fqdn1', ev_type: 'login', ev_status: 'failed', user: 'user1', vpn: FALSE,|>,
+    <|dt: 1688910500, host: 'fqdn1', ev_type: 'login', ev_status: 'failed', user: 'user2', vpn: FALSE,|>,
+    <|dt: 1688910600, host: 'fqdn', ev_type: 'someEv', ev_status: '', user: 'user1', vpn: FALSE,|>,
+    <|dt: 1688910800, host: 'fqdn2', ev_type: 'login', ev_status: 'failed', user: 'user1', vpn: FALSE,|>,
+    <|dt: 1688910900, host: 'fqdn2', ev_type: 'login', ev_status: 'failed', user: 'user2', vpn: FALSE,|>,
+    <|dt: 1688911000, host: 'fqdn2', ev_type: 'login', ev_status: 'success', user: 'user1', vpn: FALSE,|>,
+    <|dt: 1688911001, host: 'fqdn2', ev_type: 'login', ev_status: 'success', user: 'user1', vpn: FALSE,|>,
 ];
 
-PRAGMA FeatureR010 = "prototype";
-PRAGMA config.flags("MatchRecognizeStream", "disable");
+PRAGMA FeatureR010 = 'prototype';
+PRAGMA config.flags('MatchRecognizeStream', 'disable');
 
 SELECT
     *
@@ -33,23 +33,23 @@ FROM
         AFTER MATCH SKIP TO NEXT ROW
         PATTERN (LOGIN_SUCCESS_REMOTE ANY_ROW1 * SUSPICIOUS_ACTION_SOON | (LOGIN_FAILED_SAME_USER ANY_ROW2 *) {2,} LOGIN_SUCCESS_SAME_USER)
         DEFINE
-            LOGIN_SUCCESS_REMOTE AS LOGIN_SUCCESS_REMOTE.ev_type == "login"
-            AND LOGIN_SUCCESS_REMOTE.ev_status == "success"
+            LOGIN_SUCCESS_REMOTE AS LOGIN_SUCCESS_REMOTE.ev_type == 'login'
+            AND LOGIN_SUCCESS_REMOTE.ev_status == 'success'
             AND LOGIN_SUCCESS_REMOTE.vpn == TRUE
             AND COALESCE(LOGIN_SUCCESS_REMOTE.dt - FIRST(LOGIN_FAILED_SAME_USER.dt) <= 500, TRUE),
             ANY_ROW1 AS COALESCE(ANY_ROW1.dt - FIRST(LOGIN_SUCCESS_REMOTE.dt) <= 500, TRUE),
             SUSPICIOUS_ACTION_SOON AS SUSPICIOUS_ACTION_SOON.host == LAST(LOGIN_SUCCESS_REMOTE.host)
-            AND SUSPICIOUS_ACTION_SOON.ev_type == "delete_all"
+            AND SUSPICIOUS_ACTION_SOON.ev_type == 'delete_all'
             AND COALESCE(SUSPICIOUS_ACTION_SOON.dt - FIRST(LOGIN_SUCCESS_REMOTE.dt) <= 500, TRUE),
-            LOGIN_FAILED_SAME_USER AS LOGIN_FAILED_SAME_USER.ev_type == "login"
-            AND LOGIN_FAILED_SAME_USER.ev_status != "success"
+            LOGIN_FAILED_SAME_USER AS LOGIN_FAILED_SAME_USER.ev_type == 'login'
+            AND LOGIN_FAILED_SAME_USER.ev_status != 'success'
             AND (
                 LAST(LOGIN_FAILED_SAME_USER.user) IS NULL
                 OR LAST(LOGIN_FAILED_SAME_USER.user) == LOGIN_FAILED_SAME_USER.user
             ) AND COALESCE(LOGIN_FAILED_SAME_USER.dt - FIRST(LOGIN_FAILED_SAME_USER.dt) <= 500, TRUE),
             ANY_ROW2 AS COALESCE(ANY_ROW2.dt - FIRST(LOGIN_FAILED_SAME_USER.dt) <= 500, TRUE),
-            LOGIN_SUCCESS_SAME_USER AS LOGIN_SUCCESS_SAME_USER.ev_type == "login"
-            AND LOGIN_SUCCESS_SAME_USER.ev_status == "success"
+            LOGIN_SUCCESS_SAME_USER AS LOGIN_SUCCESS_SAME_USER.ev_type == 'login'
+            AND LOGIN_SUCCESS_SAME_USER.ev_status == 'success'
             AND LOGIN_SUCCESS_SAME_USER.user == LAST(LOGIN_FAILED_SAME_USER.user)
             AND COALESCE(LOGIN_SUCCESS_SAME_USER.dt - FIRST(LOGIN_FAILED_SAME_USER.dt) <= 500, TRUE)
     ) AS MATCHED
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-greedy_quantifiers_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-greedy_quantifiers_/formatted.sql
index 887a45e7e3..af71b0a919 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-greedy_quantifiers_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-greedy_quantifiers_/formatted.sql
@@ -1,5 +1,5 @@
-PRAGMA FeatureR010 = "prototype";
-PRAGMA config.flags("MatchRecognizeStream", "disable");
+PRAGMA FeatureR010 = 'prototype';
+PRAGMA config.flags('MatchRecognizeStream', 'disable');
 
 $input =
     SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-permute_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-permute_/formatted.sql
index 2768ee6088..a522e3673c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-permute_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-permute_/formatted.sql
@@ -1,18 +1,18 @@
 $data = [
-    <|dt: 1688910000, event: "A"|>,
-    <|dt: 1688910100, event: "B"|>,
-    <|dt: 1688910200, event: "C"|>,
-    <|dt: 1688910300, event: "A"|>,
-    <|dt: 1688910400, event: "C"|>,
-    <|dt: 1688910500, event: "D"|>,
-    <|dt: 1688910500, event: "C"|>,
-    <|dt: 1688910600, event: "B"|>,
-    <|dt: 1688910800, event: "A"|>,
-    <|dt: 1688910900, event: "C"|>,
-    <|dt: 1688911000, event: "B"|>,
+    <|dt: 1688910000, event: 'A'|>,
+    <|dt: 1688910100, event: 'B'|>,
+    <|dt: 1688910200, event: 'C'|>,
+    <|dt: 1688910300, event: 'A'|>,
+    <|dt: 1688910400, event: 'C'|>,
+    <|dt: 1688910500, event: 'D'|>,
+    <|dt: 1688910500, event: 'C'|>,
+    <|dt: 1688910600, event: 'B'|>,
+    <|dt: 1688910800, event: 'A'|>,
+    <|dt: 1688910900, event: 'C'|>,
+    <|dt: 1688911000, event: 'B'|>,
 ];
 
-PRAGMA FeatureR010 = "prototype";
+PRAGMA FeatureR010 = 'prototype';
 
 SELECT
     *
@@ -28,8 +28,8 @@ FROM
         AFTER MATCH SKIP TO NEXT ROW
         PATTERN (PERMUTE (A, B, C))
         DEFINE
-            A AS A.event == "A",
-            B AS B.event == "B",
-            C AS C.event == "C"
+            A AS A.event == 'A',
+            B AS B.event == 'B',
+            C AS C.event == 'C'
     ) AS MATCHED
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-simple_paritioning-streaming_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-simple_paritioning-streaming_/formatted.sql
index 5f1d895a72..e11da8639c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-simple_paritioning-streaming_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-simple_paritioning-streaming_/formatted.sql
@@ -1,31 +1,31 @@
-PRAGMA FeatureR010 = "prototype";
-PRAGMA config.flags("MatchRecognizeStream", "force");
+PRAGMA FeatureR010 = 'prototype';
+PRAGMA config.flags('MatchRecognizeStream', 'force');
 
 USE plato;
 
 $data = [
-    <|dt: 15, host: "fqdn1", key: 0|>,
-    <|dt: 16, host: "fqdn1", key: 1|>,
-    <|dt: 17, host: "fqdn1", key: 2|>,
-    <|dt: 18, host: "fqdn1", key: 3|>,
-    <|dt: 19, host: "fqdn1", key: 4|>,
-    <|dt: 20, host: "fqdn1", key: 5|>,
-    <|dt: 21, host: "fqdn1", key: 6|>,
-    <|dt: 22, host: "fqdn1", key: 7|>,
-    <|dt: 23, host: "fqdn_2", key: 0|>,
-    <|dt: 24, host: "fqdn1", key: 8|>,
-    <|dt: 25, host: "fqdn1", key: 9|>,
-    <|dt: 26, host: "fqdn1", key: 10|>,
-    <|dt: 27, host: "fqdn__3", key: 30|>,
-    <|dt: 28, host: "fqdn__3", key: 1|>,
-    <|dt: 29, host: "fqdn__3", key: 2|>,
-    <|dt: 30, host: "fqdn__3", key: 3|>,
-    <|dt: 31, host: "fqdn__3", key: 4|>,
-    <|dt: 32, host: "fqdn1", key: 11|>,
-    <|dt: 33, host: "fqdn1", key: 12|>,
-    <|dt: 34, host: "fqdn1", key: 13|>,
-    <|dt: 35, host: "fqdn1", key: 14|>,
-    <|dt: 36, host: "fqdn__3", key: 15|>
+    <|dt: 15, host: 'fqdn1', key: 0|>,
+    <|dt: 16, host: 'fqdn1', key: 1|>,
+    <|dt: 17, host: 'fqdn1', key: 2|>,
+    <|dt: 18, host: 'fqdn1', key: 3|>,
+    <|dt: 19, host: 'fqdn1', key: 4|>,
+    <|dt: 20, host: 'fqdn1', key: 5|>,
+    <|dt: 21, host: 'fqdn1', key: 6|>,
+    <|dt: 22, host: 'fqdn1', key: 7|>,
+    <|dt: 23, host: 'fqdn_2', key: 0|>,
+    <|dt: 24, host: 'fqdn1', key: 8|>,
+    <|dt: 25, host: 'fqdn1', key: 9|>,
+    <|dt: 26, host: 'fqdn1', key: 10|>,
+    <|dt: 27, host: 'fqdn__3', key: 30|>,
+    <|dt: 28, host: 'fqdn__3', key: 1|>,
+    <|dt: 29, host: 'fqdn__3', key: 2|>,
+    <|dt: 30, host: 'fqdn__3', key: 3|>,
+    <|dt: 31, host: 'fqdn__3', key: 4|>,
+    <|dt: 32, host: 'fqdn1', key: 11|>,
+    <|dt: 33, host: 'fqdn1', key: 12|>,
+    <|dt: 34, host: 'fqdn1', key: 13|>,
+    <|dt: 35, host: 'fqdn1', key: 14|>,
+    <|dt: 36, host: 'fqdn__3', key: 15|>
 ];
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-simple_paritioning_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-simple_paritioning_/formatted.sql
index 5781e816ae..c35feef25e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-simple_paritioning_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-simple_paritioning_/formatted.sql
@@ -1,31 +1,31 @@
-PRAGMA FeatureR010 = "prototype";
-PRAGMA config.flags("MatchRecognizeStream", "disable");
+PRAGMA FeatureR010 = 'prototype';
+PRAGMA config.flags('MatchRecognizeStream', 'disable');
 
 USE plato;
 
 $data = [
-    <|dt: 15, host: "fqdn1", key: 0|>,
-    <|dt: 16, host: "fqdn1", key: 1|>,
-    <|dt: 17, host: "fqdn1", key: 2|>,
-    <|dt: 18, host: "fqdn1", key: 3|>,
-    <|dt: 19, host: "fqdn1", key: 4|>,
-    <|dt: 20, host: "fqdn1", key: 5|>,
-    <|dt: 21, host: "fqdn1", key: 6|>,
-    <|dt: 22, host: "fqdn1", key: 7|>,
-    <|dt: 23, host: "fqdn_2", key: 0|>,
-    <|dt: 24, host: "fqdn1", key: 8|>,
-    <|dt: 25, host: "fqdn1", key: 9|>,
-    <|dt: 26, host: "fqdn1", key: 10|>,
-    <|dt: 27, host: "fqdn__3", key: 30|>,
-    <|dt: 28, host: "fqdn__3", key: 1|>,
-    <|dt: 29, host: "fqdn__3", key: 2|>,
-    <|dt: 30, host: "fqdn__3", key: 3|>,
-    <|dt: 31, host: "fqdn__3", key: 4|>,
-    <|dt: 32, host: "fqdn1", key: 11|>,
-    <|dt: 33, host: "fqdn1", key: 12|>,
-    <|dt: 34, host: "fqdn1", key: 13|>,
-    <|dt: 35, host: "fqdn1", key: 14|>,
-    <|dt: 36, host: "fqdn__3", key: 15|>
+    <|dt: 15, host: 'fqdn1', key: 0|>,
+    <|dt: 16, host: 'fqdn1', key: 1|>,
+    <|dt: 17, host: 'fqdn1', key: 2|>,
+    <|dt: 18, host: 'fqdn1', key: 3|>,
+    <|dt: 19, host: 'fqdn1', key: 4|>,
+    <|dt: 20, host: 'fqdn1', key: 5|>,
+    <|dt: 21, host: 'fqdn1', key: 6|>,
+    <|dt: 22, host: 'fqdn1', key: 7|>,
+    <|dt: 23, host: 'fqdn_2', key: 0|>,
+    <|dt: 24, host: 'fqdn1', key: 8|>,
+    <|dt: 25, host: 'fqdn1', key: 9|>,
+    <|dt: 26, host: 'fqdn1', key: 10|>,
+    <|dt: 27, host: 'fqdn__3', key: 30|>,
+    <|dt: 28, host: 'fqdn__3', key: 1|>,
+    <|dt: 29, host: 'fqdn__3', key: 2|>,
+    <|dt: 30, host: 'fqdn__3', key: 3|>,
+    <|dt: 31, host: 'fqdn__3', key: 4|>,
+    <|dt: 32, host: 'fqdn1', key: 11|>,
+    <|dt: 33, host: 'fqdn1', key: 12|>,
+    <|dt: 34, host: 'fqdn1', key: 13|>,
+    <|dt: 35, host: 'fqdn1', key: 14|>,
+    <|dt: 36, host: 'fqdn__3', key: 15|>
 ];
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-test_type-streaming_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-test_type-streaming_/formatted.sql
index cf8850a411..729eeaab4d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-test_type-streaming_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-test_type-streaming_/formatted.sql
@@ -1,9 +1,9 @@
-PRAGMA FeatureR010 = "prototype";
-PRAGMA config.flags("MatchRecognizeStream", "force");
+PRAGMA FeatureR010 = 'prototype';
+PRAGMA config.flags('MatchRecognizeStream', 'force');
 
 USE plato;
 
-$data = [<|dt: 4, host: "fqdn1", key: 14|>];
+$data = [<|dt: 4, host: 'fqdn1', key: 14|>];
 
 -- NoPartitionNoMeasure
 SELECT
@@ -28,7 +28,7 @@ FROM
         ORDER BY
             CAST(dt AS Timestamp)
         MEASURES
-            "SomeString" AS Measure1
+            'SomeString' AS Measure1
         ONE ROW PER MATCH
         AFTER MATCH SKIP TO NEXT ROW
         PATTERN (Q)
@@ -64,7 +64,7 @@ FROM
         ORDER BY
             CAST(dt AS Timestamp)
         MEASURES
-            "SomeString" AS Measure1
+            'SomeString' AS Measure1
         ONE ROW PER MATCH
         AFTER MATCH SKIP TO NEXT ROW
         PATTERN (Y)
@@ -84,7 +84,7 @@ FROM
         ORDER BY
             CAST(dt AS Timestamp)
         MEASURES
-            "SomeString" AS S,
+            'SomeString' AS S,
             345 AS I
         ONE ROW PER MATCH
         AFTER MATCH SKIP TO NEXT ROW
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-test_type_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-test_type_/formatted.sql
index 19cd6abbe3..f1062213f7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-test_type_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-test_type_/formatted.sql
@@ -1,9 +1,9 @@
-PRAGMA FeatureR010 = "prototype";
-PRAGMA config.flags("MatchRecognizeStream", "disable");
+PRAGMA FeatureR010 = 'prototype';
+PRAGMA config.flags('MatchRecognizeStream', 'disable');
 
 USE plato;
 
-$data = [<|dt: 4, host: "fqdn1", key: 14|>];
+$data = [<|dt: 4, host: 'fqdn1', key: 14|>];
 
 -- NoPartitionNoMeasure
 SELECT
@@ -28,7 +28,7 @@ FROM
         ORDER BY
             CAST(dt AS Timestamp)
         MEASURES
-            "SomeString" AS Measure1
+            'SomeString' AS Measure1
         ONE ROW PER MATCH
         AFTER MATCH SKIP TO NEXT ROW
         PATTERN (Q)
@@ -64,7 +64,7 @@ FROM
         ORDER BY
             CAST(dt AS Timestamp)
         MEASURES
-            "SomeString" AS Measure1
+            'SomeString' AS Measure1
         ONE ROW PER MATCH
         AFTER MATCH SKIP TO NEXT ROW
         PATTERN (Y)
@@ -84,7 +84,7 @@ FROM
         ORDER BY
             CAST(dt AS Timestamp)
         MEASURES
-            "SomeString" AS S,
+            'SomeString' AS S,
             345 AS I
         ONE ROW PER MATCH
         AFTER MATCH SKIP TO NEXT ROW
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-test_type_predicate_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-test_type_predicate_/formatted.sql
index 6df70e6d16..939272de10 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-test_type_predicate_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-test_type_predicate_/formatted.sql
@@ -1,6 +1,6 @@
 /* custom error:DEFINE expression must be a predicate*/
-PRAGMA FeatureR010 = "prototype";
-PRAGMA config.flags("MatchRecognizeStream", "disable");
+PRAGMA FeatureR010 = 'prototype';
+PRAGMA config.flags('MatchRecognizeStream', 'disable');
 
 USE plato;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-and_absorption_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-and_absorption_/formatted.sql
index 437cb88b2d..df38b2c667 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-and_absorption_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-and_absorption_/formatted.sql
@@ -1,4 +1,4 @@
-PRAGMA config.flags("OptimizerFlags", "ExtractCommonPredicatesFromLogicalOps");
+PRAGMA config.flags('OptimizerFlags', 'ExtractCommonPredicatesFromLogicalOps');
 
 $a = 1 > 2;
 $b = 3 < 4;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-combinebykey_fields_subset_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-combinebykey_fields_subset_/formatted.sql
index 384af45b66..6bf913fda8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-combinebykey_fields_subset_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-combinebykey_fields_subset_/formatted.sql
@@ -3,5 +3,5 @@ SELECT
 FROM
     plato.Input
 WHERE
-    (key == "075" OR key == "150")
+    (key == '075' OR key == '150')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-combinebykey_fields_subset_range_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-combinebykey_fields_subset_range_/formatted.sql
index b0a1069dba..8e028fcad4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-combinebykey_fields_subset_range_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-combinebykey_fields_subset_range_/formatted.sql
@@ -4,5 +4,5 @@ SELECT
 FROM
     plato.CONCAT(Input0, Input1)
 WHERE
-    (key == "075" OR key == "150")
+    (key == '075' OR key == '150')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-field_subset_for_multiusage_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-field_subset_for_multiusage_/formatted.sql
index ee8c0922aa..875507b96c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-field_subset_for_multiusage_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-field_subset_for_multiusage_/formatted.sql
@@ -7,7 +7,7 @@ SELECT
 FROM
     concat(Input1, Input2)
 WHERE
-    subkey IN ("1", "2", "3", "4")
+    subkey IN ('1', '2', '3', '4')
 GROUP BY
     key
 ORDER BY
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-group_visit_lambdas_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-group_visit_lambdas_/formatted.sql
index 786eb3047d..bcd97513db 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-group_visit_lambdas_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-group_visit_lambdas_/formatted.sql
@@ -7,9 +7,9 @@ SELECT
     value,
     TablePath() AS path
 FROM
-    range("", "Input1", "Input5")
+    range('', 'Input1', 'Input5')
 WHERE
-    key != ""
+    key != ''
 ORDER BY
     key,
     subkey,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-length_over_merge_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-length_over_merge_/formatted.sql
index 5e5f49aa93..3b18fb379d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-length_over_merge_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-length_over_merge_/formatted.sql
@@ -23,7 +23,7 @@ $filtered = (
     FROM
         $input
     WHERE
-        key IN ("023", "037", "075")
+        key IN ('023', '037', '075')
 );
 
 $filtered_cnt = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-length_over_merge_fs_multiusage_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-length_over_merge_fs_multiusage_/formatted.sql
index dc28cca2ae..3a3c1f5999 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-length_over_merge_fs_multiusage_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-length_over_merge_fs_multiusage_/formatted.sql
@@ -1,5 +1,5 @@
 /* postgres can not */
-PRAGMA config.flags("OptimizerFlags", "FieldSubsetEnableMultiusage");
+PRAGMA config.flags('OptimizerFlags', 'FieldSubsetEnableMultiusage');
 
 USE plato;
 
@@ -25,7 +25,7 @@ $filtered = (
     FROM
         $input
     WHERE
-        key IN ("023", "037", "075")
+        key IN ('023', '037', '075')
 );
 
 $filtered_cnt = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-multi_to_empty_constraint_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-multi_to_empty_constraint_/formatted.sql
index 62c0e84f2f..84d83c9a67 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-multi_to_empty_constraint_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-multi_to_empty_constraint_/formatted.sql
@@ -10,7 +10,7 @@ FROM (
     FROM
         Input
     WHERE
-        key > "010" AND value IN []
+        key > '010' AND value IN []
 )
 GROUP BY
     key
@@ -24,7 +24,7 @@ FROM (
     FROM
         Input
     WHERE
-        key > "020" AND value IN []
+        key > '020' AND value IN []
 )
 GROUP BY
     key
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-nonselected_direct_row_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-nonselected_direct_row_/formatted.sql
index dc8200e9cd..f14edb726b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-nonselected_direct_row_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-nonselected_direct_row_/formatted.sql
@@ -14,5 +14,5 @@ FROM (
         concat(Input1, Input2)
 )
 WHERE
-    tbl == "Input" AND value != ""
+    tbl == 'Input' AND value != ''
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-or_absorption_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-or_absorption_/formatted.sql
index f465946d48..5798a0edf4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-or_absorption_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-or_absorption_/formatted.sql
@@ -1,4 +1,4 @@
-PRAGMA config.flags("OptimizerFlags", "ExtractCommonPredicatesFromLogicalOps");
+PRAGMA config.flags('OptimizerFlags', 'ExtractCommonPredicatesFromLogicalOps');
 
 $a = 1 > 2;
 $b = 3 < 4;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-or_distributive_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-or_distributive_/formatted.sql
index 12b0bc62ff..b635ce07ca 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-or_distributive_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-or_distributive_/formatted.sql
@@ -1,4 +1,4 @@
-PRAGMA config.flags("OptimizerFlags", "ExtractCommonPredicatesFromLogicalOps");
+PRAGMA config.flags('OptimizerFlags', 'ExtractCommonPredicatesFromLogicalOps');
 
 $a = 1 > 2;
 $b = 3 < 4;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-passthrough_sortness_over_map_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-passthrough_sortness_over_map_/formatted.sql
index a9a6afd84a..6d1ddd7420 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-passthrough_sortness_over_map_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-passthrough_sortness_over_map_/formatted.sql
@@ -20,7 +20,7 @@ SELECT
 FROM
     @a
 WHERE
-    key < "100"
+    key < '100'
 ORDER BY
     key,
     subkey
@@ -29,12 +29,12 @@ ORDER BY
 INSERT INTO @d
 SELECT
     key AS key,
-    "" AS subkey,
-    "value:" || value AS value
+    '' AS subkey,
+    'value:' || value AS value
 FROM
     @a
 WHERE
-    key < "100"
+    key < '100'
 ORDER BY
     key
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-pushdown_nonsep_over_aggregate_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-pushdown_nonsep_over_aggregate_/formatted.sql
index 4e2555289c..ec76e9be2e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-pushdown_nonsep_over_aggregate_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-pushdown_nonsep_over_aggregate_/formatted.sql
@@ -1,6 +1,6 @@
 USE plato;
 
-PRAGMA config.flags("OptimizerFlags", "PushdownComplexFiltersOverAggregate");
+PRAGMA config.flags('OptimizerFlags', 'PushdownComplexFiltersOverAggregate');
 
 SELECT
     *
@@ -14,5 +14,5 @@ FROM (
         key
 )
 WHERE
-    AssumeNonStrict(200 > 100) AND (2000 > 1000) AND key != "911" AND (key < "150" AND mv != "ddd" OR key > "200")
+    AssumeNonStrict(200 > 100) AND (2000 > 1000) AND key != '911' AND (key < '150' AND mv != 'ddd' OR key > '200')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sort_constraint_in_left_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sort_constraint_in_left_/formatted.sql
index d5019754ca..bf15cc3bd8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sort_constraint_in_left_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sort_constraint_in_left_/formatted.sql
@@ -17,7 +17,7 @@ FROM (
     FROM
         $input_table
     WHERE
-        key != "1"
+        key != '1'
     UNION ALL
     SELECT
         key,
@@ -25,7 +25,7 @@ FROM (
     FROM
         $input_table
     WHERE
-        key != "1"
+        key != '1'
     GROUP BY
         key
 )
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sorted_scalar_content_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sorted_scalar_content_/formatted.sql
index ec594db81f..be891a596b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sorted_scalar_content_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sorted_scalar_content_/formatted.sql
@@ -30,7 +30,7 @@ SELECT
 FROM
     $ou
 WHERE
-    subkey > "0"
+    subkey > '0'
     AND key != $a
 ORDER BY
     key
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sorted_sql_in_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sorted_sql_in_/formatted.sql
index 1ce2accd17..9b6ddb334e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sorted_sql_in_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sorted_sql_in_/formatted.sql
@@ -30,7 +30,7 @@ SELECT
 FROM
     $ou
 WHERE
-    subkey > "0"
+    subkey > '0'
     AND key NOT IN COMPACT (
         SELECT
             key
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-test_fuse_map_take_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-test_fuse_map_take_/formatted.sql
index 5bef415efc..256a45c7b0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-test_fuse_map_take_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-test_fuse_map_take_/formatted.sql
@@ -13,7 +13,7 @@ $filtered = (
     FROM
         $data
     WHERE
-        Name != "BadName"
+        Name != 'BadName'
     LIMIT 10
 );
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-test_lmap_opts_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-test_lmap_opts_/formatted.sql
index dd55db0dd1..857e76f125 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-test_lmap_opts_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-test_lmap_opts_/formatted.sql
@@ -30,13 +30,13 @@ $data = (
         plato.Input0
 );
 
-$prefix = ">>";
+$prefix = '>>';
 
 $p1 = (
     PROCESS $data
-    USING $udf($prefix, TableRows(), "=")
+    USING $udf($prefix, TableRows(), '=')
     WHERE
-        Name != "foo"
+        Name != 'foo'
 );
 
 $p2 = (
@@ -48,7 +48,7 @@ $p2 = (
 
 $p3 = (
     PROCESS $p2
-    USING Streaming::Process(TableRows(), "grep", AsList("180"))
+    USING Streaming::Process(TableRows(), 'grep', AsList('180'))
 );
 
 $p4 = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-total_order_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-total_order_/formatted.sql
index 97bb36ff73..25b536ff52 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-total_order_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-total_order_/formatted.sql
@@ -1,5 +1,5 @@
 /* postgres can not */
-$x = AsTuple(Double("nan"), 42);
+$x = AsTuple(Double('nan'), 42);
 
 SELECT
     $x == $x
@@ -25,7 +25,7 @@ SELECT
     $x != $x
 ;
 
-$x = AsStruct(Double("nan") AS a, 42 AS b);
+$x = AsStruct(Double('nan') AS a, 42 AS b);
 
 SELECT
     $x == $x
@@ -35,7 +35,7 @@ SELECT
     $x != $x
 ;
 
-$x = AsTuple(Nothing(ParseType("Int32?")), 1);
+$x = AsTuple(Nothing(ParseType('Int32?')), 1);
 
 SELECT
     $x == $x
@@ -61,7 +61,7 @@ SELECT
     $x != $x
 ;
 
-$x = Nothing(ParseType("Int32?"));
+$x = Nothing(ParseType('Int32?'));
 
 SELECT
     $x == $x
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-wide_if_present_over_double_just_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-wide_if_present_over_double_just_/formatted.sql
index bd4aec757b..7619782041 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-wide_if_present_over_double_just_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-wide_if_present_over_double_just_/formatted.sql
@@ -1,3 +1,3 @@
 SELECT
-    ListFromRange(Date("2022-01-01"), Just(Date("2022-03-01")), Interval("P1D") * 2U)
+    ListFromRange(Date('2022-01-01'), Just(Date('2022-03-01')), Interval('P1D') * 2U)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-10737_lost_passthrough_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-10737_lost_passthrough_/formatted.sql
index db59797b32..6634dce904 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-10737_lost_passthrough_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-10737_lost_passthrough_/formatted.sql
@@ -6,15 +6,15 @@ USE plato;
 
 INSERT INTO @a
 SELECT
-    "1" AS Text,
-    ["a", "b"] AS Attachments
+    '1' AS Text,
+    ['a', 'b'] AS Attachments
 ;
 
 COMMIT;
 
 SELECT
     x.*,
-    "" AS Text,
+    '' AS Text,
     ListCreate(TypeOf(Attachments)) AS Attachments
 WITHOUT
     x.Text,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-14279_keyextract_with_world_dep_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-14279_keyextract_with_world_dep_/formatted.sql
index e25c21bd8a..69ed2afddf 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-14279_keyextract_with_world_dep_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-14279_keyextract_with_world_dep_/formatted.sql
@@ -5,7 +5,7 @@ $input =
     SELECT
         *
     FROM
-        range("", "Input1", "Input2")
+        range('', 'Input1', 'Input2')
 ;
 
 $key =
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-15210_sqlin_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-15210_sqlin_/formatted.sql
index 3d7756c0a4..688305fa21 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-15210_sqlin_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-15210_sqlin_/formatted.sql
@@ -14,14 +14,14 @@ $list =
     FROM
         Input
     WHERE
-        subkey > "1"
+        subkey > '1'
 ;
 
 SELECT
     *
 FROM (
     SELECT
-        if(key == $max, "max", key) AS key,
+        if(key == $max, 'max', key) AS key,
         value
     FROM
         Input
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-17413-topsort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-17413-topsort_/formatted.sql
index 247e96f6e1..186e6d0e9a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-17413-topsort_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-17413-topsort_/formatted.sql
@@ -7,7 +7,7 @@ $filtered =
     FROM
         Input
     WHERE
-        value != "xxx"
+        value != 'xxx'
 ;
 
 SELECT DISTINCT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-17715_concat_sort_desc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-17715_concat_sort_desc_/formatted.sql
index 456063e7bc..6a8a435412 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-17715_concat_sort_desc_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-17715_concat_sort_desc_/formatted.sql
@@ -1,6 +1,6 @@
 USE plato;
 
-$min_ts_for_stat_calculation = DateTime::ToSeconds(CurrentUtcDate() - Interval("P1D"));
+$min_ts_for_stat_calculation = DateTime::ToSeconds(CurrentUtcDate() - Interval('P1D'));
 
 INSERT INTO @a
 SELECT
@@ -10,7 +10,7 @@ FROM (
         1ul AS puid,
         CurrentUtcTimestamp() AS timestamp,
         [1, 2] AS segments,
-        "a" AS dummy1
+        'a' AS dummy1
 )
 ASSUME ORDER BY
     puid,
@@ -25,7 +25,7 @@ FROM (
         4ul AS puid,
         CurrentUtcTimestamp() AS timestamp,
         [3, 2] AS segments,
-        "a" AS dummy1
+        'a' AS dummy1
 )
 ASSUME ORDER BY
     puid,
@@ -40,7 +40,7 @@ FROM (
         2ul AS puid,
         Just(CurrentUtcTimestamp()) AS timestamp,
         [2, 3] AS segments,
-        "a" AS dummy2
+        'a' AS dummy2
 )
 ASSUME ORDER BY
     puid,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-18300-flatmap-over-extend_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-18300-flatmap-over-extend_/formatted.sql
index ad08e53286..c9add00b70 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-18300-flatmap-over-extend_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-18300-flatmap-over-extend_/formatted.sql
@@ -2,9 +2,9 @@ USE plato;
 
 INSERT INTO @tmp WITH truncate
 SELECT
-    "dummy" AS a,
-    "1" AS b,
-    ["b", "s"] AS data
+    'dummy' AS a,
+    '1' AS b,
+    ['b', 's'] AS data
 ORDER BY
     a
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-18408_filter_multiusage_pushdown_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-18408_filter_multiusage_pushdown_/formatted.sql
index 5e86357aa6..689721d463 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-18408_filter_multiusage_pushdown_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-18408_filter_multiusage_pushdown_/formatted.sql
@@ -1,7 +1,7 @@
 USE plato;
 
 PRAGMA AnsiOptionalAs;
-PRAGMA config.flags("OptimizerFlags", "FieldSubsetEnableMultiusage", "FilterPushdownEnableMultiusage", "EarlyExpandSkipNull");
+PRAGMA config.flags('OptimizerFlags', 'FieldSubsetEnableMultiusage', 'FilterPushdownEnableMultiusage', 'EarlyExpandSkipNull');
 
 $date_dim =
     SELECT
@@ -22,9 +22,9 @@ $customer =
         *
     FROM
         as_table([
-            <|c_customer_sk: Just(1), c_customer_id: Just(1), c_first_name: Just("Vasya"), c_last_name: Just("Ivanov"), c_preferred_cust_flag: Just("aaa"), c_birth_country: Just("RU"), c_login: Just("ivanov"), c_email_address: Just("foo@bar.com")|>,
-            <|c_customer_sk: Just(2), c_customer_id: Just(2), c_first_name: Just("Petya"), c_last_name: Just("Ivanov"), c_preferred_cust_flag: Just("bbb"), c_birth_country: Just("RU"), c_login: Just("ivanov1"), c_email_address: Just("foo1@bar.com")|>,
-            <|c_customer_sk: Just(3), c_customer_id: NULL, c_first_name: NULL, c_last_name: NULL, c_preferred_cust_flag: NULL, c_birth_country: NULL, c_login: Just("ivanov1"), c_email_address: Just("foo2@bar.com")|>,
+            <|c_customer_sk: Just(1), c_customer_id: Just(1), c_first_name: Just('Vasya'), c_last_name: Just('Ivanov'), c_preferred_cust_flag: Just('aaa'), c_birth_country: Just('RU'), c_login: Just('ivanov'), c_email_address: Just('foo@bar.com')|>,
+            <|c_customer_sk: Just(2), c_customer_id: Just(2), c_first_name: Just('Petya'), c_last_name: Just('Ivanov'), c_preferred_cust_flag: Just('bbb'), c_birth_country: Just('RU'), c_login: Just('ivanov1'), c_email_address: Just('foo1@bar.com')|>,
+            <|c_customer_sk: Just(3), c_customer_id: NULL, c_first_name: NULL, c_last_name: NULL, c_preferred_cust_flag: NULL, c_birth_country: NULL, c_login: Just('ivanov1'), c_email_address: Just('foo2@bar.com')|>,
         ])
 ;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-18733_no_filter_multiusage_pushdown_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-18733_no_filter_multiusage_pushdown_/formatted.sql
index 613fffd48b..eee65a2cf4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-18733_no_filter_multiusage_pushdown_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-18733_no_filter_multiusage_pushdown_/formatted.sql
@@ -1,4 +1,4 @@
-PRAGMA config.flags("OptimizerFlags", "FilterPushdownEnableMultiusage");
+PRAGMA config.flags('OptimizerFlags', 'FilterPushdownEnableMultiusage');
 
 USE plato;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-2582_limit_for_join_input_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-2582_limit_for_join_input_/formatted.sql
index de2a64b5bb..68dfe4a8b7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-2582_limit_for_join_input_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-2582_limit_for_join_input_/formatted.sql
@@ -7,7 +7,7 @@ $data = (
     FROM
         Input1
     WHERE
-        key < "700"
+        key < '700'
     LIMIT 10
 );
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-2582_limit_for_join_input_other_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-2582_limit_for_join_input_other_/formatted.sql
index c03bbfc0e0..6b09ea9e9d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-2582_limit_for_join_input_other_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-2582_limit_for_join_input_other_/formatted.sql
@@ -13,7 +13,7 @@ $data = (
 SELECT
     key,
     subkey,
-    _other["value"]
+    _other['value']
 FROM
     $data
 LIMIT 100;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-3455_filter_sorted_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-3455_filter_sorted_/formatted.sql
index 78da5cddd2..b24bbcd192 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-3455_filter_sorted_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-3455_filter_sorted_/formatted.sql
@@ -6,7 +6,7 @@ SELECT
 FROM
     Input
 WHERE
-    subkey < "100"
+    subkey < '100'
 ;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-6008_limit_after_map_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-6008_limit_after_map_/formatted.sql
index 8fb130eeef..ddb5e50b45 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-6008_limit_after_map_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-6008_limit_after_map_/formatted.sql
@@ -8,7 +8,7 @@ SELECT
 FROM
     plato.Input
 WHERE
-    value != "111"
+    value != '111'
 LIMIT 3;
 
 COMMIT;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-6133_skip_deps_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-6133_skip_deps_/formatted.sql
index 5b3240b628..e01e54cca3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-6133_skip_deps_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-6133_skip_deps_/formatted.sql
@@ -8,7 +8,7 @@ $out = (
     FROM
         `Input`
     WHERE
-        value != "111"
+        value != '111'
 );
 
 $row_count = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-7324_duplicate_arg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-7324_duplicate_arg_/formatted.sql
index 9b17c18e28..66098948ed 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-7324_duplicate_arg_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-7324_duplicate_arg_/formatted.sql
@@ -7,7 +7,7 @@ $to_int = ($x) -> {
 };
 
 $to_in_list = ($col) -> {
-    RETURN ListMap(String::SplitToList($col, ","), $to_int);
+    RETURN ListMap(String::SplitToList($col, ','), $to_int);
 };
 
 $input = (
@@ -17,7 +17,7 @@ $input = (
     FROM
         Input
     WHERE
-        value == "aaa"
+        value == 'aaa'
 );
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-7767_key_filter_with_view_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-7767_key_filter_with_view_/formatted.sql
index 0d32a0c25c..bbf175a35e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-7767_key_filter_with_view_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-7767_key_filter_with_view_/formatted.sql
@@ -4,11 +4,11 @@ USE plato;
 
 SELECT
     key,
-    value || "_y" ?? "" AS value
+    value || '_y' ?? '' AS value
 FROM
-    range("", "Input1", "Input2")
+    range('', 'Input1', 'Input2')
 WHERE
-    key > "010"
+    key > '010'
 ORDER BY
     key,
     value
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-8041-fuse_with_desc_map_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-8041-fuse_with_desc_map_/formatted.sql
index fec66e7902..05c529047f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-8041-fuse_with_desc_map_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-8041-fuse_with_desc_map_/formatted.sql
@@ -8,7 +8,7 @@ $i = (
     FROM
         Input
     WHERE
-        key < "100"
+        key < '100'
     ORDER BY
         key DESC
     LIMIT 1000
@@ -19,7 +19,7 @@ SELECT DISTINCT
 FROM
     $i
 WHERE
-    value != ""
+    value != ''
 ORDER BY
     key
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-8223_direct_row_and_skipnullmembers_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-8223_direct_row_and_skipnullmembers_/formatted.sql
index dd5285fc7d..51b501c150 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-8223_direct_row_and_skipnullmembers_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-8223_direct_row_and_skipnullmembers_/formatted.sql
@@ -29,11 +29,11 @@ $y = (
         FROM
             Input
         WHERE
-            key != ""
+            key != ''
     ) AS info
     USING (key)
     WHERE
-        t.key IN ("023", "150")
+        t.key IN ('023', '150')
 );
 
 SELECT DISTINCT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-9297_publish_ytcopy_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-9297_publish_ytcopy_/formatted.sql
index 0552b7d171..f47d705e65 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-9297_publish_ytcopy_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-9297_publish_ytcopy_/formatted.sql
@@ -9,7 +9,7 @@ SELECT
 FROM
     Input
 WHERE
-    key < "100"
+    key < '100'
 ORDER BY
     key DESC
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql_5830_fuse_outer_with_extra_deps_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql_5830_fuse_outer_with_extra_deps_/formatted.sql
index 5aa5e911e7..f0c40b2a55 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql_5830_fuse_outer_with_extra_deps_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql_5830_fuse_outer_with_extra_deps_/formatted.sql
@@ -7,7 +7,7 @@ $data = (
     FROM
         Input
     WHERE
-        value > "a"
+        value > 'a'
 );
 
 SELECT
@@ -22,7 +22,7 @@ LEFT JOIN (
     FROM
         Input
     WHERE
-        key > "050"
+        key > '050'
 ) AS b
 ON
     a.key == b.key
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql_6179_merge_chunks_of_outputs_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql_6179_merge_chunks_of_outputs_/formatted.sql
index 7225f9c9e5..b95635bd4f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql_6179_merge_chunks_of_outputs_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql_6179_merge_chunks_of_outputs_/formatted.sql
@@ -1,8 +1,8 @@
 /* syntax version 1 */
 /* postgres can not */
 /* kikimr can not - yt pragma */
-PRAGMA yt.MinPublishedAvgChunkSize = "0";
-PRAGMA yt.MinTempAvgChunkSize = "0";
+PRAGMA yt.MinPublishedAvgChunkSize = '0';
+PRAGMA yt.MinTempAvgChunkSize = '0';
 
 USE plato;
 
@@ -12,7 +12,7 @@ $i = (
     FROM
         Input
     WHERE
-        key == "112"
+        key == '112'
     LIMIT 1
 );
 
@@ -22,7 +22,7 @@ $j = (
     FROM
         Input
     WHERE
-        key == "113"
+        key == '113'
     LIMIT 1
 );
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yson_dup_serialize_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yson_dup_serialize_/formatted.sql
index b0b1dd6b16..dcdfee35bf 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yson_dup_serialize_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yson_dup_serialize_/formatted.sql
@@ -4,9 +4,9 @@ $l = ($x) -> (ListMap($x, Yson::Serialize));
 $d = ($x) -> (ToDict(ListMap(DictItems($x), ($i) -> (($i.0, Yson::Serialize($i.1))))));
 
 SELECT
-    $l($l(Yson::ConvertToList(Yson("[1;2;3]"))))
+    $l($l(Yson::ConvertToList(Yson('[1;2;3]'))))
 ;
 
 SELECT
-    ListSort(DictItems($d($d(Yson::ConvertToDict(Yson("{a=1;b=2}"))))), ($x) -> ($x.0))
+    ListSort(DictItems($d($d(Yson::ConvertToDict(Yson('{a=1;b=2}'))))), ($x) -> ($x.0))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yt_shuffle_by_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yt_shuffle_by_keys_/formatted.sql
index 32406341d2..58f53dccd7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yt_shuffle_by_keys_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yt_shuffle_by_keys_/formatted.sql
@@ -8,7 +8,7 @@ $input =
 SELECT
     YQL::ShuffleByKeys(
         $input,
-        ($_) -> ("dsdsa"),
+        ($_) -> ('dsdsa'),
         ($_) -> ([1]) -- list
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-assume_with_filter_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-assume_with_filter_/formatted.sql
index bd097bd215..e3d5ed2cd6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-assume_with_filter_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-assume_with_filter_/formatted.sql
@@ -5,13 +5,13 @@ USE plato;
 
 INSERT INTO Output
 SELECT
-    "3" || key AS key,
+    '3' || key AS key,
     subkey,
     value
 FROM
     Input
 WHERE
-    key >= "0"
+    key >= '0'
 ASSUME ORDER BY
     key,
     subkey
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-changed_sort_with_limit_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-changed_sort_with_limit_/formatted.sql
index 2cad17bbc8..56534fca3c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-changed_sort_with_limit_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-changed_sort_with_limit_/formatted.sql
@@ -4,11 +4,11 @@ INSERT INTO Output
 SELECT
     key,
     '1' AS subkey,
-    value || "a" AS value
+    value || 'a' AS value
 FROM
     Input
 WHERE
-    key < "100"
+    key < '100'
 ORDER BY
     value
 LIMIT 3;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_complex_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_complex_/formatted.sql
index b7d41e7416..866a1d8f56 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_complex_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_complex_/formatted.sql
@@ -2,7 +2,7 @@
 /* hybridfile can not YQL-17743 */
 USE plato;
 
-$list = AsList(AsStruct(1 AS a, "2" AS b, "3" AS c), AsStruct(4 AS a, "5" AS b, "6" AS c));
+$list = AsList(AsStruct(1 AS a, '2' AS b, '3' AS c), AsStruct(4 AS a, '5' AS b, '6' AS c));
 
 INSERT INTO Output
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_expr_over_sorted_table_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_expr_over_sorted_table_/formatted.sql
index e195edd8f3..4db79210c6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_expr_over_sorted_table_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_expr_over_sorted_table_/formatted.sql
@@ -5,5 +5,5 @@ FROM
     plato.Input
 ORDER BY
     key,
-    String::SplitToList(value, "$", 2 AS Limit)[0]
+    String::SplitToList(value, '$', 2 AS Limit)[0]
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_/formatted.sql
index 32e16929e8..ea51d04333 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_/formatted.sql
@@ -14,7 +14,7 @@ SELECT
 FROM
     Input
 ORDER BY
-    "x" || key,
+    'x' || key,
     value
 ;
 
@@ -23,7 +23,7 @@ SELECT
 FROM
     Input
 ORDER BY
-    key || "x"
+    key || 'x'
 LIMIT 3;
 
 SELECT
@@ -31,7 +31,7 @@ SELECT
 FROM
     Input AS a
 ORDER BY
-    "x" || key,
+    'x' || key,
     a.value
 LIMIT 3;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_ignored_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_ignored_/formatted.sql
index c4e74b76d9..88af69b41e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_ignored_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_ignored_/formatted.sql
@@ -3,7 +3,7 @@
 /* dq can not */
 /* dqfile can not */
 /* yt can not */
-PRAGMA warning("disable", "4504");
+PRAGMA warning('disable', '4504');
 
 $t = [<|k: 1, v: 2|>];
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_with_null_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_with_null_/formatted.sql
index b31db0182d..a6ea344a2f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_with_null_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_with_null_/formatted.sql
@@ -4,8 +4,8 @@ USE plato;
 $input = (
     SELECT
         NULL AS key,
-        "0" AS subkey,
-        "kkk" AS value
+        '0' AS subkey,
+        'kkk' AS value
     UNION ALL
     SELECT
         *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-union_all_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-union_all_/formatted.sql
index 235539fa63..6dc27b8a57 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-union_all_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-union_all_/formatted.sql
@@ -1,6 +1,6 @@
 USE plato;
 
-PRAGMA DqEngine = "disable";
+PRAGMA DqEngine = 'disable';
 
 DEFINE SUBQUERY $sample($product_type) AS
     SELECT
@@ -14,7 +14,7 @@ DEFINE SUBQUERY $sample($product_type) AS
     LIMIT 10;
 END DEFINE;
 
-$list = ["a", "b"];
+$list = ['a', 'b'];
 $s = SubqueryUnionAllFor($list, $sample);
 
 $concated =
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-dict_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-dict_/formatted.sql
index c6db10fe75..e5e2179509 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-dict_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-dict_/formatted.sql
@@ -3,10 +3,10 @@ DECLARE $x AS Dict<String, Int64?>;
 DECLARE $x2 AS Dict<Utf8, Int64?>;
 
 SELECT
-    $x["a1"],
-    $x["a2"],
-    $x["a3"],
-    $x2["a1"],
-    $x2["a2"],
-    $x2["a3"]
+    $x['a1'],
+    $x['a2'],
+    $x['a3'],
+    $x2['a1'],
+    $x2['a2'],
+    $x2['a3']
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-param_in_json_api_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-param_in_json_api_/formatted.sql
index 2f6b1063c7..8db279e4b0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-param_in_json_api_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-param_in_json_api_/formatted.sql
@@ -10,22 +10,22 @@ DECLARE $json_param AS Json;
 SELECT
     JSON_VALUE (
         $input_json,
-        "strict $var" PASSING $int64_param AS var RETURNING Int64
+        'strict $var' PASSING $int64_param AS var RETURNING Int64
     ),
     JSON_VALUE (
         $input_json,
-        "strict $var" PASSING $double_param AS var RETURNING Double
+        'strict $var' PASSING $double_param AS var RETURNING Double
     ),
     JSON_VALUE (
         $input_json,
-        "strict $var" PASSING $bool_param AS var RETURNING Bool
+        'strict $var' PASSING $bool_param AS var RETURNING Bool
     ),
     JSON_VALUE (
         $input_json,
-        "strict $var" PASSING $string_param AS var RETURNING String
+        'strict $var' PASSING $string_param AS var RETURNING String
     ),
     JSON_QUERY (
         $input_json,
-        "strict $var" PASSING $json_param AS var
+        'strict $var' PASSING $json_param AS var
     )
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-primitives_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-primitives_/formatted.sql
index f3d9b8d288..19fc917dc6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-primitives_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-primitives_/formatted.sql
@@ -36,14 +36,14 @@ SELECT
     -$x2 * 10,
     NOT $x3,
     -$x4,
-    $x5 || "2018",
+    $x5 || '2018',
     -$x6,
     $x7 + 1,
     Length($x8),
     Unicode::GetLength($x9),
     CAST($x10 AS string),
-    coalesce($x11, "XYZ"),
-    coalesce($x12, "XYZ"),
+    coalesce($x11, 'XYZ'),
+    coalesce($x12, 'XYZ'),
     Yson::LookupInt64($x13, 'a'),
     Yson::ConvertToInt64($x14.b),
     CAST($x15 AS string),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-struct_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-struct_/formatted.sql
index 45eb910120..0da4dbca4b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-struct_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-struct_/formatted.sql
@@ -2,5 +2,5 @@
 DECLARE $x AS Struct<a: Int64, b: String?>;
 
 SELECT
-    CAST($x.a AS String) || coalesce($x.b, "zzz")
+    CAST($x.a AS String) || coalesce($x.b, 'zzz')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-aggregate_factory_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-aggregate_factory_/formatted.sql
index 63d1858772..0964162ab5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-aggregate_factory_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-aggregate_factory_/formatted.sql
@@ -23,7 +23,7 @@ FROM (
     x
 );
 
-$agg_string_agg = AggregationFactory("Pg::string_agg");
+$agg_string_agg = AggregationFactory('Pg::string_agg');
 
 SELECT
     AggregateBy((x, ','p), $agg_string_agg)
@@ -50,7 +50,7 @@ FROM (
     x
 );
 
-$agg_max = AggregationFactory("Pg::max");
+$agg_max = AggregationFactory('Pg::max');
 
 SELECT
     AggregateBy(x, $agg_max)
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-dates_to_pg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-dates_to_pg_/formatted.sql
index ec33e66f8f..d6269a51f4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-dates_to_pg_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-dates_to_pg_/formatted.sql
@@ -1,14 +1,14 @@
 SELECT
-    ToPg(date("1970-01-01")),
-    ToPg(date("2105-12-31")),
-    ToPg(datetime("1970-01-01T00:00:00Z")),
-    ToPg(datetime("2105-12-31T23:59:59Z")),
-    ToPg(timestamp("1970-01-01T00:00:00.000000Z")),
-    ToPg(timestamp("2105-12-31T23:59:59.999999Z")),
-    ToPg(date32("-4714-11-24")),
-    ToPg(date32("148107-12-31")),
-    ToPg(datetime64("-4714-11-24T00:00:00Z")),
-    ToPg(datetime64("148107-12-31T23:59:59Z")),
-    ToPg(timestamp64("-4714-11-24T00:00:00.000000Z")),
-    ToPg(timestamp64("148107-12-31T23:59:59.999999Z"))
+    ToPg(date('1970-01-01')),
+    ToPg(date('2105-12-31')),
+    ToPg(datetime('1970-01-01T00:00:00Z')),
+    ToPg(datetime('2105-12-31T23:59:59Z')),
+    ToPg(timestamp('1970-01-01T00:00:00.000000Z')),
+    ToPg(timestamp('2105-12-31T23:59:59.999999Z')),
+    ToPg(date32('-4714-11-24')),
+    ToPg(date32('148107-12-31')),
+    ToPg(datetime64('-4714-11-24T00:00:00Z')),
+    ToPg(datetime64('148107-12-31T23:59:59Z')),
+    ToPg(timestamp64('-4714-11-24T00:00:00.000000Z')),
+    ToPg(timestamp64('148107-12-31T23:59:59.999999Z'))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-numeric_to_pg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-numeric_to_pg_/formatted.sql
index 55ffc3757c..a1e7e06b74 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-numeric_to_pg_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-numeric_to_pg_/formatted.sql
@@ -3,5 +3,5 @@ SELECT
     ToPg(Decimal('inf', 25, 1)),
     ToPg(Decimal('-inf', 25, 1)),
     ToPg(Decimal('1.23', 25, 1)),
-    ToPg(DyNumber("-10.23"))
+    ToPg(DyNumber('-10.23'))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-pg_iterate_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-pg_iterate_/formatted.sql
index 30e4900d92..7049e0ec17 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-pg_iterate_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-pg_iterate_/formatted.sql
@@ -1,4 +1,4 @@
-PRAGMA warning("disable", "4510");
+PRAGMA warning('disable', '4510');
 
 $init = ListCreate(Struct<n: Int32>);
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-pg_type_from_oid_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-pg_type_from_oid_/formatted.sql
index 9c96677b32..dfeddb9f88 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-pg_type_from_oid_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-pg_type_from_oid_/formatted.sql
@@ -1,4 +1,4 @@
 SELECT
     FormatType(PgType(25)),
-    FormatType(PgType("int4"))
+    FormatType(PgType('int4'))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-pg_types_literal_mods_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-pg_types_literal_mods_/formatted.sql
index 0d9d6abdbf..23a23d8c8a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-pg_types_literal_mods_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-pg_types_literal_mods_/formatted.sql
@@ -1,15 +1,15 @@
 SELECT
-    PgConst(90, pginterval, "day"),
-    PgConst("1.2345678", pginterval, "second", 3),
-    PgConst('{90}', _pginterval, "day"),
+    PgConst(90, pginterval, 'day'),
+    PgConst('1.2345678', pginterval, 'second', 3),
+    PgConst('{90}', _pginterval, 'day'),
     PgConst('13.45', pgnumeric, 10, 1),
     PgConst('{13.45}', _pgnumeric, 10, 1),
-    PgCast('90'p, pginterval, "day"),
+    PgCast('90'p, pginterval, 'day'),
     PgCast('13.45'p, pgnumeric, 10, 1),
-    PgCast('{90}'p, _pginterval, "day"),
+    PgCast('{90}'p, _pginterval, 'day'),
     PgCast('{13.45}'p, _pgnumeric, 10, 1),
-    PgInterval(90, "day"),
+    PgInterval(90, 'day'),
     PgNumeric(13.45, 10, 1),
-    _PgInterval('{90}', "day"),
+    _PgInterval('{90}', 'day'),
     _PgNumeric('{13.45}', 10, 1)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-reflection_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-reflection_/formatted.sql
index 795e4c19a2..78b75dc047 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-reflection_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-reflection_/formatted.sql
@@ -1,4 +1,4 @@
 SELECT
-    FormatType(PgTypeHandle("text")),
+    FormatType(PgTypeHandle('text')),
     PgTypeName(TypeHandle(_pgint4))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-set_of_as_structs_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-set_of_as_structs_/formatted.sql
index da0a4ba439..1015ffeced 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-set_of_as_structs_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-set_of_as_structs_/formatted.sql
@@ -1,5 +1,5 @@
 SELECT
     *
 FROM
-    AS_TABLE(PgRangeCall("json_each", pgjson('{"a":"foo", "b":"bar"}')))
+    AS_TABLE(PgRangeCall('json_each', pgjson('{"a":"foo", "b":"bar"}')))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-str_lookup_pg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-str_lookup_pg_/formatted.sql
index 4c60555215..b9c068b362 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-str_lookup_pg_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-str_lookup_pg_/formatted.sql
@@ -1,4 +1,4 @@
-PRAGMA warning("disable", "4510");
+PRAGMA warning('disable', '4510');
 
 SELECT
     StartsWith('test1'u, 'tes'p),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-strings_to_pg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-strings_to_pg_/formatted.sql
index 320aa643ed..a0a98c25aa 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-strings_to_pg_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-strings_to_pg_/formatted.sql
@@ -1,14 +1,14 @@
 SELECT
-    ToPg("foo"),
-    ToPg(Utf8("bar")),
-    ToPg(Yson("<a=1>[]")),
+    ToPg('foo'),
+    ToPg(Utf8('bar')),
+    ToPg(Yson('<a=1>[]')),
     ToPg(Json('{"a":1}')),
-    ToPg(JsonDocument("[1,2,3]")),
+    ToPg(JsonDocument('[1,2,3]')),
     ToPg(Uuid('12345678-9abc-def0-1234-567890123456')),
-    ToPg(TzDate("2001-02-03,Europe/Moscow")),
-    ToPg(TzDatetime("2001-02-03T04:05:06,Europe/Moscow")),
-    ToPg(TzTimestamp("2001-02-03T04:05:06.789012,Europe/Moscow")),
-    ToPg(TzDate32("1901-02-03,Europe/Moscow")),
-    ToPg(TzDatetime64("1901-02-03T04:05:06,Europe/Moscow")),
-    ToPg(TzTimestamp64("1901-02-03T04:05:06.789012,Europe/Moscow"))
+    ToPg(TzDate('2001-02-03,Europe/Moscow')),
+    ToPg(TzDatetime('2001-02-03T04:05:06,Europe/Moscow')),
+    ToPg(TzTimestamp('2001-02-03T04:05:06.789012,Europe/Moscow')),
+    ToPg(TzDate32('1901-02-03,Europe/Moscow')),
+    ToPg(TzDatetime64('1901-02-03T04:05:06,Europe/Moscow')),
+    ToPg(TzTimestamp64('1901-02-03T04:05:06.789012,Europe/Moscow'))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-type_aliases_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-type_aliases_/formatted.sql
index 57ba2ca381..b05c507aff 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-type_aliases_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-type_aliases_/formatted.sql
@@ -1,11 +1,11 @@
 SELECT
-    pgboolean("true"),
-    pginteger("123"),
-    pgsmallint("123"),
-    pgbigint("123"),
-    pgreal("0.5"),
-    pgdouble_precision("0.5"),
-    pgcharacter("foo"),
-    pgtime_without_time_zone("12:00"),
-    pgcharacter_varying("bar")
+    pgboolean('true'),
+    pginteger('123'),
+    pgsmallint('123'),
+    pgbigint('123'),
+    pgreal('0.5'),
+    pgdouble_precision('0.5'),
+    pgcharacter('foo'),
+    pgtime_without_time_zone('12:00'),
+    pgcharacter_varying('bar')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-classic_division_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-classic_division_/formatted.sql
index 3604b8e628..0fc1254f29 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-classic_division_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-classic_division_/formatted.sql
@@ -3,20 +3,20 @@ SELECT
     1 / 2
 ;
 
-PRAGMA ClassicDivision("false");
+PRAGMA ClassicDivision('false');
 
 SELECT
     3 / 4
 ;
 
-PRAGMA ClassicDivision("true");
+PRAGMA ClassicDivision('true');
 
 SELECT
     5 / 6
 ;
 
 DEFINE ACTION $div_8_by_value($value) AS
-    PRAGMA ClassicDivision("false");
+    PRAGMA ClassicDivision('false');
 
     SELECT
         8 / $value
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-config_exec_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-config_exec_/formatted.sql
index 77db3fae73..13ec1b1909 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-config_exec_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-config_exec_/formatted.sql
@@ -3,12 +3,12 @@ USE plato;
 
 INSERT INTO Output
 SELECT
-    "1" AS key,
-    "1" AS subkey,
-    "1" AS value
+    '1' AS key,
+    '1' AS subkey,
+    '1' AS value
 ;
 
-PRAGMA File("file", "dummy");
+PRAGMA File('file', 'dummy');
 
 INSERT INTO Output
 SELECT
@@ -16,5 +16,5 @@ SELECT
 FROM
     Input
 WHERE
-    key < "030"
+    key < '030'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-file_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-file_/formatted.sql
index 536319ed49..9400b7828f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-file_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-file_/formatted.sql
@@ -1 +1 @@
-PRAGMA file("HW", "sbr:181041334");
+PRAGMA file('HW', 'sbr:181041334');
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_/formatted.sql
index 230be75982..632902d516 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_/formatted.sql
@@ -1,12 +1,12 @@
 /* kikimr can not */
 USE plato;
 
-PRAGMA yt.ReleaseTempData = "immediate";
-PRAGMA yt.InflightTempTablesLimit = "6";
+PRAGMA yt.ReleaseTempData = 'immediate';
+PRAGMA yt.InflightTempTablesLimit = '6';
 
 DEFINE ACTION $action($param) AS
     $key = CAST($param AS String);
-    $a = "Input";
+    $a = 'Input';
 
     $b = (
         SELECT
@@ -15,7 +15,7 @@ DEFINE ACTION $action($param) AS
         FROM
             $a
         WHERE
-            key != ($key || ".1")
+            key != ($key || '.1')
         GROUP BY
             key,
             value
@@ -31,7 +31,7 @@ DEFINE ACTION $action($param) AS
         FROM
             $b
         WHERE
-            key != ($key || ".2")
+            key != ($key || '.2')
         GROUP BY
             key,
             value
@@ -47,7 +47,7 @@ DEFINE ACTION $action($param) AS
         FROM
             $c
         WHERE
-            key != ($key || ".3")
+            key != ($key || '.3')
         GROUP BY
             key,
             value
@@ -63,7 +63,7 @@ DEFINE ACTION $action($param) AS
         FROM
             $d
         WHERE
-            key != ($key || ".4")
+            key != ($key || '.4')
         GROUP BY
             key,
             value
@@ -79,7 +79,7 @@ DEFINE ACTION $action($param) AS
         FROM
             $e
         WHERE
-            key != ($key || ".5")
+            key != ($key || '.5')
         GROUP BY
             key,
             value
@@ -95,7 +95,7 @@ DEFINE ACTION $action($param) AS
         FROM
             $f
         WHERE
-            key != ($key || ".6")
+            key != ($key || '.6')
         GROUP BY
             key,
             value
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_fail_/formatted.sql
index ec6e5c1975..ff0be8d198 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_fail_/formatted.sql
@@ -1,12 +1,12 @@
 USE plato;
 
-PRAGMA yt.ReleaseTempData = "finish";
-PRAGMA yt.InflightTempTablesLimit = "6";
+PRAGMA yt.ReleaseTempData = 'finish';
+PRAGMA yt.InflightTempTablesLimit = '6';
 
 /* custom error:Too many temporary tables registered - limit is 6*/
 DEFINE ACTION $action($param) AS
     $key = CAST($param AS String);
-    $a = "Input";
+    $a = 'Input';
 
     $b = (
         SELECT
@@ -15,7 +15,7 @@ DEFINE ACTION $action($param) AS
         FROM
             $a
         WHERE
-            key != ($key || ".1")
+            key != ($key || '.1')
         GROUP BY
             key,
             value
@@ -31,7 +31,7 @@ DEFINE ACTION $action($param) AS
         FROM
             $b
         WHERE
-            key != ($key || ".2")
+            key != ($key || '.2')
         GROUP BY
             key,
             value
@@ -47,7 +47,7 @@ DEFINE ACTION $action($param) AS
         FROM
             $c
         WHERE
-            key != ($key || ".3")
+            key != ($key || '.3')
         GROUP BY
             key,
             value
@@ -63,7 +63,7 @@ DEFINE ACTION $action($param) AS
         FROM
             $d
         WHERE
-            key != ($key || ".4")
+            key != ($key || '.4')
         GROUP BY
             key,
             value
@@ -79,7 +79,7 @@ DEFINE ACTION $action($param) AS
         FROM
             $e
         WHERE
-            key != ($key || ".5")
+            key != ($key || '.5')
         GROUP BY
             key,
             value
@@ -95,7 +95,7 @@ DEFINE ACTION $action($param) AS
         FROM
             $f
         WHERE
-            key != ($key || ".6")
+            key != ($key || '.6')
         GROUP BY
             key,
             value
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_single_thread_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_single_thread_/formatted.sql
index f63d12b48d..581b5c98a6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_single_thread_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_single_thread_/formatted.sql
@@ -1,12 +1,12 @@
 /* kikimr can not */
 USE plato;
 
-PRAGMA yt.ReleaseTempData = "immediate";
-PRAGMA yt.InflightTempTablesLimit = "3";
+PRAGMA yt.ReleaseTempData = 'immediate';
+PRAGMA yt.InflightTempTablesLimit = '3';
 
 DEFINE ACTION $action($param) AS
     $key = CAST($param AS String);
-    $a = "Input";
+    $a = 'Input';
 
     $b = (
         SELECT
@@ -15,7 +15,7 @@ DEFINE ACTION $action($param) AS
         FROM
             $a
         WHERE
-            key != ($key || ".1")
+            key != ($key || '.1')
         GROUP BY
             key,
             value
@@ -31,7 +31,7 @@ DEFINE ACTION $action($param) AS
         FROM
             $b
         WHERE
-            key != ($key || ".2")
+            key != ($key || '.2')
         GROUP BY
             key,
             value
@@ -47,7 +47,7 @@ DEFINE ACTION $action($param) AS
         FROM
             $c
         WHERE
-            key != ($key || ".3")
+            key != ($key || '.3')
         GROUP BY
             key,
             value
@@ -63,7 +63,7 @@ DEFINE ACTION $action($param) AS
         FROM
             $d
         WHERE
-            key != ($key || ".4")
+            key != ($key || '.4')
         GROUP BY
             key,
             value
@@ -79,7 +79,7 @@ DEFINE ACTION $action($param) AS
         FROM
             $e
         WHERE
-            key != ($key || ".5")
+            key != ($key || '.5')
         GROUP BY
             key,
             value
@@ -95,7 +95,7 @@ DEFINE ACTION $action($param) AS
         FROM
             $f
         WHERE
-            key != ($key || ".6")
+            key != ($key || '.6')
         GROUP BY
             key,
             value
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_single_thread_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_single_thread_fail_/formatted.sql
index cae788b7ea..1b58c7dd64 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_single_thread_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_single_thread_fail_/formatted.sql
@@ -1,13 +1,13 @@
 /* dq can not */
 USE plato;
 
-PRAGMA yt.ReleaseTempData = "immediate";
-PRAGMA yt.InflightTempTablesLimit = "2";
+PRAGMA yt.ReleaseTempData = 'immediate';
+PRAGMA yt.InflightTempTablesLimit = '2';
 
 /* custom error:Too many temporary tables registered - limit is 2*/
 DEFINE ACTION $action($param) AS
     $key = CAST($param AS String);
-    $a = "Input";
+    $a = 'Input';
 
     $b = (
         SELECT
@@ -16,7 +16,7 @@ DEFINE ACTION $action($param) AS
         FROM
             $a
         WHERE
-            key != ($key || ".1")
+            key != ($key || '.1')
         GROUP BY
             key,
             value
@@ -32,7 +32,7 @@ DEFINE ACTION $action($param) AS
         FROM
             $b
         WHERE
-            key != ($key || ".2")
+            key != ($key || '.2')
         GROUP BY
             key,
             value
@@ -48,7 +48,7 @@ DEFINE ACTION $action($param) AS
         FROM
             $c
         WHERE
-            key != ($key || ".3")
+            key != ($key || '.3')
         GROUP BY
             key,
             value
@@ -64,7 +64,7 @@ DEFINE ACTION $action($param) AS
         FROM
             $d
         WHERE
-            key != ($key || ".4")
+            key != ($key || '.4')
         GROUP BY
             key,
             value
@@ -80,7 +80,7 @@ DEFINE ACTION $action($param) AS
         FROM
             $e
         WHERE
-            key != ($key || ".5")
+            key != ($key || '.5')
         GROUP BY
             key,
             value
@@ -96,7 +96,7 @@ DEFINE ACTION $action($param) AS
         FROM
             $f
         WHERE
-            key != ($key || ".6")
+            key != ($key || '.6')
         GROUP BY
             key,
             value
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-yson_auto_convert_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-yson_auto_convert_/formatted.sql
index f15124c969..e0fc87438c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-yson_auto_convert_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-yson_auto_convert_/formatted.sql
@@ -3,5 +3,5 @@ PRAGMA yson.AutoConvert;
 PRAGMA yson.Strict;
 
 SELECT
-    Yson::ConvertToString(Yson("[123;]").0)
+    Yson::ConvertToString(Yson('[123;]').0)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-yson_strict_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-yson_strict_fail_/formatted.sql
index b7a13f024c..2d417ab321 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-yson_strict_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-yson_strict_fail_/formatted.sql
@@ -3,5 +3,5 @@
 PRAGMA yson.Strict;
 
 SELECT
-    Yson::ConvertToString(Yson("122"))
+    Yson::ConvertToString(Yson('122'))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_and_filter_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_and_filter_/formatted.sql
index 03125d8b5d..d7568e3eb6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_and_filter_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_and_filter_/formatted.sql
@@ -2,5 +2,5 @@
 PROCESS pLaTo.Input0
 USING SimpleUdf::Echo(value) AS val
 WHERE
-    value == "abc"
+    value == 'abc'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_in_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_in_/formatted.sql
index ee2fbdad2d..6f7fc29fc4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_in_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_in_/formatted.sql
@@ -23,7 +23,7 @@ $src = (
     FROM
         plato.Input
     WHERE
-        key > "200"
+        key > '200'
 );
 
 $i, $j, $k = (
@@ -33,7 +33,7 @@ $i, $j, $k = (
         FROM
             plato.Input
         WHERE
-            key > "100"
+            key > '100'
     ), $src
     USING $udf(TableRows())
 );
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_in_single_out_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_in_single_out_/formatted.sql
index 0cae0255d4..0acc06292a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_in_single_out_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_in_single_out_/formatted.sql
@@ -27,6 +27,6 @@ PROCESS plato.Input0, (
     FROM
         plato.Input0
     WHERE
-        key > "100"
+        key > '100'
 )
 USING $udf(TableRows());
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_pure_with_sort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_pure_with_sort_/formatted.sql
index f111a4a0a7..864e7298aa 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_pure_with_sort_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_pure_with_sort_/formatted.sql
@@ -9,7 +9,7 @@ $sorted = ($world, $input, $orderByColumns, $asc) -> {
             $items = ListMap(
                 $orderByColumns,
                 ($x) -> {
-                    RETURN FuncCode("Member", $row, AtomCode($x));
+                    RETURN FuncCode('Member', $row, AtomCode($x));
                 }
             );
             RETURN ListCode($items);
@@ -19,7 +19,7 @@ $sorted = ($world, $input, $orderByColumns, $asc) -> {
         LambdaCode(
             ($x) -> {
                 RETURN FuncCode(
-                    "Sort",
+                    'Sort',
                     $x,
                     ListCode(ListReplicate(ReprCode($asc), $n)),
                     $keySelector
@@ -34,8 +34,8 @@ DEFINE SUBQUERY $source() AS
     PROCESS Input0;
 END DEFINE;
 
-PROCESS $sorted($source, AsList("key", "subkey"), TRUE);
+PROCESS $sorted($source, AsList('key', 'subkey'), TRUE);
 
-PROCESS $sorted($source, AsList("value"), TRUE);
+PROCESS $sorted($source, AsList('value'), TRUE);
 
-PROCESS $sorted($source, ListCreate(TypeOf("")), TRUE);
+PROCESS $sorted($source, ListCreate(TypeOf('')), TRUE);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_row_and_columns_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_row_and_columns_/formatted.sql
index e724938169..ace356916b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_row_and_columns_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_row_and_columns_/formatted.sql
@@ -19,7 +19,7 @@ $data = (
         plato.Input0
 );
 
-$separator = "|";
+$separator = '|';
 
 PROCESS $data
 USING $udf(TableRow(), Tag, $separator);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_rows_and_filter_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_rows_and_filter_/formatted.sql
index bcd5650b40..d348b0d452 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_rows_and_filter_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_rows_and_filter_/formatted.sql
@@ -22,10 +22,10 @@ $data = (
         plato.Input1
 );
 
-$prefix = ">>";
+$prefix = '>>';
 
 PROCESS $data
-USING $udf($prefix, TableRows(), "=")
+USING $udf($prefix, TableRows(), '=')
 WHERE
-    Name != "foo"
+    Name != 'foo'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_rows_sorted_desc_multi_out_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_rows_sorted_desc_multi_out_/formatted.sql
index 6596b4f06f..a67503495d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_rows_sorted_desc_multi_out_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_rows_sorted_desc_multi_out_/formatted.sql
@@ -22,10 +22,10 @@ $splitter = ($rows) -> {
     RETURN Yql::OrderedMap(
         $rows, ($row) -> {
             RETURN CASE $row.x
-                WHEN 0 THEN VARIANT ($row, "0", $varType)
-                WHEN 1 THEN VARIANT ($row, "1", $varType)
-                WHEN 2 THEN VARIANT ($row, "2", $varType)
-                ELSE VARIANT ($row, "3", $varType)
+                WHEN 0 THEN VARIANT ($row, '0', $varType)
+                WHEN 1 THEN VARIANT ($row, '1', $varType)
+                WHEN 2 THEN VARIANT ($row, '2', $varType)
+                ELSE VARIANT ($row, '3', $varType)
             END;
         }
     );
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_rows_sorted_multi_out_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_rows_sorted_multi_out_/formatted.sql
index 7170b6c85f..f4a2a0ea57 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_rows_sorted_multi_out_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_rows_sorted_multi_out_/formatted.sql
@@ -22,10 +22,10 @@ $splitter = ($rows) -> {
     RETURN Yql::OrderedMap(
         $rows, ($row) -> {
             RETURN CASE $row.x
-                WHEN 0 THEN VARIANT ($row, "0", $varType)
-                WHEN 1 THEN VARIANT ($row, "1", $varType)
-                WHEN 2 THEN VARIANT ($row, "2", $varType)
-                ELSE VARIANT ($row, "3", $varType)
+                WHEN 0 THEN VARIANT ($row, '0', $varType)
+                WHEN 1 THEN VARIANT ($row, '1', $varType)
+                WHEN 2 THEN VARIANT ($row, '2', $varType)
+                ELSE VARIANT ($row, '3', $varType)
             END;
         }
     );
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_sorted_desc_multi_out_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_sorted_desc_multi_out_/formatted.sql
index 076f511afa..5cabba9b3e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_sorted_desc_multi_out_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_sorted_desc_multi_out_/formatted.sql
@@ -20,10 +20,10 @@ $splitter = ($row) -> {
     $recordType = TypeOf($row);
     $varType = VariantType(TupleType($recordType, $recordType, $recordType, $recordType));
     RETURN CASE $row.x
-        WHEN 0 THEN VARIANT ($row, "0", $varType)
-        WHEN 1 THEN VARIANT ($row, "1", $varType)
-        WHEN 2 THEN VARIANT ($row, "2", $varType)
-        ELSE VARIANT ($row, "3", $varType)
+        WHEN 0 THEN VARIANT ($row, '0', $varType)
+        WHEN 1 THEN VARIANT ($row, '1', $varType)
+        WHEN 2 THEN VARIANT ($row, '2', $varType)
+        ELSE VARIANT ($row, '3', $varType)
     END;
 };
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_sorted_multi_out_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_sorted_multi_out_/formatted.sql
index 729ede6ba1..97b5d981b5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_sorted_multi_out_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_sorted_multi_out_/formatted.sql
@@ -20,10 +20,10 @@ $splitter = ($row) -> {
     $recordType = TypeOf($row);
     $varType = VariantType(TupleType($recordType, $recordType, $recordType, $recordType));
     RETURN CASE $row.x
-        WHEN 0 THEN VARIANT ($row, "0", $varType)
-        WHEN 1 THEN VARIANT ($row, "1", $varType)
-        WHEN 2 THEN VARIANT ($row, "2", $varType)
-        ELSE VARIANT ($row, "3", $varType)
+        WHEN 0 THEN VARIANT ($row, '0', $varType)
+        WHEN 1 THEN VARIANT ($row, '1', $varType)
+        WHEN 2 THEN VARIANT ($row, '2', $varType)
+        ELSE VARIANT ($row, '3', $varType)
     END;
 };
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_streaming_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_streaming_/formatted.sql
index 403270b7e2..e9b08e062f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_streaming_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_streaming_/formatted.sql
@@ -3,14 +3,14 @@
 -- not supported on windows
 $input = (
     SELECT
-        String::JoinFromList(AsList(key, subkey, value), ",") AS Data
+        String::JoinFromList(AsList(key, subkey, value), ',') AS Data
     FROM
         plato.Input1
 );
 
 $processed = (
     PROCESS $input
-    USING Streaming::Process(TableRows(), "grep", AsList("[14]"))
+    USING Streaming::Process(TableRows(), 'grep', AsList('[14]'))
 );
 
 $list = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_streaming_count_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_streaming_count_/formatted.sql
index 35cc47d693..a82d184958 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_streaming_count_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_streaming_count_/formatted.sql
@@ -3,14 +3,14 @@
 -- not supported on windows
 $input = (
     SELECT
-        String::JoinFromList(AsList(key, subkey, value), ",") AS Data
+        String::JoinFromList(AsList(key, subkey, value), ',') AS Data
     FROM
         plato.Input1
 );
 
 $processed = (
     PROCESS $input
-    USING Streaming::Process(TableRows(), "grep", AsList("[14]"))
+    USING Streaming::Process(TableRows(), 'grep', AsList('[14]'))
 );
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_streaming_inline_bash_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_streaming_inline_bash_/formatted.sql
index da7b03a62a..d9f6e3eab7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_streaming_inline_bash_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_streaming_inline_bash_/formatted.sql
@@ -8,10 +8,10 @@ cat - | grep $1 | head -n 3 | grep [234]
 
 $input = (
     SELECT
-        String::JoinFromList(AsList(key, subkey, value), ",") AS Data
+        String::JoinFromList(AsList(key, subkey, value), ',') AS Data
     FROM
         plato.Input1
 );
 
 PROCESS $input
-USING Streaming::ProcessInline(TableRows(), $script, AsList("bar"));
+USING Streaming::ProcessInline(TableRows(), $script, AsList('bar'));
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_udf_validate_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_udf_validate_/formatted.sql
index c723a18ceb..7ae7e7c6ce 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_udf_validate_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_udf_validate_/formatted.sql
@@ -4,7 +4,7 @@ $processed = (
     USING Person::New(key, subkey, coalesce(CAST(value AS Uint32), 0))
 );
 
-PRAGMA config.flags("ValidateUdf", "Lazy");
+PRAGMA config.flags('ValidateUdf', 'Lazy');
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_udf_validate_ignore_broken_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_udf_validate_ignore_broken_/formatted.sql
index f823ed2ce4..6fb9467814 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_udf_validate_ignore_broken_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_udf_validate_ignore_broken_/formatted.sql
@@ -4,7 +4,7 @@ $processed = (
     USING Person::New(key, subkey, Length(SimpleUdf::ReturnBrokenInt()))
 );
 
-PRAGMA config.flags("ValidateUdf", "None");
+PRAGMA config.flags('ValidateUdf', 'None');
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_lambda_list_mem_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_lambda_list_mem_/formatted.sql
index cd79b45d30..704b0848fb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_lambda_list_mem_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_lambda_list_mem_/formatted.sql
@@ -9,8 +9,8 @@ $udf = YQL::@@(lambda '(key stream) (AsStruct
 $res = (
     REDUCE (
         SELECT
-            AsList("foo") AS key,
-            "123" AS value
+            AsList('foo') AS key,
+            '123' AS value
     )
     ON
         key
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_difftype_assume_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_difftype_assume_/formatted.sql
index 59c47af2a6..7091e3a4c7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_difftype_assume_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_difftype_assume_/formatted.sql
@@ -13,9 +13,9 @@ $reducer = ($key, $stream) -> {
     $stream = YQL::OrderedMap(
         $stream, ($item) -> {
             RETURN AsStruct(
-                YQL::Guess($item, AsAtom("0")).t1 AS t1,
-                YQL::Guess($item, AsAtom("1")).t2 AS t2,
-                YQL::Guess($item, AsAtom("2")).t3 AS t3,
+                YQL::Guess($item, AsAtom('0')).t1 AS t1,
+                YQL::Guess($item, AsAtom('1')).t2 AS t2,
+                YQL::Guess($item, AsAtom('2')).t3 AS t3,
             );
         }
     );
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_difftype_assume_keytuple_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_difftype_assume_keytuple_/formatted.sql
index 3180442c68..4cfcefedc7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_difftype_assume_keytuple_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_difftype_assume_keytuple_/formatted.sql
@@ -13,9 +13,9 @@ $reducer = ($key, $stream) -> {
     $stream = YQL::OrderedMap(
         $stream, ($item) -> {
             RETURN AsStruct(
-                YQL::Guess($item, AsAtom("0")).t1 AS t1,
-                YQL::Guess($item, AsAtom("1")).t2 AS t2,
-                YQL::Guess($item, AsAtom("2")).t3 AS t3,
+                YQL::Guess($item, AsAtom('0')).t1 AS t1,
+                YQL::Guess($item, AsAtom('1')).t2 AS t2,
+                YQL::Guess($item, AsAtom('2')).t3 AS t3,
             );
         }
     );
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_ref_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_ref_/formatted.sql
index ebefe49beb..696076ec34 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_ref_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_ref_/formatted.sql
@@ -23,7 +23,7 @@ $src = (
     FROM
         plato.Input
     WHERE
-        key > "200"
+        key > '200'
 );
 
 $r = (
@@ -33,7 +33,7 @@ $r = (
         FROM
             Input
         WHERE
-            key > "100"
+            key > '100'
     ), $src
     ON
         key
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_typeinfo_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_typeinfo_/formatted.sql
index 58e095cac7..cf7354cb97 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_typeinfo_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_typeinfo_/formatted.sql
@@ -3,7 +3,7 @@
 /* ignore runonopt plan diff */
 USE plato;
 
-PRAGMA warning("disable", "4510");
+PRAGMA warning('disable', '4510');
 
 $r1 =
     REDUCE Input0
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_trivial_remaps_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_trivial_remaps_/formatted.sql
index a29b85cedb..dd4a713a91 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_trivial_remaps_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_trivial_remaps_/formatted.sql
@@ -1,6 +1,6 @@
 USE plato;
 
-PRAGMA warning("disable", "4510");
+PRAGMA warning('disable', '4510');
 
 $udf = ($_key, $stream) -> {
     $init = ($item) -> (AsStruct(1u AS cnt, $item AS row));
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-yql-10297_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-yql-10297_/formatted.sql
index eeb5f095d6..f5fe853003 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-yql-10297_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-yql-10297_/formatted.sql
@@ -4,7 +4,7 @@ DEFINE SUBQUERY $t() AS
     SELECT
         *
     FROM
-        as_table([<|key: "0"|>, <|key: "1"|>])
+        as_table([<|key: '0'|>, <|key: '1'|>])
     ;
 END DEFINE;
 
@@ -18,8 +18,8 @@ DEFINE SUBQUERY $split_formula_log($in) AS
             )
         );
         RETURN CASE
-            WHEN $row.key == "0" THEN VARIANT ($row, "0", $varType)
-            WHEN $row.key == "1" THEN VARIANT ($row, "1", $varType)
+            WHEN $row.key == '0' THEN VARIANT ($row, '0', $varType)
+            WHEN $row.key == '1' THEN VARIANT ($row, '1', $varType)
             ELSE NULL
         END;
     };
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_join_left_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_join_left_/formatted.sql
index af0da6f7e9..53a8cb05ec 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_join_left_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_join_left_/formatted.sql
@@ -12,7 +12,7 @@ $a =
     FROM
         Input
     WHERE
-        key > "199" AND value != "bbb"
+        key > '199' AND value != 'bbb'
 ;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_join_right_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_join_right_/formatted.sql
index 2adf0856e6..ec7276280e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_join_right_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_join_right_/formatted.sql
@@ -12,7 +12,7 @@ $a =
     FROM
         Input
     WHERE
-        key > "199" AND value != "bbb"
+        key > '199' AND value != 'bbb'
 ;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-map_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-map_/formatted.sql
index 0931bba475..ad17fc56c1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-map_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-map_/formatted.sql
@@ -6,5 +6,5 @@ FROM
     plato.Input
     TABLESAMPLE BERNOULLI (30) REPEATABLE (1)
 WHERE
-    subkey > "1"
+    subkey > '1'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-mapjoin_left_sample_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-mapjoin_left_sample_/formatted.sql
index 38735f8efe..2cfc205180 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-mapjoin_left_sample_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-mapjoin_left_sample_/formatted.sql
@@ -3,7 +3,7 @@
 USE plato;
 
 PRAGMA DisableSimpleColumns;
-PRAGMA yt.MapJoinLimit = "1m";
+PRAGMA yt.MapJoinLimit = '1m';
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-mapjoin_right_sample_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-mapjoin_right_sample_/formatted.sql
index bee1d03a00..81fbc09c96 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-mapjoin_right_sample_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-mapjoin_right_sample_/formatted.sql
@@ -3,7 +3,7 @@
 /* syntax version 1 */
 USE plato;
 
-PRAGMA yt.MapJoinLimit = "1m";
+PRAGMA yt.MapJoinLimit = '1m';
 PRAGMA DisableSimpleColumns;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-orderedjoin_left_sample_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-orderedjoin_left_sample_/formatted.sql
index 83e1335b9f..1173f812d3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-orderedjoin_left_sample_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-orderedjoin_left_sample_/formatted.sql
@@ -4,7 +4,7 @@
 /* syntax version 1 */
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "2";
+PRAGMA yt.JoinMergeTablesLimit = '2';
 PRAGMA DisableSimpleColumns;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-orderedjoin_right_sample_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-orderedjoin_right_sample_/formatted.sql
index 98f65b1d4b..23850c8a27 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-orderedjoin_right_sample_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-orderedjoin_right_sample_/formatted.sql
@@ -4,7 +4,7 @@
 /* syntax version 1 */
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "2";
+PRAGMA yt.JoinMergeTablesLimit = '2';
 PRAGMA DisableSimpleColumns;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_filter_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_filter_/formatted.sql
index 368b3db49e..90e69048e6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_filter_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_filter_/formatted.sql
@@ -9,9 +9,9 @@ FROM (
     FROM
         plato.Input
     WHERE
-        subkey != "1"
+        subkey != '1'
 )
 TABLESAMPLE BERNOULLI (44)
 WHERE
-    key > "50"
+    key > '50'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_mapjoin_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_mapjoin_/formatted.sql
index 4411bcbca2..698decc049 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_mapjoin_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_mapjoin_/formatted.sql
@@ -5,7 +5,7 @@
 USE plato;
 
 PRAGMA DisableSimpleColumns;
-PRAGMA yt.MapJoinLimit = "1m";
+PRAGMA yt.MapJoinLimit = '1m';
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-yql-14664_deps_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-yql-14664_deps_/formatted.sql
index 70c886b980..9e4fb2482e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-yql-14664_deps_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-yql-14664_deps_/formatted.sql
@@ -8,7 +8,7 @@ SELECT
 FROM
     Input
 WHERE
-    key > "020"
+    key > '020'
 ;
 
 COMMIT;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-append_to_desc_with_remap_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-append_to_desc_with_remap_/formatted.sql
index b2fe45e429..08235f208e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-append_to_desc_with_remap_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-append_to_desc_with_remap_/formatted.sql
@@ -7,7 +7,7 @@ SELECT
 FROM
     Input
 WHERE
-    key > "000"
+    key > '000'
 ORDER BY
     key DESC,
     subkey DESC
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-def_values_job_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-def_values_job_/formatted.sql
index 124de88178..3a8b854c19 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-def_values_job_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-def_values_job_/formatted.sql
@@ -5,5 +5,5 @@ SELECT
 FROM
     plato.Input
 WHERE
-    key != "fake"
+    key != 'fake'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-other_job_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-other_job_/formatted.sql
index eae35ea596..6080ff284b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-other_job_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-other_job_/formatted.sql
@@ -4,5 +4,5 @@ SELECT
 FROM
     plato.range(``, Input1, Input2)
 WHERE
-    key != "fake"
+    key != 'fake'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-select_all_forceinferschema_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-select_all_forceinferschema_/formatted.sql
index ea029b8ed4..14f47482b3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-select_all_forceinferschema_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-select_all_forceinferschema_/formatted.sql
@@ -7,11 +7,11 @@ FROM
 SELECT
     *
 FROM
-    plato.Input2 WITH forceinferschema = "2"
+    plato.Input2 WITH forceinferschema = '2'
 ;
 
 SELECT
     *
 FROM
-    plato.Input3 WITH forceinferschema = "3"
+    plato.Input3 WITH forceinferschema = '3'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-select_all_inferschema2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-select_all_inferschema2_/formatted.sql
index b47d26496e..48992b3fe1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-select_all_inferschema2_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-select_all_inferschema2_/formatted.sql
@@ -1,11 +1,11 @@
 SELECT
     *
 FROM
-    plato.Input2 WITH inferschema = "2"
+    plato.Input2 WITH inferschema = '2'
 ;
 
 SELECT
     *
 FROM
-    plato.Input3 WITH inferschema = "3"
+    plato.Input3 WITH inferschema = '3'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-select_all_inferschema_op_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-select_all_inferschema_op_/formatted.sql
index 821ed921f3..f3250b8c4b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-select_all_inferschema_op_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-select_all_inferschema_op_/formatted.sql
@@ -1,6 +1,6 @@
 /* postgres can not */
 /* kikimr can not */
-PRAGMA yt.InferSchemaTableCountThreshold = "0";
+PRAGMA yt.InferSchemaTableCountThreshold = '0';
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-select_all_inferschema_op_custom_tmp_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-select_all_inferschema_op_custom_tmp_/formatted.sql
index 326fea0928..8b30a1496c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-select_all_inferschema_op_custom_tmp_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-select_all_inferschema_op_custom_tmp_/formatted.sql
@@ -1,7 +1,7 @@
 /* postgres can not */
 /* kikimr can not */
-PRAGMA yt.InferSchemaTableCountThreshold = "0";
-PRAGMA yt.TmpFolder = "custom";
+PRAGMA yt.InferSchemaTableCountThreshold = '0';
+PRAGMA yt.TmpFolder = 'custom';
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-select_all_inferschema_range_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-select_all_inferschema_range_/formatted.sql
index 2302297fcd..445e42a1de 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-select_all_inferschema_range_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-select_all_inferschema_range_/formatted.sql
@@ -1,4 +1,4 @@
-PRAGMA yt.InferSchemaTableCountThreshold = "0";
+PRAGMA yt.InferSchemaTableCountThreshold = '0';
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-select_all_inferschema_range_empty_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-select_all_inferschema_range_empty_fail_/formatted.sql
index 448d9c3b90..ea9adc0f27 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-select_all_inferschema_range_empty_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-select_all_inferschema_range_empty_fail_/formatted.sql
@@ -1,5 +1,5 @@
 /* custom error:Cannot infer schema for table Input2, first 1 row(s) has no columns*/
-PRAGMA yt.InferSchemaTableCountThreshold = "0";
+PRAGMA yt.InferSchemaTableCountThreshold = '0';
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-select_with_map_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-select_with_map_/formatted.sql
index 1ffe2d54e1..d67b01100b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-select_with_map_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-select_with_map_/formatted.sql
@@ -3,5 +3,5 @@ SELECT
 FROM
     plato.Input
 WHERE
-    key > "100"
+    key > '100'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-skip_complex_type2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-skip_complex_type2_/formatted.sql
index 3b4f8b2494..ac6b13c911 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-skip_complex_type2_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-skip_complex_type2_/formatted.sql
@@ -1,7 +1,7 @@
-PRAGMA DqEngine = "disable";
+PRAGMA DqEngine = 'disable';
 PRAGMA yt.InferSchema;
-PRAGMA yt.UseNativeYtTypes = "1";
-PRAGMA yt.DefaultMaxJobFails = "1";
+PRAGMA yt.UseNativeYtTypes = '1';
+PRAGMA yt.DefaultMaxJobFails = '1';
 
 SELECT
     boobee,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-skip_complex_type_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-skip_complex_type_/formatted.sql
index 3b4f8b2494..ac6b13c911 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-skip_complex_type_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-skip_complex_type_/formatted.sql
@@ -1,7 +1,7 @@
-PRAGMA DqEngine = "disable";
+PRAGMA DqEngine = 'disable';
 PRAGMA yt.InferSchema;
-PRAGMA yt.UseNativeYtTypes = "1";
-PRAGMA yt.DefaultMaxJobFails = "1";
+PRAGMA yt.UseNativeYtTypes = '1';
+PRAGMA yt.DefaultMaxJobFails = '1';
 
 SELECT
     boobee,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-user_schema_bind_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-user_schema_bind_/formatted.sql
index a11bef4a06..107af74e8d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-user_schema_bind_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-user_schema_bind_/formatted.sql
@@ -1,7 +1,7 @@
 /* syntax version 1 */
 USE plato;
 
-$table = "In" || "put";
+$table = 'In' || 'put';
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-user_schema_empty_table_ranges_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-user_schema_empty_table_ranges_/formatted.sql
index 1652c5e712..323b72fe52 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-user_schema_empty_table_ranges_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-user_schema_empty_table_ranges_/formatted.sql
@@ -4,13 +4,13 @@ USE plato;
 SELECT
     *
 FROM
-    range("", "foo", "foo") WITH SCHEMA Struct<Key: String>
+    range('', 'foo', 'foo') WITH SCHEMA Struct<Key: String>
 ;
 
 SELECT
     *
 FROM
-    Range_strict("", "foo", "foo") WITH SCHEMA Struct<Key: String>
+    Range_strict('', 'foo', 'foo') WITH SCHEMA Struct<Key: String>
 ;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-yamred_dsv_select_from_dict_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-yamred_dsv_select_from_dict_/formatted.sql
index 978c279708..1eec9a483a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-yamred_dsv_select_from_dict_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-yamred_dsv_select_from_dict_/formatted.sql
@@ -2,10 +2,10 @@
 SELECT
     key AS key,
     subkey AS subkey,
-    Input.`dict`["a"] AS a,
-    Input.`dict`["b"] AS b,
-    Input.`dict`["c"] AS c,
-    Input.`dict`["d"] AS d
+    Input.`dict`['a'] AS a,
+    Input.`dict`['b'] AS b,
+    Input.`dict`['c'] AS c,
+    Input.`dict`['d'] AS d
 FROM
     plato.Input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-append_to_value_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-append_to_value_/formatted.sql
index 69fb94d8f4..0b2a56ab51 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-append_to_value_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-append_to_value_/formatted.sql
@@ -2,7 +2,7 @@
 SELECT
     key,
     subkey,
-    value || "foo" AS new_value
+    value || 'foo' AS new_value
 FROM
     plato.Input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-append_to_value_1000_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-append_to_value_1000_/formatted.sql
index c52a937d3b..69517e3223 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-append_to_value_1000_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-append_to_value_1000_/formatted.sql
@@ -3,7 +3,7 @@
 SELECT
     key,
     subkey,
-    value || "foo" AS new_value
+    value || 'foo' AS new_value
 FROM
     plato.Input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-bin_ops_long_concat_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-bin_ops_long_concat_/formatted.sql
index c0290a8be4..fe61ae3bdb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-bin_ops_long_concat_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-bin_ops_long_concat_/formatted.sql
@@ -1,3 +1,3 @@
 SELECT
-    "The" || " std::tuple" || " type" || " introduced" || " in" || " C++11" || " allows" || " an" || " aggregate" || " of" || " typed" || " values" || " to" || " be" || " indexed" || " by" || " a" || " compile-time" || " constant" || " integer." || " C++14" || " extends" || " this" || " to" || " allow" || " fetching" || " from" || " a" || " tuple" || " by" || " type" || " instead" || " of" || " by" || " index." || " If" || " the" || " tuple" || " has" || " more" || " than" || " one" || " element" || " of" || " the" || " type," || " a" || " compile-time" || " error" || " results..."
+    'The' || ' std::tuple' || ' type' || ' introduced' || ' in' || ' C++11' || ' allows' || ' an' || ' aggregate' || ' of' || ' typed' || ' values' || ' to' || ' be' || ' indexed' || ' by' || ' a' || ' compile-time' || ' constant' || ' integer.' || ' C++14' || ' extends' || ' this' || ' to' || ' allow' || ' fetching' || ' from' || ' a' || ' tuple' || ' by' || ' type' || ' instead' || ' of' || ' by' || ' index.' || ' If' || ' the' || ' tuple' || ' has' || ' more' || ' than' || ' one' || ' element' || ' of' || ' the' || ' type,' || ' a' || ' compile-time' || ' error' || ' results...'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-braces_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-braces_/formatted.sql
index f6b8e44b02..000dd7cd49 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-braces_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-braces_/formatted.sql
@@ -1,7 +1,7 @@
 SELECT
     key,
     subkey,
-    ("foo" || "bar") AS value
+    ('foo' || 'bar') AS value
 FROM
     plato.Input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-calculated_values_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-calculated_values_/formatted.sql
index e4e84b10ef..a7f78d5841 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-calculated_values_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-calculated_values_/formatted.sql
@@ -2,8 +2,8 @@
 /* can not check this with postgres becouse order of columns is not specified here */
 SELECT
     key,
-    (value || "ab"),
-    (value || "a"),
+    (value || 'ab'),
+    (value || 'a'),
     value
 FROM
     plato.Input
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-complex_filter_with_order_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-complex_filter_with_order_/formatted.sql
index 279105b451..ba8c42ca28 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-complex_filter_with_order_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-complex_filter_with_order_/formatted.sql
@@ -5,7 +5,7 @@ SELECT
 FROM
     plato.Input
 WHERE
-    value > "A" AND length(value) == CAST(3 AS smallint)
+    value > 'A' AND length(value) == CAST(3 AS smallint)
 ORDER BY
     key
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-core_func_test_bit_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-core_func_test_bit_/formatted.sql
index 7313d1432e..affe6ba31e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-core_func_test_bit_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-core_func_test_bit_/formatted.sql
@@ -1,5 +1,5 @@
 /* postgres can not */
 SELECT
-    TestBit(" ", 4) AS bit4,
-    TestBit(" ", 5) AS bit5
+    TestBit(' ', 4) AS bit4,
+    TestBit(' ', 5) AS bit5
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-data_instance_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-data_instance_/formatted.sql
index 17acb90bf0..64ef87ac13 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-data_instance_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-data_instance_/formatted.sql
@@ -1,134 +1,134 @@
 /* postgres can not */
 SELECT
-    Bool("true")
+    Bool('true')
 ;
 
 SELECT
-    Bool("FalsE")
+    Bool('FalsE')
 ;
 
 SELECT
-    Int8("-128")
+    Int8('-128')
 ;
 
 SELECT
-    Int8("127")
+    Int8('127')
 ;
 
 SELECT
-    Uint8("0")
+    Uint8('0')
 ;
 
 SELECT
-    Uint8("255")
+    Uint8('255')
 ;
 
 SELECT
-    Int16("-32768")
+    Int16('-32768')
 ;
 
 SELECT
-    Int16("32767")
+    Int16('32767')
 ;
 
 SELECT
-    Uint16("0")
+    Uint16('0')
 ;
 
 SELECT
-    Uint16("65535")
+    Uint16('65535')
 ;
 
 SELECT
-    Int32("-2147483648")
+    Int32('-2147483648')
 ;
 
 SELECT
-    Int32("2147483647")
+    Int32('2147483647')
 ;
 
 SELECT
-    Uint32("0")
+    Uint32('0')
 ;
 
 SELECT
-    Uint32("4294967295")
+    Uint32('4294967295')
 ;
 
 SELECT
-    Int64("-9223372036854775808")
+    Int64('-9223372036854775808')
 ;
 
 SELECT
-    Int64("9223372036854775807")
+    Int64('9223372036854775807')
 ;
 
 SELECT
-    Uint64("0")
+    Uint64('0')
 ;
 
 SELECT
-    Uint64("18446744073709551615")
+    Uint64('18446744073709551615')
 ;
 
 SELECT
-    Float("0")
+    Float('0')
 ;
 
 SELECT
-    Float("1")
+    Float('1')
 ;
 
 SELECT
-    Float("-1e30")
+    Float('-1e30')
 ;
 
 SELECT
-    Float("-inf")
+    Float('-inf')
 ;
 
 SELECT
-    Float("+inf")
+    Float('+inf')
 ;
 
 SELECT
-    Float("nan")
+    Float('nan')
 ;
 
 SELECT
-    Double("0")
+    Double('0')
 ;
 
 SELECT
-    Double("1")
+    Double('1')
 ;
 
 SELECT
-    Double("-1e300")
+    Double('-1e300')
 ;
 
 SELECT
-    Double("-inf")
+    Double('-inf')
 ;
 
 SELECT
-    Double("+inf")
+    Double('+inf')
 ;
 
 SELECT
-    Double("nan")
+    Double('nan')
 ;
 
 SELECT
-    String("foo\xffbar")
+    String('foo\xffbar')
 ;
 
 SELECT
-    Utf8("привет")
+    Utf8('привет')
 ;
 
 SELECT
-    Yson("<a=1>[3;%false]")
+    Yson('<a=1>[3;%false]')
 ;
 
 SELECT
@@ -136,39 +136,39 @@ SELECT
 ;
 
 SELECT
-    CAST(Date("2000-01-01") AS string)
+    CAST(Date('2000-01-01') AS string)
 ;
 
 SELECT
-    CAST(Datetime("2000-01-01T01:02:03Z") AS string)
+    CAST(Datetime('2000-01-01T01:02:03Z') AS string)
 ;
 
 SELECT
-    CAST(Timestamp("2000-01-01T01:02:03.4Z") AS string)
+    CAST(Timestamp('2000-01-01T01:02:03.4Z') AS string)
 ;
 
 SELECT
-    CAST(Interval("P1DT12H") AS string)
+    CAST(Interval('P1DT12H') AS string)
 ;
 
 SELECT
-    TZDATE("2010-07-01,Europe/Moscow")
+    TZDATE('2010-07-01,Europe/Moscow')
 ;
 
 SELECT
-    TZDATE("2010-07-01,America/Los_Angeles")
+    TZDATE('2010-07-01,America/Los_Angeles')
 ;
 
 SELECT
-    TZDATETIME("2010-07-01T00:00:00,Europe/Moscow")
+    TZDATETIME('2010-07-01T00:00:00,Europe/Moscow')
 ;
 
 SELECT
-    TZTIMESTAMP("2010-07-01T00:00:00,America/Los_Angeles")
+    TZTIMESTAMP('2010-07-01T00:00:00,America/Los_Angeles')
 ;
 
 SELECT
-    TZTIMESTAMP("2010-07-01T12:00:00.123456,Europe/Moscow")
+    TZTIMESTAMP('2010-07-01T12:00:00.123456,Europe/Moscow')
 ;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-dict_lookup_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-dict_lookup_/formatted.sql
index 946f0eeea7..d78d79f918 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-dict_lookup_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-dict_lookup_/formatted.sql
@@ -5,7 +5,7 @@ USE plato;
 $dictList = (
     SELECT
         AsDict(AsTuple(value, CAST(subkey AS Int32))) AS `dict`,
-        AsDict(AsTuple("z", "a"), AsTuple("y", "b")) AS d,
+        AsDict(AsTuple('z', 'a'), AsTuple('y', 'b')) AS d,
         subkey,
         value
     FROM
@@ -13,7 +13,7 @@ $dictList = (
 );
 
 SELECT
-    d["z"] AS static,
+    d['z'] AS static,
     input.`dict`[input.value] AS dynamic,
     input.`dict` AS `dict`
 FROM
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-dict_lookup_by_key_with_def_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-dict_lookup_by_key_with_def_/formatted.sql
index 25a20143c9..2525a06a39 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-dict_lookup_by_key_with_def_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-dict_lookup_by_key_with_def_/formatted.sql
@@ -10,7 +10,7 @@ $key_text = AsDict(
 
 SELECT
     value,
-    $key_text[key] ?? "unknown" AS key_text
+    $key_text[key] ?? 'unknown' AS key_text
 FROM
     plato.Input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-dict_with_few_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-dict_with_few_keys_/formatted.sql
index a8ae469fec..44c60c65fd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-dict_with_few_keys_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-dict_with_few_keys_/formatted.sql
@@ -5,9 +5,9 @@ USE plato;
 $dict = (
     SELECT
         AsDict(
-            AsTuple("key", CAST(key AS uint32) ?? 0),
-            AsTuple("sk", CAST(subkey AS uint32) ?? 1),
-            AsTuple("str", CAST(ByteAt(value, 0) AS uint32) ?? 256)
+            AsTuple('key', CAST(key AS uint32) ?? 0),
+            AsTuple('sk', CAST(subkey AS uint32) ?? 1),
+            AsTuple('str', CAST(ByteAt(value, 0) AS uint32) ?? 256)
         ) AS dd
     FROM
         Input
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-discard_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-discard_/formatted.sql
index 67ea0a7388..9ab0da32e3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-discard_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-discard_/formatted.sql
@@ -18,7 +18,7 @@ DISCARD SELECT
 FROM
     Input
 WHERE
-    key < "foo"
+    key < 'foo'
 ;
 
 DISCARD SELECT
@@ -46,13 +46,13 @@ DISCARD SELECT
     *
 FROM (
     SELECT
-        key || "a" || "b" AS key
+        key || 'a' || 'b' AS key
     FROM
         Input
 ) AS a
 JOIN (
     SELECT
-        key || "ab" AS key
+        key || 'ab' AS key
     FROM
         Input
 ) AS b
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-extend_and_take_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-extend_and_take_/formatted.sql
index f249c40e59..682ee87520 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-extend_and_take_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-extend_and_take_/formatted.sql
@@ -1,5 +1,5 @@
 /* syntax version 1 */
 /* postgres can not */
 SELECT
-    ListExtend(String::SplitToList("1234 123", " "), String::SplitToList("1234 123", " "))[1]
+    ListExtend(String::SplitToList('1234 123', ' '), String::SplitToList('1234 123', ' '))[1]
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-hits_count_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-hits_count_/formatted.sql
index 5ff376b369..23bb2df8e2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-hits_count_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-hits_count_/formatted.sql
@@ -17,10 +17,10 @@ $ru_hosts = (
         $data
     WHERE
         normalized_url IS NOT NULL AND (
-            tld == "ru"
-            OR tld == "su"
-            OR tld == "рф"
-            OR tld == "xn--p1ai" -- punycode рф
+            tld == 'ru'
+            OR tld == 'su'
+            OR tld == 'рф'
+            OR tld == 'xn--p1ai' -- punycode рф
         )
 );
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-host_count_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-host_count_/formatted.sql
index 754465cd0f..147e52f2fb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-host_count_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-host_count_/formatted.sql
@@ -18,10 +18,10 @@ $ru_hosts = (
         $data
     WHERE
         normalized_url IS NOT NULL AND (
-            tld == "ru"
-            OR tld == "su"
-            OR tld == "рф"
-            OR tld == "xn--p1ai" -- punycode рф
+            tld == 'ru'
+            OR tld == 'su'
+            OR tld == 'рф'
+            OR tld == 'xn--p1ai' -- punycode рф
         )
 );
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-if_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-if_/formatted.sql
index adf0ceb5ff..c6adf2ebe9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-if_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-if_/formatted.sql
@@ -1,6 +1,6 @@
 /* postgres can not */
 SELECT
-    if(LENGTH(value) > 2, "long", "short") AS if,
+    if(LENGTH(value) > 2, 'long', 'short') AS if,
     if(FALSE, 3) AS no_else
 FROM
     plato.Input
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-match_clause_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-match_clause_/formatted.sql
index 4b2c0ec3d3..7b85faa568 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-match_clause_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-match_clause_/formatted.sql
@@ -7,5 +7,5 @@ SELECT
 FROM
     plato.Input
 WHERE
-    value MATCH "q"
+    value MATCH 'q'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-optional_in_job_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-optional_in_job_/formatted.sql
index 385ea254aa..9672cd23a9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-optional_in_job_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-optional_in_job_/formatted.sql
@@ -4,16 +4,16 @@ USE plato;
 
 INSERT INTO @a
 SELECT
-    Yql::Nothing(OptionalType(DataType("String"))) AS level1_null,
-    Yql::Optional(OptionalType(DataType("String")), "val") AS level1_just_val,
-    Yql::Nothing(OptionalType(OptionalType(DataType("String")))) AS level2_null,
-    Yql::Optional(OptionalType(OptionalType(DataType("String"))), Yql::Nothing(OptionalType(DataType("String")))) AS level2_just_null,
-    Yql::Optional(OptionalType(OptionalType(DataType("String"))), Yql::Just("val")) AS level2_just_just_val,
-    Yql::Nothing(OptionalType(OptionalType(OptionalType(DataType("String"))))) AS level3_null,
-    Yql::Optional(OptionalType(OptionalType(OptionalType(DataType("String")))), Yql::Nothing(OptionalType(OptionalType(DataType("String"))))) AS level3_just_null,
-    Yql::Optional(OptionalType(OptionalType(OptionalType(DataType("String")))), Yql::Just(Yql::Nothing(OptionalType(DataType("String"))))) AS level3_just_just_null,
-    Yql::Optional(OptionalType(OptionalType(OptionalType(DataType("String")))), Yql::Just(Yql::Just("val"))) AS level3_just_just_just_val,
-    "const" AS const
+    Yql::Nothing(OptionalType(DataType('String'))) AS level1_null,
+    Yql::Optional(OptionalType(DataType('String')), 'val') AS level1_just_val,
+    Yql::Nothing(OptionalType(OptionalType(DataType('String')))) AS level2_null,
+    Yql::Optional(OptionalType(OptionalType(DataType('String'))), Yql::Nothing(OptionalType(DataType('String')))) AS level2_just_null,
+    Yql::Optional(OptionalType(OptionalType(DataType('String'))), Yql::Just('val')) AS level2_just_just_val,
+    Yql::Nothing(OptionalType(OptionalType(OptionalType(DataType('String'))))) AS level3_null,
+    Yql::Optional(OptionalType(OptionalType(OptionalType(DataType('String')))), Yql::Nothing(OptionalType(OptionalType(DataType('String'))))) AS level3_just_null,
+    Yql::Optional(OptionalType(OptionalType(OptionalType(DataType('String')))), Yql::Just(Yql::Nothing(OptionalType(DataType('String'))))) AS level3_just_just_null,
+    Yql::Optional(OptionalType(OptionalType(OptionalType(DataType('String')))), Yql::Just(Yql::Just('val'))) AS level3_just_just_just_val,
+    'const' AS const
 ;
 
 COMMIT;
@@ -21,17 +21,17 @@ COMMIT;
 -- Everything should be True
 SELECT
     level1_null IS NULL,
-    Yql::Unwrap(level1_just_val) == "val",
+    Yql::Unwrap(level1_just_val) == 'val',
     level2_null IS NULL,
     Yql::Unwrap(level2_just_null) IS NULL,
-    Yql::Unwrap(Yql::Unwrap(level2_just_just_val)) == "val",
+    Yql::Unwrap(Yql::Unwrap(level2_just_just_val)) == 'val',
     level3_null IS NULL,
     Yql::Unwrap(level3_just_null) IS NULL,
     Yql::Unwrap(Yql::Unwrap(level3_just_just_null)) IS NULL,
-    Yql::Unwrap(Yql::Unwrap(Yql::Unwrap(level3_just_just_just_val))) == "val",
+    Yql::Unwrap(Yql::Unwrap(Yql::Unwrap(level3_just_just_just_val))) == 'val',
     TRUE
 FROM
     @a
 WHERE
-    const == "const"
+    const == 'const'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-optional_pull_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-optional_pull_/formatted.sql
index ca3c2e028d..38ac438c96 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-optional_pull_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-optional_pull_/formatted.sql
@@ -4,16 +4,16 @@ USE plato;
 
 INSERT INTO @a
 SELECT
-    Yql::Nothing(OptionalType(DataType("String"))) AS level1_null,
-    Yql::Optional(OptionalType(DataType("String")), "val") AS level1_just_val,
-    Yql::Nothing(OptionalType(OptionalType(DataType("String")))) AS level2_null,
-    Yql::Optional(OptionalType(OptionalType(DataType("String"))), Yql::Nothing(OptionalType(DataType("String")))) AS level2_just_null,
-    Yql::Optional(OptionalType(OptionalType(DataType("String"))), Yql::Just("val")) AS level2_just_just_val,
-    Yql::Nothing(OptionalType(OptionalType(OptionalType(DataType("String"))))) AS level3_null,
-    Yql::Optional(OptionalType(OptionalType(OptionalType(DataType("String")))), Yql::Nothing(OptionalType(OptionalType(DataType("String"))))) AS level3_just_null,
-    Yql::Optional(OptionalType(OptionalType(OptionalType(DataType("String")))), Yql::Just(Yql::Nothing(OptionalType(DataType("String"))))) AS level3_just_just_null,
-    Yql::Optional(OptionalType(OptionalType(OptionalType(DataType("String")))), Yql::Just(Yql::Just("val"))) AS level3_just_just_just_val,
-    "const" AS const
+    Yql::Nothing(OptionalType(DataType('String'))) AS level1_null,
+    Yql::Optional(OptionalType(DataType('String')), 'val') AS level1_just_val,
+    Yql::Nothing(OptionalType(OptionalType(DataType('String')))) AS level2_null,
+    Yql::Optional(OptionalType(OptionalType(DataType('String'))), Yql::Nothing(OptionalType(DataType('String')))) AS level2_just_null,
+    Yql::Optional(OptionalType(OptionalType(DataType('String'))), Yql::Just('val')) AS level2_just_just_val,
+    Yql::Nothing(OptionalType(OptionalType(OptionalType(DataType('String'))))) AS level3_null,
+    Yql::Optional(OptionalType(OptionalType(OptionalType(DataType('String')))), Yql::Nothing(OptionalType(OptionalType(DataType('String'))))) AS level3_just_null,
+    Yql::Optional(OptionalType(OptionalType(OptionalType(DataType('String')))), Yql::Just(Yql::Nothing(OptionalType(DataType('String'))))) AS level3_just_just_null,
+    Yql::Optional(OptionalType(OptionalType(OptionalType(DataType('String')))), Yql::Just(Yql::Just('val'))) AS level3_just_just_just_val,
+    'const' AS const
 ;
 
 COMMIT;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-result_rows_limit_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-result_rows_limit_/formatted.sql
index 842fb6456e..9743e744a2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-result_rows_limit_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-result_rows_limit_/formatted.sql
@@ -2,10 +2,10 @@
 /* postgres can not */
 USE plato;
 
-PRAGMA ResultRowsLimit = "2";
+PRAGMA ResultRowsLimit = '2';
 
 SELECT
-    key || "a" AS key
+    key || 'a' AS key
 FROM
     Input
 ORDER BY
@@ -13,7 +13,7 @@ ORDER BY
 ;
 
 SELECT
-    key || "b" AS key
+    key || 'b' AS key
 FROM
     Input
 ORDER BY
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-result_size_limit_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-result_size_limit_/formatted.sql
index 06e03b25ae..90a0b0fa30 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-result_size_limit_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-result_size_limit_/formatted.sql
@@ -2,10 +2,10 @@
 /* kikimr can not - no refs */
 USE plato;
 
-PRAGMA ResultSizeLimit = "25";
+PRAGMA ResultSizeLimit = '25';
 
 SELECT
-    key || "a" AS key
+    key || 'a' AS key
 FROM
     Input
 ORDER BY
@@ -13,7 +13,7 @@ ORDER BY
 ;
 
 SELECT
-    key || "b" AS key
+    key || 'b' AS key
 FROM
     Input
 ORDER BY
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-result_size_limit_with_fill_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-result_size_limit_with_fill_/formatted.sql
index 638d372115..5b5a2b328b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-result_size_limit_with_fill_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-result_size_limit_with_fill_/formatted.sql
@@ -2,10 +2,10 @@
 /* kikimr can not - no refs */
 USE plato;
 
-PRAGMA ResultSizeLimit = "25";
+PRAGMA ResultSizeLimit = '25';
 
 SELECT
-    key || "a" AS key
+    key || 'a' AS key
 FROM
     Input
 ORDER BY
@@ -13,7 +13,7 @@ ORDER BY
 ;
 
 SELECT
-    key || "b" AS key
+    key || 'b' AS key
 FROM
     Input
 ORDER BY
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-reuse_named_node_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-reuse_named_node_/formatted.sql
index 7d61491a1a..e2def2732f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-reuse_named_node_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-reuse_named_node_/formatted.sql
@@ -2,7 +2,7 @@
 USE plato;
 
 $x = ($key) -> {
-    RETURN "aa" || $key;
+    RETURN 'aa' || $key;
 };
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-sampleselect_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-sampleselect_/formatted.sql
index 0a25767629..81d8ac2996 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-sampleselect_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-sampleselect_/formatted.sql
@@ -4,7 +4,7 @@ PRAGMA sampleselect;
 SELECT
     key,
     subkey,
-    value || "foo" AS new_value
+    value || 'foo' AS new_value
 FROM
     plato.Input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-scalar_subquery_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-scalar_subquery_/formatted.sql
index e68393da6c..29fdce6a9c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-scalar_subquery_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-scalar_subquery_/formatted.sql
@@ -9,5 +9,5 @@ $query = (
 );
 
 SELECT
-    $query ?? AsTuple(0, "") AS cnt
+    $query ?? AsTuple(0, '') AS cnt
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-select_all_filtered_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-select_all_filtered_/formatted.sql
index 0861b910bb..88aefa9ff3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-select_all_filtered_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-select_all_filtered_/formatted.sql
@@ -3,5 +3,5 @@ SELECT
 FROM
     plato.Input
 WHERE
-    value == "ddd"
+    value == 'ddd'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-select_all_from_concat_anon_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-select_all_from_concat_anon_/formatted.sql
index b436653019..e81b1b8328 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-select_all_from_concat_anon_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-select_all_from_concat_anon_/formatted.sql
@@ -8,7 +8,7 @@ SELECT
 
 COMMIT;
 
-$name = "fo" || "o";
+$name = 'fo' || 'o';
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-table_content_with_tmp_folder_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-table_content_with_tmp_folder_/formatted.sql
index c6c4227d23..27de9bc1fc 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-table_content_with_tmp_folder_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-table_content_with_tmp_folder_/formatted.sql
@@ -2,8 +2,8 @@
 /* kikimr can not */
 USE plato;
 
-PRAGMA yt.MapJoinLimit = "1M";
-PRAGMA yt.TmpFolder = "//custom_tmp";
+PRAGMA yt.MapJoinLimit = '1M';
+PRAGMA yt.TmpFolder = '//custom_tmp';
 
 -- MapJoin with table content
 $input = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-table_funcs_spec_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-table_funcs_spec_/formatted.sql
index 187633fe8a..9d295d5087 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-table_funcs_spec_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-table_funcs_spec_/formatted.sql
@@ -7,8 +7,8 @@ USE plato;
 SELECT
     TablePath() AS table_path,
     TableRecordIndex() AS table_rec,
-    TableName("foo/bar") AS table_name1,
-    TableName("baz") AS table_name2,
+    TableName('foo/bar') AS table_name1,
+    TableName('baz') AS table_name2,
     TableName() AS table_name3
 FROM
     Input
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-tablename_with_table_row_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-tablename_with_table_row_/formatted.sql
index 0049a4cf4f..5c4e36e6e7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-tablename_with_table_row_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-tablename_with_table_row_/formatted.sql
@@ -6,7 +6,7 @@ SELECT
 FROM
     Input
 WHERE
-    key > "010"
+    key > '010'
 ORDER BY
     rowid
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-tablepathprefix_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-tablepathprefix_/formatted.sql
index 45074a1a2c..a40bd2a625 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-tablepathprefix_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-tablepathprefix_/formatted.sql
@@ -2,9 +2,9 @@
 /* syntax version 1 */
 USE plato;
 
-PRAGMA TablePathPrefix = "//";
+PRAGMA TablePathPrefix = '//';
 
-$input = "In" || "put";
+$input = 'In' || 'put';
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-trivial_having_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-trivial_having_/formatted.sql
index 477229500c..033872e296 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-trivial_having_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-trivial_having_/formatted.sql
@@ -1,11 +1,11 @@
 SELECT
     key,
-    "WAT" AS subkey,
+    'WAT' AS subkey,
     Max(value) AS value
 FROM
     plato.Input
 GROUP BY
     key
 HAVING
-    Max(value) == "FOO"
+    Max(value) == 'FOO'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-type_assert_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-type_assert_/formatted.sql
index 8bc63d53dd..10c8bd9f0b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-type_assert_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-type_assert_/formatted.sql
@@ -4,13 +4,13 @@
 USE plato;
 
 SELECT
-    EnsureType(CAST(key AS Int64), Int64?, "some text 1")
+    EnsureType(CAST(key AS Int64), Int64?, 'some text 1')
 FROM
     Input
 ;
 
 SELECT
-    FormatType(EnsureType(TypeOf(1), Int32, "some text 2"))
+    FormatType(EnsureType(TypeOf(1), Int32, 'some text 2'))
 ;
 
 SELECT
@@ -18,13 +18,13 @@ SELECT
 ;
 
 SELECT
-    EnsureConvertibleTo(CAST(key AS Int64), Double?, "some text 3")
+    EnsureConvertibleTo(CAST(key AS Int64), Double?, 'some text 3')
 FROM
     Input
 ;
 
 SELECT
-    FormatType(EnsureConvertibleTo(TypeOf(1), Int64, "some text 4"))
+    FormatType(EnsureConvertibleTo(TypeOf(1), Int64, 'some text 4'))
 ;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-unary_op_interval_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-unary_op_interval_/formatted.sql
index 3dcb53a2b6..27c3418f02 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-unary_op_interval_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-unary_op_interval_/formatted.sql
@@ -1,24 +1,24 @@
 /* postgres can not */
 SELECT
-    +Interval("P1D")
+    +Interval('P1D')
 ;
 
 SELECT
-    -Interval("P1D")
+    -Interval('P1D')
 ;
 
 SELECT
-    +Yql::Just(Interval("P1D"))
+    +Yql::Just(Interval('P1D'))
 ;
 
 SELECT
-    -Yql::Just(Interval("P1D"))
+    -Yql::Just(Interval('P1D'))
 ;
 
 SELECT
-    +Yql::Nothing(ParseType("Interval?"))
+    +Yql::Nothing(ParseType('Interval?'))
 ;
 
 SELECT
-    -Yql::Nothing(ParseType("Interval?"))
+    -Yql::Nothing(ParseType('Interval?'))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-where_in_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-where_in_/formatted.sql
index 3745575125..33a273eaa5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-where_in_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-where_in_/formatted.sql
@@ -3,6 +3,6 @@ SELECT
 FROM
     plato.Input
 WHERE
-    "1" IN (key, subkey, value)
+    '1' IN (key, subkey, value)
     OR value NOT IN (key, subkey, value)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-where_with_lambda_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-where_with_lambda_/formatted.sql
index 834350e664..7f34ef361e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-where_with_lambda_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-where_with_lambda_/formatted.sql
@@ -2,10 +2,10 @@
 USE plato;
 
 $predicate = ($x) -> {
-    RETURN $x == "911";
+    RETURN $x == '911';
 };
 
-$field = "field";
+$field = 'field';
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_without_resolve_dublicates_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_without_resolve_dublicates_/formatted.sql
index a6047a0f8d..618980c3e6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_without_resolve_dublicates_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_without_resolve_dublicates_/formatted.sql
@@ -7,7 +7,7 @@ $data = (
     SELECT
         key AS kk,
         subkey AS sk,
-        "data: " || value AS value
+        'data: ' || value AS value
     FROM
         Input
     WHERE
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_without_resolve_dublicates_mult_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_without_resolve_dublicates_mult_/formatted.sql
index a283aa529a..932d79fff7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_without_resolve_dublicates_mult_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_without_resolve_dublicates_mult_/formatted.sql
@@ -8,7 +8,7 @@ $data = (
         CAST(CAST(key AS uint32) / 100 AS string) AS key,
         key AS kk,
         CAST(subkey AS uint32) * 10 AS subkey,
-        "data: " || value AS value
+        'data: ' || value AS value
     FROM
         Input
     WHERE
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_stream_lookup_join-lookup_join_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_stream_lookup_join-lookup_join_/formatted.sql
index b1e3bf050a..f40846adbd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_stream_lookup_join-lookup_join_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_stream_lookup_join-lookup_join_/formatted.sql
@@ -1,4 +1,4 @@
-PRAGMA dq.UseWideChannels = "true";
+PRAGMA dq.UseWideChannels = 'true';
 
 USE plato;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_stream_lookup_join-lookup_join_narrow_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_stream_lookup_join-lookup_join_narrow_/formatted.sql
index 58374e8e17..d4ac83f6c6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_stream_lookup_join-lookup_join_narrow_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_stream_lookup_join-lookup_join_narrow_/formatted.sql
@@ -1,4 +1,4 @@
-PRAGMA dq.UseWideChannels = "false";
+PRAGMA dq.UseWideChannels = 'false';
 
 USE plato;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-concat_sorted_max_sorted_tables_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-concat_sorted_max_sorted_tables_/formatted.sql
index d862a578d1..890f167b77 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-concat_sorted_max_sorted_tables_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-concat_sorted_max_sorted_tables_/formatted.sql
@@ -3,8 +3,8 @@
 /* multirun can not */
 USE plato;
 
-PRAGMA yt.MaxInputTables = "3";
-PRAGMA yt.MaxInputTablesForSortedMerge = "2";
+PRAGMA yt.MaxInputTables = '3';
+PRAGMA yt.MaxInputTablesForSortedMerge = '2';
 
 INSERT INTO Output
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-concat_sorted_max_tables_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-concat_sorted_max_tables_/formatted.sql
index 2babbf08c9..e8e9822986 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-concat_sorted_max_tables_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-concat_sorted_max_tables_/formatted.sql
@@ -3,8 +3,8 @@
 /* multirun can not */
 USE plato;
 
-PRAGMA yt.MaxInputTables = "3";
-PRAGMA yt.MaxInputTablesForSortedMerge = "2";
+PRAGMA yt.MaxInputTables = '3';
+PRAGMA yt.MaxInputTablesForSortedMerge = '2';
 
 INSERT INTO Output
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-concat_sorted_with_key_diff_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-concat_sorted_with_key_diff_/formatted.sql
index 7f19f594fe..7c6efd8fd9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-concat_sorted_with_key_diff_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-concat_sorted_with_key_diff_/formatted.sql
@@ -3,7 +3,7 @@
 SELECT
     *
 FROM
-    plato.concat("Input1", "Input2")
+    plato.concat('Input1', 'Input2')
 ORDER BY
     key,
     subkey
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-concat_with_view_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-concat_with_view_/formatted.sql
index 0746b89806..a6d93cb0eb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-concat_with_view_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-concat_with_view_/formatted.sql
@@ -3,5 +3,5 @@
 SELECT
     *
 FROM
-    plato.concat("InputA", "InputD")
+    plato.concat('InputA', 'InputD')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-each_with_non_existing_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-each_with_non_existing_/formatted.sql
index 45ce3ad455..cdaf391334 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-each_with_non_existing_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-each_with_non_existing_/formatted.sql
@@ -5,5 +5,5 @@ USE plato;
 SELECT
     *
 FROM
-    each(["Input1", "Input2", "Input3"])
+    each(['Input1', 'Input2', 'Input3'])
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-each_with_non_existing_all_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-each_with_non_existing_all_fail_/formatted.sql
index 3080b2ea4f..87e3c2d107 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-each_with_non_existing_all_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-each_with_non_existing_all_fail_/formatted.sql
@@ -6,5 +6,5 @@ USE plato;
 SELECT
     *
 FROM
-    each(["Input1", "Input2", "Input3"])
+    each(['Input1', 'Input2', 'Input3'])
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-limit_with_table_path_over_sorted_range_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-limit_with_table_path_over_sorted_range_/formatted.sql
index feec0a1b12..769fb952d5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-limit_with_table_path_over_sorted_range_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-limit_with_table_path_over_sorted_range_/formatted.sql
@@ -5,5 +5,5 @@ SELECT
     value,
     SUBSTRING(TablePath(), NULL, CAST(LENGTH(TablePath()) - 1 AS Uint32)) AS path
 FROM
-    plato.range("", "Input1", "Input2")
+    plato.range('', 'Input1', 'Input2')
 LIMIT 2;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_over_desc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_over_desc_/formatted.sql
index 93b6049e19..b50271c9b1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_over_desc_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_over_desc_/formatted.sql
@@ -7,7 +7,7 @@ SELECT
     t.*,
     TableName() AS path
 FROM
-    range("", "Input1", "Input2") AS t
+    range('', 'Input1', 'Input2') AS t
 ORDER BY
     path,
     key,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_over_like_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_over_like_/formatted.sql
index e5992f3596..a87d9d9c2d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_over_like_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_over_like_/formatted.sql
@@ -4,5 +4,5 @@
 SELECT
     count(*) AS count
 FROM
-    plato.like(``, "_np%")
+    plato.like(``, '_np%')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_over_regexp_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_over_regexp_/formatted.sql
index e29041e4ac..2eaf6d9c73 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_over_regexp_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_over_regexp_/formatted.sql
@@ -6,5 +6,5 @@ PRAGMA RegexUseRe2 = 'true';
 SELECT
     count(*) AS count
 FROM
-    plato.regexp(``, "np")
+    plato.regexp(``, 'np')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_slash_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_slash_/formatted.sql
index 3f234e54ea..dc5786e828 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_slash_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_slash_/formatted.sql
@@ -4,11 +4,11 @@ USE plato;
 SELECT
     *
 FROM
-    RANGE("/", "Input1", "Input2", "/")
+    RANGE('/', 'Input1', 'Input2', '/')
 ;
 
 SELECT
     *
 FROM
-    RANGE("/", "Input1", "Input2", "/")
+    RANGE('/', 'Input1', 'Input2', '/')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_with_view_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_with_view_/formatted.sql
index 09baf7e47e..2ca6e19f2a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_with_view_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_with_view_/formatted.sql
@@ -3,5 +3,5 @@
 SELECT
     *
 FROM
-    plato.range("", "InputA", "InputD")
+    plato.range('', 'InputA', 'InputD')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-table_funcs_expr_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-table_funcs_expr_/formatted.sql
index 7ed25c788a..7872f573d1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-table_funcs_expr_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-table_funcs_expr_/formatted.sql
@@ -5,81 +5,81 @@ USE plato;
 SELECT
     count(*)
 FROM
-    concat("Inp" || Unicode::ToLower("ut"u))
+    concat('Inp' || Unicode::ToLower("ut"u))
 ;
 
 SELECT
     count(*)
 FROM
-    concat_strict("Inp" || Unicode::ToLower("ut"u))
+    concat_strict('Inp' || Unicode::ToLower("ut"u))
 ;
 
 SELECT
     count(*)
 FROM
-    range("", "Inp" || Unicode::ToLower("ut"u))
+    range('', 'Inp' || Unicode::ToLower("ut"u))
 ;
 
 SELECT
     count(*)
 FROM
-    range_strict("", "Inp" || Unicode::ToLower("ut"u))
+    range_strict('', 'Inp' || Unicode::ToLower("ut"u))
 ;
 
 SELECT
     count(*)
 FROM
-    filter("", ($x) -> {
-        RETURN $x == "Input";
+    filter('', ($x) -> {
+        RETURN $x == 'Input';
     })
 ;
 
 SELECT
     count(*)
 FROM
-    filter_strict("", ($x) -> {
-        RETURN $x == "Input";
+    filter_strict('', ($x) -> {
+        RETURN $x == 'Input';
     })
 ;
 
 SELECT
     count(*)
 FROM
-    like("", "Inp" || "%")
+    like('', 'Inp' || '%')
 ;
 
 SELECT
     count(*)
 FROM
-    like_strict("", "Inp" || "%")
+    like_strict('', 'Inp' || '%')
 ;
 
 SELECT
     count(*)
 FROM
-    regexp("", "Inp" || ".t")
+    regexp('', 'Inp' || '.t')
 ;
 
 SELECT
     count(*)
 FROM
-    regexp_strict("", "Inp" || ".t")
+    regexp_strict('', 'Inp' || '.t')
 ;
 
 SELECT
     count(*)
 FROM
-    each(AsList("Input"))
+    each(AsList('Input'))
 ;
 
 SELECT
     count(*)
 FROM
-    each_strict(AsList("Input"))
+    each_strict(AsList('Input'))
 ;
 
 SELECT
     count(*)
 FROM
-    folder(SUBSTRING("foo", 0, 0))
+    folder(SUBSTRING('foo', 0, 0))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-tablepath_with_non_existing_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-tablepath_with_non_existing_/formatted.sql
index 59672bed28..97e85b7fed 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-tablepath_with_non_existing_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-tablepath_with_non_existing_/formatted.sql
@@ -7,5 +7,5 @@ SELECT
     subkey,
     TableName() AS name
 FROM
-    each(["Input1", "Input2", "Input3"]) WITH SCHEMA Struct<key: String, subkey: String, value: String>
+    each(['Input1', 'Input2', 'Input3']) WITH SCHEMA Struct<key: String, subkey: String, value: String>
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q10_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q10_/formatted.sql
index da72410cb8..5dcd62f4d2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q10_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q10_/formatted.sql
@@ -1,7 +1,7 @@
 -- TPC-H/TPC-R Returned Item Reporting Query (Q10)
 -- TPC TPC-H Parameter Substitution (Version 2.17.2 build 0)
 -- using 1680793381 as a seed to the RNG
-$border = Date("1993-12-01");
+$border = Date('1993-12-01');
 
 $join1 = (
     SELECT
@@ -21,7 +21,7 @@ $join1 = (
         c.c_custkey == o.o_custkey
     WHERE
         CAST(o.o_orderdate AS timestamp) >= $border
-        AND CAST(o.o_orderdate AS timestamp) < ($border + Interval("P90D"))
+        AND CAST(o.o_orderdate AS timestamp) < ($border + Interval('P90D'))
 );
 
 $join2 = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q12_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q12_/formatted.sql
index 97d7390336..e48756280f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q12_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q12_/formatted.sql
@@ -16,7 +16,7 @@ $join = (
         o.o_orderkey == l.l_orderkey
 );
 
-$border = Date("1994-01-01");
+$border = Date('1994-01-01');
 
 SELECT
     l_shipmode,
@@ -41,7 +41,7 @@ WHERE
     AND l_commitdate < l_receiptdate
     AND l_shipdate < l_commitdate
     AND CAST(l_receiptdate AS timestamp) >= $border
-    AND CAST(l_receiptdate AS timestamp) < ($border + Interval("P365D"))
+    AND CAST(l_receiptdate AS timestamp) < ($border + Interval('P365D'))
 GROUP BY
     l_shipmode
 ORDER BY
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q13_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q13_/formatted.sql
index 8f0f7d5af3..2f2b45036d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q13_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q13_/formatted.sql
@@ -8,7 +8,7 @@ $orders = (
     FROM
         plato.orders
     WHERE
-        o_comment NOT LIKE "%unusual%requests%"
+        o_comment NOT LIKE '%unusual%requests%'
 );
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q14_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q14_/formatted.sql
index 80d0cb3266..507d7bed20 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q14_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q14_/formatted.sql
@@ -1,7 +1,7 @@
 -- TPC-H/TPC-R Promotion Effect Query (Q14)
 -- TPC TPC-H Parameter Substitution (Version 2.17.2 build 0)
 -- using 1680793381 as a seed to the RNG
-$border = Date("1994-08-01");
+$border = Date('1994-08-01');
 
 SELECT
     100.00 * sum(
@@ -18,5 +18,5 @@ ON
     l.l_partkey == p.p_partkey
 WHERE
     CAST(l.l_shipdate AS timestamp) >= $border
-    AND CAST(l.l_shipdate AS timestamp) < ($border + Interval("P31D"))
+    AND CAST(l.l_shipdate AS timestamp) < ($border + Interval('P31D'))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q15_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q15_/formatted.sql
index e025499b33..aa6b5f1587 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q15_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q15_/formatted.sql
@@ -2,7 +2,7 @@
 -- TPC-H/TPC-R Top Supplier Query (Q15)
 -- TPC TPC-H Parameter Substitution (Version 2.17.2 build 0)
 -- using 1680793381 as a seed to the RNG
-$border = Date("1997-03-01");
+$border = Date('1997-03-01');
 
 $revenue0 = (
     SELECT
@@ -13,7 +13,7 @@ $revenue0 = (
         plato.lineitem
     WHERE
         CAST(l_shipdate AS timestamp) >= $border
-        AND CAST(l_shipdate AS timestamp) < ($border + Interval("P92D"))
+        AND CAST(l_shipdate AS timestamp) < ($border + Interval('P92D'))
     GROUP BY
         l_suppkey
 );
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q16_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q16_/formatted.sql
index 3d0365e39c..7329cad781 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q16_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q16_/formatted.sql
@@ -12,7 +12,7 @@ $join = (
     ON
         w.s_suppkey == ps.ps_suppkey
     WHERE
-        NOT (s_comment LIKE "%Customer%Complaints%")
+        NOT (s_comment LIKE '%Customer%Complaints%')
 );
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q1_/formatted.sql
index 55554abcd8..317f18bb84 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q1_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q1_/formatted.sql
@@ -15,7 +15,7 @@ SELECT
 FROM
     plato.lineitem
 WHERE
-    CAST(l_shipdate AS Timestamp) <= (CAST('1998-12-01' AS Date) - Interval("P100D"))
+    CAST(l_shipdate AS Timestamp) <= (CAST('1998-12-01' AS Date) - Interval('P100D'))
 GROUP BY
     l_returnflag,
     l_linestatus
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q20_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q20_/formatted.sql
index 2962866393..40df673476 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q20_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q20_/formatted.sql
@@ -1,7 +1,7 @@
 -- TPC-H/TPC-R Potential Part Promotion Query (Q20)
 -- TPC TPC-H Parameter Substitution (Version 2.17.2 build 0)
 -- using 1680793381 as a seed to the RNG
-$border = Date("1993-01-01");
+$border = Date('1993-01-01');
 
 $threshold = (
     SELECT
@@ -12,7 +12,7 @@ $threshold = (
         plato.lineitem
     WHERE
         CAST(l_shipdate AS timestamp) >= $border
-        AND CAST(l_shipdate AS timestamp) < ($border + Interval("P365D"))
+        AND CAST(l_shipdate AS timestamp) < ($border + Interval('P365D'))
     GROUP BY
         l_partkey,
         l_suppkey
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q4_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q4_/formatted.sql
index ab27020440..9b1891dfce 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q4_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q4_/formatted.sql
@@ -1,7 +1,7 @@
 -- TPC-H/TPC-R Order Priority Checking Query (Q4)
 -- TPC TPC-H Parameter Substitution (Version 2.17.2 build 0)
 -- using 1680793381 as a seed to the RNG
-$border = Date("1994-03-01");
+$border = Date('1994-03-01');
 
 $join = (
     SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q5_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q5_/formatted.sql
index 991a660686..74b1962e38 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q5_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q5_/formatted.sql
@@ -87,7 +87,7 @@ $join5 = (
         j.n_regionkey == r.r_regionkey
 );
 
-$border = Date("1995-01-01");
+$border = Date('1995-01-01');
 
 SELECT
     n_name,
@@ -97,7 +97,7 @@ FROM
 WHERE
     r_name == 'AFRICA'
     AND CAST(o_orderdate AS Timestamp) >= $border
-    AND CAST(o_orderdate AS Timestamp) < ($border + Interval("P365D"))
+    AND CAST(o_orderdate AS Timestamp) < ($border + Interval('P365D'))
 GROUP BY
     n_name
 ORDER BY
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q6_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q6_/formatted.sql
index 50a8945978..d66dc4780e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q6_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q6_/formatted.sql
@@ -1,7 +1,7 @@
 -- TPC-H/TPC-R Forecasting Revenue Change Query (Q6)
 -- TPC TPC-H Parameter Substitution (Version 2.17.2 build 0)
 -- using 1680793381 as a seed to the RNG
-$border = Date("1995-01-01");
+$border = Date('1995-01-01');
 
 SELECT
     sum(l_extendedprice * l_discount) AS revenue
@@ -9,7 +9,7 @@ FROM
     plato.lineitem
 WHERE
     CAST(l_shipdate AS Timestamp) >= $border
-    AND CAST(l_shipdate AS Timestamp) < ($border + Interval("P365D"))
+    AND CAST(l_shipdate AS Timestamp) < ($border + Interval('P365D'))
     AND l_discount BETWEEN 0.07 - 0.01 AND 0.07 + 0.01
     AND l_quantity < 25
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_literal-create_table_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_literal-create_table_/formatted.sql
index 95cf9fcbfa..786d64bcd8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_literal-create_table_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_literal-create_table_/formatted.sql
@@ -41,7 +41,7 @@ CREATE TABLE plato.Output (
     c_tuple Tuple<bool, uint64>,
     c_struct Struct<foo: string, 'bar': float>,
     c_variant1 Variant<int, bool>,
-    c_variant2 Variant<foo: int, "bar": bool>,
+    c_variant2 Variant<foo: int, 'bar': bool>,
     c_list List<Yson>,
     c_stream Stream<Date>,
     c_flow Flow<Uuid>,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_literal-declare_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_literal-declare_/formatted.sql
index e25b9f5559..5b4d7a6903 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_literal-declare_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_literal-declare_/formatted.sql
@@ -40,7 +40,7 @@ DECLARE $c_optional4 AS optional<string>?;
 DECLARE $c_tuple AS Tuple<bool, uint64>;
 DECLARE $c_struct AS Struct<foo: string, 'bar': float>;
 DECLARE $c_variant1 AS Variant<int, bool>;
-DECLARE $c_variant2 AS Variant<foo: int, "bar": bool>;
+DECLARE $c_variant2 AS Variant<foo: int, 'bar': bool>;
 DECLARE $c_list0 AS List<Yson>;
 DECLARE $c_list1 AS List<$c_yson>;
 DECLARE $c_stream AS Stream<Date>;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_literal-evaluate_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_literal-evaluate_/formatted.sql
index a135e6fc7b..d2cff9ed1f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_literal-evaluate_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_literal-evaluate_/formatted.sql
@@ -1,6 +1,6 @@
 /* syntax version 1 */
-$tag1 = "ta" || "g1";
-$struct = struct<$tag1: string, tag2: string, "tag3": string>;
+$tag1 = 'ta' || 'g1';
+$struct = struct<$tag1: string, tag2: string, 'tag3': string>;
 $type1 = TypeOf(10);
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_diff_flags_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_diff_flags_/formatted.sql
index 654e15026e..c0dc961ce7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_diff_flags_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_diff_flags_/formatted.sql
@@ -3,12 +3,12 @@
 /* postgres can not */
 USE plato;
 
-PRAGMA yt.UseNativeYtTypes = "1";
-PRAGMA yt.NativeYtTypeCompatibility = "date";
+PRAGMA yt.UseNativeYtTypes = '1';
+PRAGMA yt.NativeYtTypeCompatibility = 'date';
 
 INSERT INTO Output
 SELECT
-    key || "a" AS key,
+    key || 'a' AS key,
     subkey
 FROM
     Input
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_diff_layout1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_diff_layout1_/formatted.sql
index b145f26337..b1e4f5ee09 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_diff_layout1_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_diff_layout1_/formatted.sql
@@ -2,8 +2,8 @@
 /* postgres can not */
 USE plato;
 
-PRAGMA yt.UseNativeYtTypes = "1";
-PRAGMA yt.NativeYtTypeCompatibility = "complex";
+PRAGMA yt.UseNativeYtTypes = '1';
+PRAGMA yt.NativeYtTypeCompatibility = 'complex';
 
 $udf = YQL::@@(lambda '(x) (block '(
     (let structType (StructType '('key (DataType 'String)) '('subkey (StructType '('a (DataType 'String)) '('b (OptionalType (DataType 'Int32))) '('c (DataType 'String))))))
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_diff_layout2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_diff_layout2_/formatted.sql
index 0b800dd2f6..76c349451c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_diff_layout2_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_diff_layout2_/formatted.sql
@@ -2,8 +2,8 @@
 /* postgres can not */
 USE plato;
 
-PRAGMA yt.UseNativeYtTypes = "1";
-PRAGMA yt.NativeYtTypeCompatibility = "complex";
+PRAGMA yt.UseNativeYtTypes = '1';
+PRAGMA yt.NativeYtTypeCompatibility = 'complex';
 
 $udf = YQL::@@(lambda '(x) (block '(
     (let structType (StructType '('key (DataType 'String)) '('subkey (StructType '('a (DataType 'String)) '('b (OptionalType (DataType 'Int32))) '('c (DataType 'String))))))
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_struct_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_struct_/formatted.sql
index f0936f6f59..0132eddbb7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_struct_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_struct_/formatted.sql
@@ -4,12 +4,12 @@
 /* custom check: len(yt_res_yson[0]['Write'][0]['Data']) == 10 */
 USE plato;
 
-PRAGMA yt.UseNativeYtTypes = "1";
+PRAGMA yt.UseNativeYtTypes = '1';
 
 INSERT INTO Input
 SELECT
-    "10" AS key,
-    <|a: "10", b: Just(10), c: "e"|> AS subkey
+    '10' AS key,
+    <|a: '10', b: Just(10), c: 'e'|> AS subkey
 ;
 
 COMMIT;
@@ -20,7 +20,7 @@ SELECT
 FROM
     Input
 WHERE
-    key > "100"
+    key > '100'
 ;
 
 INSERT INTO Input
@@ -29,7 +29,7 @@ SELECT
 FROM
     Input
 WHERE
-    key <= "100"
+    key <= '100'
 ;
 
 COMMIT;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-decimal_yt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-decimal_yt_/formatted.sql
index aa94f7b5a8..a447f6b7b7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-decimal_yt_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-decimal_yt_/formatted.sql
@@ -1,17 +1,17 @@
-PRAGMA yt.UseNativeYtTypes = "true";
+PRAGMA yt.UseNativeYtTypes = 'true';
 
 INSERT INTO plato.Output WITH truncate
 SELECT
-    Decimal("3.1415", 5, 4),
-    Decimal("2.9999999999", 12, 10),
-    Decimal("2.12345678900876543", 35, 10),
-    Decimal("nan", 5, 4),
-    Decimal("nan", 15, 4),
-    Decimal("nan", 35, 4),
-    Decimal("inf", 5, 4),
-    Decimal("inf", 15, 4),
-    Decimal("inf", 35, 4),
-    Decimal("-inf", 5, 4),
-    Decimal("-inf", 15, 4),
-    Decimal("-inf", 35, 4)
+    Decimal('3.1415', 5, 4),
+    Decimal('2.9999999999', 12, 10),
+    Decimal('2.12345678900876543', 35, 10),
+    Decimal('nan', 5, 4),
+    Decimal('nan', 15, 4),
+    Decimal('nan', 35, 4),
+    Decimal('inf', 5, 4),
+    Decimal('inf', 15, 4),
+    Decimal('inf', 35, 4),
+    Decimal('-inf', 5, 4),
+    Decimal('-inf', 15, 4),
+    Decimal('-inf', 35, 4)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-decimal_yt_llvm_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-decimal_yt_llvm_/formatted.sql
index c88b9e57b9..9a56dde139 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-decimal_yt_llvm_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-decimal_yt_llvm_/formatted.sql
@@ -2,32 +2,32 @@
 /* postgres can not */
 USE plato;
 
-PRAGMA yt.UseNativeYtTypes = "1";
-PRAGMA config.flags("LLVM", "");
+PRAGMA yt.UseNativeYtTypes = '1';
+PRAGMA config.flags('LLVM', '');
 
 INSERT INTO @a
 SELECT
     *
 FROM (
     SELECT
-        Decimal("3.14", 3, 2) AS d3,
-        Decimal("2.9999999999", 12, 10) AS d12,
-        Decimal("2.12345678900876543", 35, 10) AS d35
+        Decimal('3.14', 3, 2) AS d3,
+        Decimal('2.9999999999', 12, 10) AS d12,
+        Decimal('2.12345678900876543', 35, 10) AS d35
     UNION ALL
     SELECT
-        Decimal("inf", 3, 2) AS d3,
-        Decimal("inf", 12, 10) AS d12,
-        Decimal("inf", 35, 10) AS d35
+        Decimal('inf', 3, 2) AS d3,
+        Decimal('inf', 12, 10) AS d12,
+        Decimal('inf', 35, 10) AS d35
     UNION ALL
     SELECT
-        Decimal("-inf", 3, 2) AS d3,
-        Decimal("-inf", 12, 10) AS d12,
-        Decimal("-inf", 35, 10) AS d35
+        Decimal('-inf', 3, 2) AS d3,
+        Decimal('-inf', 12, 10) AS d12,
+        Decimal('-inf', 35, 10) AS d35
     UNION ALL
     SELECT
-        Decimal("nan", 3, 2) AS d3,
-        Decimal("nan", 12, 10) AS d12,
-        Decimal("nan", 35, 10) AS d35
+        Decimal('nan', 3, 2) AS d3,
+        Decimal('nan', 12, 10) AS d12,
+        Decimal('nan', 35, 10) AS d35
 );
 
 COMMIT;
@@ -37,7 +37,7 @@ SELECT
 FROM
     @a
 WHERE
-    d3 != Decimal("5.3", 3, 2)
+    d3 != Decimal('5.3', 3, 2)
 ;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-decimal_yt_nollvm_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-decimal_yt_nollvm_/formatted.sql
index 6c9606d130..62fb5b9c09 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-decimal_yt_nollvm_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-decimal_yt_nollvm_/formatted.sql
@@ -2,32 +2,32 @@
 /* postgres can not */
 USE plato;
 
-PRAGMA yt.UseNativeYtTypes = "1";
-PRAGMA config.flags("LLVM", "OFF");
+PRAGMA yt.UseNativeYtTypes = '1';
+PRAGMA config.flags('LLVM', 'OFF');
 
 INSERT INTO @a
 SELECT
     *
 FROM (
     SELECT
-        Decimal("3.14", 3, 2) AS d3,
-        Decimal("2.9999999999", 12, 10) AS d12,
-        Decimal("2.12345678900876543", 35, 10) AS d35
+        Decimal('3.14', 3, 2) AS d3,
+        Decimal('2.9999999999', 12, 10) AS d12,
+        Decimal('2.12345678900876543', 35, 10) AS d35
     UNION ALL
     SELECT
-        Decimal("inf", 3, 2) AS d3,
-        Decimal("inf", 12, 10) AS d12,
-        Decimal("inf", 35, 10) AS d35
+        Decimal('inf', 3, 2) AS d3,
+        Decimal('inf', 12, 10) AS d12,
+        Decimal('inf', 35, 10) AS d35
     UNION ALL
     SELECT
-        Decimal("-inf", 3, 2) AS d3,
-        Decimal("-inf", 12, 10) AS d12,
-        Decimal("-inf", 35, 10) AS d35
+        Decimal('-inf', 3, 2) AS d3,
+        Decimal('-inf', 12, 10) AS d12,
+        Decimal('-inf', 35, 10) AS d35
     UNION ALL
     SELECT
-        Decimal("nan", 3, 2) AS d3,
-        Decimal("nan", 12, 10) AS d12,
-        Decimal("nan", 35, 10) AS d35
+        Decimal('nan', 3, 2) AS d3,
+        Decimal('nan', 12, 10) AS d12,
+        Decimal('nan', 35, 10) AS d35
 );
 
 COMMIT;
@@ -37,7 +37,7 @@ SELECT
 FROM
     @a
 WHERE
-    d3 != Decimal("5.3", 3, 2)
+    d3 != Decimal('5.3', 3, 2)
 ;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-float_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-float_/formatted.sql
index c93ef69328..3dfff7223a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-float_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-float_/formatted.sql
@@ -2,17 +2,17 @@
 /* postgres can not */
 USE plato;
 
-PRAGMA yt.UseNativeYtTypes = "1";
+PRAGMA yt.UseNativeYtTypes = '1';
 
 INSERT INTO Output
 SELECT
     *
 FROM (
     SELECT
-        Float("3.14") AS f
+        Float('3.14') AS f
     UNION ALL
     SELECT
-        Float("1.2") AS f
+        Float('1.2') AS f
 );
 
 COMMIT;
@@ -22,5 +22,5 @@ SELECT
 FROM
     Output
 WHERE
-    f != Float("5.3")
+    f != Float('5.3')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-ignore_v3_hint_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-ignore_v3_hint_/formatted.sql
index 309a105242..afa7ccd555 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-ignore_v3_hint_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-ignore_v3_hint_/formatted.sql
@@ -4,7 +4,7 @@ USE plato;
 
 SELECT
     key,
-    Yson::LookupString(subkey, "a") AS a,
+    Yson::LookupString(subkey, 'a') AS a,
 FROM
     Input WITH ignore_type_v3
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-ignore_v3_pragma_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-ignore_v3_pragma_/formatted.sql
index c5599d4204..5f0d89aa9f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-ignore_v3_pragma_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-ignore_v3_pragma_/formatted.sql
@@ -6,7 +6,7 @@ PRAGMA yt.IgnoreTypeV3;
 
 SELECT
     key,
-    Yson::LookupString(subkey, "a") AS a,
+    Yson::LookupString(subkey, 'a') AS a,
 FROM
     Input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-insert_struct_v3_with_native_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-insert_struct_v3_with_native_/formatted.sql
index ab53c7012c..8e1efa1fdb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-insert_struct_v3_with_native_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-insert_struct_v3_with_native_/formatted.sql
@@ -4,7 +4,7 @@
 /* kikimr can not */
 USE plato;
 
-PRAGMA yt.UseNativeYtTypes = "1";
+PRAGMA yt.UseNativeYtTypes = '1';
 
 INSERT INTO @a WITH truncate
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-insert_struct_v3_wo_native_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-insert_struct_v3_wo_native_/formatted.sql
index 189f9660cf..29513bd1d5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-insert_struct_v3_wo_native_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-insert_struct_v3_wo_native_/formatted.sql
@@ -4,7 +4,7 @@
 /* kikimr can not */
 USE plato;
 
-PRAGMA yt.UseNativeYtTypes = "0";
+PRAGMA yt.UseNativeYtTypes = '0';
 
 INSERT INTO Output WITH truncate
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-json_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-json_/formatted.sql
index b15fbf13ed..2a26114ec2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-json_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-json_/formatted.sql
@@ -2,7 +2,7 @@
 /* postgres can not */
 USE plato;
 
-PRAGMA yt.UseNativeYtTypes = "1";
+PRAGMA yt.UseNativeYtTypes = '1';
 
 INSERT INTO Output
 SELECT
@@ -22,5 +22,5 @@ SELECT
 FROM
     Output
 WHERE
-    ToBytes(j) != ""
+    ToBytes(j) != ''
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-mergejoin_with_sort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-mergejoin_with_sort_/formatted.sql
index aaddbe0244..27f0843bfc 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-mergejoin_with_sort_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-mergejoin_with_sort_/formatted.sql
@@ -2,8 +2,8 @@
 /* postgres can not */
 USE plato;
 
-PRAGMA yt.JoinMergeTablesLimit = "100";
-PRAGMA yt.JoinMergeForce = "true";
+PRAGMA yt.JoinMergeTablesLimit = '100';
+PRAGMA yt.JoinMergeForce = 'true';
 
 SELECT
     a.key AS key,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-non_strict_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-non_strict_/formatted.sql
index eca9311d8a..6a403b73aa 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-non_strict_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-non_strict_/formatted.sql
@@ -3,8 +3,8 @@
 /* postgres can not */
 USE plato;
 
-PRAGMA yt.UseNativeYtTypes = "1";
-PRAGMA yt.NativeYtTypeCompatibility = "complex";
+PRAGMA yt.UseNativeYtTypes = '1';
+PRAGMA yt.NativeYtTypeCompatibility = 'complex';
 
 INSERT INTO Output
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-replace_diff_layout_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-replace_diff_layout_/formatted.sql
index 7f374ab3bc..d9632c9997 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-replace_diff_layout_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-replace_diff_layout_/formatted.sql
@@ -2,8 +2,8 @@
 /* postgres can not */
 USE plato;
 
-PRAGMA yt.UseNativeYtTypes = "1";
-PRAGMA yt.NativeYtTypeCompatibility = "complex";
+PRAGMA yt.UseNativeYtTypes = '1';
+PRAGMA yt.NativeYtTypeCompatibility = 'complex';
 
 $udf = YQL::@@(lambda '(x) (block '(
     (let structType (StructType '('key (DataType 'String)) '('subkey (StructType '('a (DataType 'String)) '('b (OptionalType (DataType 'Int32))) '('c (DataType 'String))))))
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-singulars_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-singulars_/formatted.sql
index 06931eafb8..3f54c60fd9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-singulars_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-singulars_/formatted.sql
@@ -1,8 +1,8 @@
 /* postgres can not */
 USE plato;
 
-PRAGMA yt.UseNativeYtTypes = "1";
-PRAGMA yt.NativeYtTypeCompatibility = "null;void";
+PRAGMA yt.UseNativeYtTypes = '1';
+PRAGMA yt.NativeYtTypeCompatibility = 'null;void';
 
 INSERT INTO @tmp
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-split_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-split_/formatted.sql
index 7a5fb9fbee..894ddd1005 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-split_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-split_/formatted.sql
@@ -1,6 +1,6 @@
 USE plato;
 
-PRAGMA yt.MaxInputTables = "2";
+PRAGMA yt.MaxInputTables = '2';
 
 INSERT INTO Output
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-type_subset_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-type_subset_/formatted.sql
index 12e29c82d2..e23821c0f8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-type_subset_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-type_subset_/formatted.sql
@@ -3,15 +3,15 @@
 /* postgres can not */
 USE plato;
 
-PRAGMA yt.UseNativeYtTypes = "1";
-PRAGMA yt.NativeYtTypeCompatibility = "complex";
-PRAGMA yt.MaxInputTables = "2";
+PRAGMA yt.UseNativeYtTypes = '1';
+PRAGMA yt.NativeYtTypeCompatibility = 'complex';
+PRAGMA yt.MaxInputTables = '2';
 
 INSERT INTO Output WITH truncate
 SELECT
     key
 FROM
-    range("")
+    range('')
 WHERE
-    key > "000"
+    key > '000'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-uuid_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-uuid_/formatted.sql
index e932ae3eaf..a1db8e70ae 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-uuid_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-uuid_/formatted.sql
@@ -2,27 +2,27 @@
 /* postgres can not */
 USE plato;
 
-PRAGMA yt.UseNativeYtTypes = "1";
-PRAGMA yt.NativeYtTypeCompatibility = "uuid";
+PRAGMA yt.UseNativeYtTypes = '1';
+PRAGMA yt.NativeYtTypeCompatibility = 'uuid';
 
 INSERT INTO Output
 SELECT
     *
 FROM (
     SELECT
-        Uuid("00000000-0000-0000-0000-100000000000")
+        Uuid('00000000-0000-0000-0000-100000000000')
     UNION ALL
     SELECT
-        Uuid("00000000-0000-0000-0000-200000000000")
+        Uuid('00000000-0000-0000-0000-200000000000')
     UNION ALL
     SELECT
-        Uuid("00000000-0000-0000-0000-400000000000")
+        Uuid('00000000-0000-0000-0000-400000000000')
     UNION ALL
     SELECT
-        Uuid("FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFF")
+        Uuid('FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFF')
     UNION ALL
     SELECT
-        Uuid("3200ec12-4ded-4f6c-a981-4b0ff18bbdd5")
+        Uuid('3200ec12-4ded-4f6c-a981-4b0ff18bbdd5')
 );
 
 COMMIT;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-automap_null_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-automap_null_/formatted.sql
index 6ffee1dce0..e37c782eb5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-automap_null_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-automap_null_/formatted.sql
@@ -1,7 +1,7 @@
 /* syntax version 1 */
 /* postgres can not */
 SELECT
-    String::CollapseText("abc", 1)
+    String::CollapseText('abc', 1)
 ;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-complex_return_type_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-complex_return_type_/formatted.sql
index e5b508f1b5..8de1e36dec 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-complex_return_type_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-complex_return_type_/formatted.sql
@@ -1,3 +1,3 @@
 SELECT
-    ListSort(DictItems(SimpleUdf::ComplexReturnType("banana")))
+    ListSort(DictItems(SimpleUdf::ComplexReturnType('banana')))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-generic_udf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-generic_udf_/formatted.sql
index c06f891f82..8164ae3169 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-generic_udf_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-generic_udf_/formatted.sql
@@ -1,4 +1,4 @@
 /* postgres can not */
 SELECT
-    TypeInspection::Zip(AsList("A", "B", "C"), AsList(1, 2, 3))
+    TypeInspection::Zip(AsList('A', 'B', 'C'), AsList(1, 2, 3))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-python_script_from_file_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-python_script_from_file_/formatted.sql
index 7fbea6f03f..f559ade63c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-python_script_from_file_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-python_script_from_file_/formatted.sql
@@ -2,7 +2,7 @@
 /* syntax version 1 */
 USE plato;
 
-$udfScript = FileContent("python_script.py");
+$udfScript = FileContent('python_script.py');
 $udf = Python::AppendNum(Callable<(String, Int32?) -> String>, $udfScript);
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-regexp_udf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-regexp_udf_/formatted.sql
index c0db35795c..1d0c63c6a5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-regexp_udf_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-regexp_udf_/formatted.sql
@@ -1,5 +1,5 @@
 /* postgres can not */
-$regexp = Pire::Match("q.*");
+$regexp = Pire::Match('q.*');
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-same_udf_modules_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-same_udf_modules_/formatted.sql
index df3580f634..5fffcf7007 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-same_udf_modules_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-same_udf_modules_/formatted.sql
@@ -1,16 +1,16 @@
 /* postgres can not */
-$value = "xaaxaaxaa";
-$match = Re2::Match("[ax]+\\d");
-$grep = Re2Posix::Grep("a.*");
-$capture = Re2::Capture(".*(?P<foo>xa?)(a{2,}).*");
-$replace = Re2::Replace("x(a+)x");
-$count = Re2::Count("a");
+$value = 'xaaxaaxaa';
+$match = Re2::Match('[ax]+\\d');
+$grep = Re2Posix::Grep('a.*');
+$capture = Re2::Capture('.*(?P<foo>xa?)(a{2,}).*');
+$replace = Re2::Replace('x(a+)x');
+$count = Re2::Count('a');
 
 SELECT
     $match($value) AS match,
     $grep($value) AS grep,
     $capture($value) AS capture,
     $capture($value)._1 AS capture_member,
-    $replace($value, "b\\1z") AS replace,
+    $replace($value, 'b\\1z') AS replace,
     $count($value) AS count
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-two_regexps_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-two_regexps_/formatted.sql
index 1800e85626..05e55f7068 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-two_regexps_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-two_regexps_/formatted.sql
@@ -1,6 +1,6 @@
 /* postgres can not */
-$is_abc = Pire::Match(".*abc");
-$_is_wtf = Pire::Match(".*wtf");
+$is_abc = Pire::Match('.*abc');
+$_is_wtf = Pire::Match('.*wtf');
 
 SELECT
     *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_default_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_default_/formatted.sql
index c8488e8a0a..43d901e66a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_default_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_default_/formatted.sql
@@ -30,7 +30,7 @@ $default = ($result_type) -> {
 };
 
 $udaf_factory = AGGREGATION_FACTORY(
-    "UDAF",
+    'UDAF',
     $create,
     $add,
     $merge,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udf_/formatted.sql
index 21c91bda3d..28dbc5d0e8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udf_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udf_/formatted.sql
@@ -2,7 +2,7 @@
 SELECT
     key,
     subkey,
-    SimpleUdf::Concat(value, "test") AS value
+    SimpleUdf::Concat(value, 'test') AS value
 FROM
     plato.Input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udf_empty_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udf_empty_/formatted.sql
index fba18c650c..8b00d48a32 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udf_empty_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udf_empty_/formatted.sql
@@ -1,7 +1,7 @@
 /* postgres can not */
 SELECT
-    SimpleUdf::ReturnNull(""),
-    SimpleUdf::ReturnVoid(""),
-    SimpleUdf::ReturnEmpty(""),
-    SimpleUdf::ReturnEmpty("") IS NULL
+    SimpleUdf::ReturnNull(''),
+    SimpleUdf::ReturnVoid(''),
+    SimpleUdf::ReturnEmpty(''),
+    SimpleUdf::ReturnEmpty('') IS NULL
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udf_result_member_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udf_result_member_/formatted.sql
index 6eab21e657..7b5fa8028a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udf_result_member_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udf_result_member_/formatted.sql
@@ -1,5 +1,5 @@
 /* postgres can not */
-$person = Person::New("Vasya", "Pupkin", 33);
+$person = Person::New('Vasya', 'Pupkin', 33);
 
 SELECT
     $person.FirstName AS name,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-wrong_args_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-wrong_args_fail_/formatted.sql
index 994c4980dc..67a6d45b69 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-wrong_args_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-wrong_args_fail_/formatted.sql
@@ -7,16 +7,16 @@ SELECT
 
 -- too few
 SELECT
-    String::ReplaceAll("abc")
+    String::ReplaceAll('abc')
 ;
 
 -- too few
 SELECT
-    String::ReplaceAll("abc", "b", 2, 4)
+    String::ReplaceAll('abc', 'b', 2, 4)
 ;
 
 -- too many
 SELECT
-    String::ReplaceAll("abc", "b", 2, 4, 44)
+    String::ReplaceAll('abc', 'b', 2, 4, 44)
 ;
 -- too many
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-inner_union_all_with_limits_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-inner_union_all_with_limits_/formatted.sql
index cae2aeedd1..322f5ed2a7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-inner_union_all_with_limits_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-inner_union_all_with_limits_/formatted.sql
@@ -21,7 +21,7 @@ FROM (
     )
 )
 WHERE
-    key < "100"
+    key < '100'
 ;
 
 SELECT
@@ -42,5 +42,5 @@ FROM (
         Input
 )
 WHERE
-    key < "200"
+    key < '200'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-path_and_record_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-path_and_record_/formatted.sql
index 390d9563e6..df0a876e9f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-path_and_record_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-path_and_record_/formatted.sql
@@ -16,7 +16,7 @@ FROM (
     SELECT
         key,
         value,
-        "" AS path,
+        '' AS path,
         TableRecordIndex() AS record
     FROM
         Input
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-union_all_incompatible_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-union_all_incompatible_/formatted.sql
index 15c48bef17..29407ec6dc 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-union_all_incompatible_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-union_all_incompatible_/formatted.sql
@@ -7,11 +7,11 @@ FROM (
     FROM (
         SELECT
             1 AS key,
-            "foo" AS subkey
+            'foo' AS subkey
         UNION ALL
         SELECT
             2 AS key,
-            "bar" AS subkey
+            'bar' AS subkey
         UNION ALL
         SELECT
             3 AS key,
@@ -30,11 +30,11 @@ FROM (
     FROM (
         SELECT
             4 AS key,
-            "baz" AS subkey
+            'baz' AS subkey
         UNION ALL
         SELECT
             5 AS key,
-            "goo" AS subkey
+            'goo' AS subkey
         UNION ALL
         SELECT
             6 AS key,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-union_all_with_limits_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-union_all_with_limits_/formatted.sql
index 3a9e607322..1c70a647d4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-union_all_with_limits_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-union_all_with_limits_/formatted.sql
@@ -4,7 +4,7 @@
     FROM
         plato.Input
     WHERE
-        key < "100"
+        key < '100'
     LIMIT 2
 )
 UNION ALL
@@ -14,6 +14,6 @@ UNION ALL
     FROM
         plato.Input
     WHERE
-        key > "100"
+        key > '100'
     LIMIT 2
 );
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-init_view_after_eval_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-init_view_after_eval_/formatted.sql
index ebd59427ed..08953b2c14 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-init_view_after_eval_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-init_view_after_eval_/formatted.sql
@@ -20,7 +20,7 @@ $filteredMembers = ListFilter(
             RETURN $x.Name;
         }
     ), ($x) -> {
-        RETURN $x > "k";
+        RETURN $x > 'k';
     }
 );
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-few_source_different_columns_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-few_source_different_columns_/formatted.sql
index 5207b8b2c4..f1452f7ac6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-few_source_different_columns_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-few_source_different_columns_/formatted.sql
@@ -1,13 +1,13 @@
 /* postgres can not */
 /* syntax version 1 */
-PRAGMA yt.InferSchema = "2";
+PRAGMA yt.InferSchema = '2';
 
 USE plato;
 
 SELECT
-    WeakField(key, "String", "funny"),
-    WeakField(subkey, "String", "bunny"),
-    WeakField(value, "String", "boom")
+    WeakField(key, 'String', 'funny'),
+    WeakField(subkey, 'String', 'bunny'),
+    WeakField(value, 'String', 'boom')
 FROM
     RANGE(``, ``, ``)
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-hor_join_with_mix_weak_access_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-hor_join_with_mix_weak_access_/formatted.sql
index c97fd227e4..01842b997e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-hor_join_with_mix_weak_access_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-hor_join_with_mix_weak_access_/formatted.sql
@@ -4,13 +4,13 @@ USE plato;
 
 SELECT
     key,
-    WeakField(value1, "String", "funny") AS value
+    WeakField(value1, 'String', 'funny') AS value
 FROM
     Input
 UNION ALL
 SELECT
     key,
-    _other["value1"] AS value
+    _other['value1'] AS value
 FROM
     Input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_combine_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_combine_/formatted.sql
index ac32a73ac1..607d9fe71c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_combine_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_combine_/formatted.sql
@@ -5,8 +5,8 @@ USE plato;
 
 SELECT
     key,
-    min(WeakField(subkey, "Int64")),
-    max(WeakField(value, "String"))
+    min(WeakField(subkey, 'Int64')),
+    max(WeakField(value, 'String'))
 FROM
     Input
 GROUP BY
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_filter_combine_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_filter_combine_/formatted.sql
index d02a4e79b7..02babcdbf4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_filter_combine_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_filter_combine_/formatted.sql
@@ -6,13 +6,13 @@ USE plato;
 SELECT
     min(key),
     subkey,
-    max(WeakField(value, "String"))
+    max(WeakField(value, 'String'))
 FROM
     Input
 WHERE
-    WeakField(subkey, "Int64") > 0
+    WeakField(subkey, 'Int64') > 0
 GROUP BY
-    WeakField(subkey, "Int64") AS subkey
+    WeakField(subkey, 'Int64') AS subkey
 ORDER BY
     subkey
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_map_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_map_/formatted.sql
index fa5b87fb56..666294aefc 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_map_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_map_/formatted.sql
@@ -5,8 +5,8 @@ USE plato;
 
 SELECT
     key,
-    WeakField(subkey, "Int64"),
-    WeakField(value, "String")
+    WeakField(subkey, 'Int64'),
+    WeakField(value, 'String')
 FROM
     Input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_map_combine_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_map_combine_/formatted.sql
index 15d1c70ca1..66e446554d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_map_combine_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_map_combine_/formatted.sql
@@ -6,11 +6,11 @@ USE plato;
 SELECT
     min(key),
     subkey,
-    max(WeakField(value, "String"))
+    max(WeakField(value, 'String'))
 FROM
     Input
 GROUP BY
-    WeakField(subkey, "Int64") AS subkey
+    WeakField(subkey, 'Int64') AS subkey
 ORDER BY
     subkey
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_/formatted.sql
index 5cc12c15e3..bf9efb3ae8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_/formatted.sql
@@ -2,30 +2,30 @@
 USE plato;
 
 SELECT
-    "input1-value1" AS src,
+    'input1-value1' AS src,
     key,
-    WeakField(value1, "String", "funny") AS ozer
+    WeakField(value1, 'String', 'funny') AS ozer
 FROM
     Input1
 UNION ALL
 SELECT
-    "input2-value1" AS src,
+    'input2-value1' AS src,
     key,
-    WeakField(value1, "String", "funny") AS ozer
+    WeakField(value1, 'String', 'funny') AS ozer
 FROM
     Input2
 UNION ALL
 SELECT
-    "input1-value2" AS src,
+    'input1-value2' AS src,
     key,
-    WeakField(value2, "String") AS ozer
+    WeakField(value2, 'String') AS ozer
 FROM
     Input1
 UNION ALL
 SELECT
-    "input2-value2" AS src,
+    'input2-value2' AS src,
     key,
-    WeakField(value2, "String") AS ozer
+    WeakField(value2, 'String') AS ozer
 FROM
     Input2
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_aggregation_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_aggregation_/formatted.sql
index c648d78e05..5dd7f2d2db 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_aggregation_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_aggregation_/formatted.sql
@@ -4,7 +4,7 @@ USE plato;
 --INSERT INTO Output
 SELECT
     odd,
-    sum(WeakField(data3, "int32") + WeakField(datahole3, "uint32", 999)) AS score
+    sum(WeakField(data3, 'int32') + WeakField(datahole3, 'uint32', 999)) AS score
 FROM
     Input4
 GROUP BY
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_data_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_data_/formatted.sql
index b2ad733cdb..8ca64e88bb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_data_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_data_/formatted.sql
@@ -3,8 +3,8 @@ USE plato;
 
 SELECT
     subkey,
-    WeakField(data1, "Int32", 32) AS d1,
-    WeakField(data3, "Int32", 32) AS d3
+    WeakField(data1, 'Int32', 32) AS d1,
+    WeakField(data3, 'Int32', 32) AS d3
 FROM
     Input3
 ORDER BY
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_esc_yson_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_esc_yson_/formatted.sql
index 24e315c700..a17177dd03 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_esc_yson_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_esc_yson_/formatted.sql
@@ -5,7 +5,7 @@ USE plato;
 SELECT
     CAST(WeakField(subkey, 'string') AS uint32) AS subkey,
     WeakField(strE1, 'string'),
-    YQL::FromYsonSimpleType(WeakField(strE1, "Yson"), AsAtom("String")) AS strE1overYson
+    YQL::FromYsonSimpleType(WeakField(strE1, 'Yson'), AsAtom('String')) AS strE1overYson
 FROM
     Input
 ORDER BY
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_infer_scheme_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_infer_scheme_/formatted.sql
index d9a12163d6..d543c4e2f0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_infer_scheme_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_infer_scheme_/formatted.sql
@@ -7,7 +7,7 @@ PRAGMA yt.InferSchema;
 SELECT
     key,
     subkey,
-    WeakField(value, "String") AS value
+    WeakField(value, 'String') AS value
 FROM
     Input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_join_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_join_/formatted.sql
index c519e54659..887c370eb2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_join_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_join_/formatted.sql
@@ -3,10 +3,10 @@ USE plato;
 
 SELECT
     i1.subkey AS sk,
-    WeakField(i1.value1, "String", "funny") AS i1v1,
-    WeakField(i1.value2, "String", "bunny") AS i1v2,
-    WeakField(i2.value1, "String", "short") AS i2v1,
-    WeakField(i2.value2, "String", "circuit") AS i2v2
+    WeakField(i1.value1, 'String', 'funny') AS i1v1,
+    WeakField(i1.value2, 'String', 'bunny') AS i1v2,
+    WeakField(i2.value1, 'String', 'short') AS i2v1,
+    WeakField(i2.value2, 'String', 'circuit') AS i2v2
 FROM
     Input1 AS i1
 JOIN
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_join_condition_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_join_condition_/formatted.sql
index b4742d3398..3781a21aeb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_join_condition_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_join_condition_/formatted.sql
@@ -4,16 +4,16 @@ USE plato;
 --INSERT INTO Output
 SELECT
     i1.subkey AS sk,
-    WeakField(i1.value1, "String", "funny") AS i1v1,
-    WeakField(i1.value2, "String", "bunny") AS i1v2,
-    WeakField(i2.value1, "String", "short") AS i2v1,
-    WeakField(i2.value2, "String", "circuit") AS i2v2
+    WeakField(i1.value1, 'String', 'funny') AS i1v1,
+    WeakField(i1.value2, 'String', 'bunny') AS i1v2,
+    WeakField(i2.value1, 'String', 'short') AS i2v1,
+    WeakField(i2.value2, 'String', 'circuit') AS i2v2
 FROM
     Input1 AS i1
 JOIN
     Input2 AS i2
 ON
-    WeakField(i1.value1, "String") == WeakField(i2.value2, "String")
+    WeakField(i1.value1, 'String') == WeakField(i2.value2, 'String')
 ORDER BY
     sk
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_join_where_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_join_where_/formatted.sql
index a554a9b125..7c330b4d8d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_join_where_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_join_where_/formatted.sql
@@ -4,18 +4,18 @@ USE plato;
 --INSERT INTO Output
 SELECT
     i1.subkey AS sk,
-    WeakField(i1.value1, "String", "funny") AS i1v1,
-    WeakField(i1.value2, "String", "bunny") AS i1v2,
-    WeakField(i2.value1, "String", "short") AS i2v1,
-    WeakField(i2.value2, "String", "circuit") AS i2v2
+    WeakField(i1.value1, 'String', 'funny') AS i1v1,
+    WeakField(i1.value2, 'String', 'bunny') AS i1v2,
+    WeakField(i2.value1, 'String', 'short') AS i2v1,
+    WeakField(i2.value2, 'String', 'circuit') AS i2v2
 FROM
     Input1 AS i1
 JOIN
     Input2 AS i2
 ON
-    WeakField(i1.value1, "String") == WeakField(i2.value2, "String")
+    WeakField(i1.value1, 'String') == WeakField(i2.value2, 'String')
 WHERE
-    WeakField(i2.key, "String") == "150" OR WeakField(i1.key, "String") == "075"
+    WeakField(i2.key, 'String') == '150' OR WeakField(i1.key, 'String') == '075'
 ORDER BY
     sk
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_long_fields_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_long_fields_/formatted.sql
index e7cd62c500..c746e14d9e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_long_fields_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_long_fields_/formatted.sql
@@ -3,8 +3,8 @@ USE plato;
 
 --INSERT INTO Output
 SELECT
-    WeakField(email, "String"),
-    WeakField(yandexuid, "Uint64")
+    WeakField(email, 'String'),
+    WeakField(yandexuid, 'Uint64')
 FROM
     Input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_num_access_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_num_access_/formatted.sql
index ad8a630bd4..25c9ca9dd5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_num_access_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_num_access_/formatted.sql
@@ -4,8 +4,8 @@ USE plato;
 --INSERT INTO Output
 SELECT
     subkey,
-    WeakField(data3, "int32") AS data3,
-    WeakField(datahole3, "uint32", 999) AS holes3
+    WeakField(data3, 'int32') AS data3,
+    WeakField(datahole3, 'uint32', 999) AS holes3
 FROM
     Input4
 ORDER BY
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_opt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_opt_/formatted.sql
index c689bf128c..0b9ca30738 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_opt_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_opt_/formatted.sql
@@ -3,8 +3,8 @@ USE plato;
 
 SELECT
     subkey,
-    WeakField(data3, "int32") AS data3str,
-    WeakField(datahole3, "int32", 999) AS holes3
+    WeakField(data3, 'int32') AS data3str,
+    WeakField(datahole3, 'int32', 999) AS holes3
 FROM
     Input3
 ORDER BY
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_real_col_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_real_col_/formatted.sql
index 9e00d0ee66..e09aa5b8e0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_real_col_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_real_col_/formatted.sql
@@ -3,13 +3,13 @@ USE plato;
 
 --INSERT INTO Output
 SELECT
-    WeakField(key, "String", 'test'),
-    WeakField(balu, "String", 'bebe'),
-    WeakField(value, "String", 'zzz')
+    WeakField(key, 'String', 'test'),
+    WeakField(balu, 'String', 'bebe'),
+    WeakField(value, 'String', 'zzz')
 FROM
     Input
 WHERE
-    key < "200"
+    key < '200'
 ORDER BY
     key
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_rest_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_rest_/formatted.sql
index b0f2b197c3..32187a2ea2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_rest_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_rest_/formatted.sql
@@ -3,13 +3,13 @@ USE plato;
 
 --INSERT INTO Output
 SELECT
-    WeakField(animal, "String"),
-    WeakField(size, "String") AS sizeRating,
-    WeakField(weightMin, "Float"),
-    WeakField(weightMax, "Float"),
-    WeakField(wild, "Bool"),
-    WeakField(pet, "Bool", FALSE),
-    WeakField(miss, "Bool", TRUE)
+    WeakField(animal, 'String'),
+    WeakField(size, 'String') AS sizeRating,
+    WeakField(weightMin, 'Float'),
+    WeakField(weightMax, 'Float'),
+    WeakField(wild, 'Bool'),
+    WeakField(pet, 'Bool', FALSE),
+    WeakField(miss, 'Bool', TRUE)
 FROM
     Input
 ORDER BY
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_strict_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_strict_/formatted.sql
index 2d18cbf5fd..93ec3ba6a5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_strict_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_strict_/formatted.sql
@@ -2,12 +2,12 @@
 USE plato;
 
 SELECT
-    WeakField(first_num, "uint32") AS num_nodef,
-    WeakField(first_num, "uint32", 11) AS num_def,
-    WeakField(first_null, "uint32") AS null_nodef,
-    WeakField(first_null, "uint32", 42) AS null_def,
-    WeakField(val, "string") AS missed_nodef,
-    WeakField(val, "string", "no value") AS missed_def
+    WeakField(first_num, 'uint32') AS num_nodef,
+    WeakField(first_num, 'uint32', 11) AS num_def,
+    WeakField(first_null, 'uint32') AS null_nodef,
+    WeakField(first_null, 'uint32', 42) AS null_def,
+    WeakField(val, 'string') AS missed_nodef,
+    WeakField(val, 'string', 'no value') AS missed_def
 FROM
     Input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_to_yson_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_to_yson_/formatted.sql
index e38e188441..2fdf0cf3c9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_to_yson_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_to_yson_/formatted.sql
@@ -1,7 +1,7 @@
 USE plato;
 
 SELECT
-    YQL::FromYsonSimpleType(WeakField(uiData, "Yson"), AsAtom("Uint32")) AS val
+    YQL::FromYsonSimpleType(WeakField(uiData, 'Yson'), AsAtom('Uint32')) AS val
 FROM
     Input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_type_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_type_/formatted.sql
index 7a224230ae..9d045dcd72 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_type_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_type_/formatted.sql
@@ -2,9 +2,9 @@
 USE plato;
 
 SELECT
-    WeakField(key, DataType("String")),
-    WeakField(subkey, OptionalType(DataType("String"))),
-    WeakField(value, "String")
+    WeakField(key, DataType('String')),
+    WeakField(subkey, OptionalType(DataType('String'))),
+    WeakField(value, 'String')
 FROM
     Input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_wrong_types_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_wrong_types_fail_/formatted.sql
index 78dc5f1f36..64a8b391ea 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_wrong_types_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_wrong_types_fail_/formatted.sql
@@ -2,7 +2,7 @@
 USE plato;
 
 SELECT
-    WeakField(first_num, "int32", 42) -- first_num column have another type
+    WeakField(first_num, 'int32', 42) -- first_num column have another type
 FROM
     Input
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_member_string_copy_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_member_string_copy_/formatted.sql
index 0e3a49aa33..b9788d7481 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_member_string_copy_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_member_string_copy_/formatted.sql
@@ -1,6 +1,6 @@
 /* postgres can not */
-$d = AsDict(AsTuple("fld", "Россия, Санкт-Петербург, Петроградская набережная, 2-4"), AsTuple("_yql_fld", ""));
+$d = AsDict(AsTuple('fld', 'Россия, Санкт-Петербург, Петроградская набережная, 2-4'), AsTuple('_yql_fld', ''));
 
 SELECT
-    Yql::TryWeakMemberFromDict(Just($d), NULL, AsAtom("String"), AsAtom("fld"))
+    Yql::TryWeakMemberFromDict(Just($d), NULL, AsAtom('String'), AsAtom('fld'))
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-yql-7888_mapfieldsubset_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-yql-7888_mapfieldsubset_/formatted.sql
index 5acbc2b439..11646d24ad 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-yql-7888_mapfieldsubset_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-yql-7888_mapfieldsubset_/formatted.sql
@@ -5,15 +5,15 @@ USE plato;
 DEFINE SUBQUERY $input() AS
     SELECT
         value,
-        WeakField(strongest_id, "String") AS strongest_id,
-        WeakField(video_position_sec, "String") AS video_position_sec,
+        WeakField(strongest_id, 'String') AS strongest_id,
+        WeakField(video_position_sec, 'String') AS video_position_sec,
         key,
         subkey
     FROM
         concat(Input, Input)
     WHERE
-        key IN ("heartbeat", "show", "click")
-        AND subkey IN ("native", "gif")
+        key IN ('heartbeat', 'show', 'click')
+        AND subkey IN ('native', 'gif')
     ;
 END DEFINE;
 
@@ -26,8 +26,8 @@ DEFINE SUBQUERY $native_show_and_clicks($input) AS
     FROM
         $input()
     WHERE
-        subkey == "native"
-        AND key IN ("click", "show")
+        subkey == 'native'
+        AND key IN ('click', 'show')
     ;
 END DEFINE;
 
@@ -42,5 +42,5 @@ SELECT
 FROM
     $native_show_and_clicks($input)
 WHERE
-    key == "click"
+    key == 'click'
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_session_extended_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_session_extended_/formatted.sql
index 72bf936b89..9c3298c598 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_session_extended_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_session_extended_/formatted.sql
@@ -14,7 +14,7 @@ SELECT
     user,
     ts,
     payload,
-    AGGREGATE_LIST(CAST(ts AS string) ?? "null") OVER w AS ts_session,
+    AGGREGATE_LIST(CAST(ts AS string) ?? 'null') OVER w AS ts_session,
     COUNT(1) OVER w AS session_len,
     SessionStart() OVER w AS session_start,
     SessionState() OVER w AS session_state,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-distinct_over_window_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-distinct_over_window_/formatted.sql
index b16353d3b3..7d3c0800cb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-distinct_over_window_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-distinct_over_window_/formatted.sql
@@ -25,7 +25,7 @@ SELECT
         ORDER BY
             key
     ) AS count_by_key,
-    count(DISTINCT value || "force_preagg") OVER (
+    count(DISTINCT value || 'force_preagg') OVER (
         PARTITION BY
             subkey
         ORDER BY
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-empty_aggregations_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-empty_aggregations_/formatted.sql
index e173e660c9..01dfed8bbe 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-empty_aggregations_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-empty_aggregations_/formatted.sql
@@ -1,6 +1,6 @@
 /* syntax version 1 */
 /* postgres can not */
-PRAGMA warning("disable", "4520");
+PRAGMA warning('disable', '4520');
 
 SELECT
     value,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-empty_aggregations_leadlag_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-empty_aggregations_leadlag_/formatted.sql
index aa97f8ea05..3d9c250a7d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-empty_aggregations_leadlag_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-empty_aggregations_leadlag_/formatted.sql
@@ -1,6 +1,6 @@
 /* syntax version 1 */
 /* postgres can not */
-PRAGMA warning("disable", "4520");
+PRAGMA warning('disable', '4520');
 
 SELECT
     value,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_noncompact_with_nulls_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_noncompact_with_nulls_/formatted.sql
index fd249aa8c4..015ea182ef 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_noncompact_with_nulls_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_noncompact_with_nulls_/formatted.sql
@@ -10,13 +10,13 @@ $input = (
     UNION ALL
     SELECT
         NULL AS key,
-        "9" AS subkey,
-        "000" AS value
+        '9' AS subkey,
+        '000' AS value
     UNION ALL
     SELECT
         NULL AS key,
-        "9" AS subkey,
-        "001" AS value
+        '9' AS subkey,
+        '001' AS value
 );
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_noncompact_with_nulls_tuple_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_noncompact_with_nulls_tuple_key_/formatted.sql
index ad29891007..532f5db26f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_noncompact_with_nulls_tuple_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_noncompact_with_nulls_tuple_key_/formatted.sql
@@ -10,13 +10,13 @@ $input = (
     UNION ALL
     SELECT
         NULL AS key,
-        "9" AS subkey,
-        "000" AS value
+        '9' AS subkey,
+        '000' AS value
     UNION ALL
     SELECT
         NULL AS key,
-        "9" AS subkey,
-        "001" AS value
+        '9' AS subkey,
+        '001' AS value
 );
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_session_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_session_/formatted.sql
index 69d5a7c49f..9a02e7d19b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_session_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_session_/formatted.sql
@@ -6,7 +6,7 @@ USE plato;
 $src =
     SELECT
         t.*,
-        user ?? "u0" AS user_nonopt
+        user ?? 'u0' AS user_nonopt
     FROM
         Input AS t
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_session_incompat_sort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_session_incompat_sort_/formatted.sql
index b9122d2303..d435805440 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_session_incompat_sort_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_session_incompat_sort_/formatted.sql
@@ -6,7 +6,7 @@ USE plato;
 $src =
     SELECT
         t.*,
-        user ?? "u0" AS user_nonopt
+        user ?? 'u0' AS user_nonopt
     FROM
         Input AS t
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-presort_window_partition_by_mem_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-presort_window_partition_by_mem_/formatted.sql
index c9cd6bdb5c..30d197a370 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-presort_window_partition_by_mem_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-presort_window_partition_by_mem_/formatted.sql
@@ -4,8 +4,8 @@ SELECT
     row_number() OVER w
 FROM (
     SELECT
-        AsList("a") AS key,
-        "z" AS value
+        AsList('a') AS key,
+        'z' AS value
 )
 WINDOW
     w AS (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-rank_nulls_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-rank_nulls_/formatted.sql
index 673a284c7a..3a6d851e26 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-rank_nulls_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-rank_nulls_/formatted.sql
@@ -1,6 +1,6 @@
 /* syntax version 1 */
 /* postgres can not */
-PRAGMA warning("disable", "4520");
+PRAGMA warning('disable', '4520');
 PRAGMA AnsiRankForNullableKeys;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-rank_nulls_legacy_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-rank_nulls_legacy_/formatted.sql
index e87275072d..7ebf2f553c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-rank_nulls_legacy_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-rank_nulls_legacy_/formatted.sql
@@ -1,6 +1,6 @@
 /* syntax version 1 */
 /* postgres can not */
-PRAGMA warning("disable", "4520");
+PRAGMA warning('disable', '4520');
 PRAGMA DisableAnsiRankForNullableKeys;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-rank_opt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-rank_opt_/formatted.sql
index 7c9ab88fe2..a45aba483f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-rank_opt_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-rank_opt_/formatted.sql
@@ -1,6 +1,6 @@
 /* syntax version 1 */
 /* postgres can not */
-PRAGMA warning("disable", "4520");
+PRAGMA warning('disable', '4520');
 PRAGMA AnsiRankForNullableKeys;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-rank_plain_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-rank_plain_/formatted.sql
index bb9ea38c01..55a4ea61c1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-rank_plain_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-rank_plain_/formatted.sql
@@ -1,6 +1,6 @@
 /* syntax version 1 */
 /* postgres can not */
-PRAGMA warning("disable", "4520");
+PRAGMA warning('disable', '4520');
 PRAGMA AnsiRankForNullableKeys;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-rank_unordered_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-rank_unordered_/formatted.sql
index 1aac9fc014..ea3f24dacb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-rank_unordered_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-rank_unordered_/formatted.sql
@@ -1,7 +1,7 @@
 /* syntax version 1 */
 /* postgres can not */
-PRAGMA warning("disable", "4520");
-PRAGMA warning("disable", "4521");
+PRAGMA warning('disable', '4520');
+PRAGMA warning('disable', '4521');
 PRAGMA AnsiRankForNullableKeys;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-row_number_no_part_from_subq_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-row_number_no_part_from_subq_/formatted.sql
index b5e4c113d9..147d07c258 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-row_number_no_part_from_subq_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-row_number_no_part_from_subq_/formatted.sql
@@ -10,7 +10,7 @@ FROM (
     FROM
         Input
     WHERE
-        key != "020"
+        key != '020'
 )
 WINDOW
     w AS ()
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-row_number_no_part_multi_input_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-row_number_no_part_multi_input_/formatted.sql
index 9123e52e01..21fbe724d9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-row_number_no_part_multi_input_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-row_number_no_part_multi_input_/formatted.sql
@@ -16,7 +16,7 @@ $input = (
     FROM
         Input
     WHERE
-        key != "020"
+        key != '020'
     UNION ALL
     SELECT
         *
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-udaf_no_merge_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-udaf_no_merge_/formatted.sql
index ef02de8fc0..1b81ccee28 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-udaf_no_merge_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-udaf_no_merge_/formatted.sql
@@ -1,7 +1,7 @@
 /* postgres can not */
 /* syntax version 1 */
 $f = AggregationFactory(
-    "UDAF",
+    'UDAF',
     ($item, $_) -> ($item),
     ($state, $item, $_) -> ($state),
     NULL,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-udaf_with_def_value_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-udaf_with_def_value_/formatted.sql
index 1da88456a0..554691de41 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-udaf_with_def_value_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-udaf_with_def_value_/formatted.sql
@@ -1,4 +1,4 @@
-PRAGMA warning("disable", "4520");
+PRAGMA warning('disable', '4520');
 
 $my_table =
     SELECT
@@ -60,7 +60,7 @@ $cnt_deserialize = ($state) -> {
 $cnt_default = 0.0;
 
 $cnt_udaf_factory = AggregationFactory(
-    "UDAF",
+    'UDAF',
     $cnt_create,
     $cnt_add,
     $cnt_merge,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_by_all_aggregate_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_by_all_aggregate_/formatted.sql
index 09acdffab4..39b80d68e4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_by_all_aggregate_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_by_all_aggregate_/formatted.sql
@@ -38,7 +38,7 @@ SELECT
     histogram(age) OVER w1 AS hist,
     median(age) OVER w1 AS median,
     percentile(age, 0.9) OVER w1 AS perc90,
-    aggregate_by(age, aggregation_factory("count")) OVER w1 AS aggby
+    aggregate_by(age, aggregation_factory('count')) OVER w1 AS aggby
 FROM
     $data
 WINDOW
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_by_simple_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_by_simple_/formatted.sql
index 69b4181a33..a3be4a4b12 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_by_simple_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_by_simple_/formatted.sql
@@ -4,8 +4,8 @@ SELECT
     row_number() OVER w
 FROM (
     SELECT
-        "a" AS key,
-        "z" AS value
+        'a' AS key,
+        'z' AS value
 )
 WINDOW
     w AS (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_lead_in_mem_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_lead_in_mem_/formatted.sql
index 767173a908..c6036ecb64 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_lead_in_mem_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_lead_in_mem_/formatted.sql
@@ -15,7 +15,7 @@ $list = (
 SELECT
     item,
     YQL::Concat('+', Lead(item, 1) OVER w),
-    YQL::Concat("++", Lead(item, 2) OVER w)
+    YQL::Concat('++', Lead(item, 2) OVER w)
 FROM
     $list
 WINDOW
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_multiaggr_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_multiaggr_/formatted.sql
index 51deefc179..fd85a4f8dd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_multiaggr_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_multiaggr_/formatted.sql
@@ -2,8 +2,8 @@
 USE plato;
 
 SELECT
-    MULTI_AGGREGATE_BY(AsStruct(subkey AS a, value AS b), AGGREGATION_FACTORY("count")) OVER w,
-    MULTI_AGGREGATE_BY(AsStruct(subkey AS a, value AS b), AGGREGATION_FACTORY("max")) OVER w
+    MULTI_AGGREGATE_BY(AsStruct(subkey AS a, value AS b), AGGREGATION_FACTORY('count')) OVER w,
+    MULTI_AGGREGATE_BY(AsStruct(subkey AS a, value AS b), AGGREGATION_FACTORY('max')) OVER w
 FROM
     Input
 WINDOW
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_multiaggr_list_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_multiaggr_list_/formatted.sql
index 9960126a71..f2eacd5ba5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_multiaggr_list_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_multiaggr_list_/formatted.sql
@@ -2,8 +2,8 @@
 USE plato;
 
 SELECT
-    MULTI_AGGREGATE_BY(AsList(subkey, value), AGGREGATION_FACTORY("count")) OVER w,
-    MULTI_AGGREGATE_BY(AsList(subkey, value), AGGREGATION_FACTORY("max")) OVER w
+    MULTI_AGGREGATE_BY(AsList(subkey, value), AGGREGATION_FACTORY('count')) OVER w,
+    MULTI_AGGREGATE_BY(AsList(subkey, value), AGGREGATION_FACTORY('max')) OVER w
 FROM
     Input
 WINDOW
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_multiaggr_tuple_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_multiaggr_tuple_/formatted.sql
index 3f2fa69a0b..eff23dce4d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_multiaggr_tuple_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_multiaggr_tuple_/formatted.sql
@@ -2,8 +2,8 @@
 USE plato;
 
 SELECT
-    MULTI_AGGREGATE_BY(AsTuple(subkey, value), AGGREGATION_FACTORY("count")) OVER w,
-    MULTI_AGGREGATE_BY(AsTuple(subkey, value), AGGREGATION_FACTORY("max")) OVER w
+    MULTI_AGGREGATE_BY(AsTuple(subkey, value), AGGREGATION_FACTORY('count')) OVER w,
+    MULTI_AGGREGATE_BY(AsTuple(subkey, value), AGGREGATION_FACTORY('max')) OVER w
 FROM
     Input
 WINDOW
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-yql-14738_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-yql-14738_/formatted.sql
index 89c7466f5d..cb30cfeec3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-yql-14738_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-yql-14738_/formatted.sql
@@ -6,11 +6,11 @@ SELECT
     t.*,
     COUNT(*) OVER (
         PARTITION BY
-            key || "1"
+            key || '1'
     ) AS c1,
     COUNT(*) OVER (
         PARTITION BY
-            key || "2"
+            key || '2'
     ) AS c2,
     COUNT(*) OVER w AS c3,
 FROM
@@ -18,7 +18,7 @@ FROM
 WINDOW
     w AS (
         PARTITION BY
-            key || "3"
+            key || '3'
     )
 ORDER BY
     subkey
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-yql-15636_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-yql-15636_/formatted.sql
index 1a5c45af92..55174af959 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-yql-15636_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-yql-15636_/formatted.sql
@@ -18,7 +18,7 @@ SELECT
     utc_order_dttm,
     order_id,
     LEAD(
-        <|"order_id": order_id, "order_dttm": utc_order_dttm|>,
+        <|'order_id': order_id, 'order_dttm': utc_order_dttm|>,
         1
     ) OVER (
         PARTITION BY
@@ -27,7 +27,7 @@ SELECT
             utc_order_dttm
     ) AS next_user_order,
     LEAD(
-        <|"order_id": order_id|>,
+        <|'order_id': order_id|>,
         1
     ) OVER (
         PARTITION BY