From b63a128f49b2cde94999029607e25c3d9fdf7215 Mon Sep 17 00:00:00 2001 From: avevad Date: Tue, 26 Nov 2024 18:08:03 +0300 Subject: [PATCH 1/9] YQL-17471 Add Datetime::EndOf for intervals commit_hash:98c92942172dfcc73889ff60318242e91828c42b --- .../udfs/common/datetime2/datetime_udf.cpp | 38 +++++- .../canondata/test.test_EndOf_/results.txt | 125 +++++++++++++++++- .../common/datetime2/test/cases/EndOf.sql | 5 + 3 files changed, 164 insertions(+), 4 deletions(-) diff --git a/yql/essentials/udfs/common/datetime2/datetime_udf.cpp b/yql/essentials/udfs/common/datetime2/datetime_udf.cpp index 143eaefbcd3d..be41a0b8edf2 100644 --- a/yql/essentials/udfs/common/datetime2/datetime_udf.cpp +++ b/yql/essentials/udfs/common/datetime2/datetime_udf.cpp @@ -1596,7 +1596,25 @@ TValue DoAddYears(const TValue& date, i64 years, const NUdf::IDateBuilder& build return storage; } - struct TStartOfBinaryKernelExec : TBinaryKernelExec { + TMaybe EndOf(TTMStorage storage, ui64 interval, const IValueBuilder& valueBuilder) { + if (interval >= 86400000000ull) { + // treat as EndOfDay + SetEndOfDay(storage); + } else { + auto current = storage.ToTimeOfDay(); + auto rounded = current / interval * (interval + 1) - 1; + storage.FromTimeOfDay(rounded); + } + + auto& builder = valueBuilder.GetDateBuilder(); + if (!storage.Validate(builder)) { + return {}; + } + return storage; + } + + template + struct TStartEndOfBinaryKernelExec : TBinaryKernelExec> { template static void Process(const IValueBuilder* valueBuilder, TBlockItem arg1, TBlockItem arg2, const TSink& sink) { auto& storage = Reference(arg1); @@ -1606,7 +1624,7 @@ TValue DoAddYears(const TValue& date, i64 years, const NUdf::IDateBuilder& build return; } - if (auto res = StartOf(storage, interval, *valueBuilder)) { + if (auto res = (UseEnd ? EndOf : StartOf)(storage, interval, *valueBuilder)) { storage = res.GetRef(); sink(arg1); } else { @@ -1627,7 +1645,21 @@ TValue DoAddYears(const TValue& date, i64 years, const NUdf::IDateBuilder& build } return TUnboxedValuePod{}; } - END_SIMPLE_ARROW_UDF(TStartOf, TStartOfBinaryKernelExec::Do); + END_SIMPLE_ARROW_UDF(TStartOf, TStartEndOfBinaryKernelExec::Do); + + BEGIN_SIMPLE_STRICT_ARROW_UDF(TEndOf, TOptional>(TAutoMap>, TAutoMap)) { + auto result = args[0]; + ui64 interval = std::abs(args[1].Get()); + if (interval == 0) { + return result; + } + if (auto res = EndOf(Reference(result), interval, *valueBuilder)) { + Reference(result) = res.GetRef(); + return result; + } + return TUnboxedValuePod{}; + } + END_SIMPLE_ARROW_UDF(TEndOf, TStartEndOfBinaryKernelExec::Do); struct TTimeOfDayKernelExec : TUnaryKernelExec, TFixedSizeArrayBuilder::TLayout, false>> { template diff --git a/yql/essentials/udfs/common/datetime2/test/canondata/test.test_EndOf_/results.txt b/yql/essentials/udfs/common/datetime2/test/canondata/test.test_EndOf_/results.txt index 8dafce247318..5c813a2e6b3a 100644 --- a/yql/essentials/udfs/common/datetime2/test/canondata/test.test_EndOf_/results.txt +++ b/yql/essentials/udfs/common/datetime2/test/canondata/test.test_EndOf_/results.txt @@ -352,6 +352,56 @@ "String" ] ] + ]; + [ + "column5"; + [ + "OptionalType"; + [ + "DataType"; + "String" + ] + ] + ]; + [ + "column6"; + [ + "OptionalType"; + [ + "DataType"; + "String" + ] + ] + ]; + [ + "column7"; + [ + "OptionalType"; + [ + "DataType"; + "String" + ] + ] + ]; + [ + "column8"; + [ + "OptionalType"; + [ + "DataType"; + "String" + ] + ] + ]; + [ + "column9"; + [ + "OptionalType"; + [ + "DataType"; + "String" + ] + ] ] ] ] @@ -372,6 +422,19 @@ ]; [ "1970-01-01 23:59:59.999999 Europe/Moscow" + ]; + #; + [ + "1970-01-01 04:00:00 Europe/Moscow" + ]; + [ + "1970-01-01 05:00:00 Europe/Moscow" + ]; + [ + "1970-01-01 05:00:00 Europe/Moscow" + ]; + [ + "1970-01-01 04:59:57 Europe/Moscow" ] ]; [ @@ -389,6 +452,21 @@ ]; [ "2018-12-15 23:59:59.999999 Europe/Moscow" + ]; + [ + "2018-12-15 00:00:00 Europe/Moscow" + ]; + [ + "2018-12-15 00:00:00 Europe/Moscow" + ]; + [ + "2018-12-15 01:00:00 Europe/Moscow" + ]; + [ + "2018-12-15 01:02:00 Europe/Moscow" + ]; + [ + "2018-12-15 01:01:57 Europe/Moscow" ] ]; [ @@ -404,6 +482,21 @@ #; [ "2105-12-31 23:59:59.999999 GMT" + ]; + [ + "2105-12-31 13:00:00 GMT" + ]; + [ + "2105-12-31 16:00:00 GMT" + ]; + [ + "2105-12-31 16:15:00 GMT" + ]; + [ + "2105-12-31 16:23:40 GMT" + ]; + [ + "2105-12-31 16:23:44 GMT" ] ]; [ @@ -411,7 +504,22 @@ #; #; #; - # + #; + [ + "2106-01-01 00:00:00 Europe/Moscow" + ]; + [ + "2106-01-01 00:00:00 Europe/Moscow" + ]; + [ + "2106-01-01 01:00:00 Europe/Moscow" + ]; + [ + "2106-01-01 01:00:00 Europe/Moscow" + ]; + [ + "2106-01-01 00:59:58 Europe/Moscow" + ] ]; [ [ @@ -428,6 +536,21 @@ ]; [ "2019-07-24 23:59:59.999999 Europe/Moscow" + ]; + [ + "2019-07-24 00:00:00 Europe/Moscow" + ]; + [ + "2019-07-24 12:00:00 Europe/Moscow" + ]; + [ + "2019-07-24 12:00:00 Europe/Moscow" + ]; + [ + "2019-07-24 12:00:00 Europe/Moscow" + ]; + [ + "2019-07-24 11:59:57 Europe/Moscow" ] ] ] diff --git a/yql/essentials/udfs/common/datetime2/test/cases/EndOf.sql b/yql/essentials/udfs/common/datetime2/test/cases/EndOf.sql index ee0eb55e6a1a..75210b4b9500 100644 --- a/yql/essentials/udfs/common/datetime2/test/cases/EndOf.sql +++ b/yql/essentials/udfs/common/datetime2/test/cases/EndOf.sql @@ -39,6 +39,11 @@ select $format(DateTime::EndOfMonth(`tztimestamp`)), $format(DateTime::EndOfWeek(`tztimestamp`)), $format(DateTime::EndOfDay(`tztimestamp`)), + $format(DateTime::StartOf(`tztimestamp`, Interval("PT13H"))), + $format(DateTime::StartOf(`tztimestamp`, Interval("PT4H"))), + $format(DateTime::StartOf(`tztimestamp`, Interval("PT15M"))), + $format(DateTime::StartOf(`tztimestamp`, Interval("PT20S"))), + $format(DateTime::StartOf(`tztimestamp`, Interval("PT7S"))), from ( select cast(ftztimestamp as TzTimestamp) as `tztimestamp` From 4b252d894a5c829dca409068912a233b6e275d56 Mon Sep 17 00:00:00 2001 From: bulatman Date: Tue, 26 Nov 2024 18:27:12 +0300 Subject: [PATCH 2/9] YT: Better yson struct schema extension commit_hash:90b902c559a5122188e8bbf668e39c4b96e00106 --- yt/yt/core/ytree/yson_schema-inl.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/yt/yt/core/ytree/yson_schema-inl.h b/yt/yt/core/ytree/yson_schema-inl.h index 2f7b98912a8b..17ba013d1b6d 100644 --- a/yt/yt/core/ytree/yson_schema-inl.h +++ b/yt/yt/core/ytree/yson_schema-inl.h @@ -40,6 +40,14 @@ concept CIsMapping = requires(T) { template concept CIsAssociativeArray = CIsArray && CIsMapping; +template +concept CHasWriteSchema = requires ( + const T& parameter, + NYson::IYsonConsumer* consumer) +{ + parameter.WriteSchema(consumer); +}; + //////////////////////////////////////////////////////////////////////////////// #define DEFINE_SCHEMA_FOR_SIMPLE_TYPE(type, name) \ @@ -89,7 +97,7 @@ void WriteSchema(const T&, NYson::IYsonConsumer* consumer) .EndMap(); } -template +template void WriteSchemaForNull(NYson::IYsonConsumer* consumer) { if constexpr (std::is_same_v) { @@ -104,7 +112,7 @@ void WriteSchemaForNull(NYson::IYsonConsumer* consumer) } } -template +template void WriteSchema(const NYT::TIntrusivePtr& value, NYson::IYsonConsumer* consumer) { BuildYsonFluently(consumer) @@ -120,7 +128,7 @@ void WriteSchema(const NYT::TIntrusivePtr& value, NYson::IYsonConsumer* consu .EndMap(); } -template +template void WriteSchema(const T& value, NYson::IYsonConsumer* consumer) { return value.WriteSchema(consumer); From 00deefc167044535c1a7adb6b825f46e47c1d643 Mon Sep 17 00:00:00 2001 From: imunkin Date: Tue, 26 Nov 2024 19:46:40 +0300 Subject: [PATCH 3/9] YQL-18303: Introduce From* converters overloads for Timestamp64 commit_hash:9e4f59aa752831d906745606e53e3f36a370a0a4 --- .../udfs/common/datetime2/datetime_udf.cpp | 76 ++++++------- .../test_bigdates/canondata/result.json | 10 ++ .../test.test_BlockFrom_/results.txt | 102 ++++++++++++++++++ .../canondata/test.test_From_/results.txt | 102 ++++++++++++++++++ .../test_bigdates/cases/BlockFrom.cfg | 1 + .../test_bigdates/cases/BlockFrom.in | 30 ++++++ .../test_bigdates/cases/BlockFrom.in.attr | 30 ++++++ .../test_bigdates/cases/BlockFrom.sql | 8 ++ .../datetime2/test_bigdates/cases/From.cfg | 1 + .../datetime2/test_bigdates/cases/From.in | 30 ++++++ .../test_bigdates/cases/From.in.attr | 31 ++++++ .../datetime2/test_bigdates/cases/From.sql | 6 ++ 12 files changed, 391 insertions(+), 36 deletions(-) create mode 100644 yql/essentials/udfs/common/datetime2/test_bigdates/canondata/test.test_BlockFrom_/results.txt create mode 100644 yql/essentials/udfs/common/datetime2/test_bigdates/canondata/test.test_From_/results.txt create mode 100644 yql/essentials/udfs/common/datetime2/test_bigdates/cases/BlockFrom.cfg create mode 100644 yql/essentials/udfs/common/datetime2/test_bigdates/cases/BlockFrom.in create mode 100644 yql/essentials/udfs/common/datetime2/test_bigdates/cases/BlockFrom.in.attr create mode 100644 yql/essentials/udfs/common/datetime2/test_bigdates/cases/BlockFrom.sql create mode 100644 yql/essentials/udfs/common/datetime2/test_bigdates/cases/From.cfg create mode 100644 yql/essentials/udfs/common/datetime2/test_bigdates/cases/From.in create mode 100644 yql/essentials/udfs/common/datetime2/test_bigdates/cases/From.in.attr create mode 100644 yql/essentials/udfs/common/datetime2/test_bigdates/cases/From.sql diff --git a/yql/essentials/udfs/common/datetime2/datetime_udf.cpp b/yql/essentials/udfs/common/datetime2/datetime_udf.cpp index be41a0b8edf2..3798557b919d 100644 --- a/yql/essentials/udfs/common/datetime2/datetime_udf.cpp +++ b/yql/essentials/udfs/common/datetime2/datetime_udf.cpp @@ -548,14 +548,19 @@ TValue DoAddYears(const TValue& date, i64 years, const NUdf::IDateBuilder& build return false; } - inline bool ValidateDatetime(ui32 datetime) { - return datetime < MAX_DATETIME; - } + template + inline bool Validate(typename TDataType::TLayout arg); - inline bool ValidateTimestamp(ui64 timestamp) { + template<> + inline bool Validate(ui64 timestamp) { return timestamp < MAX_TIMESTAMP; } + template<> + inline bool Validate(i64 timestamp) { + return timestamp >= MIN_TIMESTAMP64 && timestamp <= MAX_TIMESTAMP64; + } + inline bool ValidateInterval(i64 interval) { return interval > -i64(MAX_TIMESTAMP) && interval < i64(MAX_TIMESTAMP); } @@ -1268,44 +1273,39 @@ TValue DoAddYears(const TValue& date, i64 years, const NUdf::IDateBuilder& build // From* - BEGIN_SIMPLE_STRICT_ARROW_UDF(TFromSeconds, TOptional(TAutoMap)) { - Y_UNUSED(valueBuilder); - auto res = args[0].Get(); - if (!ValidateDatetime(res)) { - return TUnboxedValuePod(); - } - return TUnboxedValuePod((ui64)(res * 1000000ull)); + template + inline TUnboxedValuePod TFromConverter(TInput arg) { + using TLayout = TDataType::TLayout; + const TLayout usec = TLayout(arg) * UsecMultiplier; + return Validate(usec) ? TUnboxedValuePod(usec) : TUnboxedValuePod(); } - using TFromSecondsKernel = TUnaryUnsafeFixedSizeFilterKernel; - END_SIMPLE_ARROW_UDF(TFromSeconds, TFromSecondsKernel::Do); - BEGIN_SIMPLE_STRICT_ARROW_UDF(TFromMilliseconds, TOptional(TAutoMap)) { - Y_UNUSED(valueBuilder); - auto res = args[0].Get(); - if (res >= MAX_TIMESTAMP / 1000u) { - return TUnboxedValuePod(); - } - return TUnboxedValuePod(res * 1000u); - } + template + using TFromConverterKernel = TUnaryUnsafeFixedSizeFilterKernel::TLayout, [] (TInput arg) { + using TLayout = TDataType::TLayout; + const TLayout usec = TLayout(arg) * UsecMultiplier; + return std::make_pair(usec, Validate(usec)); + }>; - using TFromMillisecondsKernel = TUnaryUnsafeFixedSizeFilterKernel; - END_SIMPLE_ARROW_UDF(TFromMilliseconds, TFromMillisecondsKernel::Do); - BEGIN_SIMPLE_STRICT_ARROW_UDF(TFromMicroseconds, TOptional(TAutoMap)) { - Y_UNUSED(valueBuilder); - auto res = args[0].Get(); - if (!ValidateTimestamp(res)) { - return TUnboxedValuePod(); - } - return TUnboxedValuePod(res); - } +#define DATETIME_FROM_CONVERTER_UDF(name, retType, argType, usecMultiplier) \ + BEGIN_SIMPLE_STRICT_ARROW_UDF(T##name, TOptional(TAutoMap)) { \ + Y_UNUSED(valueBuilder); \ + return TFromConverter(args[0].Get()); \ + } \ + \ + END_SIMPLE_ARROW_UDF(T##name, (TFromConverterKernel::Do)) + + DATETIME_FROM_CONVERTER_UDF(FromSeconds, TTimestamp, ui32, UsecondsInSecond); + DATETIME_FROM_CONVERTER_UDF(FromMilliseconds, TTimestamp, ui64, UsecondsInMilliseconds); + DATETIME_FROM_CONVERTER_UDF(FromMicroseconds, TTimestamp, ui64, 1); + + DATETIME_FROM_CONVERTER_UDF(FromSeconds64, TTimestamp64, i64, UsecondsInSecond); + DATETIME_FROM_CONVERTER_UDF(FromMilliseconds64, TTimestamp64, i64, UsecondsInMilliseconds); + DATETIME_FROM_CONVERTER_UDF(FromMicroseconds64, TTimestamp64, i64, 1); - using TFromMicrosecondsKernel = TUnaryUnsafeFixedSizeFilterKernel; - END_SIMPLE_ARROW_UDF(TFromMicroseconds, TFromMicrosecondsKernel::Do); template using TIntervalFromKernel = TUnaryUnsafeFixedSizeFilterKernel Date: Tue, 26 Nov 2024 20:13:11 +0300 Subject: [PATCH 4/9] External build system generator release 101 Update tools: yexport, os-yexport commit_hash:267008537db44e27a06cbd8e958550223626121f --- build/external_resources/yexport/public.resources.json | 6 +++--- build/external_resources/yexport/resources.json | 6 +++--- build/mapping.conf.json | 6 ++++++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/build/external_resources/yexport/public.resources.json b/build/external_resources/yexport/public.resources.json index eca229879352..ab5e69583236 100644 --- a/build/external_resources/yexport/public.resources.json +++ b/build/external_resources/yexport/public.resources.json @@ -1,13 +1,13 @@ { "by_platform": { "darwin": { - "uri": "sbr:7370212609" + "uri": "sbr:7539368752" }, "darwin-arm64": { - "uri": "sbr:7370211678" + "uri": "sbr:7539368187" }, "linux": { - "uri": "sbr:7370210775" + "uri": "sbr:7539367458" } } } diff --git a/build/external_resources/yexport/resources.json b/build/external_resources/yexport/resources.json index 2936b9695bf9..deaacd465da6 100644 --- a/build/external_resources/yexport/resources.json +++ b/build/external_resources/yexport/resources.json @@ -1,13 +1,13 @@ { "by_platform": { "darwin": { - "uri": "sbr:7370190051" + "uri": "sbr:7539341499" }, "darwin-arm64": { - "uri": "sbr:7370188821" + "uri": "sbr:7539340652" }, "linux": { - "uri": "sbr:7370187741" + "uri": "sbr:7539339643" } } } diff --git a/build/mapping.conf.json b/build/mapping.conf.json index b8c96f814d2e..65cdb12e4db7 100644 --- a/build/mapping.conf.json +++ b/build/mapping.conf.json @@ -520,6 +520,7 @@ "6913307396": "https://devtools-registry.s3.yandex.net/6913307396", "7196092605": "https://devtools-registry.s3.yandex.net/7196092605", "7370212609": "https://devtools-registry.s3.yandex.net/7370212609", + "7539368752": "https://devtools-registry.s3.yandex.net/7539368752", "5811823398": "https://devtools-registry.s3.yandex.net/5811823398", "5840611310": "https://devtools-registry.s3.yandex.net/5840611310", "5860185593": "https://devtools-registry.s3.yandex.net/5860185593", @@ -543,6 +544,7 @@ "6913305359": "https://devtools-registry.s3.yandex.net/6913305359", "7196092155": "https://devtools-registry.s3.yandex.net/7196092155", "7370211678": "https://devtools-registry.s3.yandex.net/7370211678", + "7539368187": "https://devtools-registry.s3.yandex.net/7539368187", "5811822876": "https://devtools-registry.s3.yandex.net/5811822876", "5840610640": "https://devtools-registry.s3.yandex.net/5840610640", "5860184285": "https://devtools-registry.s3.yandex.net/5860184285", @@ -566,6 +568,7 @@ "6913303010": "https://devtools-registry.s3.yandex.net/6913303010", "7196091589": "https://devtools-registry.s3.yandex.net/7196091589", "7370210775": "https://devtools-registry.s3.yandex.net/7370210775", + "7539367458": "https://devtools-registry.s3.yandex.net/7539367458", "5766172292": "https://devtools-registry.s3.yandex.net/5766172292", "5805431504": "https://devtools-registry.s3.yandex.net/5805431504", "5829027626": "https://devtools-registry.s3.yandex.net/5829027626", @@ -1581,6 +1584,7 @@ "6913307396": "devtools/yexport/bin/yexport for darwin", "7196092605": "devtools/yexport/bin/yexport for darwin", "7370212609": "devtools/yexport/bin/yexport for darwin", + "7539368752": "devtools/yexport/bin/yexport for darwin", "5811823398": "devtools/yexport/bin/yexport for darwin-arm64", "5840611310": "devtools/yexport/bin/yexport for darwin-arm64", "5860185593": "devtools/yexport/bin/yexport for darwin-arm64", @@ -1604,6 +1608,7 @@ "6913305359": "devtools/yexport/bin/yexport for darwin-arm64", "7196092155": "devtools/yexport/bin/yexport for darwin-arm64", "7370211678": "devtools/yexport/bin/yexport for darwin-arm64", + "7539368187": "devtools/yexport/bin/yexport for darwin-arm64", "5811822876": "devtools/yexport/bin/yexport for linux", "5840610640": "devtools/yexport/bin/yexport for linux", "5860184285": "devtools/yexport/bin/yexport for linux", @@ -1627,6 +1632,7 @@ "6913303010": "devtools/yexport/bin/yexport for linux", "7196091589": "devtools/yexport/bin/yexport for linux", "7370210775": "devtools/yexport/bin/yexport for linux", + "7539367458": "devtools/yexport/bin/yexport for linux", "5766172292": "devtools/ymake/bin/ymake for darwin", "5805431504": "devtools/ymake/bin/ymake for darwin", "5829027626": "devtools/ymake/bin/ymake for darwin", From 60419ef1ed276c3a1f4269720382826a2b85e912 Mon Sep 17 00:00:00 2001 From: vvvv Date: Tue, 26 Nov 2024 20:46:59 +0300 Subject: [PATCH 5/9] Fixed usage of local/global as column names etc init commit_hash:9d93e3a75a50972e6d21935a82825a019017f087 --- yql/essentials/sql/v1/SQLv1.g.in | 5 ++++- yql/essentials/sql/v1/SQLv1Antlr4.g.in | 5 ++++- yql/essentials/sql/v1/sql_ut.cpp | 24 ++++++++++++------------ yql/essentials/sql/v1/sql_ut_antlr4.cpp | 24 ++++++++++++------------ 4 files changed, 32 insertions(+), 26 deletions(-) diff --git a/yql/essentials/sql/v1/SQLv1.g.in b/yql/essentials/sql/v1/SQLv1.g.in index d58f184ec0c6..b31594eba394 100644 --- a/yql/essentials/sql/v1/SQLv1.g.in +++ b/yql/essentials/sql/v1/SQLv1.g.in @@ -1206,7 +1206,6 @@ keyword_expr_uncompat: | JSON_EXISTS | JSON_VALUE | JSON_QUERY - | LOCAL | NOT | NULL | PROCESS @@ -1338,6 +1337,7 @@ keyword_as_compat: | FOREIGN | FUNCTION | GLOB + | GLOBAL | GRANT | GROUP | GROUPING @@ -1367,6 +1367,7 @@ keyword_as_compat: // | LEFT | LEGACY | LIKE + | LOCAL | MANAGE | MATCH | MATCHES @@ -1560,6 +1561,7 @@ keyword_compat: ( | FOREIGN | FUNCTION | GLOB + | GLOBAL | GRANT | GROUP | GROUPING @@ -1589,6 +1591,7 @@ keyword_compat: ( | LEFT | LEGACY | LIKE + | LOCAL | MANAGE | MATCH | MATCHES diff --git a/yql/essentials/sql/v1/SQLv1Antlr4.g.in b/yql/essentials/sql/v1/SQLv1Antlr4.g.in index 64be15d0b735..87cbcaed3df0 100644 --- a/yql/essentials/sql/v1/SQLv1Antlr4.g.in +++ b/yql/essentials/sql/v1/SQLv1Antlr4.g.in @@ -1205,7 +1205,6 @@ keyword_expr_uncompat: | JSON_EXISTS | JSON_VALUE | JSON_QUERY - | LOCAL | NOT | NULL | PROCESS @@ -1337,6 +1336,7 @@ keyword_as_compat: | FOREIGN | FUNCTION | GLOB + | GLOBAL | GRANT | GROUP | GROUPING @@ -1366,6 +1366,7 @@ keyword_as_compat: // | LEFT | LEGACY | LIKE + | LOCAL | MANAGE | MATCH | MATCHES @@ -1559,6 +1560,7 @@ keyword_compat: ( | FOREIGN | FUNCTION | GLOB + | GLOBAL | GRANT | GROUP | GROUPING @@ -1588,6 +1590,7 @@ keyword_compat: ( | LEFT | LEGACY | LIKE + | LOCAL | MANAGE | MATCH | MATCHES diff --git a/yql/essentials/sql/v1/sql_ut.cpp b/yql/essentials/sql/v1/sql_ut.cpp index 2acc9e722a26..1bbdaada1ea9 100644 --- a/yql/essentials/sql/v1/sql_ut.cpp +++ b/yql/essentials/sql/v1/sql_ut.cpp @@ -72,8 +72,8 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) { auto failed = ValidateTokens({ "ALL", "ANY", "AS", "ASSUME", "ASYMMETRIC", "AUTOMAP", "BETWEEN", "BITCAST", "CALLABLE", "CASE", "CAST", "CUBE", "CURRENT_DATE", "CURRENT_TIME", "CURRENT_TIMESTAMP", - "DICT", "DISTINCT", "ENUM", "ERASE", "EXCEPT", "EXISTS", "FLOW", "FROM", "FULL", "GLOBAL", - "HAVING", "HOP", "INTERSECT", "JSON_EXISTS", "JSON_QUERY", "JSON_VALUE", "LIMIT", "LIST", "LOCAL", + "DICT", "DISTINCT", "ENUM", "ERASE", "EXCEPT", "EXISTS", "FLOW", "FROM", "FULL", + "HAVING", "HOP", "INTERSECT", "JSON_EXISTS", "JSON_QUERY", "JSON_VALUE", "LIMIT", "LIST", "NOT", "OPTIONAL", "PROCESS", "REDUCE", "REPEATABLE", "RESOURCE", "RETURN", "RETURNING", "ROLLUP", "SELECT", "SET", "STREAM", "STRUCT", "SYMMETRIC", "TAGGED", "TUPLE", "UNBOUNDED", "UNION", "VARIANT", "WHEN", "WHERE", "WINDOW", "WITHOUT" @@ -91,8 +91,8 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) { auto failed = ValidateTokens({ "ALL", "AS", "ASSUME", "ASYMMETRIC", "AUTOMAP", "BETWEEN", "BITCAST", "CALLABLE", "CASE", "CAST", "CUBE", "CURRENT_DATE", "CURRENT_TIME", "CURRENT_TIMESTAMP", - "DICT", "DISTINCT", "EMPTY_ACTION", "ENUM", "EXCEPT", "EXISTS", "FALSE", "FLOW", "FROM", "FULL", "GLOBAL", - "HAVING", "HOP", "INTERSECT", "JSON_EXISTS", "JSON_QUERY", "JSON_VALUE", "LIMIT", "LIST", "LOCAL", + "DICT", "DISTINCT", "EMPTY_ACTION", "ENUM", "EXCEPT", "EXISTS", "FALSE", "FLOW", "FROM", "FULL", + "HAVING", "HOP", "INTERSECT", "JSON_EXISTS", "JSON_QUERY", "JSON_VALUE", "LIMIT", "LIST", "NOT", "NULL", "OPTIONAL", "PROCESS", "REDUCE", "REPEATABLE", "RESOURCE", "RETURN", "RETURNING", "ROLLUP", "SELECT", "SET", "STRUCT", "SYMMETRIC", "TAGGED", "TRUE", "TUPLE", "UNBOUNDED", "UNION", "VARIANT", "WHEN", "WHERE", "WINDOW", "WITHOUT" @@ -109,7 +109,7 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) { Y_UNIT_TEST(TokensAsColumnNameInAddColumn) { //id_schema auto failed = ValidateTokens({ "ANY", "AUTOMAP", "CALLABLE", "COLUMN", "DICT", "ENUM", "ERASE", "FALSE", "FLOW", - "GLOBAL", "LIST", "OPTIONAL", "REPEATABLE", "RESOURCE", + "LIST", "OPTIONAL", "REPEATABLE", "RESOURCE", "SET", "STREAM", "STRUCT", "TAGGED", "TRUE", "TUPLE", "VARIANT" }, [](const TString& token){ @@ -124,7 +124,7 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) { Y_UNIT_TEST(TokensAsColumnAlias) { auto failed = ValidateTokens({ "AUTOMAP", "FALSE", - "GLOBAL", "REPEATABLE", "TRUE" + "REPEATABLE", "TRUE" }, [](const TString& token){ TStringBuilder req; @@ -138,7 +138,7 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) { Y_UNIT_TEST(TokensAsTableName) { //id_table_or_type auto failed = ValidateTokens({ "ANY", "AUTOMAP", "COLUMN", "ERASE", "FALSE", - "GLOBAL", "REPEATABLE", "STREAM", "TRUE" + "REPEATABLE", "STREAM", "TRUE" }, [](const TString& token){ TStringBuilder req; @@ -152,7 +152,7 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) { Y_UNIT_TEST(TokensAsTableAlias) { //id_table auto failed = ValidateTokens({ "AUTOMAP", "CALLABLE", "DICT", "ENUM","FALSE", "FLOW", - "GLOBAL", "LIST", "OPTIONAL", "REPEATABLE", "RESOURCE", + "LIST", "OPTIONAL", "REPEATABLE", "RESOURCE", "SET", "STRUCT", "TAGGED", "TRUE", "TUPLE", "VARIANT" }, [](const TString& token){ @@ -167,7 +167,7 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) { Y_UNIT_TEST(TokensAsHints) { //id_hint auto failed = ValidateTokens({ "AUTOMAP", "CALLABLE", "COLUMNS", "DICT", "ENUM", "FALSE", "FLOW", - "GLOBAL", "LIST", "OPTIONAL", "REPEATABLE", "RESOURCE", + "LIST", "OPTIONAL", "REPEATABLE", "RESOURCE", "SCHEMA", "SET", "STRUCT", "TAGGED", "TRUE", "TUPLE", "VARIANT" }, [](const TString& token){ @@ -181,7 +181,7 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) { Y_UNIT_TEST(TokensAsWindow) { //id_window auto failed = ValidateTokens({ - "AUTOMAP", "CALLABLE", "DICT", "ENUM", "FALSE", "FLOW", "GLOBAL", "GROUPS", "LIST", "OPTIONAL", + "AUTOMAP", "CALLABLE", "DICT", "ENUM", "FALSE", "FLOW", "GROUPS", "LIST", "OPTIONAL", "RANGE", "REPEATABLE", "RESOURCE", "ROWS", "SET", "STRUCT", "TAGGED" ,"TRUE", "TUPLE", "VARIANT" }, [](const TString& token){ @@ -197,8 +197,8 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) { auto failed = ValidateTokens({ "ALL", "ANY", "AS", "ASSUME", "ASYMMETRIC", "AUTOMAP", "BETWEEN", "BITCAST", "CALLABLE", "CASE", "CAST", "COMPACT", "CUBE", "CURRENT_DATE", "CURRENT_TIME", "CURRENT_TIMESTAMP", - "DICT", "DISTINCT", "ENUM", "ERASE", "EXCEPT", "EXISTS", "FLOW", "FROM", "FULL", "GLOBAL", - "HAVING", "HOP", "INTERSECT", "JSON_EXISTS", "JSON_QUERY", "JSON_VALUE", "LIMIT", "LIST", "LOCAL", + "DICT", "DISTINCT", "ENUM", "ERASE", "EXCEPT", "EXISTS", "FLOW", "FROM", "FULL", + "HAVING", "HOP", "INTERSECT", "JSON_EXISTS", "JSON_QUERY", "JSON_VALUE", "LIMIT", "LIST", "NOT", "OPTIONAL", "PROCESS", "REDUCE", "REPEATABLE", "RESOURCE", "RETURN", "RETURNING", "ROLLUP", "SELECT", "SET", "STREAM", "STRUCT", "SYMMETRIC", "TAGGED", "TUPLE", "UNBOUNDED", "UNION", "VARIANT", "WHEN", "WHERE", "WINDOW", "WITHOUT" diff --git a/yql/essentials/sql/v1/sql_ut_antlr4.cpp b/yql/essentials/sql/v1/sql_ut_antlr4.cpp index 1cd05a7ea5af..0f61449ae203 100644 --- a/yql/essentials/sql/v1/sql_ut_antlr4.cpp +++ b/yql/essentials/sql/v1/sql_ut_antlr4.cpp @@ -72,8 +72,8 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) { auto failed = ValidateTokens({ "ALL", "ANY", "AS", "ASSUME", "ASYMMETRIC", "AUTOMAP", "BETWEEN", "BITCAST", "CALLABLE", "CASE", "CAST", "CUBE", "CURRENT_DATE", "CURRENT_TIME", "CURRENT_TIMESTAMP", - "DICT", "DISTINCT", "ENUM", "ERASE", "EXCEPT", "EXISTS", "FLOW", "FROM", "FULL", "GLOBAL", - "HAVING", "HOP", "INTERSECT", "JSON_EXISTS", "JSON_QUERY", "JSON_VALUE", "LIMIT", "LIST", "LOCAL", + "DICT", "DISTINCT", "ENUM", "ERASE", "EXCEPT", "EXISTS", "FLOW", "FROM", "FULL", + "HAVING", "HOP", "INTERSECT", "JSON_EXISTS", "JSON_QUERY", "JSON_VALUE", "LIMIT", "LIST", "NOT", "OPTIONAL", "PROCESS", "REDUCE", "REPEATABLE", "RESOURCE", "RETURN", "RETURNING", "ROLLUP", "SELECT", "SET", "STREAM", "STRUCT", "SYMMETRIC", "TAGGED", "TUPLE", "UNBOUNDED", "UNION", "VARIANT", "WHEN", "WHERE", "WINDOW", "WITHOUT" @@ -91,8 +91,8 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) { auto failed = ValidateTokens({ "ALL", "AS", "ASSUME", "ASYMMETRIC", "AUTOMAP", "BETWEEN", "BITCAST", "CALLABLE", "CASE", "CAST", "CUBE", "CURRENT_DATE", "CURRENT_TIME", "CURRENT_TIMESTAMP", - "DICT", "DISTINCT", "EMPTY_ACTION", "ENUM", "EXCEPT", "EXISTS", "FALSE", "FLOW", "FROM", "FULL", "GLOBAL", - "HAVING", "HOP", "INTERSECT", "JSON_EXISTS", "JSON_QUERY", "JSON_VALUE", "LIMIT", "LIST", "LOCAL", + "DICT", "DISTINCT", "EMPTY_ACTION", "ENUM", "EXCEPT", "EXISTS", "FALSE", "FLOW", "FROM", "FULL", + "HAVING", "HOP", "INTERSECT", "JSON_EXISTS", "JSON_QUERY", "JSON_VALUE", "LIMIT", "LIST", "NOT", "NULL", "OPTIONAL", "PROCESS", "REDUCE", "REPEATABLE", "RESOURCE", "RETURN", "RETURNING", "ROLLUP", "SELECT", "SET", "STRUCT", "SYMMETRIC", "TAGGED", "TRUE", "TUPLE", "UNBOUNDED", "UNION", "VARIANT", "WHEN", "WHERE", "WINDOW", "WITHOUT" @@ -109,7 +109,7 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) { Y_UNIT_TEST(TokensAsColumnNameInAddColumn) { //id_schema auto failed = ValidateTokens({ "ANY", "AUTOMAP", "CALLABLE", "COLUMN", "DICT", "ENUM", "ERASE", "FALSE", "FLOW", - "GLOBAL", "LIST", "OPTIONAL", "REPEATABLE", "RESOURCE", + "LIST", "OPTIONAL", "REPEATABLE", "RESOURCE", "SET", "STREAM", "STRUCT", "TAGGED", "TRUE", "TUPLE", "VARIANT" }, [](const TString& token){ @@ -124,7 +124,7 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) { Y_UNIT_TEST(TokensAsColumnAlias) { auto failed = ValidateTokens({ "AUTOMAP", "FALSE", - "GLOBAL", "REPEATABLE", "TRUE" + "REPEATABLE", "TRUE" }, [](const TString& token){ TStringBuilder req; @@ -138,7 +138,7 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) { Y_UNIT_TEST(TokensAsTableName) { //id_table_or_type auto failed = ValidateTokens({ "ANY", "AUTOMAP", "COLUMN", "ERASE", "FALSE", - "GLOBAL", "REPEATABLE", "STREAM", "TRUE" + "REPEATABLE", "STREAM", "TRUE" }, [](const TString& token){ TStringBuilder req; @@ -152,7 +152,7 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) { Y_UNIT_TEST(TokensAsTableAlias) { //id_table auto failed = ValidateTokens({ "AUTOMAP", "CALLABLE", "DICT", "ENUM","FALSE", "FLOW", - "GLOBAL", "LIST", "OPTIONAL", "REPEATABLE", "RESOURCE", + "LIST", "OPTIONAL", "REPEATABLE", "RESOURCE", "SET", "STRUCT", "TAGGED", "TRUE", "TUPLE", "VARIANT" }, [](const TString& token){ @@ -167,7 +167,7 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) { Y_UNIT_TEST(TokensAsHints) { //id_hint auto failed = ValidateTokens({ "AUTOMAP", "CALLABLE", "COLUMNS", "DICT", "ENUM", "FALSE", "FLOW", - "GLOBAL", "LIST", "OPTIONAL", "REPEATABLE", "RESOURCE", + "LIST", "OPTIONAL", "REPEATABLE", "RESOURCE", "SCHEMA", "SET", "STRUCT", "TAGGED", "TRUE", "TUPLE", "VARIANT" }, [](const TString& token){ @@ -181,7 +181,7 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) { Y_UNIT_TEST(TokensAsWindow) { //id_window auto failed = ValidateTokens({ - "AUTOMAP", "CALLABLE", "DICT", "ENUM", "FALSE", "FLOW", "GLOBAL", "GROUPS", "LIST", "OPTIONAL", + "AUTOMAP", "CALLABLE", "DICT", "ENUM", "FALSE", "FLOW", "GROUPS", "LIST", "OPTIONAL", "RANGE", "REPEATABLE", "RESOURCE", "ROWS", "SET", "STRUCT", "TAGGED" ,"TRUE", "TUPLE", "VARIANT" }, [](const TString& token){ @@ -197,8 +197,8 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) { auto failed = ValidateTokens({ "ALL", "ANY", "AS", "ASSUME", "ASYMMETRIC", "AUTOMAP", "BETWEEN", "BITCAST", "CALLABLE", "CASE", "CAST", "COMPACT", "CUBE", "CURRENT_DATE", "CURRENT_TIME", "CURRENT_TIMESTAMP", - "DICT", "DISTINCT", "ENUM", "ERASE", "EXCEPT", "EXISTS", "FLOW", "FROM", "FULL", "GLOBAL", - "HAVING", "HOP", "INTERSECT", "JSON_EXISTS", "JSON_QUERY", "JSON_VALUE", "LIMIT", "LIST", "LOCAL", + "DICT", "DISTINCT", "ENUM", "ERASE", "EXCEPT", "EXISTS", "FLOW", "FROM", "FULL", + "HAVING", "HOP", "INTERSECT", "JSON_EXISTS", "JSON_QUERY", "JSON_VALUE", "LIMIT", "LIST", "NOT", "OPTIONAL", "PROCESS", "REDUCE", "REPEATABLE", "RESOURCE", "RETURN", "RETURNING", "ROLLUP", "SELECT", "SET", "STREAM", "STRUCT", "SYMMETRIC", "TAGGED", "TUPLE", "UNBOUNDED", "UNION", "VARIANT", "WHEN", "WHERE", "WINDOW", "WITHOUT" From 40f133ee2bbedc81d314e9804f0a39910489a3e6 Mon Sep 17 00:00:00 2001 From: zhvv117 Date: Tue, 26 Nov 2024 23:03:38 +0300 Subject: [PATCH 6/9] YQL-formatter improvements (part 1) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Список изменений: 1. Не делается перенос строки перед `WITH` с одним хинтом (например, перед `WITH TRUNCATE`). 2. Бинарные операторы ставятся в начале, а не конце строки. 3. Убрана лишняя пустая строка в конце файла. 4. Внутри выражений меняем `=` на `==` и `<>` на `!=`. 5. Улучшено форматирование комментариев. 6. Перечисление символов в `EXPORT` записывается в виде вертикально развёрнутого списка вместо одной длинной строки. 7. Убран отступ для блока `WITHOUT`. commit_hash:a407628a023fbd1b9eb98eb41ac92b1ca1593298 --- yql/essentials/sql/v1/format/sql_format.cpp | 296 ++++++++---------- yql/essentials/sql/v1/format/sql_format_ut.h | 104 +++--- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 5 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 5 +- .../formatted.sql | 5 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 7 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 7 +- .../formatted.sql | 7 +- .../formatted.sql | 9 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 10 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 5 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 2 +- .../formatted.sql | 4 +- .../formatted.sql | 5 +- .../formatted.sql | 5 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 5 +- .../formatted.sql | 5 +- .../formatted.sql | 8 +- .../formatted.sql | 8 +- .../formatted.sql | 5 +- .../formatted.sql | 5 +- .../formatted.sql | 5 +- .../formatted.sql | 8 +- .../formatted.sql | 5 +- .../formatted.sql | 5 +- .../formatted.sql | 5 +- .../formatted.sql | 5 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 2 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 23 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 18 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 10 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 8 +- .../formatted.sql | 20 +- .../formatted.sql | 20 +- .../formatted.sql | 3 +- .../formatted.sql | 147 ++++----- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 51 +-- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 6 +- .../formatted.sql | 12 +- .../formatted.sql | 12 +- .../formatted.sql | 2 +- .../formatted.sql | 12 +- .../formatted.sql | 4 +- .../formatted.sql | 8 +- .../formatted.sql | 3 +- .../formatted.sql | 18 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 6 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 15 +- .../formatted.sql | 6 +- .../formatted.sql | 6 +- .../formatted.sql | 6 +- .../formatted.sql | 2 +- .../formatted.sql | 6 +- .../formatted.sql | 3 +- .../formatted.sql | 6 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 6 +- .../formatted.sql | 5 +- .../formatted.sql | 3 +- .../formatted.sql | 5 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 15 +- .../formatted.sql | 15 +- .../formatted.sql | 3 +- .../formatted.sql | 7 +- .../formatted.sql | 5 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 6 +- .../formatted.sql | 8 +- .../formatted.sql | 4 +- .../formatted.sql | 6 +- .../formatted.sql | 4 +- .../formatted.sql | 6 +- .../formatted.sql | 6 +- .../formatted.sql | 6 +- .../formatted.sql | 6 +- .../formatted.sql | 4 +- .../formatted.sql | 6 +- .../formatted.sql | 6 +- .../formatted.sql | 6 +- .../formatted.sql | 6 +- .../formatted.sql | 6 +- .../formatted.sql | 14 +- .../formatted.sql | 8 +- .../formatted.sql | 6 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 8 +- .../formatted.sql | 8 +- .../formatted.sql | 8 +- .../formatted.sql | 8 +- .../formatted.sql | 35 +-- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 6 +- .../formatted.sql | 6 +- .../formatted.sql | 3 +- .../formatted.sql | 8 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 6 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 6 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 2 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 27 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 20 +- .../formatted.sql | 26 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 5 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 23 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 7 +- .../formatted.sql | 5 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 2 +- .../formatted.sql | 9 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 5 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 6 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 6 +- .../formatted.sql | 6 +- .../formatted.sql | 6 +- .../formatted.sql | 6 +- .../formatted.sql | 6 +- .../formatted.sql | 6 +- .../formatted.sql | 6 +- .../formatted.sql | 6 +- .../formatted.sql | 6 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 5 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 37 +-- .../formatted.sql | 14 +- .../formatted.sql | 34 +- .../formatted.sql | 29 +- .../formatted.sql | 3 +- .../formatted.sql | 14 +- .../formatted.sql | 34 +- .../formatted.sql | 34 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 37 +-- .../formatted.sql | 29 +- .../formatted.sql | 3 +- .../formatted.sql | 26 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 26 +- .../formatted.sql | 3 +- .../formatted.sql | 2 +- .../formatted.sql | 3 +- .../formatted.sql | 33 +- .../formatted.sql | 21 +- .../formatted.sql | 21 +- .../formatted.sql | 2 +- .../formatted.sql | 8 +- .../formatted.sql | 6 +- .../formatted.sql | 3 +- .../formatted.sql | 7 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 7 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 9 +- .../formatted.sql | 10 +- .../formatted.sql | 10 +- .../formatted.sql | 10 +- .../formatted.sql | 10 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 24 +- .../formatted.sql | 3 +- .../formatted.sql | 6 +- .../formatted.sql | 3 +- .../formatted.sql | 6 +- .../formatted.sql | 6 +- .../formatted.sql | 6 +- .../formatted.sql | 6 +- .../formatted.sql | 4 +- .../formatted.sql | 7 +- .../formatted.sql | 7 +- .../formatted.sql | 3 +- .../formatted.sql | 6 +- .../formatted.sql | 3 +- .../formatted.sql | 24 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 6 +- .../formatted.sql | 3 +- .../formatted.sql | 7 +- .../formatted.sql | 6 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 6 +- .../formatted.sql | 3 +- .../formatted.sql | 6 +- .../formatted.sql | 3 +- .../formatted.sql | 6 +- .../formatted.sql | 6 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 8 +- .../formatted.sql | 3 +- .../formatted.sql | 8 +- .../formatted.sql | 8 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 6 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 6 +- .../formatted.sql | 6 +- .../formatted.sql | 6 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 2 +- .../formatted.sql | 8 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 4 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 6 +- .../formatted.sql | 18 +- .../formatted.sql | 18 +- .../formatted.sql | 14 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 5 +- .../formatted.sql | 2 +- .../formatted.sql | 6 +- .../formatted.sql | 2 +- .../formatted.sql | 6 +- .../formatted.sql | 5 +- .../formatted.sql | 4 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 6 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 4 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 4 +- .../formatted.sql | 8 +- .../formatted.sql | 5 +- .../formatted.sql | 2 +- .../formatted.sql | 4 +- .../formatted.sql | 2 +- .../formatted.sql | 5 +- .../formatted.sql | 5 +- .../formatted.sql | 5 +- .../formatted.sql | 7 +- .../formatted.sql | 5 +- .../formatted.sql | 5 +- .../formatted.sql | 6 +- .../formatted.sql | 8 +- .../formatted.sql | 4 +- .../formatted.sql | 5 +- .../formatted.sql | 7 +- .../formatted.sql | 4 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 9 +- .../formatted.sql | 9 +- .../formatted.sql | 5 +- .../formatted.sql | 9 +- .../formatted.sql | 5 +- .../formatted.sql | 4 +- .../formatted.sql | 18 +- .../formatted.sql | 2 +- .../formatted.sql | 6 +- .../formatted.sql | 4 +- .../formatted.sql | 6 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 4 +- .../formatted.sql | 8 +- .../formatted.sql | 4 +- .../formatted.sql | 2 +- .../formatted.sql | 8 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 4 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 8 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 8 +- .../formatted.sql | 18 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 6 +- .../formatted.sql | 6 +- .../formatted.sql | 6 +- .../formatted.sql | 6 +- .../formatted.sql | 3 +- .../formatted.sql | 2 +- .../formatted.sql | 3 +- .../formatted.sql | 5 +- .../formatted.sql | 2 +- .../formatted.sql | 6 +- .../formatted.sql | 8 +- .../formatted.sql | 6 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 7 +- .../formatted.sql | 3 +- .../formatted.sql | 9 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 7 +- .../formatted.sql | 3 +- .../formatted.sql | 7 +- .../formatted.sql | 3 +- .../formatted.sql | 9 +- .../formatted.sql | 4 +- .../formatted.sql | 24 +- .../formatted.sql | 4 +- .../formatted.sql | 5 +- .../formatted.sql | 7 +- .../formatted.sql | 7 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 9 +- .../formatted.sql | 4 +- .../formatted.sql | 16 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 25 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 11 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 90 ++---- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 23 +- .../formatted.sql | 3 +- .../formatted.sql | 36 +-- .../formatted.sql | 5 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 6 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 2 +- .../formatted.sql | 6 +- .../formatted.sql | 3 +- .../formatted.sql | 2 +- .../formatted.sql | 5 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 24 +- .../formatted.sql | 24 +- .../formatted.sql | 24 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 3 +- .../formatted.sql | 2 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 8 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 11 +- .../formatted.sql | 3 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 3 +- .../formatted.sql | 12 +- .../formatted.sql | 4 +- .../formatted.sql | 5 +- .../formatted.sql | 2 +- .../formatted.sql | 5 +- .../formatted.sql | 2 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 6 +- .../formatted.sql | 5 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 2 +- .../formatted.sql | 12 +- .../formatted.sql | 3 +- .../formatted.sql | 6 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 5 +- .../formatted.sql | 4 +- .../formatted.sql | 5 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 5 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 6 +- .../formatted.sql | 12 +- .../formatted.sql | 8 +- .../formatted.sql | 94 +++--- .../formatted.sql | 94 +++--- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 5 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 2 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 12 +- .../formatted.sql | 4 +- .../formatted.sql | 6 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 7 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 5 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 6 +- .../formatted.sql | 6 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 12 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 7 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 5 +- .../formatted.sql | 5 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 6 +- .../formatted.sql | 6 +- .../formatted.sql | 3 +- .../formatted.sql | 5 +- .../formatted.sql | 6 +- .../formatted.sql | 7 +- .../formatted.sql | 7 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 7 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 5 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 2 +- .../formatted.sql | 8 +- .../formatted.sql | 3 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 2 +- .../formatted.sql | 3 +- .../formatted.sql | 8 +- .../formatted.sql | 8 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 2 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 5 +- .../formatted.sql | 11 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 1 + .../formatted.sql | 3 +- .../formatted.sql | 2 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 8 +- .../formatted.sql | 8 +- .../formatted.sql | 3 +- .../formatted.sql | 6 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 4 +- .../formatted.sql | 2 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 4 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 8 +- .../formatted.sql | 8 +- .../formatted.sql | 12 +- .../formatted.sql | 12 +- .../formatted.sql | 5 +- .../formatted.sql | 2 +- .../formatted.sql | 6 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 6 +- .../formatted.sql | 6 +- .../formatted.sql | 10 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 2 +- .../formatted.sql | 2 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 12 +- .../formatted.sql | 6 +- .../formatted.sql | 18 +- .../formatted.sql | 2 +- .../formatted.sql | 6 +- .../formatted.sql | 8 +- .../formatted.sql | 10 +- .../formatted.sql | 8 +- .../formatted.sql | 4 +- .../formatted.sql | 38 +-- .../formatted.sql | 14 +- .../formatted.sql | 22 +- .../formatted.sql | 4 +- .../formatted.sql | 18 +- .../formatted.sql | 10 +- .../formatted.sql | 8 +- .../formatted.sql | 18 +- .../formatted.sql | 8 +- .../formatted.sql | 16 +- .../formatted.sql | 20 +- .../formatted.sql | 10 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 5 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 11 +- .../formatted.sql | 11 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 21 +- .../formatted.sql | 7 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 5 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 11 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 4 +- .../formatted.sql | 5 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 5 +- .../formatted.sql | 5 +- .../formatted.sql | 5 +- .../formatted.sql | 5 +- .../formatted.sql | 5 +- .../formatted.sql | 7 +- .../formatted.sql | 5 +- .../formatted.sql | 5 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 5 +- .../formatted.sql | 5 +- .../formatted.sql | 5 +- .../formatted.sql | 5 +- .../formatted.sql | 5 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 5 +- .../formatted.sql | 5 +- .../formatted.sql | 5 +- .../formatted.sql | 5 +- .../formatted.sql | 5 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 5 +- .../formatted.sql | 5 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 1 + .../formatted.sql | 6 +- .../formatted.sql | 6 +- .../formatted.sql | 3 +- .../formatted.sql | 4 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 12 +- .../formatted.sql | 3 +- .../formatted.sql | 2 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../formatted.sql | 3 +- .../tools/sql_formatter/sql_formatter.cpp | 2 +- 1332 files changed, 3950 insertions(+), 2941 deletions(-) diff --git a/yql/essentials/sql/v1/format/sql_format.cpp b/yql/essentials/sql/v1/format/sql_format.cpp index 3cc18b141bb7..7422b37a9382 100644 --- a/yql/essentials/sql/v1/format/sql_format.cpp +++ b/yql/essentials/sql/v1/format/sql_format.cpp @@ -43,6 +43,17 @@ TTokenIterator SkipWSOrComment(TTokenIterator curr, TTokenIterator end) { return curr; } +TParsedToken TransformTokenForValidate(TParsedToken token) { + if (token.Name == "EQUALS2") { + token.Name = "EQUALS"; + token.Content = "="; + } else if (token.Name == "NOT_EQUALS2") { + token.Name = "NOT_EQUALS"; + token.Content = "!="; + } + return token; +} + bool Validate(const TParsedTokenList& query, const TParsedTokenList& formattedQuery) { auto in = query.begin(); auto out = formattedQuery.begin(); @@ -53,15 +64,17 @@ bool Validate(const TParsedTokenList& query, const TParsedTokenList& formattedQu in = SkipWS(in, inEnd); out = SkipWS(out, outEnd); if (in != inEnd && out != outEnd) { - if (in->Name != out->Name) { + auto inToken = TransformTokenForValidate(*in); + auto outToken = TransformTokenForValidate(*out); + if (inToken.Name != outToken.Name) { return false; } - if (IsProbablyKeyword(*in)) { - if (!AsciiEqualsIgnoreCase(in->Content, out->Content)) { + if (IsProbablyKeyword(inToken)) { + if (!AsciiEqualsIgnoreCase(inToken.Content, outToken.Content)) { return false; } } else { - if (in->Content != out->Content) { + if (inToken.Content != outToken.Content) { return false; } } @@ -456,14 +469,17 @@ friend struct TStaticData; MarkTokens(msg); Y_ENSURE(MarkTokenStack.empty()); Y_ENSURE(TokenIndex == ParsedTokens.size()); + TokenIndex = 0; Visit(msg); Y_ENSURE(TokenIndex == ParsedTokens.size()); Y_ENSURE(MarkTokenStack.empty()); + for (; LastComment < Comments.size(); ++LastComment) { const auto text = Comments[LastComment].Content; AddComment(text); } + addLine = AddLine.GetOrElse(true); return SB; @@ -508,17 +524,34 @@ friend struct TStaticData; } void NewLine() { + if (TokenIndex >= ParsedTokens.size() || ParsedTokens[TokenIndex].Line > LastLine) { + WriteComments(true); + } + if (OutColumn) { Out('\n'); } } void AddComment(TStringBuf text) { - if (text.StartsWith("--") && !SB.empty() && SB.back() == '-') { + if (!AfterComment && OutLine > BlockFirstLine && OutColumn == 0) { + Out('\n'); + } + AfterComment = true; + + if (!SB.empty() && SB.back() != ' ' && SB.back() != '\n') { Out(' '); } Out(text); + + if (!text.StartsWith("--") && + TokenIndex < ParsedTokens.size() && + Comments[LastComment].Line < ParsedTokens[TokenIndex].Line && + (LastComment + 1 >= Comments.size() || Comments[LastComment].Line < Comments[LastComment + 1].Line) + ) { + Out('\n'); + } } void MarkTokens(const NProtoBuf::Message& msg) { @@ -753,7 +786,6 @@ friend struct TStaticData; } void VisitPragma(const TRule_pragma_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitKeyword(msg.GetToken1()); auto prefix = msg.GetRule_opt_id_prefix_or_type2(); @@ -776,44 +808,7 @@ friend struct TStaticData; } } - void PosFromPartial(const TRule_select_kind_partial& partial) { - const auto& kind = partial.GetRule_select_kind1(); - if (kind.HasBlock1()) { // DISCARD - PosFromToken(kind.GetBlock1().GetToken1()); - } else { - switch (kind.GetBlock2().Alt_case()) { - case TRule_select_kind_TBlock2::kAlt1: - PosFromToken(kind.GetBlock2().GetAlt1().GetRule_process_core1().GetToken1()); - break; - case TRule_select_kind_TBlock2::kAlt2: - PosFromToken(kind.GetBlock2().GetAlt2().GetRule_reduce_core1().GetToken1()); - break; - case TRule_select_kind_TBlock2::kAlt3: { - const auto& selCore = kind.GetBlock2().GetAlt3().GetRule_select_core1(); - if (selCore.HasBlock1()) { - PosFromToken(selCore.GetBlock1().GetToken1()); - } else { - PosFromToken(selCore.GetToken2()); - } - - break; - } - - default: - ythrow yexception() << "Alt is not supported"; - } - } - } - void VisitSelect(const TRule_select_stmt& msg) { - const auto& paren = msg.GetRule_select_kind_parenthesis1(); - if (paren.Alt_case() == TRule_select_kind_parenthesis::kAltSelectKindParenthesis1) { - const auto& partial = paren.GetAlt_select_kind_parenthesis1().GetRule_select_kind_partial1(); - PosFromPartial(partial); - } else { - PosFromToken(paren.GetAlt_select_kind_parenthesis2().GetToken1()); - } - NewLine(); Visit(msg.GetRule_select_kind_parenthesis1()); for (const auto& block : msg.GetBlock2()) { @@ -825,8 +820,6 @@ friend struct TStaticData; } void VisitSelectUnparenthesized(const TRule_select_unparenthesized_stmt& msg) { - const auto& partial = msg.GetRule_select_kind_partial1(); - PosFromPartial(partial); NewLine(); Visit(msg.GetRule_select_kind_partial1()); for (const auto& block : msg.GetBlock2()) { @@ -838,10 +831,11 @@ friend struct TStaticData; } void VisitNamedNodes(const TRule_named_nodes_stmt& msg) { - PosFromToken(msg.GetRule_bind_parameter_list1().GetRule_bind_parameter1().GetToken1()); NewLine(); Visit(msg.GetRule_bind_parameter_list1()); Visit(msg.GetToken2()); + ExprLineIndent = CurrentIndent; + switch (msg.GetBlock3().Alt_case()) { case TRule_named_nodes_stmt::TBlock3::kAlt1: { const auto& alt = msg.GetBlock3().GetAlt1(); @@ -884,10 +878,11 @@ friend struct TStaticData; default: ythrow yexception() << "Alt is not supported"; } + + ExprLineIndent = 0; } void VisitCreateTable(const TRule_create_table_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); Visit(msg.GetToken1()); Visit(msg.GetBlock2()); @@ -933,31 +928,26 @@ friend struct TStaticData; } void VisitDropTable(const TRule_drop_table_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_drop_table_stmt::GetDescriptor(), msg); } void VisitAnalyze(const TRule_analyze_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_analyze_stmt::GetDescriptor(), msg); } void VisitBackup(const TRule_backup_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_backup_stmt::GetDescriptor(), msg); } void VisitRestore(const TRule_restore_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_restore_stmt::GetDescriptor(), msg); } void VisitUse(const TRule_use_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_use_stmt::GetDescriptor(), msg); } @@ -969,41 +959,16 @@ friend struct TStaticData; } void VisitIntoTable(const TRule_into_table_stmt& msg) { - switch (msg.GetBlock1().Alt_case()) { - case TRule_into_table_stmt_TBlock1::AltCase::kAlt1: - PosFromToken(msg.GetBlock1().GetAlt1().GetToken1()); - break; - case TRule_into_table_stmt_TBlock1::AltCase::kAlt2: - PosFromToken(msg.GetBlock1().GetAlt2().GetToken1()); - break; - case TRule_into_table_stmt_TBlock1::AltCase::kAlt3: - PosFromToken(msg.GetBlock1().GetAlt3().GetToken1()); - break; - case TRule_into_table_stmt_TBlock1::AltCase::kAlt4: - PosFromToken(msg.GetBlock1().GetAlt4().GetToken1()); - break; - case TRule_into_table_stmt_TBlock1::AltCase::kAlt5: - PosFromToken(msg.GetBlock1().GetAlt5().GetToken1()); - break; - case TRule_into_table_stmt_TBlock1::AltCase::kAlt6: - PosFromToken(msg.GetBlock1().GetAlt6().GetToken1()); - break; - default: - ythrow yexception() << "Alt is not supported"; - } - NewLine(); VisitAllFields(TRule_into_table_stmt::GetDescriptor(), msg); } void VisitCommit(const TRule_commit_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_commit_stmt::GetDescriptor(), msg); } void VisitUpdate(const TRule_update_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); Visit(msg.GetToken1()); Visit(msg.GetRule_simple_table_ref2()); @@ -1103,7 +1068,6 @@ friend struct TStaticData; } void VisitDelete(const TRule_delete_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); Visit(msg.GetToken1()); Visit(msg.GetToken2()); @@ -1129,31 +1093,39 @@ friend struct TStaticData; } void VisitRollback(const TRule_rollback_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_rollback_stmt::GetDescriptor(), msg); } void VisitDeclare(const TRule_declare_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_declare_stmt::GetDescriptor(), msg); } void VisitImport(const TRule_import_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_import_stmt::GetDescriptor(), msg); } void VisitExport(const TRule_export_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); - VisitAllFields(TRule_export_stmt::GetDescriptor(), msg); + VisitKeyword(msg.GetToken1()); + + NewLine(); + PushCurrentIndent(); + + const auto& list = msg.GetRule_bind_parameter_list2(); + Visit(list.GetRule_bind_parameter1()); + for (auto& b : list.GetBlock2()) { + Visit(b.GetToken1()); + NewLine(); + Visit(b.GetRule_bind_parameter2()); + } + + PopCurrentIndent(); } void VisitAlterTable(const TRule_alter_table_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitKeyword(msg.GetToken1()); VisitKeyword(msg.GetToken2()); @@ -1171,13 +1143,11 @@ friend struct TStaticData; } void VisitAlterTableStore(const TRule_alter_table_store_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_alter_table_store_stmt::GetDescriptor(), msg); } void VisitAlterExternalTable(const TRule_alter_external_table_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitKeyword(msg.GetToken1()); VisitKeyword(msg.GetToken2()); @@ -1196,7 +1166,6 @@ friend struct TStaticData; } void VisitDo(const TRule_do_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitKeyword(msg.GetToken1()); switch (msg.GetBlock2().Alt_case()) { @@ -1230,7 +1199,6 @@ friend struct TStaticData; } void VisitAction(const TRule_define_action_or_subquery_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitKeyword(msg.GetToken1()); VisitKeyword(msg.GetToken2()); @@ -1253,12 +1221,6 @@ friend struct TStaticData; } void VisitIf(const TRule_if_stmt& msg) { - if (msg.HasBlock1()) { - PosFromToken(msg.GetBlock1().GetToken1()); - } else { - PosFromToken(msg.GetToken2()); - } - NewLine(); if (msg.HasBlock1()) { Visit(msg.GetBlock1()); @@ -1281,14 +1243,6 @@ friend struct TStaticData; } void VisitFor(const TRule_for_stmt& msg) { - if (msg.HasBlock1()) { - PosFromToken(msg.GetBlock1().GetToken1()); - } else if (msg.HasBlock2()) { - PosFromToken(msg.GetBlock2().GetToken1()); - } else { - PosFromToken(msg.GetToken3()); - } - NewLine(); if (msg.HasBlock1()) { Visit(msg.GetBlock1()); @@ -1317,7 +1271,6 @@ friend struct TStaticData; } void VisitValues(const TRule_values_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitKeyword(msg.GetToken1()); const auto& rowList = msg.GetRule_values_source_row_list2(); @@ -1334,73 +1287,61 @@ friend struct TStaticData; } void VisitGrantPermissions(const TRule_grant_permissions_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_grant_permissions_stmt::GetDescriptor(), msg); } void VisitRevokePermissions(const TRule_revoke_permissions_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_revoke_permissions_stmt::GetDescriptor(), msg); } void VisitCreateUser(const TRule_create_user_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_create_user_stmt::GetDescriptor(), msg); } void VisitAlterUser(const TRule_alter_user_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_alter_user_stmt::GetDescriptor(), msg); } void VisitCreateGroup(const TRule_create_group_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_create_group_stmt::GetDescriptor(), msg); } void VisitAlterGroup(const TRule_alter_group_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_alter_group_stmt::GetDescriptor(), msg); } void VisitDropRole(const TRule_drop_role_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_drop_role_stmt::GetDescriptor(), msg); } void VisitUpsertObject(const TRule_upsert_object_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_upsert_object_stmt::GetDescriptor(), msg); } void VisitCreateObject(const TRule_create_object_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_create_object_stmt::GetDescriptor(), msg); } void VisitAlterObject(const TRule_alter_object_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_alter_object_stmt::GetDescriptor(), msg); } void VisitDropObject(const TRule_drop_object_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_drop_object_stmt::GetDescriptor(), msg); } void VisitCreateTopic(const TRule_create_topic_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitKeyword(msg.GetToken1()); VisitKeyword(msg.GetToken2()); @@ -1435,7 +1376,6 @@ friend struct TStaticData; } void VisitAlterTopic(const TRule_alter_topic_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitKeyword(msg.GetToken1()); VisitKeyword(msg.GetToken2()); @@ -1454,19 +1394,16 @@ friend struct TStaticData; } void VisitDropTopic(const TRule_drop_topic_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_drop_topic_stmt::GetDescriptor(), msg); } void VisitCreateExternalDataSource(const TRule_create_external_data_source_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_create_external_data_source_stmt::GetDescriptor(), msg); } void VisitAlterExternalDataSource(const TRule_alter_external_data_source_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitToken(msg.GetToken1()); VisitToken(msg.GetToken2()); @@ -1487,49 +1424,41 @@ friend struct TStaticData; } void VisitDropExternalDataSource(const TRule_drop_external_data_source_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_drop_external_data_source_stmt::GetDescriptor(), msg); } void VisitCreateView(const TRule_create_view_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_create_view_stmt::GetDescriptor(), msg); } void VisitDropView(const TRule_drop_view_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_drop_view_stmt::GetDescriptor(), msg); } void VisitCreateAsyncReplication(const TRule_create_replication_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_create_replication_stmt::GetDescriptor(), msg); } void VisitAlterAsyncReplication(const TRule_alter_replication_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_alter_replication_stmt::GetDescriptor(), msg); } void VisitDropAsyncReplication(const TRule_drop_replication_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_drop_replication_stmt::GetDescriptor(), msg); } void VisitCreateResourcePool(const TRule_create_resource_pool_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_create_resource_pool_stmt::GetDescriptor(), msg); } void VisitAlterResourcePool(const TRule_alter_resource_pool_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitToken(msg.GetToken1()); VisitToken(msg.GetToken2()); @@ -1549,19 +1478,16 @@ friend struct TStaticData; } void VisitDropResourcePool(const TRule_drop_resource_pool_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_drop_resource_pool_stmt::GetDescriptor(), msg); } void VisitCreateBackupCollection(const TRule_create_backup_collection_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_create_backup_collection_stmt::GetDescriptor(), msg); } void VisitAlterBackupCollection(const TRule_alter_backup_collection_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitToken(msg.GetToken1()); Visit(msg.GetRule_backup_collection2()); @@ -1595,19 +1521,16 @@ friend struct TStaticData; } void VisitDropBackupCollection(const TRule_drop_backup_collection_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_drop_backup_collection_stmt::GetDescriptor(), msg); } void VisitCreateResourcePoolClassifier(const TRule_create_resource_pool_classifier_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_create_resource_pool_classifier_stmt::GetDescriptor(), msg); } void VisitAlterResourcePoolClassifier(const TRule_alter_resource_pool_classifier_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitToken(msg.GetToken1()); VisitToken(msg.GetToken2()); @@ -1628,7 +1551,6 @@ friend struct TStaticData; } void VisitDropResourcePoolClassifier(const TRule_drop_resource_pool_classifier_stmt& msg) { - PosFromToken(msg.GetToken1()); NewLine(); VisitAllFields(TRule_drop_resource_pool_classifier_stmt::GetDescriptor(), msg); } @@ -1637,10 +1559,10 @@ friend struct TStaticData; VisitAllFieldsImpl(this, descr, msg); } - void WriteComments() { + void WriteComments(bool completeLine) { while (LastComment < Comments.size()) { const auto& c = Comments[LastComment]; - if (c.Line > LastLine || c.Line == LastLine && c.LinePos > LastColumn) { + if (c.Line > LastLine || !completeLine && c.Line == LastLine && c.LinePos > LastColumn) { break; } @@ -1652,13 +1574,7 @@ friend struct TStaticData; void PosFromToken(const TToken& token) { LastLine = token.GetLine(); LastColumn = token.GetColumn(); - WriteComments(); - } - - void PosFromParsedToken(const TParsedToken& token) { - LastLine = token.Line; - LastColumn = token.LinePos; - WriteComments(); + WriteComments(false); } void VisitToken(const TToken& token) { @@ -1713,6 +1629,7 @@ friend struct TStaticData; AfterQuestion = (str == "?"); AfterLess = (str == "<"); AfterKeyExpr = false; + AfterComment = false; if (forceKeyword) { str = to_upper(str); @@ -1737,9 +1654,22 @@ friend struct TStaticData; MarkTokenStack.pop_back(); } + if (InCondExpr) { + if (str == "=") { + str = "=="; + } else if (str == "<>") { + str = "!="; + } + } + Out(str); + + if (TokenIndex + 1 >= ParsedTokens.size() || ParsedTokens[TokenIndex + 1].Line > LastLine) { + WriteComments(true); + } + if (str == ";") { - Out('\n'); + NewLine(); } if (markedInfo.OpeningBracket) { @@ -1941,12 +1871,13 @@ friend struct TStaticData; Visit(msg.GetBlock7()); } + PopCurrentIndent(); + if (msg.HasBlock8()) { NewLine(); Visit(msg.GetBlock8()); } - PopCurrentIndent(); if (msg.HasBlock9()) { NewLine(); Visit(msg.GetBlock9()); @@ -2082,13 +2013,37 @@ friend struct TStaticData; } } + void VisitTableHints(const TRule_table_hints& msg) { + Visit(msg.GetToken1()); + const auto& block2 = msg.GetBlock2(); + if (block2.Alt_case() == TRule_table_hints::TBlock2::kAlt2) { + const auto& alt = block2.GetAlt2(); + + Visit(alt.GetToken1()); + + NewLine(); + PushCurrentIndent(); + + Visit(alt.GetRule_table_hint2()); + for (const auto& block : alt.GetBlock3()) { + Visit(block.GetToken1()); + NewLine(); + Visit(block.GetRule_table_hint2()); + } + + NewLine(); + PopCurrentIndent(); + + Visit(alt.GetToken4()); + } else { + Visit(block2); + } + } + void VisitSimpleTableRef(const TRule_simple_table_ref& msg) { Visit(msg.GetRule_simple_table_ref_core1()); if (msg.HasBlock2()) { - NewLine(); - PushCurrentIndent(); Visit(msg.GetBlock2()); - PopCurrentIndent(); } } @@ -2357,9 +2312,13 @@ friend struct TStaticData; } Visit(msg.GetToken3()); + ExprLineIndent = CurrentIndent; + Visit(msg.GetRule_expr4()); VisitRepeated(msg.GetBlock5()); + ExprLineIndent = 0; + PopCurrentIndent(); NewLine(); } @@ -2572,6 +2531,19 @@ friend struct TStaticData; VisitBinaryOp(orExpr.GetRule_or_subexpr1(), getOp, getExpr, orExpr.GetBlock2().begin(), orExpr.GetBlock2().end()); } + void VisitCondExpr(const TRule_cond_expr& msg) { + if (msg.Alt_case() == TRule_cond_expr::kAltCondExpr5) { + for (const auto& block : msg.GetAlt_cond_expr5().GetBlock1()) { + InCondExpr = true; + Visit(block.GetBlock1()); + InCondExpr = false; + Visit(block.GetRule_eq_subexpr2()); + } + } else { + VisitAllFields(TRule_cond_expr::GetDescriptor(), msg); + } + } + void VisitOrSubexpr(const TRule_or_subexpr& msg) { auto getExpr = [](const TRule_or_subexpr::TBlock2& b) -> const TRule_and_subexpr& { return b.GetRule_and_subexpr2(); }; auto getOp = [](const TRule_or_subexpr::TBlock2& b) -> const TToken& { return b.GetToken1(); }; @@ -2609,7 +2581,6 @@ friend struct TStaticData; const bool hasSecondNewline = ParsedTokens[TokenIndex].Line != ParsedTokens[TokenIndex + 2].Line; const ui32 currentOutLine = OutLine; - PosFromParsedToken(ParsedTokens[TokenIndex]); if (currentOutLine != OutLine || (hasFirstNewline && hasSecondNewline)) { NewLine(); if (!pushedIndent) { @@ -2619,7 +2590,6 @@ friend struct TStaticData; } Visit(alt.GetRule_double_question1()); - PosFromParsedToken(ParsedTokens[TokenIndex]); if (hasFirstNewline || hasSecondNewline) { NewLine(); if (!pushedIndent) { @@ -2701,8 +2671,8 @@ friend struct TStaticData; template void VisitBinaryOp(const TExpr& expr, TGetOp getOp, TGetExpr getExpr, TIter begin, TIter end) { Visit(expr); - bool pushedIndent = false; + bool pushedIndent = false; for (; begin != end; ++begin) { const auto op = getOp(*begin); const auto opSize = BinaryOpTokenSize(op); @@ -2710,23 +2680,18 @@ friend struct TStaticData; const bool hasSecondNewline = ParsedTokens[TokenIndex].Line != ParsedTokens[TokenIndex + opSize].Line; const ui32 currentOutLine = OutLine; - PosFromParsedToken(ParsedTokens[TokenIndex]); - if (currentOutLine != OutLine || (hasFirstNewline && hasSecondNewline)) { + if (currentOutLine != OutLine || hasFirstNewline || hasSecondNewline) { NewLine(); - if (!pushedIndent) { + if (!pushedIndent && CurrentIndent == ExprLineIndent) { PushCurrentIndent(); pushedIndent = true; } } + Visit(op); - PosFromParsedToken(ParsedTokens[TokenIndex]); - if (hasFirstNewline || hasSecondNewline) { + if (hasFirstNewline && hasSecondNewline) { NewLine(); - if (!pushedIndent) { - PushCurrentIndent(); - pushedIndent = true; - } } Visit(getExpr(*begin)); @@ -2739,6 +2704,11 @@ friend struct TStaticData; void PushCurrentIndent() { CurrentIndent += OneIndent; + + BlockFirstLine = OutLine; + if (OutColumn > 0) { + ++BlockFirstLine; + } } void PopCurrentIndent() { @@ -2770,9 +2740,13 @@ friend struct TStaticData; bool AfterQuestion = false; bool AfterLess = false; bool AfterKeyExpr = false; + bool AfterComment = false; bool InMultiTokenOp = false; + bool InCondExpr = false; ui32 ForceExpandedLine = 0; ui32 ForceExpandedColumn = 0; + ui32 BlockFirstLine = 1; + i32 ExprLineIndent = 0; ui32 TokenIndex = 0; TMarkTokenStack MarkTokenStack; @@ -2826,6 +2800,7 @@ TStaticData::TStaticData() {TRule_single_source::GetDescriptor(), MakePrettyFunctor(&TPrettyVisitor::VisitSingleSource)}, {TRule_flatten_source::GetDescriptor(), MakePrettyFunctor(&TPrettyVisitor::VisitFlattenSource)}, {TRule_named_single_source::GetDescriptor(), MakePrettyFunctor(&TPrettyVisitor::VisitNamedSingleSource)}, + {TRule_table_hints::GetDescriptor(), MakePrettyFunctor(&TPrettyVisitor::VisitTableHints)}, {TRule_simple_table_ref::GetDescriptor(), MakePrettyFunctor(&TPrettyVisitor::VisitSimpleTableRef)}, {TRule_into_simple_table_ref::GetDescriptor(), MakePrettyFunctor(&TPrettyVisitor::VisitIntoSimpleTableRef)}, {TRule_select_kind_partial::GetDescriptor(), MakePrettyFunctor(&TPrettyVisitor::VisitSelectKindPartial)}, @@ -2853,6 +2828,7 @@ TStaticData::TStaticData() {TRule_ttl_tier_action::GetDescriptor(), MakePrettyFunctor(&TPrettyVisitor::VisitTtlTierAction)}, {TRule_expr::GetDescriptor(), MakePrettyFunctor(&TPrettyVisitor::VisitExpr)}, + {TRule_cond_expr::GetDescriptor(), MakePrettyFunctor(&TPrettyVisitor::VisitCondExpr)}, {TRule_or_subexpr::GetDescriptor(), MakePrettyFunctor(&TPrettyVisitor::VisitOrSubexpr)}, {TRule_and_subexpr::GetDescriptor(), MakePrettyFunctor(&TPrettyVisitor::VisitAndSubexpr)}, {TRule_eq_subexpr::GetDescriptor(), MakePrettyFunctor(&TPrettyVisitor::VisitEqSubexpr)}, diff --git a/yql/essentials/sql/v1/format/sql_format_ut.h b/yql/essentials/sql/v1/format/sql_format_ut.h index fc919b38c431..bed9e055abc7 100644 --- a/yql/essentials/sql/v1/format/sql_format_ut.h +++ b/yql/essentials/sql/v1/format/sql_format_ut.h @@ -157,8 +157,8 @@ Y_UNIT_TEST(Rollback) { Y_UNIT_TEST(Export) { TCases cases = { - {"export $foo;","EXPORT $foo;\n"}, - {"export $foo, $bar;","EXPORT $foo, $bar;\n"}, + {"export $foo;","EXPORT\n\t$foo;\n"}, + {"export $foo, $bar;","EXPORT\n\t$foo,\n\t$bar;\n"}, }; TSetup setup; @@ -566,13 +566,13 @@ Y_UNIT_TEST(DefineActionOrSubquery) { Y_UNIT_TEST(If) { TCases cases = { {"evaluate if 1=1 do $a()", - "EVALUATE IF 1 = 1\n\tDO $a();\n"}, + "EVALUATE IF 1 == 1\n\tDO $a();\n"}, {"evaluate if 1=1 do $a() else do $b()", - "EVALUATE IF 1 = 1\n\tDO $a()\nELSE\n\tDO $b();\n"}, + "EVALUATE IF 1 == 1\n\tDO $a()\nELSE\n\tDO $b();\n"}, {"evaluate if 1=1 do begin select 1; end do", - "EVALUATE IF 1 = 1\n\tDO BEGIN\n\t\tSELECT\n\t\t\t1;\n\tEND DO;\n"}, + "EVALUATE IF 1 == 1\n\tDO BEGIN\n\t\tSELECT\n\t\t\t1;\n\tEND DO;\n"}, {"evaluate if 1=1 do begin select 1; end do else do begin select 2; end do", - "EVALUATE IF 1 = 1\n\tDO BEGIN\n\t\tSELECT\n\t\t\t1;\n\tEND DO\n" + "EVALUATE IF 1 == 1\n\tDO BEGIN\n\t\tSELECT\n\t\t\t1;\n\tEND DO\n" "ELSE\n\tDO BEGIN\n\t\tSELECT\n\t\t\t2;\n\tEND DO;\n"}, }; @@ -623,7 +623,7 @@ Y_UNIT_TEST(Update) { {"update user set (x,y)=(select 1,2)", "UPDATE user\nSET\n(\n\tx,\n\ty\n) = (\n\tSELECT\n\t\t1,\n\t\t2\n);\n"}, {"update user set x=1,y=2 where z=3", - "UPDATE user\nSET\n\tx = 1,\n\ty = 2\nWHERE z = 3;\n"}, + "UPDATE user\nSET\n\tx = 1,\n\ty = 2\nWHERE z == 3;\n"}, }; TSetup setup; @@ -635,7 +635,7 @@ Y_UNIT_TEST(Delete) { {"delete from user", "DELETE FROM user;\n"}, {"delete from user where 1=1", - "DELETE FROM user\nWHERE 1 = 1;\n"}, + "DELETE FROM user\nWHERE 1 == 1;\n"}, {"delete from user on select 1 as x, 2 as y", "DELETE FROM user\nON\nSELECT\n\t1 AS x,\n\t2 AS y;\n"}, {"delete from user on (x) values (1)", @@ -677,13 +677,13 @@ Y_UNIT_TEST(Into) { {"upsert into user erase by (x,y) values (1)", "UPSERT INTO user\n\tERASE BY (\n\t\tx,\n\t\ty\n\t)\nVALUES\n\t(1);\n"}, {"insert into user with truncate select 1 as x", - "INSERT INTO user\n\tWITH truncate\nSELECT\n\t1 AS x;\n"}, + "INSERT INTO user WITH truncate\nSELECT\n\t1 AS x;\n"}, {"insert into user with (truncate,inferscheme='1') select 1 as x", - "INSERT INTO user\n\tWITH (truncate, inferscheme = '1')\nSELECT\n\t1 AS x;\n"}, + "INSERT INTO user WITH (\n\ttruncate,\n\tinferscheme = '1'\n)\nSELECT\n\t1 AS x;\n"}, {"insert into user with schema Struct select 1 as user", - "INSERT INTO user\n\tWITH SCHEMA Struct\nSELECT\n\t1 AS user;\n"}, + "INSERT INTO user WITH SCHEMA Struct\nSELECT\n\t1 AS user;\n"}, {"insert into user with schema (int32 as user) select 1 as user", - "INSERT INTO user\n\tWITH SCHEMA (int32 AS user)\nSELECT\n\t1 AS user;\n"}, + "INSERT INTO user WITH SCHEMA (int32 AS user)\nSELECT\n\t1 AS user;\n"}, }; TSetup setup; @@ -699,7 +699,7 @@ Y_UNIT_TEST(Process) { {"process user,user using $f()", "PROCESS user, user\nUSING $f();\n"}, {"process user using $f() where 1=1 having 1=1 assume order by user", - "PROCESS user\nUSING $f()\nWHERE 1 = 1\nHAVING 1 = 1\nASSUME ORDER BY\n\tuser;\n"}, + "PROCESS user\nUSING $f()\nWHERE 1 == 1\nHAVING 1 == 1\nASSUME ORDER BY\n\tuser;\n"}, {"process user using $f() union all process user using $f()", "PROCESS user\nUSING $f()\nUNION ALL\nPROCESS user\nUSING $f();\n"}, {"process user using $f() with foo=bar", @@ -733,7 +733,7 @@ Y_UNIT_TEST(Reduce) { {"reduce user on user,user using $f()", "REDUCE user\nON\n\tuser,\n\tuser\nUSING $f();\n"}, {"reduce user on user using $f() where 1=1 having 1=1 assume order by user", - "REDUCE user\nON\n\tuser\nUSING $f()\nWHERE 1 = 1\nHAVING 1 = 1\nASSUME ORDER BY\n\tuser;\n"}, + "REDUCE user\nON\n\tuser\nUSING $f()\nWHERE 1 == 1\nHAVING 1 == 1\nASSUME ORDER BY\n\tuser;\n"}, {"reduce user presort user,user on user using $f();", "REDUCE user\nPRESORT\n\tuser,\n\tuser\nON\n\tuser\nUSING $f();\n"}, }; @@ -755,11 +755,11 @@ Y_UNIT_TEST(Select) { {"select a.*", "SELECT\n\ta.*;\n"}, {"select * without a", - "SELECT\n\t*\n\tWITHOUT\n\t\ta;\n"}, + "SELECT\n\t*\nWITHOUT\n\ta;\n"}, {"select * without a,b", - "SELECT\n\t*\n\tWITHOUT\n\t\ta,\n\t\tb;\n"}, + "SELECT\n\t*\nWITHOUT\n\ta,\n\tb;\n"}, {"select * without a,", - "SELECT\n\t*\n\tWITHOUT\n\t\ta,;\n"}, + "SELECT\n\t*\nWITHOUT\n\ta,;\n"}, {"select 1 from user", "SELECT\n\t1\nFROM user;\n"}, {"select 1 from plato.user", @@ -781,7 +781,7 @@ Y_UNIT_TEST(Select) { {"select 1 from user with user=user", "SELECT\n\t1\nFROM user\n\tWITH user = user;\n"}, {"select 1 from user with (user=user, user=user)", - "SELECT\n\t1\nFROM user\n\tWITH (user = user, user = user);\n"}, + "SELECT\n\t1\nFROM user\n\tWITH (\n\t\tuser = user,\n\t\tuser = user\n\t);\n"}, {"select 1 from user sample 0.1", "SELECT\n\t1\nFROM user\n\tSAMPLE 0.1;\n"}, {"select 1 from user tablesample system(0.1)", @@ -803,21 +803,21 @@ Y_UNIT_TEST(Select) { {"from user select 1", "FROM user\nSELECT\n\t1;\n"}, {"select * from user as a join user as b on a.x=b.y", - "SELECT\n\t*\nFROM user\n\tAS a\nJOIN user\n\tAS b\nON a.x = b.y;\n"}, + "SELECT\n\t*\nFROM user\n\tAS a\nJOIN user\n\tAS b\nON a.x == b.y;\n"}, {"select * from user as a join user as b using(x)", "SELECT\n\t*\nFROM user\n\tAS a\nJOIN user\n\tAS b\nUSING (x);\n"}, {"select * from any user as a full join user as b on a.x=b.y", - "SELECT\n\t*\nFROM ANY user\n\tAS a\nFULL JOIN user\n\tAS b\nON a.x = b.y;\n"}, + "SELECT\n\t*\nFROM ANY user\n\tAS a\nFULL JOIN user\n\tAS b\nON a.x == b.y;\n"}, {"select * from user as a left join any user as b on a.x=b.y", - "SELECT\n\t*\nFROM user\n\tAS a\nLEFT JOIN ANY user\n\tAS b\nON a.x = b.y;\n"}, + "SELECT\n\t*\nFROM user\n\tAS a\nLEFT JOIN ANY user\n\tAS b\nON a.x == b.y;\n"}, {"select * from any user as a right join any user as b on a.x=b.y", - "SELECT\n\t*\nFROM ANY user\n\tAS a\nRIGHT JOIN ANY user\n\tAS b\nON a.x = b.y;\n"}, + "SELECT\n\t*\nFROM ANY user\n\tAS a\nRIGHT JOIN ANY user\n\tAS b\nON a.x == b.y;\n"}, {"select * from user as a cross join user as b", "SELECT\n\t*\nFROM user\n\tAS a\nCROSS JOIN user\n\tAS b;\n"}, {"select 1 from user where key = 1", - "SELECT\n\t1\nFROM user\nWHERE key = 1;\n"}, + "SELECT\n\t1\nFROM user\nWHERE key == 1;\n"}, {"select 1 from user having count(*) = 1", - "SELECT\n\t1\nFROM user\nHAVING count(*) = 1;\n"}, + "SELECT\n\t1\nFROM user\nHAVING count(*) == 1;\n"}, {"select 1 from user group by key", "SELECT\n\t1\nFROM user\nGROUP BY\n\tkey;\n"}, {"select 1 from user group compact by key, value as v", @@ -860,7 +860,7 @@ Y_UNIT_TEST(CompositeTypesAndQuestions) { TCases cases = { {"declare $_x AS list??;declare $_y AS int32 ? ? ;select 1<>2, 1??2," "formattype(list), formattype(resource),formattype(tuple<>), formattype(tuple< >), formattype(int32 ? ? )", - "DECLARE $_x AS list??;\nDECLARE $_y AS int32??;\n\nSELECT\n\t1 <> 2,\n\t1 ?? 2,\n\tformattype(list)," + "DECLARE $_x AS list??;\nDECLARE $_y AS int32??;\n\nSELECT\n\t1 != 2,\n\t1 ?? 2,\n\tformattype(list)," "\n\tformattype(resource),\n\tformattype(tuple<>),\n\tformattype(tuple< >),\n\tformattype(int32??" ");\n" }, }; @@ -927,7 +927,7 @@ Y_UNIT_TEST(TableHints) { {"select * from plato.T with schema struct> where key<0", "SELECT\n\t*\nFROM plato.T\n\tWITH SCHEMA struct>\nWHERE key < 0;\n"}, {"select * from plato.T with (foo=bar, x=$y, a=(a, b, c), u='aaa', schema (foo int32, bar list))", - "SELECT\n\t*\nFROM plato.T\n\tWITH (foo = bar, x = $y, a = (a, b, c), u = 'aaa', SCHEMA (foo int32, bar list));\n"}, + "SELECT\n\t*\nFROM plato.T\n\tWITH (\n\t\tfoo = bar,\n\t\tx = $y,\n\t\ta = (a, b, c),\n\t\tu = 'aaa',\n\t\tSCHEMA (foo int32, bar list)\n\t);\n"}, }; TSetup setup; @@ -947,7 +947,7 @@ Y_UNIT_TEST(BoolAsVariableName) { Y_UNIT_TEST(WithSchemaEquals) { TCases cases = { {"select * from plato.T with (format= csv_with_names, schema=(year int32 Null, month String, day String not null, a Utf8, b Uint16));", - "SELECT\n\t*\nFROM plato.T\n\tWITH (format = csv_with_names, SCHEMA = (year int32 NULL, month String, day String NOT NULL, a Utf8, b Uint16));\n"}, + "SELECT\n\t*\nFROM plato.T\n\tWITH (\n\t\tformat = csv_with_names,\n\t\tSCHEMA = (year int32 NULL, month String, day String NOT NULL, a Utf8, b Uint16)\n\t);\n"}, }; TSetup setup; @@ -1397,13 +1397,13 @@ Y_UNIT_TEST(Union) { Y_UNIT_TEST(CommentAfterLastSelect) { TCases cases = { {"SELECT 1--comment\n", - "SELECT\n\t1--comment\n;\n"}, + "SELECT\n\t1 --comment\n;\n"}, {"SELECT 1\n\n--comment\n", - "SELECT\n\t1--comment\n;\n"}, + "SELECT\n\t1 --comment\n;\n"}, {"SELECT 1\n\n--comment", - "SELECT\n\t1--comment\n;\n"}, + "SELECT\n\t1 --comment\n;\n"}, {"SELECT * FROM Input\n\n\n\n/* comment */\n\n\n", - "SELECT\n\t*\nFROM Input/* comment */;\n"}, + "SELECT\n\t*\nFROM Input /* comment */;\n"}, }; TSetup setup; @@ -1417,7 +1417,7 @@ Y_UNIT_TEST(WindowFunctionInsideExpr) { {"SELECT CAST(ROW_NUMBER() OVER (PARTITION BY key) AS String) AS x,\nFROM Input;", "SELECT\n\tCAST(\n\t\tROW_NUMBER() OVER (\n\t\t\tPARTITION BY\n\t\t\t\tkey\n\t\t) AS String\n\t) AS x,\nFROM Input;\n"}, {"SELECT CAST(ROW_NUMBER() OVER (users) AS String) AS x,\nFROM Input;", - "SELECT\n\tCAST(\n\t\tROW_NUMBER() OVER (\n\t\t\tusers\n\t\t) AS String\n\t) AS x,\nFROM Input;\n"}, + "SELECT\n\tCAST(\n\t\tROW_NUMBER() OVER (\n\t\t\tusers\n\t\t) AS String\n\t) AS x,\nFROM Input;\n"}, }; TSetup setup; @@ -1464,12 +1464,12 @@ Y_UNIT_TEST(MultiTokenOperations) { TCases cases = { {"$x = 1 >>| 2;", "$x = 1 >>| 2;\n"}, - {"$x = 1 >> 2;", + {"$x = 1 >> 2;", "$x = 1 >> 2;\n"}, - {"$x = 1 ?? 2;", + {"$x = 1 ?? 2;", "$x = 1 ?? 2;\n"}, - {"$x = 1 > /*comment*/ > /*comment*/ | 2;", - "$x = 1 >/*comment*/>/*comment*/| 2;\n"}, + {"$x = 1 > /*comment*/ > /*comment*/ | 2;", + "$x = 1 > /*comment*/> /*comment*/| 2;\n"}, }; TSetup setup; @@ -1481,27 +1481,27 @@ Y_UNIT_TEST(OperatorNewlines) { {"$x = TRUE\nOR\nFALSE;", "$x = TRUE\n\tOR\n\tFALSE;\n"}, {"$x = TRUE OR\nFALSE;", - "$x = TRUE OR\n\tFALSE;\n"}, + "$x = TRUE\n\tOR FALSE;\n"}, {"$x = TRUE\nOR FALSE;", - "$x = TRUE OR\n\tFALSE;\n"}, - {"$x = 1\n+2\n*3;", - "$x = 1 +\n\t2 *\n\t\t3;\n"}, + "$x = TRUE\n\tOR FALSE;\n"}, + {"$x = 1+\n2*\n3;", + "$x = 1\n\t+ 2\n\t* 3;\n"}, {"$x = 1\n+\n2\n*3\n*5\n+\n4;", - "$x = 1\n\t+\n\t2 *\n\t\t3 *\n\t\t5\n\t+\n\t4;\n"}, + "$x = 1\n\t+\n\t2\n\t* 3\n\t* 5\n\t+\n\t4;\n"}, {"$x = 1\n+2+3+4\n+5+6+7+\n\n8+9+10;", - "$x = 1 +\n\t2 + 3 + 4 +\n\t5 + 6 + 7 +\n\t8 + 9 + 10;\n"}, + "$x = 1\n\t+ 2 + 3 + 4\n\t+ 5 + 6 + 7\n\t+ 8 + 9 + 10;\n"}, {"$x = TRUE\nAND\nTRUE OR\nFALSE\nAND TRUE\nOR FALSE\nAND TRUE\nOR FALSE;", - "$x = TRUE\n\tAND\n\tTRUE OR\n\tFALSE AND\n\t\tTRUE OR\n\tFALSE AND\n\t\tTRUE OR\n\tFALSE;\n"}, + "$x = TRUE\n\tAND\n\tTRUE\n\tOR FALSE\n\tAND TRUE\n\tOR FALSE\n\tAND TRUE\n\tOR FALSE;\n"}, {"$x = 1 -- comment\n+ 2;", - "$x = 1-- comment\n\t+\n\t2;\n"}, - {"$x = 1 -- comment\n+ -- comment\n2;", - "$x = 1-- comment\n\t+-- comment\n\t2;\n"}, - {"$x = 1 + -- comment\n2;", - "$x = 1 +-- comment\n\t2;\n"}, - {"$x = 1\n>\n>\n|\n2;", + "$x = 1 -- comment\n\t+ 2;\n"}, + {"$x = 1 -- comment\n+ -- comment\n2;", + "$x = 1 -- comment\n\t+ -- comment\n\t2;\n"}, + {"$x = 1 + -- comment\n2;", + "$x = 1\n\t+ -- comment\n\t2;\n"}, + {"$x = 1\n>\n>\n|\n2;", "$x = 1\n\t>>|\n\t2;\n"}, - {"$x = 1\n?? 2 ??\n3\n??\n4 +\n5\n*\n6 +\n7 ??\n8;", - "$x = 1 ??\n\t2 ??\n\t3\n\t??\n\t4 +\n\t\t5\n\t\t\t*\n\t\t\t6 +\n\t\t7 ??\n\t8;\n"}, + {"$x = 1\n?? 2 ??\n3\n??\n4 +\n5\n*\n6 +\n7 ??\n8;", + "$x = 1 ??\n\t2 ??\n\t3\n\t??\n\t4\n\t+ 5\n\t*\n\t6\n\t+ 7 ??\n\t8;\n"}, }; TSetup setup; @@ -1531,7 +1531,7 @@ Y_UNIT_TEST(ObfuscateSelect) { {"declare $a as int32;", "DECLARE $id AS int32;\n"}, {"select * from `logs/of/bob` where pwd='foo';", - "SELECT\n\t*\nFROM id\nWHERE id = 'str';\n"}, + "SELECT\n\t*\nFROM id\nWHERE id == 'str';\n"}, {"select $f();", "SELECT\n\t$id();\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 096eaf6d0b87..422ea438015c 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $cluster = "pla" || "to"; $name = "In" || "put"; 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 21c5d791ed0a..c29c4e6f3cdd 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $foo = CAST(Unicode::ToLower("PLATO"u) AS String); INSERT INTO yt: $foo.Output 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 fa4b8696ef3f..3a0a31659ca6 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ DEFINE ACTION $a($x) AS $foo = CAST(Unicode::ToLower($x) AS String); 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 8fa8376f944f..1c36271fd7ce 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $foo = CAST(Unicode::ToLower("PLATO"u) AS String); USE yt: $foo; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_nested_query_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_nested_query_/formatted.sql index 99f9092eedaf..f92e8bd49c8c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_nested_query_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_nested_query_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; DEFINE ACTION $action() AS diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_opt_args_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_opt_args_/formatted.sql index 6dc70983ef97..1e41b9121d07 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_opt_args_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_opt_args_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ DEFINE ACTION $action($a, $b?) AS SELECT $a + ($b ?? 0); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_udf_args_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_udf_args_/formatted.sql index 31bf0edb841f..af885991d83c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_udf_args_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_udf_args_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ DEFINE ACTION $f($x) AS SELECT $x; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-closure_action_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-closure_action_/formatted.sql index 1da6c09afcf1..84dcd3aef30c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-closure_action_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-closure_action_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ DEFINE ACTION $action($b, $c) AS $d = $b + $c; 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 5b94a5ef5fe8..774199e7f612 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $combineQueries = ($query, $list) -> { RETURN EvaluateCode( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-define_simple_action_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-define_simple_action_/formatted.sql index 037a14e17740..e2df18f8e99a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-define_simple_action_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-define_simple_action_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ DEFINE ACTION $action($b, $c) AS $d = $b + $c; 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 8f438ddc5a5b..5e92f404b60b 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; DEFINE ACTION $aaa($z) AS 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 01b0fd953652..b06a38b85163 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $combineQueries = ($query, $list) -> { RETURN EvaluateCode( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-discard_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-discard_/formatted.sql index ef4f964c8041..b96ddbaa267d 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-discard_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-discard_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ DEFINE SUBQUERY $a() AS $_x = SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-empty_do_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-empty_do_/formatted.sql index 7c12117bde5f..1d3df1622557 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-empty_do_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-empty_do_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ DO EMPTY_ACTION(); $action1 = EMPTY_ACTION; DO $action1(); 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 075981ccecaa..a86345781d2b 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $a = CAST(Unicode::ToUpper("T"u) AS String) || "able"; $b = CAST(Unicode::ToUpper("T"u) AS String) || "able"; 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 af9978c62f5d..b112c3640ab0 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,3 +1,4 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT 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 6699ea396d8d..4558b3436a95 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,3 +1,4 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT 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 a8e1634c6037..f552a995278e 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 @@ -1,4 +1,5 @@ -/* yt can not *//* custom error: Expected data or optional of data, but got: List */ +/* yt can not */ +/* custom error: Expected data or optional of data, but got: List */ USE plato; $n = ["foo"]; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_atom_wrong_type_param_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_atom_wrong_type_param_/formatted.sql index 098515d285ba..ec1dc67bda82 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_atom_wrong_type_param_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_atom_wrong_type_param_/formatted.sql @@ -1,4 +1,5 @@ -/* yt can not *//* custom error: Expected data or optional of data, but got optional of: List */ +/* yt can not */ +/* custom error: Expected data or optional of data, but got optional of: List */ USE plato; DECLARE $n AS List?; 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 4c67cdf4eb86..3f6254e7b555 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $capture = Re2::Capture(".*" || CAST(Unicode::ToLower("(\\D+)"u) AS String) || ".*"); SELECT 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 a47fc0e75202..81e1d336fe62 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT EvaluateCode(FuncCode("Int32", AtomCode("1"))); $inc = EvaluateCode( 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 dbbf8a606f13..f503347bde70 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT EvaluateCode( ReprCode(1) 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 ee9ede11aedc..b21d3f39b380 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $x = CAST(Unicode::ToLower("foo"u) AS String); @@ -50,7 +51,7 @@ FROM Input AS a JOIN Input AS b -ON (a.$x = b.$x) +ON (a.$x == b.$x) 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 089f6ffefb41..c91506157784 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $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 1f5bf9701c34..8dd6d619971f 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $a = ListMap(ListFromRange(0, 2), ($_x) -> (CAST(Unicode::ToUpper("i"u) AS String) || "nput")); 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 0b8ef1bf20ed..133b38ab44e1 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,3 +1,4 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT 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 c79f632c4c23..29cd0dee7957 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $list = AsList(AsStruct(1 AS One, "2" AS Two), AsStruct(3 AS One, "4" AS Two)); SELECT 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 0df3978d6535..85f0e39603b1 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $arg1 = "" || ""; $arg2 = ($_item) -> { 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 8812fbe25026..778b9ba7d30a 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; SELECT 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 3e53daafa6e5..cd5415d83317 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; PRAGMA yt.FolderInlineItemsLimit = "0"; @@ -9,7 +10,7 @@ $list = ( SELECT Path FROM folder("") - WHERE Type = "table" + WHERE 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 f7ae2a30f5be..8988709a9bd2 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; PRAGMA yt.FolderInlineItemsLimit = "0"; $script = @@ @@ -14,7 +15,7 @@ $list = ( SELECT Path FROM folder("") - WHERE Type = "table" AND $callable(Path) + WHERE Type == "table" AND $callable(Path) LIMIT 30 ) ); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_for_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_for_/formatted.sql index da96a6fb1ce9..b292df6cde0a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_for_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_for_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; DEFINE ACTION $action1($x) AS diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_for_over_subquery_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_for_over_subquery_/formatted.sql index fe8674c1763c..016dea3d95ce 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_for_over_subquery_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_for_over_subquery_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $list = ( 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 b1667544220f..f0ac90828aad 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; DEFINE ACTION $action1($x) AS 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 30f7b7a0d409..6417c38e065f 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $list = ListTake(AsList("Input"), 0); 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 f0ff8155a334..c8416f1b58f3 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $a = CAST(Unicode::ToUpper("o"u) AS String) || "utput"; $b = CAST(Unicode::ToUpper("i"u) AS String) || "nput"; 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 d1ddf9641aae..1d0e4d5c1a8f 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $a = ( 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 ad46c4ac7803..3939200414be 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $arg1 = "" || ""; $arg2 = CAST(Unicode::ToUpper("i"u) AS String) || "npu_"; 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 3b5081f3e3e2..b1f883f82a20 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 @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* custom error: Table "Output" is used before commit */ +/* syntax version 1 */ +/* postgres can not */ +/* custom error: Table "Output" is used before commit */ USE plato; INSERT INTO Output diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_percentile_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_percentile_/formatted.sql index 610dc0c03443..9a7572362422 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_percentile_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_percentile_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $x = 1.0 / length(CAST(Unicode::ToUpper("ab"u) AS String)); SELECT 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 97fcce603905..7ece483ab12e 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,3 +1,4 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $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_python3_ann_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_python3_ann_/formatted.sql index 324736c06c5f..1f07588c8a0d 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_python3_ann_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_python3_ann_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $script = @@ from yql.typing import * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_python3_signature_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_python3_signature_/formatted.sql index 54f21f7a34e3..cec2c1863836 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_python3_signature_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_python3_signature_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $script = @@ def f(x, y): """ diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_python_signature_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_python_signature_/formatted.sql index 9f3ce03a5dfb..ba9400b04d02 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_python_signature_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_python_signature_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $script = @@ def f(x, y): """ 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 e7b3e0d5c884..c708a7f80447 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $arg1 = "" || ""; $arg2 = CAST(Unicode::ToUpper("i"u) AS String) || "nput"; 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 61a003042e57..5d8d5683f9c1 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $arg1 = "" || ""; $arg2 = (Unicode::ToUpper("i") ?? "") || "npu."; 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 d949cefdc516..38794da69da9 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,3 +1,4 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT 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_result_label_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_result_label_/formatted.sql index ab9c25dedc57..16e778147980 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_result_label_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_result_label_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $x = CAST(Unicode::ToUpper("foo"u) AS String); SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_sample_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_sample_/formatted.sql index b59f5462c8fb..0a48cee84d3e 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_sample_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_sample_/formatted.sql @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ +/* syntax version 1 */ +/* postgres can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ $x = 1.0 / 3; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_skip_take_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_skip_take_/formatted.sql index 8301e7d487a6..1195824b00a2 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_skip_take_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_skip_take_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; SELECT 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 30c8bc5b05c8..a7ca4b2a508f 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $x = "Input"; 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 df2385fa4a1b..9fc83bda558a 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,3 +1,4 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT 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 350aca6ec680..1913ce46544b 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,3 +1,4 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT 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 a95875b9e7c4..6b849ac117f2 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 @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* custom error: Table "Output" does not exist */ +/* syntax version 1 */ +/* postgres can not */ +/* custom error: Table "Output" does not exist */ USE plato; INSERT INTO Output @@ -14,8 +16,7 @@ $c = EvaluateCode(ReprCode(FormatType(TypeOf($input)))); SELECT $c; -INSERT INTO Output - WITH TRUNCATE +INSERT INTO Output WITH TRUNCATE SELECT 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 abe2b4d31957..adbc9c1f82fb 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 @@ -1,7 +1,9 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $myAddSuffix = ($row, $value) -> { $type = TypeOf($row); + --$type=Struct; $lambda = EvaluateCode( LambdaCode( 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 316573b43c7e..c37c8231caa0 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $a = ( 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 a00dcbd4f74f..323c12f4c166 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $vt = ParseType("Variant"); SELECT 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 c565cbfe9d78..2a360696c7bd 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $keep_only_last = ($row) -> { $members = ListFilter(StructMembers($row), ($x) -> (FIND($x, "key") IS NOT NULL)); 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 228ac3c38a29..787f29d49095 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-evaluate_queries_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-evaluate_queries_/formatted.sql index 7c06f6ec54b3..1fe5f0a88ec1 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-evaluate_queries_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-evaluate_queries_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $s = ( 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 34f2c46b0ef8..ab3e20f52019 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,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* kikimr can not - range not supported */ +/* syntax version 1 */ +/* postgres can not */ +/* kikimr can not - range not supported */ PRAGMA library("lib1.sql"); IMPORT lib1 SYMBOLS $action; DO $action("Input"); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-inline_action_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-inline_action_/formatted.sql index d89982ae950f..9558e50ea6ba 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-inline_action_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-inline_action_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ DO BEGIN SELECT 1; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-insert_after_eval_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-insert_after_eval_/formatted.sql index 71a27fb97ad6..0051e1de916a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-insert_after_eval_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-insert_after_eval_/formatted.sql @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* multirun can not */ +/* syntax version 1 */ +/* postgres can not */ +/* multirun can not */ USE plato; $s1 = ( @@ -13,8 +15,7 @@ $s2 = ( FROM Output ); -INSERT INTO Output - WITH truncate +INSERT INTO Output WITH truncate SELECT EvaluateExpr($s1) AS a, EvaluateExpr($s2) AS b; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-insert_after_eval_xlock_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-insert_after_eval_xlock_/formatted.sql index cf90cc8d7411..dd4cb9f88760 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-insert_after_eval_xlock_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-insert_after_eval_xlock_/formatted.sql @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* multirun can not */ +/* syntax version 1 */ +/* postgres can not */ +/* multirun can not */ USE plato; $s1 = ( @@ -15,8 +17,7 @@ $s2 = ( WITH xlock ); -INSERT INTO Output - WITH truncate +INSERT INTO Output WITH truncate SELECT EvaluateExpr($s1) AS a, EvaluateExpr($s2) AS b; 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 a4f2ec2b4b34..0a22908f73e2 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 @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* multirun can not */ +/* syntax version 1 */ +/* postgres can not */ +/* multirun can not */ USE plato; $list = ( @@ -8,15 +10,14 @@ $list = ( SELECT Path FROM folder("") - WHERE Type = "table" AND Path LIKE "Input%" + WHERE Type == "table" AND Path LIKE "Input%" ORDER BY Path DESC LIMIT 30 ) ); -INSERT INTO Output - WITH truncate +INSERT INTO Output WITH truncate SELECT count(*) FROM each($list); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-lambda_arg_count_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-lambda_arg_count_/formatted.sql index 734134517b8f..500c6c305a1c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-lambda_arg_count_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-lambda_arg_count_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT LambdaArgumentsCount(() -> (1)), LambdaArgumentsCount(($x) -> ($x + 1)), 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 90e5fbfa8016..0750a8c42159 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,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* custom error: Too large list for EVALUATE FOR, allowed: 3, got: 10 */ +/* syntax version 1 */ +/* postgres can not */ +/* custom error: Too large list for EVALUATE FOR, allowed: 3, got: 10 */ PRAGMA config.flags("EvaluateForLimit", "3"); EVALUATE FOR $_i IN ListFromRange(0, 10) 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 d9ad7be873c0..64a1d9b724a5 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 @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* custom error:Anonymous table "@Output1" must be materialized*/ +/* syntax version 1 */ +/* postgres can not */ +/* custom error:Anonymous table "@Output1" must be materialized*/ USE plato; $force_remove_members = ($struct, $to_remove) -> { $remover = EvaluateCode( @@ -27,16 +29,14 @@ $force_remove_members = ($struct, $to_remove) -> { DEFINE ACTION $func($input, $output) AS $jname = $output; - INSERT INTO @$jname - WITH truncate + INSERT INTO @$jname WITH truncate SELECT * FROM $input AS input; COMMIT; - INSERT INTO $output - WITH truncate + INSERT INTO $output WITH truncate SELECT AGG_LIST( $force_remove_members( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_action_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_action_/formatted.sql index 41fae1e06f1f..8f31e1b266a2 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_action_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_action_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ DEFINE ACTION $action($b, $c) AS DEFINE ACTION $aaa() AS SELECT 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 406698d02bd7..27015f31c3c9 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $make_struct = CALLABLE ( Callable<(String) -> Struct>, ($_string) -> { diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_subquery_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_subquery_/formatted.sql index 85fbc26686b9..9781807bcc02 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_subquery_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_subquery_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; DEFINE SUBQUERY $q($name) AS diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-parallel_for_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-parallel_for_/formatted.sql index 28d1a6a7c573..f4666e89f5f9 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-parallel_for_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-parallel_for_/formatted.sql @@ -9,8 +9,7 @@ EVALUATE PARALLEL FOR $i IN [1, 2, 1, 2, 1] END DO; COMMIT; -INSERT INTO Output - WITH truncate +INSERT INTO Output WITH truncate SELECT a FROM Output 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 970e341ff445..e62b4dc237d2 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ DEFINE ACTION $dup($x) AS DO $x(); DO $x(); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-pass_subquery_as_param_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-pass_subquery_as_param_/formatted.sql index 0cb67d7497d1..908cc492086c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-pass_subquery_as_param_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-pass_subquery_as_param_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ DEFINE SUBQUERY $dup($x) AS SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-pending_arg_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-pending_arg_fail_/formatted.sql index e2a1a36fd917..02de6525ca73 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-pending_arg_fail_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-pending_arg_fail_/formatted.sql @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* custom error:Failed to evaluate unresolved argument: row. Did you use a column?*/ +/* syntax version 1 */ +/* postgres can not */ +/* custom error:Failed to evaluate unresolved argument: row. Did you use a column?*/ USE plato; SELECT 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 79754c2ab447..552a62476d8d 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $func = ($x) -> { RETURN $x == 1; }; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_for_select_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_for_select_/formatted.sql index 9fa68e320989..0204a1dd965b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_for_select_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_for_select_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ FOR $i IN Just(AsList(1, 2, 3)) DO BEGIN SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_format_type_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_format_type_/formatted.sql index 212c8fcc4f17..5adf49f5c1bb 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_format_type_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_format_type_/formatted.sql @@ -1,3 +1,4 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT FormatType(TypeHandle(TypeOf(1))); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_if_select_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_if_select_/formatted.sql index 0cb04a0724c5..b331c3f6a534 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_if_select_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_if_select_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; INSERT INTO @foo 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 d0db5440e762..746b7472223e 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ SELECT FormatCode( ListCode( 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 d898abcaf396..2c6506b5176b 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,3 +1,4 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ SELECT 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 9483430a6d6a..f64c2f5b193a 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,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ SELECT FormatCode(QuoteCode(AsAtom("foo"))), FormatCode(QuoteCode(AsTuple())), 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 49bb8833a4f8..19ff7afe391d 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $fact = EvaluateCode( Yql::Fold( ListFromRange(1, 11), diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_serialize_type_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_serialize_type_/formatted.sql index 381f52d0355b..74f0d286163c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_serialize_type_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_serialize_type_/formatted.sql @@ -1,3 +1,4 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT Yql::SerializeTypeHandle(TypeHandle(TypeOf(1))); 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 e567db2e6c15..01c57b239fc4 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT TypeKind(TypeHandle(TypeOf(1))), TypeKind(TypeHandle(TypeOf(AsList(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 36cf173064c5..2332e774d7b5 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $formatTagged = ($x) -> { RETURN AsStruct(FormatType($x.Base) AS Base, $x.Tag AS Tag) }; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-select_from_subquery_with_orderby_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-select_from_subquery_with_orderby_/formatted.sql index 025e6b04f58e..a18791caa665 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-select_from_subquery_with_orderby_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-select_from_subquery_with_orderby_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ DEFINE SUBQUERY $src() AS SELECT * 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 d225bf9e73cc..3a80775476d1 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; DEFINE SUBQUERY $q($name, $a) AS diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_accessnode_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_accessnode_/formatted.sql index 7b3ac5a72908..30c661c9f169 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_accessnode_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_accessnode_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ DEFINE SUBQUERY $foo() AS SELECT <|a: 1, b: 2|> AS s; 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 4c12219b6560..de017033e32f 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ DEFINE SUBQUERY $sub() AS SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_extend_over_extend_for_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_extend_over_extend_for_/formatted.sql index d89b6bf7df87..bd6c9d47540b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_extend_over_extend_for_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_extend_over_extend_for_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ DEFINE SUBQUERY $sub($i) AS SELECT $i AS x; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge1_/formatted.sql index 1f20d7257992..5362ff7249c6 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge1_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge1_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ DEFINE SUBQUERY $sub1() AS SELECT 1 AS x; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge2_/formatted.sql index 9475e733064c..2fdd018f2118 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge2_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge2_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ DEFINE SUBQUERY $sub($i) AS SELECT $i AS x; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge_evaluate_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge_evaluate_/formatted.sql index cf4bc5e4de3b..c4c1c2d135d1 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge_evaluate_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge_evaluate_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; DEFINE SUBQUERY $sub1($i, $j?) AS 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 3a09fb832dc3..47adf7517c4f 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; DEFINE SUBQUERY $get_tables_list($dir) AS 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 898addbeb3b8..14bf11dedbda 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; DEFINE SUBQUERY $s($_i) AS diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_opt_args_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_opt_args_/formatted.sql index 5b0db96f21a3..5b4be2eae6c1 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_opt_args_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_opt_args_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ DEFINE SUBQUERY $sub($a, $b?) AS SELECT $a + ($b ?? 0); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_orderby0_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_orderby0_/formatted.sql index 311eead752dd..8ce3c88d5a3f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_orderby0_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_orderby0_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ DEFINE SUBQUERY $sub() AS 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 0bbdac3b9668..dda471d20986 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ DEFINE SUBQUERY $sub() AS SELECT * 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 b787b7a09cb6..25bfd19db2b1 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ DEFINE SUBQUERY $sub() AS SELECT * 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 73801928540a..ad9f33320b92 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; PRAGMA yt.EvaluationTableSizeLimit = "1"; 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 57fc2f316cc7..f454a486c961 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; $a = 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 4d67f7cea647..54f76913fe05 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; SELECT 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 85452e3b3110..fb6a96f9b114 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-avg_numeric_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-avg_numeric_/formatted.sql index 05d4e10bfb9f..d9668b618259 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-avg_numeric_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-avg_numeric_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-avg_numeric_opt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-avg_numeric_opt_/formatted.sql index e38d9b0a1f2e..583cd24e7f46 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-avg_numeric_opt_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-avg_numeric_opt_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; SELECT 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 c64e77ad9246..29268b978a5e 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-count_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-count_/formatted.sql index 4cccb40f7765..40f8c71c7710 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-count_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-count_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-max_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-max_/formatted.sql index 0b9ccb2707fa..5bc93328d7d5 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-max_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-max_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-min_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-min_/formatted.sql index f8cee39d392a..b6e020cfec2a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-min_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-min_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-opt_column_subset_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-opt_column_subset_/formatted.sql index b51739e13e3f..3335c51db672 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-opt_column_subset_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-opt_column_subset_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; $x = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-opt_len_count_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-opt_len_count_/formatted.sql index 043f1dbed307..ec7535164b97 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-opt_len_count_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-opt_len_count_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-opt_len_count_all_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-opt_len_count_all_/formatted.sql index 99ae51c6e991..35505e444396 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-opt_len_count_all_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-opt_len_count_all_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-opt_len_count_distinct_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-opt_len_count_distinct_/formatted.sql index cbfe616e7426..4e45fd009a94 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-opt_len_count_distinct_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-opt_len_count_distinct_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-opt_len_count_null_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-opt_len_count_null_/formatted.sql index 9259a031016c..dd8b9e040c88 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-opt_len_count_null_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-opt_len_count_null_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-opt_sum_divide_by_zero_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-opt_sum_divide_by_zero_/formatted.sql index b79937131aee..1dec791d9adb 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-opt_sum_divide_by_zero_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-opt_sum_divide_by_zero_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-opt_sum_null_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-opt_sum_null_/formatted.sql index 7d3f5ac97fac..4d97b2f7adba 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-opt_sum_null_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-opt_sum_null_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-pg_int4_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-pg_int4_/formatted.sql index f4a889dca788..3a75bc89127b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-pg_int4_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-pg_int4_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-pg_int8_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-pg_int8_/formatted.sql index f90796f2f333..b66e2ab0c5c8 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-pg_int8_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-pg_int8_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-pg_text_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-pg_text_/formatted.sql index cf57d5f8442b..24aac5220055 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-pg_text_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-pg_text_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-some_notnull_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-some_notnull_/formatted.sql index f0800b7a771b..9c7cc0bbfb6f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-some_notnull_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-some_notnull_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-some_null_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-some_null_/formatted.sql index 7664aa3b1d23..4209e769d57e 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-some_null_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-some_null_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; SELECT 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 0c40fcdbb70d..50529a4fcb1e 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; SELECT 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 0cf490eb41f7..1316760a89c1 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_double_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_double_/formatted.sql index 5a5a96214379..0c254e2963f6 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_double_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_double_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_interval_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_interval_/formatted.sql index 5b8f773b2fe5..a129cd7e1d0a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_interval_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_interval_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_signed_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_signed_/formatted.sql index cc2ecea20979..92ea13a97580 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_signed_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_signed_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_type_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_type_/formatted.sql index b6127a07b1c4..cfa10bd73bde 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_type_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_type_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; $p = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_type_empty_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_type_empty_/formatted.sql index f322705c426d..429ca882bbad 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_type_empty_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_type_empty_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; $p = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_type_group_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_type_group_by_/formatted.sql index 74a4e9d74011..95574ef487e7 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_type_group_by_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_type_group_by_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; $p = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_unsigned_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_unsigned_/formatted.sql index 29cfa34f665f..d7fafe3ab2db 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_unsigned_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-sum_unsigned_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-table_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-table_/formatted.sql index bc7e4f5aec14..b2a5138bde0b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-table_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_apply-table_/formatted.sql @@ -1,6 +1,7 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; SELECT - count(if(key = 1, CAST(key AS string))) + count(if(key == 1, CAST(key AS string))) FROM plato.Input; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-avg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-avg_/formatted.sql index eb8ffa058bda..494165d349e2 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-avg_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-avg_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-avg_null_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-avg_null_/formatted.sql index 5dcbe4141e9b..2ba806b7c0da 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-avg_null_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-avg_null_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-avg_opt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-avg_opt_/formatted.sql index 660b23b87bbc..4d0da91b6337 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-avg_opt_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-avg_opt_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-count_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-count_/formatted.sql index 948b68d617af..06d20e890260 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-count_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-count_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-count_all_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-count_all_/formatted.sql index cd43c264fbf1..d724337c6403 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-count_all_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-count_all_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-count_all_null_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-count_all_null_/formatted.sql index 0f5138d6cace..885faaa9412e 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-count_all_null_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-count_all_null_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-count_all_opt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-count_all_opt_/formatted.sql index 5f12cc17c487..42b5ccc40276 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-count_all_opt_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-count_all_opt_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-count_null_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-count_null_/formatted.sql index cf76a96dcdd9..3b5dc337863f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-count_null_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-count_null_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-count_opt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-count_opt_/formatted.sql index c0dc34cb32b4..34e499801761 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-count_opt_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-count_opt_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-max_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-max_/formatted.sql index 98261670849e..bee02faa2a0a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-max_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-max_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-max_null_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-max_null_/formatted.sql index fdeeda844266..7941b3e75d7c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-max_null_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-max_null_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-max_opt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-max_opt_/formatted.sql index ecea4f3ca83f..f42e5a5b9a0f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-max_opt_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-max_opt_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-min_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-min_/formatted.sql index 6eb67bff18fa..3ed15bd0913f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-min_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-min_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-min_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-min_by_/formatted.sql index ec0f1446fe6f..9603779332e8 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-min_by_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-min_by_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-min_by_null_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-min_by_null_/formatted.sql index bad658c61a88..9eebe1213e67 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-min_by_null_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-min_by_null_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-min_by_opt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-min_by_opt_/formatted.sql index d35c4bb18151..81648fefbfb6 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-min_by_opt_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-min_by_opt_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-min_null_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-min_null_/formatted.sql index 539b6aa816d1..3b32213aa750 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-min_null_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-min_null_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-min_opt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-min_opt_/formatted.sql index 7acd838924d1..e2136ffb76c8 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-min_opt_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-min_opt_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-percentile_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-percentile_/formatted.sql index 5bda05e4667b..aa38a7f5a859 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-percentile_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-percentile_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-percentile_null_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-percentile_null_/formatted.sql index 8e0cd324620b..43f038a3aed3 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-percentile_null_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-percentile_null_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-percentile_opt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-percentile_opt_/formatted.sql index 900cf5ef5678..8b13589b1090 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-percentile_opt_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-percentile_opt_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-sum_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-sum_/formatted.sql index 70e1f6083708..591d445c2302 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-sum_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-sum_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-sum_null_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-sum_null_/formatted.sql index 015ad6562a5c..6335ed449d37 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-sum_null_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-sum_null_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-sum_opt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-sum_opt_/formatted.sql index 6e2859869131..dc71d4c34ee2 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-sum_opt_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases-sum_opt_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-avg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-avg_/formatted.sql index 88447f0e32f5..c96663add3ae 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-avg_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-avg_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; $t = 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 3bf7664699bf..b71bdfc4b2ca 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; $t = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-count_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-count_/formatted.sql index 144f24276805..ce5a0843940e 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-count_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-count_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; $t = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-count_all_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-count_all_/formatted.sql index a4b1bc4bdf8c..2ac28e92e7de 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-count_all_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-count_all_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; $t = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-count_all_null_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-count_all_null_/formatted.sql index 30c4be1c5df6..711fc80db657 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-count_all_null_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-count_all_null_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; $t = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-count_all_opt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-count_all_opt_/formatted.sql index 9bf9b4edaaca..1360a93083e7 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-count_all_opt_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-count_all_opt_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; $t = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-count_null_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-count_null_/formatted.sql index 5c694ed44039..759153011a60 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-count_null_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-count_null_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; $t = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-count_opt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-count_opt_/formatted.sql index 5001f79226e9..3af210ee4f9b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-count_opt_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-count_opt_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; $t = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-max_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-max_/formatted.sql index 1df035fe04a8..560e5fe8eddc 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-max_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-max_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; $t = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-min_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-min_/formatted.sql index 7e827ebe260d..5c138948e7c7 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-min_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-min_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; $t = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-some_notnull_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-some_notnull_/formatted.sql index f068f22fa4e4..fcc6a4587a27 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-some_notnull_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-some_notnull_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; $t = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-some_null_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-some_null_/formatted.sql index 384a4a48225c..132ea9cb7bf6 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-some_null_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-some_null_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; $t = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-sum_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-sum_/formatted.sql index d3d316a384b2..1aea3b1fd2e9 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-sum_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-sum_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; $t = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-sum_null_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-sum_null_/formatted.sql index 016f09b490d7..85fd15b5d8ae 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-sum_null_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-sum_null_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; $t = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-sum_opt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-sum_opt_/formatted.sql index 9ddb84c04dc0..41d63a366a77 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-sum_opt_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_agg_phases_agg_apply-sum_opt_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA EmitAggApply; $t = 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 9471203bd664..d388cb68f674 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a)); $f = AGGREGATION_FACTORY("avg"); 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 d2ad0fa6ba51..396fca4cf0b2 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a), AsStruct(1 AS a)); $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 22ca7a3b8379..b9277028e90b 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a)); $f = AGGREGATION_FACTORY("avg_if"); 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 edcb9bc67183..0fed8a2963a2 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = AsList(AsStruct(1u AS a), AsStruct(2u AS a)); $f = AGGREGATION_FACTORY("bitand"); 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 648f50ee1e50..c624e863edd6 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = AsList(AsStruct(1u AS a), AsStruct(2u AS a)); $f = AGGREGATION_FACTORY("bitor"); 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 298c21bef484..7de1024fd385 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = AsList(AsStruct(1u AS a), AsStruct(2u AS a)); $f = AGGREGATION_FACTORY("bitxor"); 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 7e6ce1c82c5e..7dceb8601b2b 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = AsList(AsStruct(TRUE AS a), AsStruct(FALSE AS a)); $f = AGGREGATION_FACTORY("booland"); 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 ea8e41863e0b..a1e37a761e1d 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = AsList(AsStruct(TRUE AS a), AsStruct(FALSE AS a)); $f = AGGREGATION_FACTORY("boolor"); 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 d071eb803398..153526da2fd8 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = AsList( AsStruct(7 AS a), AsStruct(4 AS 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 15a1ec365d7a..de28f11dd595 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = AsList( AsStruct(1 AS key, 101 AS value), AsStruct(6 AS key, 34 AS value), 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 586809d3244f..b5f851670e77 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $factory = AGGREGATION_FACTORY("sum"); SELECT 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 d961d1995d81..8477294dad95 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT ListAggregate([], 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 d70d3a3a6782..171e0f5fd9ab 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a)); $f = AGGREGATION_FACTORY("correlation"); 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 5ee2f84695da..96faf567b480 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a)); $f = AGGREGATION_FACTORY("count"); 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 85e5cbbc1beb..16b6666e7c9b 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = AsList(AsStruct(TRUE AS a), AsStruct(FALSE AS a)); $f = AGGREGATION_FACTORY("countif"); 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 c71617dbfd15..60e598da74bf 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = AsList(AsStruct(TRUE AS a), AsStruct(FALSE AS a)); $f = AGGREGATION_FACTORY("every"); 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 eb7d917e9f13..87ff0ec95b29 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $f = AGGREGATION_FACTORY("sum"); $g = AggregateFlatten($f); 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 8ba0d240bf05..c676f0271aaa 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a)); $f = AGGREGATION_FACTORY("histogram"); 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 1f83ce75dd27..59f57142ab72 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a)); $f = AGGREGATION_FACTORY("hll"); 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 22f3f1bb2c2b..d719e985202b 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a)); $f = AGGREGATION_FACTORY("linearhistogram"); 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 6f99437dbae7..4ce55a29a419 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a)); $f = AGGREGATION_FACTORY("aggregate_list"); 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 58bf23559c13..c6295281789e 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a)); $f = AGGREGATION_FACTORY("loghistogram"); 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 37ff799dc4bf..ae2c7930d38b 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a)); $f = AGGREGATION_FACTORY("logarithmichistogram"); 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 02422988081c..ed99b7b168c5 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a)); $f = AGGREGATION_FACTORY("max"); 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 0a9e2a2eef2d..dad4cee099c6 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = AsList( AsStruct(1 AS key, 200 AS value), AsStruct(2 AS key, 100 AS value) 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 ff7a39f2d35b..e208c61b733f 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a)); $f = AGGREGATION_FACTORY("median"); 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 6758d32217be..1b36354475ed 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a)); $f = AGGREGATION_FACTORY("min"); 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 50ba547a6e5d..88fb8111f0d9 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = AsList( AsStruct(1 AS key, 200 AS value), AsStruct(2 AS key, 100 AS value) 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 bf506a320067..68f3cb129669 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a)); $f = AGGREGATION_FACTORY("mode"); 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 7497a470066f..5a8deebb2610 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $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 45423bfdaaa2..1327ea2e90bb 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $input = SELECT AsList( 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 7fd10e8b7802..2fe3fc84e8cb 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $input = SELECT AsList( 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 09c1ccfc453c..5ad9b39284a4 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $data = AsList( AsStruct(AsList(1.0, 2.0) AS x), AsStruct(AsList(3.0, 4.0) AS x), 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 53b2d3a30217..ba738bef4f80 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT MULTI_AGGREGATE_BY(nums, AGGREGATION_FACTORY("minby")) FROM ( 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 75f3569e445e..fc07102c0b5f 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $data = AsList( AsStruct(AsStruct(1.0 AS a, 2 AS b) AS x), AsStruct(AsStruct(3.0 AS a, 4 AS b) AS x), 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 d1c247a85eb1..71c304569fd2 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $input = SELECT AsTuple( 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 0139a91ab1a3..081abb342456 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $data = AsList( AsStruct(AsTuple(1.0, 2) AS x), AsStruct(AsTuple(3.0, 4) AS x), 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 b127061e824d..282f0d19ef2a 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = AsList(AsStruct(1 AS a), AsStruct(1 AS a)); $f = AGGREGATION_FACTORY("some"); 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 70525da2416c..48e71e4e9b66 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a)); $f = AGGREGATION_FACTORY("stddev"); 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 08ca5ef391c8..f53c5ce9dbcc 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a)); $f = AGGREGATION_FACTORY("sum_if"); 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 8d23f997cd02..5a5a25d72234 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = AsList( AsStruct(7 AS a), AsStruct(4 AS 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 7e297c300f52..ee0d68065fcf 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = AsList( AsStruct(1 AS key, 101 AS value), AsStruct(6 AS key, 34 AS value), 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 298bf6c1d0d1..639146d19c3e 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $f = AGGREGATION_FACTORY("sum"); $g = AggregateTransformInput($f, ($x) -> (CAST($x AS Int32))); $h = AggregateTransformInput($f, ($x) -> ($x * 2)); 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 4077dfe93383..ffddf73b4df6 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $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 214cfbbea12d..8d3e95ad70c8 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 @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not */-- count example +/* syntax version 1 */ +/* postgres can not */ +-- count example $create = ($_item, $_parent) -> { RETURN 1 }; 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 d6247097f03e..5d7b4fe1f540 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 @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not */-- count example +/* syntax version 1 */ +/* postgres can not */ +-- count example $create = ($_item, $_parent) -> { RETURN 1 }; 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 4a3c8772b1ed..898e08cccfe8 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = AsList(AsStruct(1 AS a), AsStruct(2 AS a)); $f = AGGREGATION_FACTORY("variance"); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_full_table_list_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_full_table_list_/formatted.sql index 013032f3fb76..cb584fa30d18 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_full_table_list_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_full_table_list_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT agglist(x) FROM ( 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 0de86f9eb6e6..4d9273df2b25 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; PRAGMA EmitAggApply; PRAGMA yt.UseAggPhases = "1"; 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 5ff2dc204209..4470ec22b69d 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; PRAGMA EmitAggApply; PRAGMA yt.UseAggPhases = "1"; 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 e527c009a22f..a13676612adc 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; PRAGMA EmitAggApply; PRAGMA yt.UseAggPhases = "1"; 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 35c792e816cf..eb99d181c514 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; SELECT 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 fc904ff0bce0..5f066596df8f 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_distinct_expr_with_udf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_distinct_expr_with_udf_/formatted.sql index 6a9f9a620c88..030834eb9c21 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_distinct_expr_with_udf_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_distinct_expr_with_udf_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; SELECT 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 c447793e6778..98a12627b02c 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT key, AGGREGATE_LIST(DISTINCT CAST(subkey AS Int32))[COUNT(DISTINCT CAST(subkey AS Uint64)) - 1] AS foo diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_distinct_list_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_distinct_list_/formatted.sql index a32000baeb71..8b7b3c1b0e6b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_distinct_list_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_distinct_list_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; INSERT INTO @foo diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_distinct_struct_access_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_distinct_struct_access_/formatted.sql index 4edb93b9707c..c518bcf68460 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_distinct_struct_access_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_distinct_struct_access_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $withStruct = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_inmem_distinct_list_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_inmem_distinct_list_/formatted.sql index b362fe05ffb1..21f08bf85758 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_inmem_distinct_list_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_inmem_distinct_list_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT listlength(aggregate_list(DISTINCT x)) AS c FROM ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_inmem_list_in_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_inmem_list_in_key_/formatted.sql index 1909fbf32090..5a2f79a36c17 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_inmem_list_in_key_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_inmem_list_in_key_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT x, count(*) AS c diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_key_column_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_key_column_/formatted.sql index 547eb9d7cb09..14b0f0b9e771 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_key_column_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_key_column_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT Some(key) AS some_key, FROM plato.Input diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_list_in_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_list_in_key_/formatted.sql index 4261a842ac10..93d0ecab9b21 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_list_in_key_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_list_in_key_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; INSERT INTO @foo diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_udf_nested_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_udf_nested_/formatted.sql index 1b2e79c0eadc..7cd14fb03512 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_udf_nested_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_udf_nested_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT String::HexText(String::HexText(value)) AS value FROM plato.Input4 diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_with_deep_aggregated_column_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_with_deep_aggregated_column_/formatted.sql index 57618a642f06..b74d6ece8910 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_with_deep_aggregated_column_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_with_deep_aggregated_column_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $data = ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_with_lambda_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_with_lambda_/formatted.sql index 9761eccfba7b..4ac2c46aca40 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_with_lambda_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_with_lambda_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $empty = ($list) -> { RETURN ListCreate(TypeOf($list[0])); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_with_lambda_inside_avg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_with_lambda_inside_avg_/formatted.sql index d4824cfefa73..78c3f2a6750c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_with_lambda_inside_avg_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_with_lambda_inside_avg_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $cast_to_double = ($column) -> { RETURN CAST($column AS Double); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregation_by_udf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregation_by_udf_/formatted.sql index b94f67d1cef1..dc1a0b851eb8 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregation_by_udf_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregation_by_udf_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT sum(Math::Pow(CAST(subkey AS double), 2)) FROM plato.Input4; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregation_with_named_node_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregation_with_named_node_/formatted.sql index df6054e631a9..738f0800d8fc 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregation_with_named_node_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregation_with_named_node_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $data = ( SELECT CAST(key AS Uint32) ?? 0 AS key, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggrs_no_grouping_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggrs_no_grouping_/formatted.sql index e4917c9120ca..1c527d4551b0 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggrs_no_grouping_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggrs_no_grouping_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT count(key) AS keyCount, count(sub) AS subCount, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggrs_no_grouping_via_map_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggrs_no_grouping_via_map_/formatted.sql index d4462d3c00f7..994117d2eaa8 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggrs_no_grouping_via_map_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggrs_no_grouping_via_map_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA yt.PartitionByConstantKeysViaMap; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggrs_no_grouping_via_map_compact_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggrs_no_grouping_via_map_compact_/formatted.sql index af544732958a..be070298909d 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggrs_no_grouping_via_map_compact_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggrs_no_grouping_via_map_compact_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA yt.PartitionByConstantKeysViaMap; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-compare_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-compare_by_/formatted.sql index 5d5ce58bdc8b..3deef9e1d9e7 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-compare_by_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-compare_by_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT min_by(sub, key) AS min, max_by(value, sub) AS max, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-compare_by_nulls_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-compare_by_nulls_/formatted.sql index 99cbfb4143de..eabaed038db0 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-compare_by_nulls_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-compare_by_nulls_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $src = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-compare_by_tuple_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-compare_by_tuple_/formatted.sql index 2b29e6541270..4dd533a24505 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-compare_by_tuple_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-compare_by_tuple_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT key, min_by(AsTuple(subkey, value), AsTuple(subkey, value)) AS min, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-compare_tuple_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-compare_tuple_/formatted.sql index 1099e25fda15..ed999b4cae2d 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-compare_tuple_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-compare_tuple_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT key, min(AsTuple(subkey, value)) AS min, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-count_distinct_with_filter_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-count_distinct_with_filter_/formatted.sql index ee1b94468af1..4e6fb05333e3 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-count_distinct_with_filter_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-count_distinct_with_filter_/formatted.sql @@ -1,4 +1,4 @@ SELECT count(DISTINCT value) AS Count FROM plato.Input5 -WHERE `key` = '150'; +WHERE `key` == '150'; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_column_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_column_/formatted.sql index a30597d7d475..f8cb365f0b1a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_column_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_column_/formatted.sql @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not */-- order to have same on yt and yamr +/* syntax version 1 */ +/* postgres can not */ +-- order to have same on yt and yamr SELECT count(1), z diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_column_alias_reuse_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_column_alias_reuse_/formatted.sql index 7a833f300763..ea3822b8e25a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_column_alias_reuse_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_column_alias_reuse_/formatted.sql @@ -1,6 +1,9 @@ -/* syntax version 1 *//* postgres can not */--INSERT INTO Output +/* syntax version 1 */ +/* postgres can not */ +--INSERT INTO Output SELECT a.key AS kk, + -- key as kkk, aggregate_list(subkey) FROM plato.Input4 diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_column_alias_reuse_for_join_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_column_alias_reuse_for_join_/formatted.sql index 50360a981efd..2f470b63ac25 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_column_alias_reuse_for_join_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_column_alias_reuse_for_join_/formatted.sql @@ -1,6 +1,9 @@ -/* syntax version 1 *//* postgres can not */--INSERT INTO Output +/* syntax version 1 */ +/* postgres can not */ +--INSERT INTO Output SELECT a.key AS kk, + -- kk, aggregate_list(b.subkey) FROM plato.Input diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_cube_duo_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_cube_duo_/formatted.sql index d8aca439b183..186c1d9c4930 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_cube_duo_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_cube_duo_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT sum(length(value)), key, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_cube_expr_trio_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_cube_expr_trio_/formatted.sql index 82095213f6dd..ccdbd7d8907d 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_cube_expr_trio_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_cube_expr_trio_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA sampleselect; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_cube_grouping_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_cube_grouping_/formatted.sql index e6ce30b36c21..7b424680a68e 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_cube_grouping_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_cube_grouping_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT sum(length(value)) AS s, m0, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_cube_grouping_and_expr_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_cube_grouping_and_expr_/formatted.sql index b25fe6ed0ec5..dc056eca8b02 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_cube_grouping_and_expr_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_cube_grouping_and_expr_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT key, subkey, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_cube_join_count_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_cube_join_count_/formatted.sql index 9aaee955e5ca..aa3ab82bd25e 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_cube_join_count_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_cube_join_count_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA sampleselect; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_/formatted.sql index 44f8fedd4f2d..9859e806c924 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT sum(CAST(subkey AS uint32)) AS s FROM plato.Input diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_alias_on_subexp_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_alias_on_subexp_/formatted.sql index ca892cfe1333..1003c063edaa 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_alias_on_subexp_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_alias_on_subexp_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; --INSERT INTO Output diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_and_having_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_and_having_/formatted.sql index a34c3f480975..47b86b434da0 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_and_having_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_and_having_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT count(*) AS count, mod_sk diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_columns_reuse_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_columns_reuse_/formatted.sql index 089bc8f0198e..4330a31d0eb5 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_columns_reuse_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_columns_reuse_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; --INSERT INTO Output diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_dict_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_dict_/formatted.sql index 809d1d2d62f0..2bd1a6d96f1a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_dict_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_dict_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $data_dict = ( SELECT mod, 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 de2ee12cd213..8e58838fcf21 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT count(*) AS s FROM plato.Input diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_mul_col_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_mul_col_/formatted.sql index 89e7927db5ca..cf1f99754f13 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_mul_col_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_mul_col_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT count(*) AS count, mod_sk + mod_k AS mod_sum diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_only_join_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_only_join_/formatted.sql index 7424c533dc25..138426562012 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_only_join_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_only_join_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT aggregate_list(a.k), aval diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_order_by_expr_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_order_by_expr_/formatted.sql index be9ec97baff5..f5649461ca16 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_order_by_expr_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_order_by_expr_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT sum(CAST(key AS uint32)) AS keysum FROM plato.Input diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_semi_join_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_semi_join_/formatted.sql index 6999f2571880..b6ec83e7247c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_semi_join_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_semi_join_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT ListSort(aggregate_list(b.uk)), ListSort(aggregate_list(b.uk)), diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_with_join_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_with_join_/formatted.sql index da55208c7c39..a0043ddbe376 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_with_join_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_with_join_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA sampleselect; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_with_where_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_with_where_/formatted.sql index 25ca39ee301f..2f04352649b6 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_with_where_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_expr_with_where_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT ki, count(1) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_alt_duo_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_alt_duo_/formatted.sql index bdbfbb081a6b..b1a084510cdd 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_alt_duo_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_alt_duo_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT sum(length(value)), key, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_and_having_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_and_having_/formatted.sql index ed3269742d0c..3979a71ba670 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_and_having_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_and_having_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; --INSERT INTO Output diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_duo_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_duo_/formatted.sql index 20547e1a5c27..29a129f4bc3d 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_duo_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_duo_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT sum(length(value)), key, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_few_empty_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_few_empty_/formatted.sql index 3dcf0ec4dcec..81a3df28a3ec 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_few_empty_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_few_empty_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT count(1), key, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_flatten_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_flatten_/formatted.sql index ad10340e2a19..734bf95f7512 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_flatten_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_flatten_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $input = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_flatten_columns_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_flatten_columns_/formatted.sql index 4c5ba745b081..c25b4a85d7a4 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_flatten_columns_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_flatten_columns_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $input = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_flatten_expr_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_flatten_expr_/formatted.sql index b3d115f920e6..96b4c68e3b16 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_flatten_expr_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_flatten_expr_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $input = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_grouping_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_grouping_/formatted.sql index 80e38ad6bf0d..bd7606b16d28 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_grouping_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_grouping_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT count(1), key_first, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_join_aliases_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_join_aliases_/formatted.sql index 953dac3b7f0e..13c0b2573ad3 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_join_aliases_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_join_aliases_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT k1, k2, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_simp_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_simp_/formatted.sql index 6c74e0e45ea2..429b4e9fafc8 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_simp_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_simp_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT sum(length(value)), key, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_subselect_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_subselect_/formatted.sql index 749d2a788abf..edf161f45f9a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_subselect_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_subselect_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $sub = ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_subselect_asterisk_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_subselect_asterisk_/formatted.sql index e11004accb2c..6c59104f0613 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_subselect_asterisk_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_subselect_asterisk_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $sub = ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_with_rollup_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_with_rollup_/formatted.sql index 030d54d64d7c..371bb211a753 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_with_rollup_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_with_rollup_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; --insert into Output 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 0c9ad4b0e3db..f40c06b767ec 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 @@ -1,4 +1,7 @@ -/* syntax version 1 *//* postgres can not *//* ytfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* ytfile can not */ +/* yt can not */ PRAGMA dq.AnalyticsHopping = "true"; SELECT 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 376d4497edd2..6398f4b5b1f9 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 @@ -1,4 +1,7 @@ -/* syntax version 1 *//* postgres can not *//* ytfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* ytfile can not */ +/* yt can not */ PRAGMA dq.AnalyticsHopping = "true"; SELECT 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 080f8d363985..5cbba31a3208 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 @@ -1,4 +1,10 @@ -/* Test is broken for now *//* syntax version 1 *//* postgres can not *//* ytfile can not *//* yt can not *//* dq can not *//* dqfile can not */ +/* Test is broken for now */ +/* syntax version 1 */ +/* postgres can not */ +/* ytfile can not */ +/* yt can not */ +/* dq can not */ +/* dqfile can not */ PRAGMA dq.AnalyticsHopping = "true"; SELECT 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 193f0541539c..ce33eda65cd3 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 @@ -1,4 +1,10 @@ -/* Test is broken for now *//* syntax version 1 *//* postgres can not *//* ytfile can not *//* yt can not *//* dq can not *//* dqfile can not */ +/* Test is broken for now */ +/* syntax version 1 */ +/* postgres can not */ +/* ytfile can not */ +/* yt can not */ +/* dq can not */ +/* dqfile can not */ PRAGMA dq.AnalyticsHopping = "true"; SELECT 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 8c70f377fae8..5210482bbb5d 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 @@ -1,4 +1,7 @@ -/* syntax version 1 *//* postgres can not *//* ytfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* ytfile can not */ +/* yt can not */ PRAGMA dq.AnalyticsHopping = "true"; SELECT 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 aa104028556a..25beaf4ba097 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 @@ -1,4 +1,7 @@ -/* syntax version 1 *//* postgres can not *//* ytfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* ytfile can not */ +/* yt can not */ PRAGMA dq.AnalyticsHopping = "true"; SELECT 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 199a6256a688..91feb1abed4b 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 @@ -1,4 +1,7 @@ -/* syntax version 1 *//* postgres can not *//* ytfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* ytfile can not */ +/* yt can not */ PRAGMA dq.AnalyticsHopping = "true"; SELECT 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 0f0770da1a3b..48287a0a9cc2 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 @@ -1,4 +1,10 @@ -/* Test is broken for now *//* syntax version 1 *//* postgres can not *//* ytfile can not *//* yt can not *//* dq can not *//* dqfile can not */ +/* Test is broken for now */ +/* syntax version 1 */ +/* postgres can not */ +/* ytfile can not */ +/* yt can not */ +/* dq can not */ +/* dqfile can not */ PRAGMA dq.AnalyticsHopping = "true"; SELECT 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 221d62849165..35f8e191cd22 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 @@ -1,4 +1,7 @@ -/* syntax version 1 *//* postgres can not *//* ytfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* ytfile can not */ +/* yt can not */ PRAGMA dq.AnalyticsHopping = "true"; SELECT 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 d148be89c00a..bc347b9a8e2e 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 @@ -1,4 +1,7 @@ -/* syntax version 1 *//* postgres can not *//* ytfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* ytfile can not */ +/* yt can not */ PRAGMA dq.AnalyticsHopping = "true"; SELECT 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 a8a18e25fb8d..3b69b85086c9 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 @@ -1,4 +1,7 @@ -/* syntax version 1 *//* postgres can not *//* ytfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* ytfile can not */ +/* yt can not */ $input = SELECT * 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 81246596035d..7669836508da 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 @@ -1,4 +1,7 @@ -/* syntax version 1 *//* postgres can not *//* ytfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* ytfile can not */ +/* yt can not */ $input = SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_mul_gb_ru_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_mul_gb_ru_/formatted.sql index 9e8a16dac4d6..944b8dd624d3 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_mul_gb_ru_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_mul_gb_ru_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT sum(length(value)), vf, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_mul_gs_expr_and_column_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_mul_gs_expr_and_column_/formatted.sql index aa96c51ff522..aff88b08c2af 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_mul_gs_expr_and_column_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_mul_gs_expr_and_column_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; --insert into Output diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_mul_gs_gs_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_mul_gs_gs_/formatted.sql index 77d506df9086..b118834d9a3f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_mul_gs_gs_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_mul_gs_gs_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT count(1), kf, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_mul_gs_ru_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_mul_gs_ru_/formatted.sql index ff1eca29d9dd..9b2a77fedc1b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_mul_gs_ru_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_mul_gs_ru_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT count(1), kf, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_mul_ru_ru_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_mul_ru_ru_/formatted.sql index 0325968041e5..bc9089527e44 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_mul_ru_ru_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_mul_ru_ru_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT count(1), kf, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_aggr_expr_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_aggr_expr_/formatted.sql index 6da33af60830..692a990c8585 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_aggr_expr_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_aggr_expr_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $input = ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_column_ref_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_column_ref_/formatted.sql index fbd8c6b8901f..e83f495ddde5 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_column_ref_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_column_ref_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $input = ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_column_ref_same_names_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_column_ref_same_names_/formatted.sql index 3b3df8217624..93ecb38847bd 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_column_ref_same_names_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_column_ref_same_names_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $input = ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_column_reuse_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_column_reuse_/formatted.sql index d341d224e24b..37cb7029f73f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_column_reuse_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_column_reuse_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $input = ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_duo_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_duo_/formatted.sql index 7ec6f97b52d3..e59f777aecba 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_duo_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_duo_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT sum(length(value)), key, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_duo_opt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_duo_opt_/formatted.sql index ef36d2579acd..07b5afb596e9 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_duo_opt_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_duo_opt_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT count(1), k, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_grouping_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_grouping_/formatted.sql index 161a469a9222..791853313236 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_grouping_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_grouping_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT sum(length(value)) AS s, m0, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_grouping_hum_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_grouping_hum_/formatted.sql index 482fca6df357..7ddca82844f7 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_grouping_hum_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_grouping_hum_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT count(1) AS elements, key_first, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_grouping_hum_bind_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_grouping_hum_bind_/formatted.sql index 4c54034eb94c..cb0c47f06d6a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_grouping_hum_bind_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_grouping_hum_bind_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $hum_gr_kv = ($grouping) -> { RETURN CASE $grouping WHEN 1 diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_key_check_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_key_check_/formatted.sql index 5cabe711faf0..b6568315cce0 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_key_check_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_key_check_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; --INSERT INTO Output diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_rename_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_rename_/formatted.sql index 15798c5c2041..9ed1ab44855c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_rename_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_rename_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $s = ( SELECT 1 AS x, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_udf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_udf_/formatted.sql index 46c5de73c92b..663b7e831904 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_udf_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_udf_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_with_filter_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_with_filter_/formatted.sql index e5e70800e92a..a70e4371b0f0 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_with_filter_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_with_filter_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; --insert into Output diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_ru_join_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_ru_join_/formatted.sql index ff5a395b3835..c41d1c263110 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_ru_join_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_ru_join_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA sampleselect; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_ru_join_agg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_ru_join_agg_/formatted.sql index 37ba96558604..0b6e52acd46d 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_ru_join_agg_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_ru_join_agg_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA sampleselect; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_ru_join_grouping_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_ru_join_grouping_/formatted.sql index c55f9f058348..76f7a9b9e4b4 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_ru_join_grouping_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_ru_join_grouping_/formatted.sql @@ -17,6 +17,6 @@ FROM Input AS a JOIN $t AS b -ON a.key = b.key +ON a.key == b.key GROUP BY ROLLUP (a.key, a.subkey); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_ru_join_qualified_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_ru_join_qualified_/formatted.sql index d3354ea407a2..d740a34d1134 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_ru_join_qualified_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_ru_join_qualified_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT k, b.subkey AS sk, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_ru_join_simple_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_ru_join_simple_/formatted.sql index 23affa335e24..3af0d286e631 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_ru_join_simple_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_ru_join_simple_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA sampleselect; SELECT 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 fc1792ed2c44..74797890b70c 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA sampleselect; PRAGMA config.flags("OptimizerFlags", "FieldSubsetEnableMultiusage"); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_ru_join_star_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_ru_join_star_/formatted.sql index c03031a65845..09b60f0375ce 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_ru_join_star_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_ru_join_star_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT * FROM plato.Input diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_/formatted.sql index c48a3cb86195..1870d8755c1d 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT user, MIN(ts) ?? 100500 AS session_start, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_aliases_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_aliases_/formatted.sql index e2650837fb49..f7661c0329d8 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_aliases_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_aliases_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT user, session_start, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_compact_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_compact_/formatted.sql index e5ddabbc5d8e..86fa050d650b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_compact_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_compact_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT user, MIN(ts) ?? 100500 AS session_start, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_distinct_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_distinct_/formatted.sql index a1a43e55adff..5f316da55e4c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_distinct_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_distinct_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT user, MIN(ts) ?? 100500 AS session_start, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_distinct_compact_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_distinct_compact_/formatted.sql index 99caa2529513..24c7958510c3 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_distinct_compact_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_distinct_compact_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT user, MIN(ts) ?? 100500 AS session_start, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_extended_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_extended_/formatted.sql index 78b011a9ed7d..199e12e432b3 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_extended_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_extended_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $init = ($row) -> (AsStruct($row.ts ?? 0 AS value, 1 AS count)); $calculate = ($_row, $state) -> ($state.value); -- split partition into two-element grooups, make session key to be cumulative sum of ts from partition start diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_extended_subset_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_extended_subset_/formatted.sql index ead2074b0462..891d83b2968c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_extended_subset_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_extended_subset_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $init = ($row) -> (AsStruct($row.ts ?? 0 AS value, 1 AS count)); $calculate = ($_row, $state) -> ($state.value); -- split partition into two-element grooups, make session key to be cumulative sum of ts from partition start 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 b76bd95d985a..0f160b2d8bdf 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ $timeout = 60 * 30; $init = ($row) -> (AsTuple($row.unixtime, $row.unixtime, $row.video_content_id)); $update = ($row, $state) -> { diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_nopush_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_nopush_/formatted.sql index 60af046b1bae..6ebb49936dbe 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_nopush_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_nopush_/formatted.sql @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* yt can not */ SELECT * FROM ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_only_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_only_/formatted.sql index 1d2cc54ac188..9ea299c5e120 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_only_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_only_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT MIN(ts) ?? 100500 AS session_start, FROM plato.Input diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_only_distinct_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_only_distinct_/formatted.sql index f791791adfaa..b1ab03d3f902 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_only_distinct_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_only_distinct_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT MIN(DISTINCT ts) ?? 100500 AS session_start, FROM plato.Input diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_star_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_star_/formatted.sql index de6b2ea6ca7d..5f240e433fc5 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_star_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_star_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA OrderedColumns; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_tablerow_column_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_tablerow_column_/formatted.sql index de9f6549c7ee..a8991e4cefc5 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_tablerow_column_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_tablerow_column_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_with_udf_by_aggregate_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_with_udf_by_aggregate_/formatted.sql index 3afd1f1f51f5..168aa6b8567b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_with_udf_by_aggregate_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_with_udf_by_aggregate_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $majority_vote = Python::majority_vote( Callable<(List) -> String>, @@ diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_with_where_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_with_where_/formatted.sql index 6727f99869c3..5cffbdefad12 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_with_where_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_with_where_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT ki, count(1) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_compact_sorted_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_compact_sorted_/formatted.sql index 597c82124a8f..809fd06ee7d5 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_compact_sorted_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_compact_sorted_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_compact_sorted_distinct_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_compact_sorted_distinct_/formatted.sql index 3e3c907fd84b..179331492e2b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_compact_sorted_distinct_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_compact_sorted_distinct_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_compact_sorted_distinct_complex_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_compact_sorted_distinct_complex_/formatted.sql index ae6d477355e2..eab31a43340d 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_compact_sorted_distinct_complex_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_compact_sorted_distinct_complex_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_compact_sorted_with_diff_order_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_compact_sorted_with_diff_order_/formatted.sql index dffae9f5c5f5..6039f777b591 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_compact_sorted_with_diff_order_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_compact_sorted_with_diff_order_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; INSERT INTO @ksv @@ -32,8 +33,7 @@ SELECT key, subkey, value -FROM @ksv --- YtReduce +FROM @ksv -- YtReduce GROUP COMPACT BY key, subkey, @@ -47,9 +47,8 @@ SELECT key, subkey, value -FROM @vsk --- YtReduce -GROUP/*+ compact() */ BY +FROM @vsk -- YtReduce +GROUP /*+ compact() */ BY key, subkey, value @@ -62,8 +61,7 @@ SELECT key, subkey, some(value) AS value -FROM @ksv --- YtReduce +FROM @ksv -- YtReduce GROUP COMPACT BY key, subkey @@ -76,8 +74,7 @@ SELECT key, subkey, some(value) AS value -FROM @vsk --- YtMapReduce +FROM @vsk -- YtMapReduce GROUP COMPACT BY key, subkey @@ -90,8 +87,7 @@ SELECT key, subkey, value -FROM concat(@ksv, @vsk) --- YtMapReduce +FROM concat(@ksv, @vsk) -- YtMapReduce GROUP COMPACT BY key, subkey, @@ -105,8 +101,7 @@ SELECT some(key) AS key, subkey, value -FROM concat(@vs, @vsk) --- YtReduce +FROM concat(@vs, @vsk) -- YtReduce GROUP COMPACT BY subkey, value diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-list_after_group_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-list_after_group_/formatted.sql index f3ccf28a75fe..fb23113b9f99 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-list_after_group_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-list_after_group_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT aggregate_list(key) AS key_list, listsort(aggregate_list(key)) AS sorted_key_list, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-list_nullable_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-list_nullable_/formatted.sql index 93ee9c309fe4..60e22f878f2e 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-list_nullable_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-list_nullable_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT aggregate_list(CAST(value AS int)) AS val_list FROM plato.Input; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-listbuiltin_constness_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-listbuiltin_constness_/formatted.sql index 5ef211fbed43..8bc5897a466b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-listbuiltin_constness_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-listbuiltin_constness_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT ListMap([1, 2, 3], ($x) -> ($x)) AS x FROM AS_TABLE([<|key: 1|>, <|key: 2|>]) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-native_desc_group_compact_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-native_desc_group_compact_by_/formatted.sql index 9b185f6f8e0c..9999a0c43ea9 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-native_desc_group_compact_by_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-native_desc_group_compact_by_/formatted.sql @@ -1,12 +1,12 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; PRAGMA yt.UseNativeDescSort; SELECT key, subkey -FROM Input1 --- YtReduce +FROM Input1 -- YtReduce GROUP COMPACT BY key, subkey @@ -17,8 +17,7 @@ ORDER BY SELECT key, subkey -FROM Input1 --- YtReduce +FROM Input1 -- YtReduce GROUP COMPACT BY subkey, key @@ -28,8 +27,7 @@ ORDER BY SELECT key -FROM Input1 --- YtReduce +FROM Input1 -- YtReduce GROUP COMPACT BY key ORDER BY @@ -37,8 +35,7 @@ ORDER BY SELECT subkey -FROM Input1 --- YtMapReduce +FROM Input1 -- YtMapReduce GROUP COMPACT BY subkey ORDER BY @@ -47,8 +44,7 @@ ORDER BY SELECT key, subkey -FROM concat(Input1, Input2) --- YtMapReduce, mix of ascending/descending +FROM concat(Input1, Input2) -- YtMapReduce, mix of ascending/descending GROUP COMPACT BY key, subkey diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-null_type_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-null_type_/formatted.sql index 333e1ccd2b79..771aee6a7da7 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-null_type_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-null_type_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT min(x), count(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 a9112ec793ff..43696dcbe55a 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT Yson::ConvertTo("[1,2]"j, ParseType("List")) AS x FROM AS_TABLE([<|key: 1|>, <|key: 2|>]) 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 669ffa2f3ec4..335bb0874afd 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; --insert into Output diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-subquery_aggregation_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-subquery_aggregation_/formatted.sql index 0253dfd09939..e9d7b19ac44d 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-subquery_aggregation_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-subquery_aggregation_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $total_count = ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-table_funcs_group_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-table_funcs_group_by_/formatted.sql index 111fb42bc282..f257d9ec9dc0 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-table_funcs_group_by_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-table_funcs_group_by_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; --insert into Output diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-table_row_aggregation_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-table_row_aggregation_/formatted.sql index 7fe083533749..826c02dec64b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-table_row_aggregation_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-table_row_aggregation_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $data = ( 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 37b4724b38ae..9e45af8cca6d 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 @@ -1,11 +1,11 @@ /* yt can not */ $round_period = ($day, $period) -> { RETURN CASE - WHEN $period = 'd' + WHEN $period == 'd' THEN $day - WHEN $period = 'w' + WHEN $period == 'w' THEN DateTime::MakeDate(DateTime::StartOfWeek($day)) - WHEN $period = 'm' + WHEN $period == 'm' THEN DateTime::MakeDate(DateTime::StartOfMonth($day)) ELSE $day END @@ -56,7 +56,7 @@ SELECT ELSE NULL END AS period_type, user_cards_segm, - if(GROUPING(user_cards_segm) = 1, -300, user_cards_segm) AS __user_cards_segm__, + if(GROUPING(user_cards_segm) == 1, -300, user_cards_segm) AS __user_cards_segm__, GROUPING(user_cards_segm) AS grouping_user_cards_segm, COUNT(DISTINCT user_id) AS all_user_qty, FROM $data @@ -66,9 +66,11 @@ GROUP BY -- day grouping (day), (day, user_cards_segm), + -- -- week grouping (week), (week, user_cards_segm), + -- -- month grouping (month), (month, user_cards_segm)); 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 3cd19e827ca5..287ecc0358b8 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 @@ -1,5 +1,6 @@ --!ansi_lexer -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; SELECT 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 9cd9d48d530a..e11c74c3f259 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,5 +1,6 @@ --!ansi_lexer -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA warning("disable", "4510"); $foo = "YQL"::'(lambda ''(item) (Concat (String ''"foo\''") item))'; 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 221ef104e71b..dd25e69ae508 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,5 +1,6 @@ --!ansi_lexer -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $s = <|"a": 1, b: 2, `c`: 3|>; SELECT 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 926bfcff0836..d703c9b6ec29 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 @@ -2,13 +2,13 @@ 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")), 8, 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 58dafb07c3b4..ed622812c1db 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 @@ -2,25 +2,25 @@ 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")), 18, 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 70b74dcd144b..6a1f0cb717bd 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 @@ -2,25 +2,25 @@ 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")), 18, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-table_io_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-table_io_/formatted.sql index ff1896b98a33..f21b94ad6d60 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-table_io_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-table_io_/formatted.sql @@ -7,8 +7,7 @@ FROM BigDates ORDER BY row; -INSERT INTO @Output - WITH truncate +INSERT INTO @Output WITH truncate SELECT * FROM BigDates diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-table_yt_key_filter_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-table_yt_key_filter_/formatted.sql index 82dde7478fdc..a7780a69667f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-table_yt_key_filter_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-table_yt_key_filter_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* multirun can not */ +/* postgres can not */ +/* multirun can not */ USE plato; PRAGMA yt.UseNewPredicateExtraction; @@ -36,95 +37,95 @@ COMMIT; SELECT * FROM OutDate32 -WHERE key > Date('1970-1-1') AND - key > Datetime('1970-1-1T0:0:0Z') AND - key > Timestamp('1970-1-1T0:0:0Z') AND - key > Date32('-144169-1-1') AND - key > Datetime64('-144169-1-1T0:0:0Z') AND - key > Timestamp64('-144169-1-1T0:0:0Z') AND - key >= Date('2105-12-31') AND - key >= Datetime('2105-12-31T23:59:59Z') AND - key >= Timestamp('2105-12-31T23:59:59Z') AND - key >= Date32('148107-12-31') AND - key >= Datetime64('148107-12-31T0:0:0Z') AND - key >= Timestamp64('148107-12-31T0:0:0Z'); +WHERE key > Date('1970-1-1') + AND key > Datetime('1970-1-1T0:0:0Z') + AND key > Timestamp('1970-1-1T0:0:0Z') + AND key > Date32('-144169-1-1') + AND key > Datetime64('-144169-1-1T0:0:0Z') + AND key > Timestamp64('-144169-1-1T0:0:0Z') + AND key >= Date('2105-12-31') + AND key >= Datetime('2105-12-31T23:59:59Z') + AND key >= Timestamp('2105-12-31T23:59:59Z') + AND key >= Date32('148107-12-31') + AND key >= Datetime64('148107-12-31T0:0:0Z') + AND key >= Timestamp64('148107-12-31T0:0:0Z'); SELECT * FROM OutDate32 -WHERE key < Date('2105-12-31') AND - key < Datetime('2105-12-31T23:59:59Z') AND - key < Timestamp('2105-12-31T23:59:59.999999Z') AND - key < Date32('148107-12-31') AND - key < Datetime64('148107-12-31T23:59:59Z') AND - key < Timestamp64('148107-12-31T23:59:59.999999Z') AND - key <= Date('1970-1-1') AND - key <= Datetime('1970-1-1T0:0:0Z') AND - key <= Timestamp('1970-1-1T0:0:0Z') AND - key <= Date32('-144169-1-1') AND - key <= Datetime64('-144169-1-1T0:0:0Z') AND - key <= Timestamp64('-144169-1-1T0:0:0Z'); +WHERE key < Date('2105-12-31') + AND key < Datetime('2105-12-31T23:59:59Z') + AND key < Timestamp('2105-12-31T23:59:59.999999Z') + AND key < Date32('148107-12-31') + AND key < Datetime64('148107-12-31T23:59:59Z') + AND key < Timestamp64('148107-12-31T23:59:59.999999Z') + AND key <= Date('1970-1-1') + AND key <= Datetime('1970-1-1T0:0:0Z') + AND key <= Timestamp('1970-1-1T0:0:0Z') + AND key <= Date32('-144169-1-1') + AND key <= Datetime64('-144169-1-1T0:0:0Z') + AND key <= Timestamp64('-144169-1-1T0:0:0Z'); SELECT * FROM OutDatetime64 -WHERE key > Date('1970-1-1') AND - key > Datetime('1970-1-1T0:0:0Z') AND - key > Timestamp('1970-1-1T0:0:0Z') AND - key > Date32('-144169-1-1') AND - key > Datetime64('-144169-1-1T0:0:0Z') AND - key > Timestamp64('-144169-1-1T0:0:0Z') AND - key >= Date('2105-12-31') AND - key >= Datetime('2105-12-31T23:59:59Z') AND - key >= Timestamp('2105-12-31T23:59:59Z') AND - key >= Date32('148107-12-31') AND - key >= Datetime64('148107-12-31T0:0:0Z') AND - key >= Timestamp64('148107-12-31T0:0:0Z'); +WHERE key > Date('1970-1-1') + AND key > Datetime('1970-1-1T0:0:0Z') + AND key > Timestamp('1970-1-1T0:0:0Z') + AND key > Date32('-144169-1-1') + AND key > Datetime64('-144169-1-1T0:0:0Z') + AND key > Timestamp64('-144169-1-1T0:0:0Z') + AND key >= Date('2105-12-31') + AND key >= Datetime('2105-12-31T23:59:59Z') + AND key >= Timestamp('2105-12-31T23:59:59Z') + AND key >= Date32('148107-12-31') + AND key >= Datetime64('148107-12-31T0:0:0Z') + AND key >= Timestamp64('148107-12-31T0:0:0Z'); SELECT * FROM OutDatetime64 -WHERE key < Date('2105-12-31') AND - key < Datetime('2105-12-31T23:59:59Z') AND - key < Timestamp('2105-12-31T23:59:59.999999Z') AND - key < Date32('148107-12-31') AND - key < Datetime64('148107-12-31T23:59:59Z') AND - key < Timestamp64('148107-12-31T23:59:59.999999Z') AND - key <= Date('1970-1-1') AND - key <= Datetime('1970-1-1T0:0:0Z') AND - key <= Timestamp('1970-1-1T0:0:0Z') AND - key <= Date32('-144169-1-1') AND - key <= Datetime64('-144169-1-1T0:0:0Z') AND - key <= Timestamp64('-144169-1-1T0:0:0Z'); +WHERE key < Date('2105-12-31') + AND key < Datetime('2105-12-31T23:59:59Z') + AND key < Timestamp('2105-12-31T23:59:59.999999Z') + AND key < Date32('148107-12-31') + AND key < Datetime64('148107-12-31T23:59:59Z') + AND key < Timestamp64('148107-12-31T23:59:59.999999Z') + AND key <= Date('1970-1-1') + AND key <= Datetime('1970-1-1T0:0:0Z') + AND key <= Timestamp('1970-1-1T0:0:0Z') + AND key <= Date32('-144169-1-1') + AND key <= Datetime64('-144169-1-1T0:0:0Z') + AND key <= Timestamp64('-144169-1-1T0:0:0Z'); SELECT * FROM OutTimestamp64 -WHERE key > Date('1970-1-1') AND - key > Datetime('1970-1-1T0:0:0Z') AND - key > Timestamp('1970-1-1T0:0:0Z') AND - key > Date32('-144169-1-1') AND - key > Datetime64('-144169-1-1T0:0:0Z') AND - key > Timestamp64('-144169-1-1T0:0:0Z') AND - key >= Date('2105-12-31') AND - key >= Datetime('2105-12-31T23:59:59Z') AND - key >= Timestamp('2105-12-31T23:59:59Z') AND - key >= Date32('148107-12-31') AND - key >= Datetime64('148107-12-31T0:0:0Z') AND - key >= Timestamp64('148107-12-31T0:0:0Z'); +WHERE key > Date('1970-1-1') + AND key > Datetime('1970-1-1T0:0:0Z') + AND key > Timestamp('1970-1-1T0:0:0Z') + AND key > Date32('-144169-1-1') + AND key > Datetime64('-144169-1-1T0:0:0Z') + AND key > Timestamp64('-144169-1-1T0:0:0Z') + AND key >= Date('2105-12-31') + AND key >= Datetime('2105-12-31T23:59:59Z') + AND key >= Timestamp('2105-12-31T23:59:59Z') + AND key >= Date32('148107-12-31') + AND key >= Datetime64('148107-12-31T0:0:0Z') + AND key >= Timestamp64('148107-12-31T0:0:0Z'); SELECT * FROM OutTimestamp64 -WHERE key < Date('2105-12-31') AND - key < Datetime('2105-12-31T23:59:59Z') AND - key < Timestamp('2105-12-31T23:59:59.999999Z') AND - key < Date32('148107-12-31') AND - key < Datetime64('148107-12-31T23:59:59Z') AND - key < Timestamp64('148107-12-31T23:59:59.999999Z') AND - key <= Date('1970-1-1') AND - key <= Datetime('1970-1-1T0:0:0Z') AND - key <= Timestamp('1970-1-1T0:0:0Z') AND - key <= Date32('-144169-1-1') AND - key <= Datetime64('-144169-1-1T0:0:0Z') AND - key <= Timestamp64('-144169-1-1T0:0:0Z'); +WHERE key < Date('2105-12-31') + AND key < Datetime('2105-12-31T23:59:59Z') + AND key < Timestamp('2105-12-31T23:59:59.999999Z') + AND key < Date32('148107-12-31') + AND key < Datetime64('148107-12-31T23:59:59Z') + AND key < Timestamp64('148107-12-31T23:59:59.999999Z') + AND key <= Date('1970-1-1') + AND key <= Datetime('1970-1-1T0:0:0Z') + AND key <= Timestamp('1970-1-1T0:0:0Z') + AND key <= Date32('-144169-1-1') + AND key <= Datetime64('-144169-1-1T0:0:0Z') + AND key <= Timestamp64('-144169-1-1T0:0:0Z'); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-table_yt_native_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-table_yt_native_/formatted.sql index 605728c745d9..73cfa7410cd6 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-table_yt_native_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-table_yt_native_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* multirun can not */ +/* postgres can not */ +/* multirun can not */ USE plato; INSERT INTO @tmpTable 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 8b0e1a2274fd..6bb2bdd1c70d 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,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ SELECT ToBytes(TzDate32("1901-01-01,Europe/Moscow")); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tz_table_yt_key_filter_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tz_table_yt_key_filter_/formatted.sql index 09b038ad8389..d4889c422b47 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tz_table_yt_key_filter_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tz_table_yt_key_filter_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* multirun can not */ +/* postgres can not */ +/* multirun can not */ USE plato; PRAGMA yt.UseNewPredicateExtraction; @@ -36,47 +37,47 @@ COMMIT; SELECT * FROM OutTzDate32 -WHERE key > TzDate32('-144169-1-1,UTC') AND - key > TzDatetime64('-144169-1-1T0:0:0,UTC') AND - key > TzTimestamp64('-144169-1-1T0:0:0,UTC') AND - key >= TzDate32('148107-12-31,UTC') AND - key >= TzDatetime64('148107-12-31T0:0:0,UTC') AND - key >= TzTimestamp64('148107-12-31T0:0:0,UTC'); +WHERE key > TzDate32('-144169-1-1,UTC') + AND key > TzDatetime64('-144169-1-1T0:0:0,UTC') + AND key > TzTimestamp64('-144169-1-1T0:0:0,UTC') + AND key >= TzDate32('148107-12-31,UTC') + AND key >= TzDatetime64('148107-12-31T0:0:0,UTC') + AND key >= TzTimestamp64('148107-12-31T0:0:0,UTC'); SELECT * FROM OutTzDate32 -WHERE key < TzDate32('148107-12-31,UTC') AND - key < TzDatetime64('148107-12-31T23:59:59,UTC') AND - key < TzTimestamp64('148107-12-31T23:59:59.999999,UTC') AND - key <= TzDate32('-144169-1-1,UTC') AND - key <= TzDatetime64('-144169-1-1T0:0:0,UTC') AND - key <= TzTimestamp64('-144169-1-1T0:0:0,UTC'); +WHERE key < TzDate32('148107-12-31,UTC') + AND key < TzDatetime64('148107-12-31T23:59:59,UTC') + AND key < TzTimestamp64('148107-12-31T23:59:59.999999,UTC') + AND key <= TzDate32('-144169-1-1,UTC') + AND key <= TzDatetime64('-144169-1-1T0:0:0,UTC') + AND key <= TzTimestamp64('-144169-1-1T0:0:0,UTC'); SELECT * FROM OutTzDatetime64 -WHERE key > TzDatetime64('-144169-1-1T0:0:0,UTC') AND - key > TzTimestamp64('-144169-1-1T0:0:0,UTC') AND - key >= TzDatetime64('148107-12-31T0:0:0,UTC') AND - key >= TzTimestamp64('148107-12-31T0:0:0,UTC'); +WHERE key > TzDatetime64('-144169-1-1T0:0:0,UTC') + AND key > TzTimestamp64('-144169-1-1T0:0:0,UTC') + AND key >= TzDatetime64('148107-12-31T0:0:0,UTC') + AND key >= TzTimestamp64('148107-12-31T0:0:0,UTC'); SELECT * FROM OutTzDatetime64 -WHERE key < TzDatetime64('148107-12-31T23:59:59,UTC') AND - key < TzTimestamp64('148107-12-31T23:59:59.999999,UTC') AND - key <= TzDatetime64('-144169-1-1T0:0:0,UTC') AND - key <= TzTimestamp64('-144169-1-1T0:0:0,UTC'); +WHERE key < TzDatetime64('148107-12-31T23:59:59,UTC') + AND key < TzTimestamp64('148107-12-31T23:59:59.999999,UTC') + AND key <= TzDatetime64('-144169-1-1T0:0:0,UTC') + AND key <= TzTimestamp64('-144169-1-1T0:0:0,UTC'); SELECT * FROM OutTzTimestamp64 -WHERE key > TzTimestamp64('-144169-1-1T0:0:0,UTC') AND - key >= TzTimestamp64('148107-12-31T0:0:0,UTC'); +WHERE key > TzTimestamp64('-144169-1-1T0:0:0,UTC') + AND key >= TzTimestamp64('148107-12-31T0:0:0,UTC'); SELECT * FROM OutTzTimestamp64 -WHERE key < TzTimestamp64('148107-12-31T23:59:59.999999,UTC') AND - key <= TzTimestamp64('-144169-1-1T0:0:0,UTC'); +WHERE key < TzTimestamp64('148107-12-31T23:59:59.999999,UTC') + AND key <= TzTimestamp64('-144169-1-1T0:0:0,UTC'); 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 24f6f8b2bc54..510c13dd14b4 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $c = "cccc"; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-bind_cast_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-bind_cast_/formatted.sql index 40290ae732f8..c5351bb93e19 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-bind_cast_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-bind_cast_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $casted_null = CAST(NULL AS Double); SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-bind_select_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-bind_select_/formatted.sql index f563da5d9830..056fb4b2144c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-bind_select_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-bind_select_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $foo = ( 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 4e489b1eaca4..4d3c9c8c9582 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 @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* kikimr can not - can't drop non-existent table */ +/* syntax version 1 */ +/* postgres can not */ +/* kikimr can not - can't drop non-existent table */ USE plato; $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 5deff94ff619..31477d483b9c 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $a = "Output"; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-named_callable_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-named_callable_/formatted.sql index f36b71a88b40..da248e246eea 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-named_callable_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-named_callable_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $foo = ($item) -> { RETURN $item + $item }; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-named_expr_input_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-named_expr_input_/formatted.sql index 045bcfafc3ac..c4d9e8908b33 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-named_expr_input_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-named_expr_input_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $foo = ( SELECT 100500 AS bar diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-named_node_corr_names_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-named_node_corr_names_/formatted.sql index 21b496b76d4c..8dd56c0b9a99 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-named_node_corr_names_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-named_node_corr_names_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $a = ( 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 602abe718d3b..f9ae6e13f513 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $a = "Input"; SELECT 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 f1b18fc1f8cc..9b5f56d6aff5 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $a = "Input"; SELECT 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 d82349bfbd40..b093765c0f1a 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,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* kikimr can not - range not supported */ +/* syntax version 1 */ +/* postgres can not */ +/* kikimr can not - range not supported */ $a = ""; $b = ($_item) -> { RETURN TRUE; 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 3a2a0aa8179a..a484e9972de7 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,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* kikimr can not - range not supported */ +/* syntax version 1 */ +/* postgres can not */ +/* kikimr can not - range not supported */ $a = ""; $b = ($_item) -> { RETURN TRUE; 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 f64fe39198f2..fad51735700d 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $x = "Input"; 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 e8e4e8c028fa..59fa0331868d 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* kikimr can not */ +/* syntax version 1 */ +/* kikimr can not */ PRAGMA yt.InferSchema; /* postgres can not */ USE plato; 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 5d182be1cf09..f62f1382af9d 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,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* kikimr can not - range not supported */ +/* syntax version 1 */ +/* postgres can not */ +/* kikimr can not - range not supported */ $a = ""; $b = "Input"; $c = "Input"; 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 4ae29228457f..abbb925a0b3e 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,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* kikimr can not - range_strict not supported */ +/* syntax version 1 */ +/* postgres can not */ +/* kikimr can not - range_strict not supported */ $a = ""; $b = "Input"; $c = "Input"; 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 1aeebc99e33d..0183209c0490 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,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* kikimr can not - range not supported */ +/* syntax version 1 */ +/* postgres can not */ +/* kikimr can not - range not supported */ $a = ""; $b = "Input"; $c = ""; 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 e2e79ff38d2f..576a63114bae 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,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* kikimr can not - range not supported */ +/* syntax version 1 */ +/* postgres can not */ +/* kikimr can not - range not supported */ $a = ""; $b = "Input"; $c = ""; 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 4ee9ca9e73a6..8bbfb5271ba3 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $a, $b, $c = AsTuple(1, 5u, "test"); SELECT 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 9cf143f1af77..0ba2d96f06e5 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,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* custom error:Expected tuple type of size: 2, but got: 3*/ +/* syntax version 1 */ +/* postgres can not */ +/* custom error:Expected tuple type of size: 2, but got: 3*/ $i, $j = AsTuple(1, 5u, "test"); SELECT 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 301716afaa24..73791a67f799 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $foo = ($x) -> { RETURN AsTuple($x, $x); }; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_avg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_avg_/formatted.sql index 08f17a3e425e..fc885b3ee9ff 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_avg_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_avg_/formatted.sql @@ -7,7 +7,7 @@ SELECT avg(CAST(key AS int32)), avg(1u / 0u), avg(2), - avg(if(key = 10u, key)), - avg(if(key = 100u, key)), - avg(key = 10u) + avg(if(key == 10u, key)), + avg(if(key == 100u, key)), + avg(key == 10u) FROM Input; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_max_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_max_/formatted.sql index 9d9c18a09139..01323eb6503f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_max_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_max_/formatted.sql @@ -7,13 +7,13 @@ SELECT max(CAST(key AS int32)), max(1u / 0u), max(2), - max(if(key = 10u, key)), - max(if(key = 100u, key)), + max(if(key == 10u, key)), + max(if(key == 100u, key)), max(FALSE), - max(key = 10u), + max(key == 10u), max(key >= 10u), - max(key = 20u), - max(if(key = 10u, TRUE)), - max(if(key = 100u, TRUE)), + max(key == 20u), + max(if(key == 10u, TRUE)), + max(if(key == 100u, TRUE)), max(if(key >= 10u, TRUE)), FROM Input; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_min_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_min_/formatted.sql index 70847d0c494b..b6e73d5945a6 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_min_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_min_/formatted.sql @@ -7,13 +7,13 @@ SELECT min(CAST(key AS int32)), min(1u / 0u), min(2), - min(if(key = 10u, key)), - min(if(key = 100u, key)), + min(if(key == 10u, key)), + min(if(key == 100u, key)), min(FALSE), - min(key = 10u), + min(key == 10u), min(key >= 10u), - min(key = 20u), - min(if(key = 10u, TRUE)), - min(if(key = 100u, TRUE)), + min(key == 20u), + min(if(key == 10u, TRUE)), + min(if(key == 100u, TRUE)), min(if(key >= 10u, TRUE)), FROM Input; 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 20886fd22eed..ead923553130 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 @@ -11,4 +11,4 @@ SELECT Pg::max(c), Pg::avg(c), FROM Input -WHERE d = "aaa"; +WHERE d == "aaa"; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_some_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_some_/formatted.sql index 59333d3d22dd..d47224c804f1 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_some_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_some_/formatted.sql @@ -7,13 +7,13 @@ SELECT some(CAST(key AS int32)), some(1u / 0u), some(2), - some(if(key = 10u, key)), - some(if(key = 100u, key)), + some(if(key == 10u, key)), + some(if(key == 100u, key)), some(FALSE), - some(key = 10u), + some(key == 10u), some(key >= 10u), - some(key = 20u), - some(if(key = 10u, TRUE)), - some(if(key = 100u, TRUE)), + some(key == 20u), + some(if(key == 10u, TRUE)), + some(if(key == 100u, TRUE)), some(if(key >= 10u, TRUE)), FROM Input; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_sum_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_sum_/formatted.sql index b96d98331b95..43f6e859a160 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_sum_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_sum_/formatted.sql @@ -7,6 +7,6 @@ SELECT sum(CAST(key AS int32)), sum(1u / 0u), sum(2), - sum(if(key = 10u, key)), - sum(if(key = 100u, key)) + sum(if(key == 10u, key)), + sum(if(key == 100u, key)) FROM Input; 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 f79a6a9cde89..acb3f07f1743 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 @@ -3,6 +3,10 @@ USE plato; SELECT val.a AS a, <|qq: key, qkrq: "QKRQ"|> AS q, - /* XXX: callable always expands to . */ AddMember(val, "k", key) AS wik, - /* XXX: callable always expands to . */ RemoveMember(val, "x") AS wox, + + /* XXX: callable always expands to . */ + AddMember(val, "k", key) AS wik, + + /* XXX: callable always expands to . */ + RemoveMember(val, "x") AS wox, FROM Input; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_many_val_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_many_val_/formatted.sql index 4efedaf1f07e..968019ea03d2 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_many_val_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_many_val_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* yt can not */ +/* syntax version 1 */ +/* yt can not */ $switch = ($x) -> { $res = CASE $x WHEN 0 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 bf2dca0835b4..f7a2ef08e2fd 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 @@ -29,38 +29,32 @@ $i4 = -- 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 $i4; 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 6a5c3bd69b9b..33c3b18feebd 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 @@ -21,8 +21,7 @@ SELECT FROM $i; -- 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 $i; 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 479a5cc6f05f..b9abcaf5151a 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,8 +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 Input; 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 88641ef02450..ad48e357a92f 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,12 @@ /* 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 Input; 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 e4d30eaa935f..ffda239fae7d 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,8 +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 Input; 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 30225209ea08..ff978e5d51b0 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,8 +2,7 @@ USE plato; -- duplicate column -INSERT INTO Output - WITH column_groups = "{def1=#;def2=#}" +INSERT INTO Output WITH column_groups = "{def1=#;def2=#}" SELECT * FROM Input; 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 8fc4dd7dde02..b0a27f6ff23e 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,8 +2,7 @@ USE plato; -- empty group -INSERT INTO Output - WITH column_groups = "{g1=[];def=#}" +INSERT INTO Output WITH column_groups = "{g1=[];def=#}" SELECT * FROM Input; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_non_lst_yson_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_non_lst_yson_fail_/formatted.sql index 2e191132010a..7fd3e1a495dc 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_non_lst_yson_fail_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-hint_non_lst_yson_fail_/formatted.sql @@ -2,8 +2,7 @@ USE plato; -- bad yson -INSERT INTO Output - WITH column_groups = @@{g1="a"}@@ +INSERT INTO Output WITH column_groups = @@{g1="a"}@@ SELECT * FROM Input; 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 cd1a62dbc281..e8be046a364d 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,8 +2,7 @@ USE plato; -- bad yson -INSERT INTO Output - WITH column_groups = "[abc]" +INSERT INTO Output WITH column_groups = "[abc]" SELECT * FROM Input; 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 bb8f67a41a93..a7757e7bd1e0 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,8 +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 Input; 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 950c26f0f4b6..d7f53aa2e9ff 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,8 +2,7 @@ USE plato; -- bad yson -INSERT INTO Output - WITH column_groups = "!" +INSERT INTO Output WITH column_groups = "!" SELECT * FROM Input; 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 3d1edd4ff152..7c9c0eb65a3c 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,8 +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 Input; 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 f756aeada2c5..21cc3c9f324c 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,8 +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 Input; 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 21d46e91aee7..a1fd936f3e06 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 @@ -20,8 +20,7 @@ SELECT FROM $s1; COMMIT; -INSERT INTO @a - WITH column_groups = "{a=#}" +INSERT INTO @a WITH column_groups = "{a=#}" SELECT * FROM $s2; 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 3921b0800b96..8465b20c54d6 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 @@ -20,8 +20,7 @@ SELECT FROM $s1; COMMIT; -INSERT INTO Output - WITH column_groups = "{a=#}" +INSERT INTO Output WITH column_groups = "{a=#}" SELECT * FROM $s2; 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 1ad931564460..c8edbb44cbc7 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 @@ -2,8 +2,7 @@ USE plato; PRAGMA yt.ColumnGroupMode = "perusage"; -INSERT INTO Output - WITH column_groups = "{a=#}" +INSERT INTO Output WITH column_groups = "{a=#}" SELECT * FROM Input 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 f00185e6a408..3338437aa155 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 @@ -13,8 +13,7 @@ $s2 = FROM Input WHERE a > "a1"; -INSERT INTO @a - WITH column_groups = "{a=#}" +INSERT INTO @a WITH column_groups = "{a=#}" SELECT * FROM $s1; @@ -29,15 +28,13 @@ SELECT * FROM $s1; -INSERT INTO Output - WITH column_groups = "{a=#}" +INSERT INTO Output WITH column_groups = "{a=#}" SELECT * FROM $s1; COMMIT; -INSERT INTO @a - WITH column_groups = "{a=#}" +INSERT INTO @a WITH column_groups = "{a=#}" SELECT * FROM $s2; @@ -47,14 +44,12 @@ SELECT * 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 $s2; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-align_publish_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-align_publish_/formatted.sql index d9cb53fdec4a..912a8abea77b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-align_publish_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-align_publish_/formatted.sql @@ -1,8 +1,7 @@ PRAGMA OrderedColumns; USE plato; -INSERT INTO @table1 - WITH TRUNCATE ( +INSERT INTO @table1 WITH TRUNCATE ( a, c, b @@ -11,8 +10,7 @@ VALUES ('1', '2', '3'); COMMIT; -INSERT INTO Output - WITH TRUNCATE +INSERT INTO Output WITH TRUNCATE SELECT x.c AS d, x.b AS b, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-align_publish_native_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-align_publish_native_/formatted.sql index ecd985055e84..8af42fd46273 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-align_publish_native_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-align_publish_native_/formatted.sql @@ -3,8 +3,7 @@ PRAGMA OrderedColumns; PRAGMA yt.UseNativeYtTypes; USE plato; -INSERT INTO @table1 - WITH TRUNCATE ( +INSERT INTO @table1 WITH TRUNCATE ( a, c, b @@ -13,8 +12,7 @@ VALUES ('1', '2', '3'); COMMIT; -INSERT INTO Output - WITH TRUNCATE +INSERT INTO Output WITH TRUNCATE SELECT x.c AS d, x.b AS b, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_/formatted.sql index bac0f7940f42..50a630ac720b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; PRAGMA OrderedColumns; @@ -33,8 +34,7 @@ ORDER BY subkey, key; -INSERT INTO Output - WITH truncate +INSERT INTO Output WITH truncate SELECT key, value, 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 da266fca8d3e..2b5dd2a168df 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 @@ -12,5 +12,5 @@ SELECT $Group, value FROM Input -WHERE key = "150" +WHERE key == "150" LIMIT 1; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_tmp_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_tmp_/formatted.sql index 5710d3b879d8..5bec7509cbdd 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_tmp_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_tmp_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; PRAGMA OrderedColumns; @@ -18,8 +19,7 @@ ORDER BY subkey, key; -INSERT INTO @tmp - WITH truncate +INSERT INTO @tmp WITH truncate SELECT key, value, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_with_desc_sort_and_native_types_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_with_desc_sort_and_native_types_/formatted.sql index 6293c34cb63a..4e9d2e17fb8e 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_with_desc_sort_and_native_types_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_with_desc_sort_and_native_types_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* hybridfile can not YQL-17743 */ +/* postgres can not */ +/* hybridfile can not YQL-17743 */ USE plato; PRAGMA OrderedColumns; PRAGMA yt.UseNativeYtTypes; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_with_new_cols_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_with_new_cols_/formatted.sql index 5219e5558f82..5899f1fbed22 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_with_new_cols_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_with_new_cols_/formatted.sql @@ -1,9 +1,9 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; PRAGMA OrderedColumns; -INSERT INTO Output - WITH truncate +INSERT INTO Output WITH truncate SELECT a.*, count(key) OVER ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_with_reorder_cols_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_with_reorder_cols_/formatted.sql index a4664cd44add..708217f5c920 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_with_reorder_cols_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_with_reorder_cols_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; PRAGMA PositionalUnionAll; PRAGMA yt.UseNativeYtTypes; 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 6f1a78f17563..1d5ca3d7da2f 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; PRAGMA OrderedColumns; 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 e8cc62d322a7..fccac9c8b3e3 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; PRAGMA OrderedColumns; PRAGMA DisableSimpleColumns; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-ordered_plus_native_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-ordered_plus_native_/formatted.sql index e44682034715..e806d46b67ea 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-ordered_plus_native_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-ordered_plus_native_/formatted.sql @@ -1,10 +1,10 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; PRAGMA OrderedColumns; PRAGMA yt.UseNativeYtTypes; -INSERT INTO Output - WITH TRUNCATE +INSERT INTO Output WITH TRUNCATE SELECT aggr_list(subkey) AS subkey, key, 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 785e481c3e68..82bce446ea4c 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; PRAGMA OrderedColumns; @@ -7,5 +8,5 @@ EVALUATE FOR $i IN ["1", "2", "3"] SELECT * FROM Input - WHERE subkey = $i; + WHERE subkey == $i; END DO; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_distinct_star_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_distinct_star_/formatted.sql index 36f624c99c87..4ce061d6a05e 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_distinct_star_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_distinct_star_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; PRAGMA OrderedColumns; 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 1b2f28456bc0..9a4be2cb5d64 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; PRAGMA OrderedColumns; @@ -18,7 +19,7 @@ FROM Input GROUP BY value, key -HAVING key = "150"; +HAVING key == "150"; SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_limit_offset_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_limit_offset_/formatted.sql index 9310c30367c4..df6df5a0e4c4 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_limit_offset_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_limit_offset_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; PRAGMA OrderedColumns; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_limit_offset_reorder_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_limit_offset_reorder_/formatted.sql index fe89265f59fd..f4c853674378 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_limit_offset_reorder_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_limit_offset_reorder_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; PRAGMA OrderedColumns; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_orderby_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_orderby_/formatted.sql index dc85882f788e..922b561f3041 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_orderby_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_orderby_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; PRAGMA OrderedColumns; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_plain_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_plain_/formatted.sql index a641c9a164cc..5409fdfba5ac 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_plain_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_plain_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; PRAGMA OrderedColumns; @@ -10,8 +11,8 @@ ORDER BY SELECT * - WITHOUT - key +WITHOUT + key FROM Input ORDER BY subkey; @@ -25,8 +26,8 @@ ORDER BY SELECT a.* - WITHOUT - key +WITHOUT + key FROM Input AS a ORDER BY @@ -45,8 +46,8 @@ SELECT 1 AS z, 2 AS x, a.* - WITHOUT - key +WITHOUT + key FROM Input AS a ORDER BY diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_plain_nosimple_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_plain_nosimple_/formatted.sql index 77ce87741ef2..1de6daf7dc0e 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_plain_nosimple_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_plain_nosimple_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; PRAGMA OrderedColumns; PRAGMA DisableSimpleColumns; @@ -9,8 +10,8 @@ FROM Input; SELECT * - WITHOUT - key +WITHOUT + key FROM Input; SELECT @@ -20,8 +21,8 @@ FROM Input SELECT a.* - WITHOUT - key +WITHOUT + key FROM Input AS a; @@ -36,8 +37,8 @@ SELECT 1 AS z, 2 AS x, a.* - WITHOUT - key +WITHOUT + key FROM Input AS a; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_sample_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_sample_/formatted.sql index 0454a4c59a13..b52a46df9196 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_sample_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_sample_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; PRAGMA OrderedColumns; 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 b4b5c1eaf690..bb33c290047f 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 @@ -1,12 +1,13 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; PRAGMA OrderedColumns; DEFINE SUBQUERY $select_star($table) AS SELECT * - WITHOUT - subkey + WITHOUT + subkey FROM $table; END DEFINE; 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 2ac28e20ef6a..9d2298a1b08e 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 @@ -1,8 +1,9 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; PRAGMA OrderedColumns; SELECT * FROM Input -WHERE key = "150"; +WHERE key == "150"; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_win_func_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_win_func_/formatted.sql index 24320a7c6e22..0cae0562aeb3 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_win_func_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_win_func_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; PRAGMA OrderedColumns; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-union_all_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-union_all_/formatted.sql index 2b070ff80a59..8fe6b2114868 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-union_all_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-union_all_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ PRAGMA OrderedColumns; SELECT 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 4c31677b0383..e06ce255b4a7 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,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ PRAGMA PositionalUnionAll; PRAGMA warning("disable", "1107"); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-union_all_positional_columns_count_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-union_all_positional_columns_count_fail_/formatted.sql index 1913c0dca9fb..0b653bd6c6e4 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-union_all_positional_columns_count_fail_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-union_all_positional_columns_count_fail_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* syntax version 1 *//* custom error:Different column counts in UNION ALL inputs: input #0 has 3 column, input #1 has 2 columns*/ +/* postgres can not */ +/* syntax version 1 */ +/* custom error:Different column counts in UNION ALL inputs: input #0 has 3 column, input #1 has 2 columns*/ PRAGMA PositionalUnionAll; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-values_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-values_/formatted.sql index 14d1daaf9ad5..cb5fe9dda5bb 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-values_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-values_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ PRAGMA OrderedColumns; VALUES 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 f7874014d4a1..54ef4f68c665 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,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* yt can not */ PRAGMA warning("disable", "4510"); -- [10, 11) -> [10, 10] 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 0b770abfe7ff..188216e49b4d 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,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* yt can not */ PRAGMA warning("disable", "4510"); $opt_type = Struct; $keys = AsTuple(AsAtom("x")); 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 8744b09d48cd..cb543db889f6 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,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* yt can not */ PRAGMA warning("disable", "4510"); PRAGMA warning("disable", "1108"); 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 358de9f9f52d..c1c9ab0529ad 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 @@ -1,4 +1,8 @@ -/* syntax version 1 *//* postgres can not *//* dq can not *//* dqfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* dq can not */ +/* dqfile can not */ +/* yt can not */ PRAGMA warning("disable", "4510"); PRAGMA warning("disable", "1108"); 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 fec693f55d35..cce6aff79f83 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 @@ -1,4 +1,8 @@ -/* syntax version 1 *//* postgres can not *//* dq can not *//* dqfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* dq can not */ +/* dqfile can not */ +/* yt can not */ PRAGMA warning("disable", "4510"); PRAGMA warning("disable", "1108"); $Input = [(4, 100), (5, 100)]; @@ -71,7 +75,7 @@ SELECT ($row) -> ( ( ( - $row.c = 33 AND $row.d = 44 AND ( + $row.c == 33 AND $row.d == 44 AND ( $row.b, $row.a, $row.b, 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 0334a789c60f..494e24d413ba 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,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* yt can not */ PRAGMA warning("disable", "4510"); PRAGMA warning("disable", "1108"); 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 bfd3ff52cea9..7e12cbc8f87e 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 @@ -1,4 +1,8 @@ -/* syntax version 1 *//* postgres can not *//* dq can not *//* dqfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* dq can not */ +/* dqfile can not */ +/* yt can not */ PRAGMA warning("disable", "4510"); PRAGMA warning("disable", "1108"); 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 74c45c804c53..21d613d93957 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,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* yt can not */ PRAGMA warning("disable", "4510"); PRAGMA warning("disable", "1108"); 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 4c2fffae01a5..760204aa5aaa 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 @@ -1,4 +1,8 @@ -/* syntax version 1 *//* postgres can not *//* dq can not *//* dqfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* dq can not */ +/* dqfile can not */ +/* yt can not */ PRAGMA warning("disable", "4510"); PRAGMA warning("disable", "1108"); 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 f6bcc85b389c..5718fe14d46f 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 @@ -1,4 +1,8 @@ -/* syntax version 1 *//* postgres can not *//* dq can not *//* dqfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* dq can not */ +/* dqfile can not */ +/* yt can not */ PRAGMA warning("disable", "4510"); PRAGMA warning("disable", "1108"); 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 d3ab624da5c9..a7b9cf847fa1 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 @@ -1,4 +1,8 @@ -/* syntax version 1 *//* postgres can not *//* dq can not *//* dqfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* dq can not */ +/* dqfile can not */ +/* yt can not */ PRAGMA warning("disable", "4510"); PRAGMA warning("disable", "1108"); $lst = ListExtend( 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 885f413ce05e..b126133cdb20 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 @@ -1,4 +1,8 @@ -/* syntax version 1 *//* postgres can not *//* dq can not *//* dqfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* dq can not */ +/* dqfile can not */ +/* yt can not */ PRAGMA warning("disable", "4510"); PRAGMA warning("disable", "1108"); 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 6cd4d46e7e07..85f64a6c5ed9 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,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* yt can not */ PRAGMA warning("disable", "4510"); $opt_type = Struct; $xy_keys = AsTuple(AsAtom("x"), AsAtom("y")); 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 2af61363f704..723c01afff1c 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 @@ -1,4 +1,8 @@ -/* syntax version 1 *//* postgres can not *//* dq can not *//* dqfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* dq can not */ +/* dqfile can not */ +/* yt can not */ PRAGMA warning("disable", "4510"); PRAGMA warning("disable", "1108"); 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 ed3c079bb3bf..235a0b269600 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 @@ -1,4 +1,8 @@ -/* syntax version 1 *//* postgres can not *//* dq can not *//* dqfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* dq can not */ +/* dqfile can not */ +/* yt can not */ PRAGMA warning("disable", "4510"); PRAGMA warning("disable", "1108"); 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 ab28d332ae8c..ac7c10e54e78 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 @@ -1,4 +1,8 @@ -/* syntax version 1 *//* postgres can not *//* dq can not *//* dqfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* dq can not */ +/* dqfile can not */ +/* yt can not */ PRAGMA warning("disable", "4510"); PRAGMA warning("disable", "1108"); 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 af17cb804094..4883eb3172ca 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 @@ -1,4 +1,8 @@ -/* syntax version 1 *//* postgres can not *//* dq can not *//* dqfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* dq can not */ +/* dqfile can not */ +/* yt can not */ PRAGMA warning("disable", "4510"); PRAGMA warning("disable", "1108"); PRAGMA AnsiInForEmptyOrNullableItemsCollections; 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 2be73d39a404..226adcebbf8b 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 @@ -1,4 +1,8 @@ -/* syntax version 1 *//* postgres can not *//* dq can not *//* dqfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* dq can not */ +/* dqfile can not */ +/* yt can not */ PRAGMA warning("disable", "4510"); PRAGMA warning("disable", "1108"); 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 12bac666cacd..ba8acbffaa1d 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,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* yt can not */ PRAGMA warning("disable", "4510"); PRAGMA warning("disable", "1108"); @@ -6,11 +8,11 @@ SELECT YQL::RangeComputeFor( Struct, ($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") AND - (len($row.z) == 1 OR len($row.z || 'x') == 2) + ($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")) ); 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 8b5d3fcca789..81804358c2f4 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,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* yt can not */ PRAGMA warning("disable", "4510"); PRAGMA warning("disable", "1108"); @@ -7,8 +9,8 @@ SELECT Struct, ($row) -> ( $row.x == 1 AND ( - $row.y = 2 AND $row.z > 0 AND $row.z < 10 OR - $row.y = 2 AND $row.z > 8 AND $row.z < 20 + $row.y == 2 AND $row.z > 0 AND $row.z < 10 + OR $row.y == 2 AND $row.z > 8 AND $row.z < 20 ) ), 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 8af2fa735ca3..35ea00b03493 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 @@ -1,4 +1,8 @@ -/* syntax version 1 *//* postgres can not *//* dq can not *//* dqfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* dq can not */ +/* dqfile can not */ +/* yt can not */ PRAGMA warning("disable", "4510"); -- string/string 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 24fa800e21e7..e889026d5bcc 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,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* yt can not */ PRAGMA warning("disable", "4510"); $type = Struct; $keys = AsTuple(AsAtom("x"), AsAtom("y"), AsAtom("z")); 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 356b00e77b25..514003e8a7ea 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,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* yt can not */ PRAGMA warning("disable", "4510"); -- == 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 e981777ff241..18c681890a65 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,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* yt can not */ PRAGMA warning("disable", "4510"); $opt_type = Struct; $xy_keys = AsTuple(AsAtom("x"), AsAtom("y")); 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 31c0be00744d..921ecba9d87a 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,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* yt can not */ PRAGMA warning("disable", "4510"); SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_count-count_all_view_concat_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_count-count_all_view_concat_/formatted.sql index 61c652eb70d8..598df2e6f676 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_count-count_all_view_concat_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_count-count_all_view_concat_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ SELECT count(*) AS count FROM plato.concat(Input VIEW ksv, Input VIEW ksv); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_count-count_distinct_from_view_concat_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_count-count_distinct_from_view_concat_/formatted.sql index 644a3edfbb58..c2e5bf0cbb0f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_count-count_distinct_from_view_concat_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_count-count_distinct_from_view_concat_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ SELECT count(DISTINCT k) AS count FROM plato.concat(Input VIEW ksv, Input VIEW ksv); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-closure_in_l1_and_l2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-closure_in_l1_and_l2_/formatted.sql index ff6036c79387..5d51dfb54b20 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-closure_in_l1_and_l2_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-closure_in_l1_and_l2_/formatted.sql @@ -2,8 +2,8 @@ SELECT AsList( ListMap( AsList(3, 4), ($x) -> { - RETURN $x + - Yql::Fold( + RETURN $x + + Yql::Fold( AsList(9, 10), 1, ($c, $d) -> { RETURN $c + $d + Yql::Fold( ListMap( @@ -15,8 +15,8 @@ SELECT } ) } - ) + - Yql::Fold( + ) + + Yql::Fold( ListMap( AsList(7, 8), ($y) -> { RETURN $x + $y diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-closure_in_l2_and_l1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-closure_in_l2_and_l1_/formatted.sql index f6510d9472e5..0ae34ac9766e 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-closure_in_l2_and_l1_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-closure_in_l2_and_l1_/formatted.sql @@ -2,8 +2,8 @@ SELECT AsList( ListMap( AsList(3, 4), ($x) -> { - RETURN $x + - Yql::Fold( + RETURN $x + + Yql::Fold( ListMap( AsList(7, 8), ($y) -> { RETURN $x + $y @@ -11,8 +11,8 @@ SELECT ), 0, ($a, $b) -> { RETURN $a + $b } - ) + - Yql::Fold( + ) + + Yql::Fold( AsList(9, 10), 1, ($c, $d) -> { RETURN $c + $d + Yql::Fold( ListMap( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-nested_closure_in_l1_and_l2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-nested_closure_in_l1_and_l2_/formatted.sql index ca2e1315826f..263aa65b3675 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-nested_closure_in_l1_and_l2_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-nested_closure_in_l1_and_l2_/formatted.sql @@ -2,8 +2,8 @@ SELECT AsList( ListMap( AsList(3, 4), ($x) -> { - RETURN $x + - Yql::Fold( + RETURN $x + + Yql::Fold( AsList(9, 10), 1, ($c, $d) -> { RETURN $c + $d + Yql::Fold( ListMap( @@ -23,8 +23,8 @@ SELECT } ) } - ) + - Yql::Fold( + ) + + Yql::Fold( ListMap( AsList(7, 8), ($y) -> { RETURN $x + Yql::Fold( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-nested_closure_in_l2_and_l1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-nested_closure_in_l2_and_l1_/formatted.sql index 1771f454810a..de4158c0e8f2 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-nested_closure_in_l2_and_l1_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-nested_closure_in_l2_and_l1_/formatted.sql @@ -2,8 +2,8 @@ SELECT AsList( ListMap( AsList(3, 4), ($x) -> { - RETURN $x + - Yql::Fold( + RETURN $x + + Yql::Fold( ListMap( AsList(7, 8), ($y) -> { RETURN $x + Yql::Fold( @@ -19,8 +19,8 @@ SELECT } ) } - ) + - Yql::Fold( + ) + + Yql::Fold( AsList(9, 10), 1, ($c, $d) -> { RETURN $c + $d + Yql::Fold( ListMap( 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 92d3914f8de3..e7431a393579 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 @@ -12,25 +12,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; @@ -63,8 +54,8 @@ $push_final_preprocessing = ( SELECT COALESCE(fixed_manufacturer, "other") AS manufacturer, L.* - WITHOUT - L.manufacturer +WITHOUT + L.manufacturer FROM $push_final_preprocessing AS L LEFT JOIN ( @@ -73,4 +64,4 @@ LEFT JOIN ( FROM $manufacturers_whitelist ) AS R -ON (L.manufacturer = R.fixed_manufacturer); +ON (L.manufacturer == R.fixed_manufacturer); 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 4f3c7d519358..aec24f7c8f1c 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,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ SELECT ToBytes(TzDate("2001-01-01,Europe/Moscow")); 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 4ec6437ffd20..f88256c9d321 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 @@ -2,7 +2,8 @@ SELECT CAST( AddTimezone( - /* "1970-01-01T20:59:59Z" */CAST(75599 AS DateTime), + /* "1970-01-01T20:59:59Z" */ + CAST(75599 AS DateTime), "Europe/Moscow" ) AS TzDate ); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_table_sort_asc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_table_sort_asc_/formatted.sql index 3b8f938cd8c0..b60fa64b190c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_table_sort_asc_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_table_sort_asc_/formatted.sql @@ -1,8 +1,8 @@ -/* postgres can not *//* multirun can not */ +/* postgres can not */ +/* multirun can not */ USE plato; -INSERT INTO Output - WITH truncate +INSERT INTO Output WITH truncate SELECT CAST(value AS tzdatetime) AS x FROM Input diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_table_sort_desc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_table_sort_desc_/formatted.sql index 280e8381861b..86c487180d11 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_table_sort_desc_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_table_sort_desc_/formatted.sql @@ -1,8 +1,8 @@ -/* postgres can not *//* multirun can not */ +/* postgres can not */ +/* multirun can not */ USE plato; -INSERT INTO Output - WITH truncate +INSERT INTO Output WITH truncate SELECT CAST(value AS tzdatetime) AS x FROM Input diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_distinct-distinct_list_after_group_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_distinct-distinct_list_after_group_/formatted.sql index 5db055965abe..c1ec1edf1ee7 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_distinct-distinct_list_after_group_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_distinct-distinct_list_after_group_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT listsort(aggregate_list(DISTINCT key)) AS key_list, value AS name diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_distinct-distinct_star_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_distinct-distinct_star_/formatted.sql index ad6cf409f88d..7bdd19dff502 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_distinct-distinct_star_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_distinct-distinct_star_/formatted.sql @@ -10,8 +10,8 @@ ORDER BY SELECT DISTINCT * - WITHOUT - subkey +WITHOUT + subkey FROM Input2 ORDER BY key, @@ -20,8 +20,8 @@ ORDER BY SELECT DISTINCT a.*, TableName() AS tn, - WITHOUT - subkey +WITHOUT + subkey FROM Input2 AS a ORDER BY diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_distinct-distinct_star_inmem_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_distinct-distinct_star_inmem_/formatted.sql index 38ee9305835b..575a205621ca 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_distinct-distinct_star_inmem_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_distinct-distinct_star_inmem_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $src = SELECT 1, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-blacklisted_pragmas1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-blacklisted_pragmas1_/formatted.sql index 2acce5f7a996..0c102e0b5dcc 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-blacklisted_pragmas1_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-blacklisted_pragmas1_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* dq can not *//* syntax version 1 */ +/* postgres can not */ +/* dq can not */ +/* syntax version 1 */ USE plato; PRAGMA OrderedColumns; PRAGMA yt.PoolTrees = 'test'; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-blacklisted_pragmas_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-blacklisted_pragmas_/formatted.sql index df9608118346..09fb66e36f9e 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-blacklisted_pragmas_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-blacklisted_pragmas_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* dq can not *//* syntax version 1 */ +/* postgres can not */ +/* dq can not */ +/* syntax version 1 */ USE plato; PRAGMA OrderedColumns; PRAGMA yt.MaxRowWeight = '32M'; 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 c5846148ff40..c75ef00517e4 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 @@ -10,13 +10,13 @@ FROM Input1 AS i1 JOIN Input2 AS i2 -ON i1.key = i2.key +ON i1.key == i2.key JOIN Input3 AS i3 -ON i1.key = i3.key +ON i1.key == i3.key JOIN Input4 AS i4 -ON i1.key = i4.key +ON i1.key == i4.key ORDER BY i1.value, i2.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 6ef0aa6ec933..1f790f67eb26 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* dqfile can not */ +/* syntax version 1 */ +/* dqfile can not */ USE plato; PRAGMA DqEngine = "force"; PRAGMA dq.MemoryLimit = "1M"; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-pool_trees_whitelist_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-pool_trees_whitelist_/formatted.sql index 27f5942b993c..2015d992249d 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-pool_trees_whitelist_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-pool_trees_whitelist_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; PRAGMA OrderedColumns; PRAGMA yt.PoolTrees = 'physical,cloud'; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-wrong_script_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-wrong_script_/formatted.sql index e0916de0badc..733867e5d014 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-wrong_script_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-wrong_script_/formatted.sql @@ -1,4 +1,5 @@ -/* custom error:Failed to cast arguments*//* dqfile can not */ +/* custom error:Failed to cast arguments*/ +/* dqfile can not */ USE plato; $f = Python3::f( @@ diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-wrong_script_segf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-wrong_script_segf_/formatted.sql index 85a3ee8abd94..d19c6efcd2eb 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-wrong_script_segf_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-wrong_script_segf_/formatted.sql @@ -1,4 +1,5 @@ -/* custom error:PrintBacktraceToStderr*//* dqfile can not */ +/* custom error:PrintBacktraceToStderr*/ +/* dqfile can not */ USE plato; $f = Python3::f( @@ diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-read_modified_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-read_modified_/formatted.sql index be9ff80b0cfa..f00fa9963a44 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-read_modified_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-read_modified_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* multirun can not */ +/* postgres can not */ +/* multirun can not */ USE plato; INSERT INTO Output diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-reset_sortness_on_append_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-reset_sortness_on_append_/formatted.sql index a6653bf79da2..d60770ef0ff0 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-reset_sortness_on_append_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-reset_sortness_on_append_/formatted.sql @@ -1,8 +1,8 @@ -/* postgres can not *//* multirun can not */ +/* postgres can not */ +/* multirun can not */ USE plato; -INSERT INTO Output - WITH truncate ( +INSERT INTO Output WITH truncate ( a, b ) 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 9ea59213d03f..086d4a4e0a6c 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* multirun can not */ +/* postgres can not */ +/* multirun can not */ USE plato; INSERT INTO @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 7d0c48c5ec1e..1a55894a8c5c 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* multirun can not */ +/* postgres can not */ +/* multirun can not */ USE plato; INSERT INTO Output diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_set_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_set_/formatted.sql index 60005c06cee9..23f491d5ed80 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_set_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_set_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT DictLength(AsSetStrict(1, 2, 3)), DictLength(AsSet(1, 2, 3u)), 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 a491355cc081..f5440c52ea35 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,4 +1,5 @@ -/* postgres can not *//* custom error:Member not found: Value3. Did you mean Value1?*/ +/* 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), diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_table_bad_row_type_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_table_bad_row_type_fail_/formatted.sql index 11a8144a1c90..75d8ad14f2d0 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_table_bad_row_type_fail_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_table_bad_row_type_fail_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* custom error:Expected struct type, but got: Uint32*/ +/* postgres can not */ +/* custom error:Expected struct type, but got: Uint32*/ $data = AsList(1u, 2u, 3u); SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_table_emptylist2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_table_emptylist2_/formatted.sql index bcc6cd5f7ff4..b0856f7c42e4 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_table_emptylist2_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_table_emptylist2_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT * FROM as_table([]) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_table_emptylist_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_table_emptylist_/formatted.sql index eaabfe3031ff..3a0d09e4a9e5 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_table_emptylist_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_table_emptylist_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT * FROM as_table([]); 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 6ae70061e7bd..3a53013ea002 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,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ SELECT 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 bc21ab9aadab..28ec9c362902 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,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ SELECT ENUM ("foo", Enum<"foo", "bar">) == AsEnum("foo"), ENUM ("foo", Enum<"foo", "bar">) == AsEnum("bar"), diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-callable_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-callable_/formatted.sql index 59ceb8448e23..c13a9ba70c1a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-callable_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-callable_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ $lambda = ($x) -> { RETURN CAST($x AS String) }; 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 bc9df808facc..c2e5a3ac8a4c 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,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ SELECT CAST(DyNumber("-21.33") AS String), CAST(DyNumber("0") AS Utf8), 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 4a434d75575a..26982bd02a68 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,3 +1,4 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ SELECT CAST(ListReverse(ListExtend(["1", "2", "3"], ["4", "5", "6"])) AS List); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_struct_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_struct_/formatted.sql index bb5560139f27..cb8e719c3030 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_struct_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_struct_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ $struct = <|du: 3.14, fl: -1.f, i: 0, s: "str"u, u: 123u|>; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_type_bind_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_type_bind_/formatted.sql index 27540a3efaac..57cecce84206 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_type_bind_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_type_bind_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ $t = List; SELECT 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 8cce68c1c3f0..1c908eb75c0e 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,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ $a = AsEnum("a"); $b = AsEnum("b"); $c = AsEnum("c"); 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 43bc5c962bcc..c509046558c2 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ 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 bdeefad8fd3d..268c72c850ba 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 @@ -24,4 +24,4 @@ SELECT AsTuple(NULL) <= AsTuple(NULL); 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-convert_to_lambda_optional_args_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-convert_to_lambda_optional_args_/formatted.sql index 40445c422105..255407701916 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-convert_to_lambda_optional_args_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-convert_to_lambda_optional_args_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $f = ($x, $y?) -> ($x + ($y ?? 0)); SELECT 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 4d84a0c1a6a9..c2db42494a77 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT CurrentTzDate("Europe/Moscow"), CurrentTzDatetime("Europe/Moscow"), 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 6bb6e6ebceeb..5dbf5369abe0 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,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ $dict = AsDict(AsTuple("foo", 3), AsTuple("bar", 4)); SELECT 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 9a15947b087a..94922c9d9d9a 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 @@ -6,27 +6,18 @@ $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 - DictContains($d3, NULL), - -- true, null is convertible to Nothing for any T - DictLookup($d2, NULL), - -- Nothing(String?), no such key + DictContains($d2, NULL), -- false, no such key + DictContains($d3, NULL), -- true, null is convertible to Nothing for any T + DictLookup($d2, NULL), -- Nothing(String?), no such key DictLookup($d3, NULL); -- Just("baz"), null is convertible to Nothing 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 for any T - DictLookup($t2, AsTuple(NULL, "key")), - -- Nothing(Tuple?), no such 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 for any T + DictLookup($t2, AsTuple(NULL, "key")), -- Nothing(Tuple?), no such key DictLookup($t3, AsTuple(NULL, "key")); -- Just(AsTuple(123, "value")), null is convertible to Nothing 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 0af320556d6f..c3e024ec6f2d 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,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* yt can not */ 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_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-distinct_from_/formatted.sql index 310f67ba9140..bf65de535bd1 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-distinct_from_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-distinct_from_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT 1 IS DISTINCT FROM 2, 1 IS NOT DISTINCT FROM 2, 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 f62bf617e170..e73f2799378b 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,19 +1,15 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $vt1 = ParseType("Variant"); $vt2 = ParseType("Variant"); $svt1 = ParseType("Variant"); $svt2 = ParseType("Variant"); 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 + (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 ; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-distinct_from_opt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-distinct_from_opt_/formatted.sql index 2e37cb4f1af1..72b9fc2a9fd9 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-distinct_from_opt_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-distinct_from_opt_/formatted.sql @@ -1,18 +1,12 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT - NULL IS NOT DISTINCT FROM 1 / 0, - --true - 1 / 0 IS DISTINCT FROM NULL, - --false - 1u / 0u IS DISTINCT FROM 1 / 0, - --false - Just(1u) IS NOT DISTINCT FROM 1 / 0, - --false - 1u / 0u IS DISTINCT FROM Just(1), - --true - 1u IS DISTINCT FROM 1, - --false - Nothing(Int32??) IS DISTINCT FROM Just(1 / 0), - --true - 1 IS NOT DISTINCT FROM Just(Just(1u)),--true + NULL IS NOT DISTINCT FROM 1 / 0, --true + 1 / 0 IS DISTINCT FROM NULL, --false + 1u / 0u IS DISTINCT FROM 1 / 0, --false + Just(1u) IS NOT DISTINCT FROM 1 / 0, --false + 1u / 0u IS DISTINCT FROM Just(1), --true + 1u IS DISTINCT FROM 1, --false + Nothing(Int32??) IS DISTINCT FROM Just(1 / 0), --true + 1 IS NOT DISTINCT FROM Just(Just(1u)), --true ; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_dict_ops_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_dict_ops_/formatted.sql index 0c73e5d2f10c..4d15166bd1a3 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_dict_ops_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_dict_ops_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT DictLength({}), DictHasItems({}), 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 6c750023ed9e..28607c16541a 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $train = 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 99785f2a37be..a2c9d8a7c33b 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $train = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_list_ops1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_list_ops1_/formatted.sql index c19b63a0925b..48c468ea2240 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_list_ops1_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_list_ops1_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT ListLength([]), Yql::Append([], 1), diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_list_ops2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_list_ops2_/formatted.sql index 0264b93b26a2..d9f9264ef5bb 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_list_ops2_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_list_ops2_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT ListHasItems([]), Yql::Filter( 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 1b284d4de34a..46b2c8aa13a5 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $pred = ($x) -> { RETURN $x > 0 }; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_struct_tuple_types_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_struct_tuple_types_/formatted.sql index c63d596a48b0..907ba6d1bae3 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_struct_tuple_types_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_struct_tuple_types_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT FormatType(Tuple<>), FormatType(Tuple< >), 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 efc37b3cb332..2231823c2fea 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,3 +1,4 @@ -/* postgres can not *//* custom error:message*/ +/* postgres can not */ +/* custom error:message*/ SELECT 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 dd30d3bd61cf..e06c7e55c8f7 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 @@ -1,3 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* syntax version 1 *//* custom error:Mismatch types: Int32 != String (message)*/ +/* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ +/* custom error:Mismatch types: Int32 != String (message)*/ SELECT EnsureType(42, String, "message"); 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 9a258fd31480..e655fa5a7283 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 @@ -1,4 +1,6 @@ -/* postgres can not *//* syntax version 1 *//* yt can not */ +/* postgres can not */ +/* syntax version 1 */ +/* yt can not */ $s = <|a: 1, b: 2u / 1u, c: Just(Just(1))|>; $js = Just($s); $es = Nothing(Struct?); 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 5f6dce9012eb..cb56797e25b9 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,4 +1,5 @@ -/* postgres can not *//* custom error:Cannot infer common type for Int64 and Uint64*/ +/* postgres can not */ +/* custom error:Cannot infer common type for Int64 and Uint64*/ PRAGMA warning("error", "1107"); SELECT 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 9d2ddb14885c..abfebf6b02d2 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $x = AsStruct(1 AS a); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-iterable_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-iterable_/formatted.sql index b019b0fa9341..b227fb6a2a6c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-iterable_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-iterable_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ $a = Yql::ToList(() -> (Yql::Iterator([1, 2, 3]))); SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-lds_empty_cast_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-lds_empty_cast_/formatted.sql index fc03939d4c39..54355c8b1787 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-lds_empty_cast_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-lds_empty_cast_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT Yql::Append(AsList(ListCreate(Int32)), []), Yql::Append(AsList(DictCreate(Int32, String)), {}), diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-lds_empty_compare_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-lds_empty_compare_/formatted.sql index 57c604f61121..416f887bdd01 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-lds_empty_compare_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-lds_empty_compare_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT Yql::AggrEquals([], []), Yql::AggrNotEquals([], []), @@ -8,11 +9,11 @@ SELECT Yql::AggrGreaterOrEqual([], []), Yql::AggrEquals({}, {}), Yql::AggrNotEquals({}, {}), - [] = [], - [] = ListCreate(Int32), - ListCreate(Int32) = [], - [] = [1], - [1] = [], + [] == [], + [] == ListCreate(Int32), + ListCreate(Int32) == [], + [] == [1], + [1] == [], [] != [], [] != ListCreate(Int32), ListCreate(Int32) != [], @@ -38,11 +39,11 @@ SELECT ListCreate(Int32) >= [], [] >= [1], [1] >= [], - {} = {}, - {} = SetCreate(Int32), - SetCreate(Int32) = {}, - {} = {1}, - {1} = {}, + {} == {}, + {} == SetCreate(Int32), + SetCreate(Int32) == {}, + {} == {1}, + {1} == {}, {} != {}, {} != SetCreate(Int32), SetCreate(Int32) != {}, 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 4436977ea4e0..ba86ab88e3f0 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT [], [,], 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 a7489d246d19..11f1e611416d 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT FormatType(EmptyList), TypeKind(TypeHandle(EmptyList)), 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 2735d51534b4..e8611aa52141 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ $list = AsList(3, 1, 2, 3); $other_list = AsList(4); $bool_list = AsList(TRUE, FALSE, TRUE); 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 9b1e60779237..8bdcfa5cf8b3 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,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ $list0 = AsList("a", "b"); $list1 = AsList(Just("a"), "b", Nothing(ParseType("String?"))); $list2 = Just(AsList("a", "b")); 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 4eab4b374cb5..69916337f03e 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,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ $list = ["one", "two", "three", "four", "five"]; SELECT 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 a156e0d805e1..a822e19dd235 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,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ PRAGMA warning("disable", "1107"); SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_flat_map_deprecated_opt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_flat_map_deprecated_opt_/formatted.sql index ea28d18529bf..2fc6cae3aa7f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_flat_map_deprecated_opt_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_flat_map_deprecated_opt_/formatted.sql @@ -1,3 +1,4 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ SELECT ListFlatMap([1, 2, NULL], ($x) -> (10 + $x)); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_flatten_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_flatten_/formatted.sql index 477f72ccb059..d31cf789057d 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_flatten_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_flatten_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ SELECT ListFlatten(NULL), ListFlatten([]), diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_not_null_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_not_null_/formatted.sql index c80305f9a94b..a8fc9191cda6 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_not_null_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_not_null_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ SELECT ListNotNull(NULL), ListNotNull([]), diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_replicate_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_replicate_fail_/formatted.sql index 29e846ab52fb..e6697edf678e 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_replicate_fail_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_replicate_fail_/formatted.sql @@ -1,3 +1,4 @@ -/* postgres can not *//* custom error:Second argument in ListReplicate = 18446744073709551615 exceeds maximum value = 4294967296*/ +/* postgres can not */ +/* custom error:Second argument in ListReplicate = 18446744073709551615 exceeds maximum value = 4294967296*/ SELECT ListReplicate(1, -1); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_takeskipwhile_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_takeskipwhile_/formatted.sql index 9e21551313d6..a85cfa14be90 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_takeskipwhile_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_takeskipwhile_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ $a = AsList(1, 2, 3, 1, 2, 3); SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_takeskipwhileinclusive_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_takeskipwhileinclusive_/formatted.sql index 28bffc78e011..945e9ed19518 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_takeskipwhileinclusive_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_takeskipwhileinclusive_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ $a = AsList(1, 2, 3, 1, 2, 3); SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-literal_list_element_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-literal_list_element_/formatted.sql index 4ca02cac5450..0f0f46a0e484 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-literal_list_element_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-literal_list_element_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $list = YQL::@@(AsList (String 'z) (String 'a))@@; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-literal_strings_suffix_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-literal_strings_suffix_/formatted.sql index 6a5d112f76a0..425c70ec2114 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-literal_strings_suffix_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-literal_strings_suffix_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ SELECT "ab"u, "[1;2]"y, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-literal_true_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-literal_true_/formatted.sql index 5257dbafc0cb..bfa456ec9c33 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-literal_true_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-literal_true_/formatted.sql @@ -1,3 +1,4 @@ -/* postgres can not *//* postgres returns "t" as string representation */ +/* postgres can not */ +/* postgres returns "t" as string representation */ SELECT TRUE; 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 519dc1c9b732..eca0dd884ba2 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,4 +1,5 @@ -/* postgres can not */-- not supported on windows +/* postgres can not */ +-- not supported on windows $value = "1000000000000"; $negative = -1000000000000; $longint = YQL::StrictFromString($value, AsAtom("Decimal"), AsAtom("32"), AsAtom("0")); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-opt_list_map_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-opt_list_map_/formatted.sql index 1f67448960a2..9e017f986b5b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-opt_list_map_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-opt_list_map_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ $l1 = AsList(1, 2, 3, 1, 2, 3); $l2 = Just($l1); $l3 = Nothing(TypeOf($l2)); 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 9bfc9c29241a..7e8984666113 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 @@ -1,4 +1,6 @@ -/* postgres can not *//* kikimr can not *//* syntax version 1 */ +/* postgres can not */ +/* kikimr can not */ +/* syntax version 1 */ SELECT TryMember(Just(<|x: 1|>), "x", 0), TryMember(Just(<|x: 1|>), "y", 0), 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 690dde25d5e8..000baa623b8a 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 @@ -1,4 +1,6 @@ -/* postgres can not *//* syntax version 1 *//* yt can not */ +/* postgres can not */ +/* syntax version 1 */ +/* yt can not */ $s = <|a: 1p|>; $js = Just($s); $es = Nothing(Struct?); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-pickle_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-pickle_/formatted.sql index aaac9f3fff34..f2c6276a50b5 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-pickle_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-pickle_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ $lst = AsList(AsTuple(13, 4), AsTuple(11, 2), AsTuple(17, 8), AsTuple(5, 6)); $p1 = Pickle(ToDict($lst)); $p2 = StablePickle(ToDict($lst)); @@ -9,9 +10,9 @@ $p5 = StablePickle(ToDict(ListReverse($lst))); SELECT $p1, Ensure($p2, $p1 != $p2), - Ensure($p3, $p2 = $p3), + Ensure($p3, $p2 == $p3), Ensure($p4, $p4 != $p1), - Ensure($p5, $p5 = $p2); + Ensure($p5, $p5 == $p2); SELECT ListSort(DictItems(Unpickle(TypeOf(ToDict($lst)), $p1))), 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 2073ed819f9e..8545f7389c13 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ $data = <|x: [<|y: 2|>], z: 5|>; -- set field function $F = ($field, $function) -> ( @@ -11,7 +12,7 @@ $E = ($index, $function) -> ( ($list) -> ( ListMap( ListEnumerate($list), ($pair) -> ( - IF($pair.0 = $index, $function($pair.1), $pair.1) + IF($pair.0 == $index, $function($pair.1), $pair.1) ) ) ) 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 3733ff585c35..ffe23134a2f2 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,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* 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); 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 246dcf3cc124..8c173fa37116 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 @@ -1,4 +1,6 @@ -/* postgres can not *//* kikimr can not *//* syntax version 1 */ +/* postgres can not */ +/* kikimr can not */ +/* syntax version 1 */ $ad = AsStruct(1 AS a, 4 AS d); $b = AsStruct(2 AS b); $c_name = 'c'; 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 dcdb2a8fd90e..26c64cdf4047 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ SELECT StructMembers(<|a: 1|>), StructMembers(Just(<|a: 1|>)), 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 a4545a9601f6..971253977b4f 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT <||>, <|,|>, 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 a08269a1727e..69b385589bc3 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $s = <|x: 1, y: "2"|>; SELECT 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 4dba1b59511a..a514d08ee3d8 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,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ $s = <|a: 1, b: 2, c: 3, d: 4|>; $list = ["a", "b"]; 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 c5225e1e746d..92c16355cd3c 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 @@ -1,4 +1,6 @@ -/* postgres can not *//* syntax version 1 *//* yt can not */ +/* postgres can not */ +/* syntax version 1 */ +/* yt can not */ $s = <|a: 1, b: 2u / 1u, c: Just(Just(1))|>; $js = Just($s); $es = Nothing(Struct?); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-type_as_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-type_as_key_/formatted.sql index ba9b49cc359b..897d044158b6 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-type_as_key_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-type_as_key_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT a.int32 FROM ( 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 8a723af534f6..b50fedd24f1b 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $parse = DateTime::Parse("%Y-%m-%d,%Z"); $date_string = '2020-05-30,Europe/Moscow'; $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 e8ff1fa099c8..771f3b41d170 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $lists_2sum = ($l1, $l2) -> ( ListMap(ListZip($l1, $l2), ($x) -> ($x.0 + $x.1)) ); 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 0379aff425d6..96f31c8f7a9c 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,3 +1,4 @@ -/* postgres can not *//* custom error:message*/ +/* postgres can not */ +/* custom error:message*/ SELECT Unwrap(NULL, "message"); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-uuid_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-uuid_/formatted.sql index e270aedad57e..b9c7f62728c8 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-uuid_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-uuid_/formatted.sql @@ -8,10 +8,10 @@ SELECT CAST(CAST('550e8400-e29b-41d4-a716-446655440000' AS Uuid) AS varchar); SELECT - CAST(CAST('550e8400-e29b-41d4-a716-446655440000' AS Uuid) AS varchar) = '550e8400-e29b-41d4-a716-446655440000'; + CAST(CAST('550e8400-e29b-41d4-a716-446655440000' AS Uuid) AS varchar) == '550e8400-e29b-41d4-a716-446655440000'; SELECT - Uuid('550e8400-e29b-41d4-a716-446655440000') = CAST('550e8400-e29b-41d4-a716-446655440000' AS uuid); + Uuid('550e8400-e29b-41d4-a716-446655440000') == CAST('550e8400-e29b-41d4-a716-446655440000' AS uuid); SELECT Uuid('550e8400-e29b-41d4-a716-446655440000') < CAST('550e8400-e29b-41d4-a716-446655440000' AS uuid); 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 3324cb2df306..2f87d7a87a04 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $list = [AsVariant(1, "int"), AsVariant(1.f, "float"), AsVariant(1.0, "double"), AsVariant(1u, "unsigned")]; SELECT 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 fd5df90b64cf..1194fdd2a010 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $f = Yql::WithOptionalArgs(($x, $y, $z) -> ($x + ($y ?? 0) + ($z ?? 0)), AsAtom("2")); SELECT 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 73c1bd282ab9..83fc510ec369 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 @@ -11,7 +11,7 @@ DEFINE SUBQUERY $last_tables($path, $limit) AS SELECT ListLast(String::SplitToList(Path, "/")) AS Name FROM FOLDER($path) - WHERE Type = "table" + WHERE Type == "table" ORDER BY Name DESC LIMIT $limit diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-yql-15485_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-yql-15485_/formatted.sql index b65f82d8f258..957f331d8780 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-yql-15485_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-yql-15485_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $ages = [ <|suffix: "0-0.5"u, begin: 0.f, end: 0.5f|>, <|suffix: "0.5-1"u, begin: 0.5f, end: 1.f|>, @@ -17,12 +18,10 @@ $interval_fits_in = ($interval, $other) -> { $interval.end <= $other.begin OR $interval.begin >= $other.end, 0.f, IF( - $interval.begin >= $other.begin AND $interval.end <= $other.end, - -- interval is completely within other + $interval.begin >= $other.begin AND $interval.end <= $other.end, -- interval is completely within other 1.f, IF( - $interval.begin <= $other.begin AND $interval.end >= $other.end, - -- other is completely within the interval + $interval.begin <= $other.begin AND $interval.end >= $other.end, -- other is completely within the interval ($other.end - $other.begin) / $length, IF( $interval.begin < $other.begin, 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 84c50a81904b..acca8283c591 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ SELECT key, FileContent("keyid.lst") AS content, 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 dfe1ac7c687b..9b1adaf44206 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 @@ -1,4 +1,6 @@ -/* postgres can not *//* syntax version 1 */-- compiles to different code in v0/v1 due to different SplitToList settings +/* postgres can not */ +/* syntax version 1 */ +-- compiles to different code in v0/v1 due to different SplitToList settings SELECT * FROM plato.Input 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 e2084e94a291..346146c84f80 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,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ $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 a73a548a8645..fd547c185991 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,3 +1,4 @@ -/* postgres can not *//* custom error:User type Uuid is not supported*/ +/* postgres can not */ +/* custom error:User type Uuid is not supported*/ SELECT ParseFile('uuid', "keyid.lst"); 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 61dd64b34639..883a0410f6f3 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,4 +1,5 @@ -/* 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*/ +/* 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"); SELECT 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 dfe1ac7c687b..9b1adaf44206 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 @@ -1,4 +1,6 @@ -/* postgres can not *//* syntax version 1 */-- compiles to different code in v0/v1 due to different SplitToList settings +/* postgres can not */ +/* syntax version 1 */ +-- compiles to different code in v0/v1 due to different SplitToList settings SELECT * FROM plato.Input diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_and_where_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_and_where_/formatted.sql index 8382c173dcdd..b7645e7a7330 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_and_where_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_and_where_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $data = ( SELECT mod, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_by_aster_opt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_by_aster_opt_/formatted.sql index 05c50a95e877..1d0af91cd303 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_by_aster_opt_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_by_aster_opt_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ SELECT * FROM ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_by_opt_dict_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_by_opt_dict_/formatted.sql index 7c9c6bcdf29a..f2fd7e3d74eb 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_by_opt_dict_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_by_opt_dict_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $data_dict = ( SELECT mod, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_by_typed_table_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_by_typed_table_/formatted.sql index a181c15f4376..e7c3cdf182ea 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_by_typed_table_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_by_typed_table_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ SELECT bb FROM plato.Input diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_corr_name_column_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_corr_name_column_/formatted.sql index 568cad833864..ab595d437f9c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_corr_name_column_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_corr_name_column_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $data = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_dict_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_dict_/formatted.sql index 8ffad72338b7..e80a6a86c76e 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_dict_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_dict_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA sampleselect; $data_dict = ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_dict_by_opt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_dict_by_opt_/formatted.sql index 0a42fc0821e4..40b24169fdbc 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_dict_by_opt_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_dict_by_opt_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $data_dict = ( SELECT mod, 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 b5b9e2b8fc3f..6ce9d1ed9db0 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $data = SELECT "a,b,c,d" AS 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 8422c5b17bd6..384b7ca9315f 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $data = SELECT "a,b,c,d" AS a, 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 3cef440fea8a..25391942a860 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $data = @@ -15,6 +16,6 @@ FROM ANY $data ) JOIN Input AS y -ON x.aa = y.key +ON x.aa == y.key ORDER BY aa; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_expr_struct_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_expr_struct_/formatted.sql index 46df7d55cb6f..689eeb4eff12 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_expr_struct_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_expr_struct_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $data = 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 4f0b3500d476..5570dbc2b041 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $data = SELECT "a,b,c,d" AS a, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_few_fields_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_few_fields_/formatted.sql index 9a0d8ebfcd24..d9872c308d6f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_few_fields_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_few_fields_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA sampleselect; $data_deep = ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_list_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_list_/formatted.sql index 42b18417bd92..8de5dcddf472 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_list_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_list_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $data = ( SELECT mod, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_list_on_flatten_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_list_on_flatten_by_/formatted.sql index 674c544a7a9a..6e98277968a3 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_list_on_flatten_by_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_list_on_flatten_by_/formatted.sql @@ -9,7 +9,7 @@ $flatten = ( AS a FLATTEN BY parsed_answers_and_clicks AS answer_and_clicks - WHERE answer_and_clicks.1 = 1 + WHERE answer_and_clicks.1 == 1 ); SELECT @@ -19,8 +19,8 @@ FROM ( SELECT asList(bc_type_tuple.0, 'total') AS bc_type, a.* - WITHOUT - bc_type_tuple + WITHOUT + bc_type_tuple FROM $flatten AS a ) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_one_field_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_one_field_/formatted.sql index 1487d1563b13..5ab1b4031386 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_one_field_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_one_field_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $data = ( SELECT mod, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_one_field_another_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_one_field_another_/formatted.sql index 6e94acace0bf..24f58c2e0cf5 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_one_field_another_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_one_field_another_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $data = ( SELECT mod, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_two_fields_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_two_fields_/formatted.sql index 4aa1974475c4..df6d24fd9df2 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_two_fields_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_two_fields_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $data_deep = ( SELECT mod, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_group_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_group_by_/formatted.sql index e78b6e35e190..d1336d3d8ea8 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_group_by_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_group_by_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $data_deep = ( SELECT mod, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_group_by_expr_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_group_by_expr_/formatted.sql index 32ce0f42caa7..9d9dd9289f9c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_group_by_expr_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_group_by_expr_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $data_deep = ( SELECT mod, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_join_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_join_/formatted.sql index 4994bd7ebc04..66f9c4289ddc 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_join_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_join_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $data = ( SELECT mod, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_resource_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_resource_/formatted.sql index 72c8bb841c1f..e3c5c291cffc 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_resource_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_resource_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* kikimr can not *//* syntax version 1 */ +/* postgres can not */ +/* kikimr can not */ +/* syntax version 1 */ $script = @@ def save(item): return item diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_subquery_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_subquery_/formatted.sql index 5c866b394cfd..0f09ff6e3f24 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_subquery_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_subquery_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ DEFINE SUBQUERY $bar() AS SELECT [1, 2] AS ks; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-struct_without_correlation_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-struct_without_correlation_/formatted.sql index b075c112eeae..5a4d3e612396 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-struct_without_correlation_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-struct_without_correlation_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA sampleselect; USE plato; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-basic_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-basic_/formatted.sql index c8953dce142b..21157963b210 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-basic_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-basic_/formatted.sql @@ -1,4 +1,8 @@ -/* syntax version 1 *//* postgres can not *//* dq can not *//* dqfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* dq can not */ +/* dqfile can not */ +/* yt can not */ PRAGMA FlexibleTypes; $format = ($x) -> (FormatType($x)); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-flatten_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-flatten_by_/formatted.sql index afd8756e8ad4..53683af2e057 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-flatten_by_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-flatten_by_/formatted.sql @@ -1,4 +1,8 @@ -/* syntax version 1 *//* postgres can not *//* dq can not *//* dqfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* dq can not */ +/* dqfile can not */ +/* yt can not */ PRAGMA FlexibleTypes; 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 b99f03bdd7ab..bc32fd343e96 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 @@ -1,4 +1,8 @@ -/* syntax version 1 *//* postgres can not *//* dq can not *//* dqfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* dq can not */ +/* dqfile can not */ +/* yt can not */ PRAGMA FlexibleTypes; PRAGMA warning("disable", "4510"); $x1 = () -> (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 ca3f15217290..d24e04b2b88b 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 @@ -1,4 +1,8 @@ -/* syntax version 1 *//* postgres can not *//* dq can not *//* dqfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* dq can not */ +/* dqfile can not */ +/* yt can not */ PRAGMA FlexibleTypes; $groupsrc = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-group_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-group_by_/formatted.sql index 68adef24cd36..9e66236f2845 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-group_by_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-group_by_/formatted.sql @@ -1,4 +1,8 @@ -/* syntax version 1 *//* postgres can not *//* dq can not *//* dqfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* dq can not */ +/* dqfile can not */ +/* yt can not */ PRAGMA FlexibleTypes; $groupsrc = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-struct_literals_vs_columns_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-struct_literals_vs_columns_/formatted.sql index 2e722d202edd..62ff32da69db 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-struct_literals_vs_columns_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-struct_literals_vs_columns_/formatted.sql @@ -1,4 +1,8 @@ -/* syntax version 1 *//* postgres can not *//* dq can not *//* dqfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* dq can not */ +/* dqfile can not */ +/* yt can not */ PRAGMA FlexibleTypes; SELECT 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 f82160cffb88..e9d2270328c2 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 @@ -1,4 +1,8 @@ -/* syntax version 1 *//* postgres can not *//* dq can not *//* dqfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* dq can not */ +/* dqfile can not */ +/* yt can not */ PRAGMA FlexibleTypes; $src = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-unused_types_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-unused_types_/formatted.sql index cec54f853c02..71d005b61618 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-unused_types_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-unused_types_/formatted.sql @@ -1,4 +1,8 @@ -/* syntax version 1 *//* postgres can not *//* dq can not *//* dqfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* dq can not */ +/* dqfile can not */ +/* yt can not */ PRAGMA FlexibleTypes; $format = ($x) -> (FormatType($x)); 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 f9d44948c248..f6ba3d48ed58 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 @@ -1,4 +1,8 @@ -/* syntax version 1 *//* postgres can not *//* dq can not *//* dqfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* dq can not */ +/* dqfile can not */ +/* yt can not */ PRAGMA FlexibleTypes; $src = 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 618ce6d87ae1..468b6fac6b3e 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* kikimr can not */ +/* postgres can not */ +/* kikimr can not */ SELECT * FROM ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-group_ranges_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-group_ranges_/formatted.sql index b203f60c2fba..cbc2cd73def0 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-group_ranges_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-group_ranges_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* kikimr can not */ +/* postgres can not */ +/* kikimr can not */ USE plato; $i = ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-group_sampling_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-group_sampling_/formatted.sql index 0c6e8bc89214..d23775100c1d 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-group_sampling_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-group_sampling_/formatted.sql @@ -1,4 +1,7 @@ -/* postgres can not *//* kikimr can not *//* hybridfile can not YQL-17284 *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 16 */ +/* postgres can not */ +/* kikimr can not */ +/* hybridfile can not YQL-17284 */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 16 */ USE plato; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-less_outs_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-less_outs_/formatted.sql index 582e3d2d477b..e7fffc5d6e27 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-less_outs_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-less_outs_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $i1 = SELECT CAST(key AS Int32) ?? 0 AS key, 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 8004df696aa5..f78e010e3010 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,4 +1,5 @@ -/* postgres can not *//* kikimr can not */ +/* postgres can not */ +/* kikimr can not */ 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 5c43e4efe178..86a53d723f78 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,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* kikimr can not */ +/* syntax version 1 */ +/* postgres can not */ +/* kikimr can not */ PRAGMA yt.MaxOutputTables = "3"; $i1 = ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-merge_multiouts_all_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-merge_multiouts_all_/formatted.sql index a7a907f57987..49f6f95aa05b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-merge_multiouts_all_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-merge_multiouts_all_/formatted.sql @@ -1,5 +1,6 @@ USE plato; -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $udfScript = @@ def MyFunc(list): return [(int(x.key) % 4, x) for x in list] diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-merge_multiouts_part_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-merge_multiouts_part_/formatted.sql index 6d11e9200077..e044d76f9404 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-merge_multiouts_part_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-merge_multiouts_part_/formatted.sql @@ -1,5 +1,6 @@ USE plato; -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $udfScript = @@ def MyFunc(list): return [(int(x.key) % 4, x) for x in list] diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-merge_multiouts_reuse_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-merge_multiouts_reuse_/formatted.sql index bc07ed8ce993..0a83a16248f7 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-merge_multiouts_reuse_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-merge_multiouts_reuse_/formatted.sql @@ -1,5 +1,6 @@ USE plato; -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $udfScript = @@ def MyFunc(list): return [(int(x.key) % 4, x) for x in list] 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 2b1521fa28b3..fc66908fc957 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,4 +1,5 @@ -/* postgres can not *//* kikimr can not */ +/* postgres can not */ +/* kikimr can not */ PRAGMA yt.MaxOutputTables = "3"; PRAGMA yt.DisableOptimizers = "HorizontalJoin,MultiHorizontalJoin"; 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 fea6c2126ae2..3ae90c9229f9 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* kikimr can not - yt pragma */ +/* postgres can not */ +/* kikimr can not - yt pragma */ USE plato; PRAGMA yt.MaxExtraJobMemoryToFuseOperations = "550m"; PRAGMA yt.CombineCoreLimit = "128m"; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_sampling_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_sampling_/formatted.sql index 22f616e80976..6574ba53e855 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_sampling_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_sampling_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* kikimr can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) == 10 and len(yt_res_yson[1]['Write'][0]['Data']) < 10 and len(yt_res_yson[2]['Write'][0]['Data']) < 10 and len(yt_res_yson[3]['Write'][0]['Data']) == 10 */ +/* postgres can not */ +/* kikimr can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) == 10 and len(yt_res_yson[1]['Write'][0]['Data']) < 10 and len(yt_res_yson[2]['Write'][0]['Data']) < 10 and len(yt_res_yson[3]['Write'][0]['Data']) == 10 */ USE plato; SELECT 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 a4abafef0664..c11f9e4a75c4 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; PRAGMA yt.DisableOptimizers = "HorizontalJoin,MultiHorizontalJoin"; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-row_num_per_sect_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-row_num_per_sect_/formatted.sql index 34163fb64e1d..1c6148afad7c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-row_num_per_sect_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-row_num_per_sect_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* kikimr can not *//* syntax version 1 */ +/* postgres can not */ +/* kikimr can not */ +/* syntax version 1 */ USE plato; $with_row1 = ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-runtime_dep_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-runtime_dep_/formatted.sql index 49f9e4354aa8..485b38132a85 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-runtime_dep_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-runtime_dep_/formatted.sql @@ -1,8 +1,7 @@ /* postgres can not */ USE plato; -INSERT INTO @ttt - WITH TRUNCATE +INSERT INTO @ttt WITH TRUNCATE SELECT CAST(key AS int) AS key, subkey, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-skip_sampling_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-skip_sampling_/formatted.sql index e9cf21d7b06d..24211c44c40a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-skip_sampling_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-skip_sampling_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* kikimr can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 12 */ +/* postgres can not */ +/* kikimr can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 12 */ USE plato; SELECT 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 caa09e05ae36..07b2f436a669 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,4 +1,5 @@ -/* postgres can not *//* kikimr can not */ +/* postgres can not */ +/* kikimr can not */ PRAGMA yt.DisableOptimizers = "UnorderedOuts"; SELECT 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 1611a9a8cfbe..2186eb4ea729 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,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* kikimr can not */ +/* syntax version 1 */ +/* postgres can not */ +/* kikimr can not */ PRAGMA yt.DisableOptimizers = "UnorderedOuts"; $i1 = ( 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 c66323b8c2cb..c927ae3b8143 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; SELECT 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 a8996bc23723..c241facf24dc 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; PRAGMA config.flags("UdfSupportsYield", "false"); $s = @@ 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 603a2afd665c..203034758a01 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; PRAGMA config.flags("UdfSupportsYield", "true"); $s = @@ 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 7aedd0e7e588..f0d05539d4ac 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 @@ -1,4 +1,6 @@ -/* postgres can not *//* syntax version 1 *//* kikimr can not - yt pragma */ +/* postgres can not */ +/* syntax version 1 */ +/* kikimr can not - yt pragma */ USE plato; PRAGMA yt.UseSystemColumns = "0"; 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 494fd698623d..b0a6eda6bdff 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 @@ -1,4 +1,6 @@ -/* postgres can not *//* syntax version 1 *//* kikimr can not - yt pragma */ +/* postgres can not */ +/* syntax version 1 */ +/* kikimr can not - yt pragma */ USE plato; PRAGMA yt.MaxExtraJobMemoryToFuseOperations = "512M"; $udfScript = @@ diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_/formatted.sql index d441ec24b4d5..5f1c613ee04f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_/formatted.sql @@ -1,30 +1,21 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA AnsiInForEmptyOrNullableItemsCollections; SELECT - 1 IN (2, 3, NULL), - -- Nothing - NULL IN (), - -- false? - NULL IN (NULL), - -- Nothing - NULL IN (1), - -- Nothing - (1, NULL) IN ((1, 1), (2, 2)), - -- Nothing - (1, NULL) IN ((2, 2), (3, 3)), - -- false? - (1, 2) IN ((1, NULL), (2, 2)), - -- Nothing - (1, 2) IN ((NULL, 1), (2, 1)), - -- false? - (1, 2) IN ((1, NULL), (2, 1)), - -- Nothing - 128 IN (128ut, 1t),-- true + 1 IN (2, 3, NULL), -- Nothing + NULL IN (), -- false? + NULL IN (NULL), -- Nothing + NULL IN (1), -- Nothing + (1, NULL) IN ((1, 1), (2, 2)), -- Nothing + (1, NULL) IN ((2, 2), (3, 3)), -- false? + (1, 2) IN ((1, NULL), (2, 2)), -- Nothing + (1, 2) IN ((NULL, 1), (2, 1)), -- false? + (1, 2) IN ((1, NULL), (2, 1)), -- Nothing + 128 IN (128ut, 1t), -- true ; SELECT - Just(1) IN (1, 2, 3), - -- true? - 1 IN (Just(2), Just(3)),-- false? + Just(1) IN (1, 2, 3), -- true? + 1 IN (Just(2), Just(3)), -- false? ; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_dict1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_dict1_/formatted.sql index 7f9793272eb0..663e2e424f5c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_dict1_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_dict1_/formatted.sql @@ -1,12 +1,10 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA AnsiInForEmptyOrNullableItemsCollections; SELECT - 1 IN {2, 3, NULL}, - -- Nothing - 2 IN {2, 3, NULL}, - -- true? - (1, 2) IN {(1, NULL), (2, 1)}, - -- Nothing - (1, 2) IN {(1, NULL), (1, 2)},-- true? + 1 IN {2, 3, NULL}, -- Nothing + 2 IN {2, 3, NULL}, -- true? + (1, 2) IN {(1, NULL), (2, 1)}, -- Nothing + (1, 2) IN {(1, NULL), (1, 2)}, -- true? ; 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 a620341d6d87..f6a65c2952e8 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 @@ -1,28 +1,20 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA AnsiInForEmptyOrNullableItemsCollections; SELECT - 1 IN AsDict((2, "x"), (3, "y"), (NULL, "z")), - -- Nothing - NULL IN DictCreate(Int32, String?), - -- false? - NULL IN AsDict((NULL, "foo")), - -- Nothing - NULL IN AsDict((1, "bar")), - -- Nothing - (1, NULL) IN AsDict(((1, 1), NULL), ((2, 2), "foo")), - -- Nothing - (1, NULL) IN AsDict(((2, 2), "foo"), ((3, 3), "bar")), - -- false? - (1, 2) IN AsDict(((1, NULL), "foo"), ((2, 2), "bar")), - -- Nothing - (1, 2) IN AsDict(((NULL, 1), "foo"), ((2, 1), NULL)), - -- false? - (1, 2) IN AsDict(((1, NULL), "foo"), ((2, 1), "bar")),-- Nothing + 1 IN AsDict((2, "x"), (3, "y"), (NULL, "z")), -- Nothing + NULL IN DictCreate(Int32, String?), -- false? + NULL IN AsDict((NULL, "foo")), -- Nothing + NULL IN AsDict((1, "bar")), -- Nothing + (1, NULL) IN AsDict(((1, 1), NULL), ((2, 2), "foo")), -- Nothing + (1, NULL) IN AsDict(((2, 2), "foo"), ((3, 3), "bar")), -- false? + (1, 2) IN AsDict(((1, NULL), "foo"), ((2, 2), "bar")), -- Nothing + (1, 2) IN AsDict(((NULL, 1), "foo"), ((2, 1), NULL)), -- false? + (1, 2) IN AsDict(((1, NULL), "foo"), ((2, 1), "bar")), -- Nothing ; 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 7e7f8f15d592..92810d802732 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 @@ -1,22 +1,15 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA AnsiInForEmptyOrNullableItemsCollections; SELECT - NULL IN EmptyList(), - -- false? - NULL IN EmptyDict(), - -- false? - NULL IN (), - -- false? - 1 IN EmptyList(), - -- false - 1 IN EmptyDict(), - -- false - 1 IN (), - -- false - NULL IN Nothing(EmptyList?), - -- Nothing - NULL IN Nothing(EmptyDict?), - -- Nothing - NULL IN Nothing(ParseType("Tuple<>?")),-- Nothing + NULL IN EmptyList(), -- false? + NULL IN EmptyDict(), -- false? + NULL IN (), -- false? + 1 IN EmptyList(), -- false + 1 IN EmptyDict(), -- false + 1 IN (), -- false + NULL IN Nothing(EmptyList?), -- Nothing + NULL IN Nothing(EmptyDict?), -- Nothing + NULL IN Nothing(ParseType("Tuple<>?")), -- Nothing ; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_join_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_join_/formatted.sql index 62f5e3042881..cf24ad956333 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_join_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_join_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA AnsiInForEmptyOrNullableItemsCollections; USE plato; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_list1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_list1_/formatted.sql index ed0a9df97995..41256d9f601a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_list1_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_list1_/formatted.sql @@ -1,12 +1,10 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA AnsiInForEmptyOrNullableItemsCollections; SELECT - 1 IN [2, 3, NULL], - -- Nothing - 2 IN [2, 3, NULL], - -- true? - (1, 2) IN [(1, NULL), (2, 1)], - -- Nothing - (1, 2) IN [(1, NULL), (1, 2)],-- true? + 1 IN [2, 3, NULL], -- Nothing + 2 IN [2, 3, NULL], -- true? + (1, 2) IN [(1, NULL), (2, 1)], -- Nothing + (1, 2) IN [(1, NULL), (1, 2)], -- true? ; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_list_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_list_/formatted.sql index 4439e59048ff..fc315b55c7ba 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_list_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_list_/formatted.sql @@ -1,28 +1,20 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA AnsiInForEmptyOrNullableItemsCollections; SELECT - 1 IN AsList(2, 3, NULL), - -- Nothing - NULL IN ListCreate(Int32), - -- false? - NULL IN AsList(NULL), - -- Nothing - NULL IN AsList(1), - -- Nothing - (1, NULL) IN AsList((1, 1), (2, 2)), - -- Nothing - (1, NULL) IN AsList((2, 2), (3, 3)), - -- false? - (1, 2) IN AsList((1, NULL), (2, 2)), - -- Nothing - (1, 2) IN AsList((NULL, 1), (2, 1)), - -- false? - (1, 2) IN AsList((1, NULL), (2, 1)),-- Nothing + 1 IN AsList(2, 3, NULL), -- Nothing + NULL IN ListCreate(Int32), -- false? + NULL IN AsList(NULL), -- Nothing + NULL IN AsList(1), -- Nothing + (1, NULL) IN AsList((1, 1), (2, 2)), -- Nothing + (1, NULL) IN AsList((2, 2), (3, 3)), -- false? + (1, 2) IN AsList((1, NULL), (2, 2)), -- Nothing + (1, 2) IN AsList((NULL, 1), (2, 1)), -- false? + (1, 2) IN AsList((1, NULL), (2, 1)), -- Nothing ; SELECT - Just(1) IN AsList(1, 2, 3), - -- true? - 1 IN AsList(Just(2), Just(3)),-- false? + Just(1) IN AsList(1, 2, 3), -- true? + 1 IN AsList(Just(2), Just(3)), -- false? ; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_set_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_set_/formatted.sql index ee80a6458497..9b73031f3606 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_set_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_set_/formatted.sql @@ -1,28 +1,20 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA AnsiInForEmptyOrNullableItemsCollections; SELECT - 1 IN AsSet(2, 3, NULL), - -- Nothing - NULL IN SetCreate(Int32), - -- false? - NULL IN AsSet(NULL), - -- Nothing - NULL IN AsSet(1), - -- Nothing - (1, NULL) IN AsSet((1, 1), (2, 2)), - -- Nothing - (1, NULL) IN AsSet((2, 2), (3, 3)), - -- false? - (1, 2) IN AsSet((1, NULL), (2, 2)), - -- Nothing - (1, 2) IN AsSet((NULL, 1), (2, 1)), - -- false? - (1, 2) IN AsSet((1, NULL), (2, 1)),-- Nothing + 1 IN AsSet(2, 3, NULL), -- Nothing + NULL IN SetCreate(Int32), -- false? + NULL IN AsSet(NULL), -- Nothing + NULL IN AsSet(1), -- Nothing + (1, NULL) IN AsSet((1, 1), (2, 2)), -- Nothing + (1, NULL) IN AsSet((2, 2), (3, 3)), -- false? + (1, 2) IN AsSet((1, NULL), (2, 2)), -- Nothing + (1, 2) IN AsSet((NULL, 1), (2, 1)), -- false? + (1, 2) IN AsSet((1, NULL), (2, 1)), -- Nothing ; SELECT - Just(1) IN AsSet(1, 2, 3), - -- true? - 1 IN AsSet(Just(2), Just(3)),-- false? + Just(1) IN AsSet(1, 2, 3), -- true? + 1 IN AsSet(Just(2), Just(3)), -- false? ; 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 8dba7f6cd0b1..a178c2043aa6 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ PRAGMA AnsiInForEmptyOrNullableItemsCollections; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_exists_immediate_nested_subq_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_exists_immediate_nested_subq_/formatted.sql index a6dc8a332fb9..2da24c624e50 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_exists_immediate_nested_subq_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_exists_immediate_nested_subq_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* ignore runonopt plan diff */ +/* postgres can not */ +/* ignore runonopt plan diff */ USE plato; $q = ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_noansi_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_noansi_/formatted.sql index bd4e248d447c..8289457a1d08 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_noansi_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_noansi_/formatted.sql @@ -1,30 +1,21 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA DisableAnsiInForEmptyOrNullableItemsCollections; SELECT - 1 IN (2, 3, NULL), - -- false - NULL IN (), - -- Nothing - NULL IN (NULL), - -- Nothing - NULL IN (1), - -- Nothing - (1, NULL) IN ((1, 1), (2, 2)), - -- Nothing - (1, NULL) IN ((2, 2), (3, 3)), - -- Nothing - (1, 2) IN ((1, NULL), (2, 2)), - -- false - (1, 2) IN ((NULL, 1), (2, 1)), - -- false - (1, 2) IN ((1, NULL), (2, 1)), - -- false - 128 IN (128ut, 1t),-- true + 1 IN (2, 3, NULL), -- false + NULL IN (), -- Nothing + NULL IN (NULL), -- Nothing + NULL IN (1), -- Nothing + (1, NULL) IN ((1, 1), (2, 2)), -- Nothing + (1, NULL) IN ((2, 2), (3, 3)), -- Nothing + (1, 2) IN ((1, NULL), (2, 2)), -- false + (1, 2) IN ((NULL, 1), (2, 1)), -- false + (1, 2) IN ((1, NULL), (2, 1)), -- false + 128 IN (128ut, 1t), -- true ; SELECT - Just(1) IN (1, 2, 3), - -- true? - 1 IN (Just(2), Just(3)),-- false + Just(1) IN (1, 2, 3), -- true? + 1 IN (Just(2), Just(3)), -- false ; 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 eeec352b1e2f..f7ed9d799106 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 @@ -1,22 +1,15 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA DisableAnsiInForEmptyOrNullableItemsCollections; SELECT - NULL IN EmptyList(), - -- Nothing - NULL IN EmptyDict(), - -- Nothing - NULL IN (), - -- Nothing - 1 IN EmptyList(), - -- false - 1 IN EmptyDict(), - -- false - 1 IN (), - -- false - NULL IN Nothing(EmptyList?), - -- Nothing - NULL IN Nothing(EmptyDict?), - -- Nothing - NULL IN Nothing(ParseType("Tuple<>?")),-- Nothing + NULL IN EmptyList(), -- Nothing + NULL IN EmptyDict(), -- Nothing + NULL IN (), -- Nothing + 1 IN EmptyList(), -- false + 1 IN EmptyDict(), -- false + 1 IN (), -- false + NULL IN Nothing(EmptyList?), -- Nothing + NULL IN Nothing(EmptyDict?), -- Nothing + NULL IN Nothing(ParseType("Tuple<>?")), -- Nothing ; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_noansi_join_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_noansi_join_/formatted.sql index 6844b30110e7..3517a17e2e31 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_noansi_join_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_noansi_join_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA DisableAnsiInForEmptyOrNullableItemsCollections; USE plato; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_noansi_list_dict_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_noansi_list_dict_/formatted.sql index c4dfd695aced..5bf9207be1f5 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_noansi_list_dict_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_noansi_list_dict_/formatted.sql @@ -1,20 +1,14 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA DisableAnsiInForEmptyOrNullableItemsCollections; SELECT - 1 IN [2, 3, NULL], - -- false - 2 IN [2, 3, NULL], - -- true - (1, 2) IN [(1, NULL), (2, 1)], - -- false - (1, 2) IN [(1, NULL), (1, 2)], - -- true - 1 IN {2, 3, NULL}, - -- false - 2 IN {2, 3, NULL}, - -- true - (1, 2) IN {(1, NULL), (2, 1)}, - -- false - (1, 2) IN {(1, NULL), (1, 2)},-- true + 1 IN [2, 3, NULL], -- false + 2 IN [2, 3, NULL], -- true + (1, 2) IN [(1, NULL), (2, 1)], -- false + (1, 2) IN [(1, NULL), (1, 2)], -- true + 1 IN {2, 3, NULL}, -- false + 2 IN {2, 3, NULL}, -- true + (1, 2) IN {(1, NULL), (2, 1)}, -- false + (1, 2) IN {(1, NULL), (1, 2)}, -- true ; 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 fda3d047f56b..33ded8fd6ab1 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $in = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_sorted_by_tuple_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_sorted_by_tuple_/formatted.sql index 48785f280f2f..8ca3a52db30c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_sorted_by_tuple_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_sorted_by_tuple_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_tablesource_to_equijoin_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_tablesource_to_equijoin_/formatted.sql index c523d4109934..bc1060e297e7 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_tablesource_to_equijoin_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_tablesource_to_equijoin_/formatted.sql @@ -46,13 +46,21 @@ $r1_12 = ( SELECT key FROM Input -WHERE (key + 1) IN $r4_20 AND-- key = [3, 19] -- 2 joinable - optkey IN $r6_20 AND-- key = [6, 19] - key IN/*+ COMPACT() */ $r8_20 AND-- key = [8, 19] -- 1 nonjoinable (due to COMPACT) - (optkey + 3) IN $r10_20 AND-- key = [8, 17] -- 3 joinable - (key + 4) NOT IN $r1_12 AND-- key = [9, 17] - key IN $r10_20 AND-- key = [10, 17] - (optkey IN $r1_16 OR key IN $r1_16) AND-- key = [10, 16] -- 1 nonjoinable (not SqlIn) - (key - 1) IN $r1_12 AND-- key = [10, 13] -- 2 joinable - (key - 3) NOT IN $r8_20-- key = [10] +WHERE (key + 1) IN $r4_20 + AND -- key = [3, 19] -- 2 joinable + optkey IN $r6_20 + AND -- key = [6, 19] + key IN /*+ COMPACT() */ $r8_20 + AND -- key = [8, 19] -- 1 nonjoinable (due to COMPACT) + (optkey + 3) IN $r10_20 + AND -- key = [8, 17] -- 3 joinable + (key + 4) NOT IN $r1_12 + AND -- key = [9, 17] + key IN $r10_20 + AND -- key = [10, 17] + (optkey IN $r1_16 OR key IN $r1_16) + AND -- key = [10, 16] -- 1 nonjoinable (not SqlIn) + (key - 1) IN $r1_12 + AND -- key = [10, 13] -- 2 joinable + (key - 3) NOT IN $r8_20 -- key = [10] ; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_tuple_check0_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_tuple_check0_fail_/formatted.sql index 81574f3e97e0..29203b4b2659 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_tuple_check0_fail_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_tuple_check0_fail_/formatted.sql @@ -3,6 +3,5 @@ SELECT AsTuple(1, 1) IN ( AsTuple(2, 1), AsTuple(1, 2), - AsTuple(1, AsTuple(1, 2)), - -- expect compatible tuple + AsTuple(1, AsTuple(1, 2)), -- expect compatible tuple ); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_tuple_check1_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_tuple_check1_fail_/formatted.sql index d0f613636931..ae9ea4ac265b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_tuple_check1_fail_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_tuple_check1_fail_/formatted.sql @@ -3,5 +3,5 @@ SELECT AsTuple(1, 1) IN ( AsTuple(2, 1), AsTuple(1, 2), - 42-- expect tuple, not data + 42 -- expect tuple, not data ); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_types_cast_all_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_types_cast_all_/formatted.sql index d34d33a20134..7f9b242b895e 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_types_cast_all_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_types_cast_all_/formatted.sql @@ -6,7 +6,6 @@ WHERE CAST(key AS Uint8) IN ( 1u, 3l, 23ul, - 255, - -- out of Uint8 + 255, -- out of Uint8 0, ); 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 7b6eeee10adc..1ec4193a3312 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 @@ -3,28 +3,17 @@ $pt = AsTuple(1, 2, 3); $et = Nothing(ParseType("Tuple?")); SELECT - 1 IN $pt, - -- true - 100 IN $pt, - -- false - 1 / 1 IN $pt, - -- Just(true) - 1 / 0 IN $pt, - -- Nothing(bool) - NULL IN $pt, - -- Nothing(bool) - 1 IN Just($pt), - -- Just(true) - 100 IN Just($pt), - -- Just(false) - 1 / 1 IN Just($pt), - -- Just(true) - 1 / 0 IN Just($pt), - -- Nothing(bool) - NULL IN Just($pt), - -- Nothing(bool) - 1 IN $et, - -- Nothing(bool) starting from here + 1 IN $pt, -- true + 100 IN $pt, -- false + 1 / 1 IN $pt, -- Just(true) + 1 / 0 IN $pt, -- Nothing(bool) + NULL IN $pt, -- Nothing(bool) + 1 IN Just($pt), -- Just(true) + 100 IN Just($pt), -- Just(false) + 1 / 1 IN Just($pt), -- Just(true) + 1 / 0 IN Just($pt), -- Nothing(bool) + NULL IN Just($pt), -- Nothing(bool) + 1 IN $et, -- Nothing(bool) starting from here 100 IN $et, 1 / 1 IN $et, 1 / 0 IN $et, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_with_nulls_and_optionals_extra_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_with_nulls_and_optionals_extra_/formatted.sql index 48c10c3de19e..a5f7120d73b0 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_with_nulls_and_optionals_extra_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_with_nulls_and_optionals_extra_/formatted.sql @@ -2,19 +2,12 @@ PRAGMA DisableAnsiInForEmptyOrNullableItemsCollections; SELECT - 1 IN (2, 3, NULL), - -- false - 1 IN (NULL), - -- false - (1, NULL) IN ((1, 2), (1, 3), (1, NULL)), - -- Nothing - (1, 1) IN ((1, NULL)), - -- false - (1, 1) IN ((1, 1), (2, NULL)), - -- true - (1, NULL) IN ((1, 2), (1, 3)), - -- Nothing - (2, NULL) IN ((1, 2), (1, 3)), - -- Nothing + 1 IN (2, 3, NULL), -- false + 1 IN (NULL), -- false + (1, NULL) IN ((1, 2), (1, 3), (1, NULL)), -- Nothing + (1, 1) IN ((1, NULL)), -- false + (1, 1) IN ((1, 1), (2, NULL)), -- true + (1, NULL) IN ((1, 2), (1, 3)), -- Nothing + (2, NULL) IN ((1, 2), (1, 3)), -- Nothing (1, NULL) IN (); -- Nothing diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_with_nulls_and_optionals_extra_ansi_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_with_nulls_and_optionals_extra_ansi_/formatted.sql index d9045a29e738..11e631e124ad 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_with_nulls_and_optionals_extra_ansi_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_with_nulls_and_optionals_extra_ansi_/formatted.sql @@ -2,19 +2,12 @@ PRAGMA AnsiInForEmptyOrNullableItemsCollections; SELECT - 1 IN (2, 3, NULL), - -- Nothing - 1 IN (NULL), - -- Nothing - (1, NULL) IN ((1, 2), (1, 3), (1, NULL)), - -- Nothing - (1, 1) IN ((1, NULL)), - -- Nothing - (1, 1) IN ((1, 1), (2, NULL)), - -- Just(true) - (1, NULL) IN ((1, 2), (1, 3)), - -- Nothing - (2, NULL) IN ((1, 2), (1, 3)), - -- Just(false) + 1 IN (2, 3, NULL), -- Nothing + 1 IN (NULL), -- Nothing + (1, NULL) IN ((1, 2), (1, 3), (1, NULL)), -- Nothing + (1, 1) IN ((1, NULL)), -- Nothing + (1, 1) IN ((1, 1), (2, NULL)), -- Just(true) + (1, NULL) IN ((1, 2), (1, 3)), -- Nothing + (2, NULL) IN ((1, 2), (1, 3)), -- Just(false) (1, NULL) IN (); -- Just(false) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_with_tuple_simple_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_with_tuple_simple_/formatted.sql index c628dc80bbb9..55ab5aba96a0 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_with_tuple_simple_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_with_tuple_simple_/formatted.sql @@ -1,4 +1,4 @@ /* postgres can not */ SELECT - AsTuple(1, 1)-- tuple is unsupported + AsTuple(1, 1) -- tuple is unsupported IN (AsTuple(1, 1)); 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 58b5b2f83f1b..8d83d8e26e99 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 @@ -16,10 +16,10 @@ $dict = ( SELECT * FROM @input -WHERE ui = 'touch' AND - reqid IN ( +WHERE ui == 'touch' + AND reqid IN ( SELECT reqid FROM $dict - ) AND - 236273 IN test_ids; + ) + AND 236273 IN test_ids; 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 bec40b5f1022..2211f347226c 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 @@ -10,6 +10,6 @@ $l1 = SELECT * FROM Input -WHERE TRUE AND - value != "" AND - key IN $l1; +WHERE TRUE + AND value != "" + AND key IN $l1; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-append_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-append_/formatted.sql index b3b9d061eb7d..92b8c7741361 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-append_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-append_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* multirun can not */ +/* postgres can not */ +/* multirun can not */ INSERT INTO plato.Output SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-append_after_replace_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-append_after_replace_/formatted.sql index 7e54ed90ba5c..6267566520a8 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-append_after_replace_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-append_after_replace_/formatted.sql @@ -1,6 +1,7 @@ -/* postgres can not *//* multirun can not */-- kikimr only: pragma kikimr.UnwrapReadTableValues = "false"; create table plato.Output (key varchar null, subkey varchar null, value varchar null, primary key (key)); commit; -INSERT INTO plato.Output - WITH truncate ( +/* postgres can not */ +/* multirun can not */ +-- kikimr only: pragma kikimr.UnwrapReadTableValues = "false"; create table plato.Output (key varchar null, subkey varchar null, value varchar null, primary key (key)); commit; +INSERT INTO plato.Output WITH truncate ( key, subkey, value diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-append_proto_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-append_proto_fail_/formatted.sql index 5630432f0f75..79fa4b23b53a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-append_proto_fail_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-append_proto_fail_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* multirun can not *//* custom error:Table "Output" has udf remappers, append is not allowed*/ +/* postgres can not */ +/* multirun can not */ +/* custom error:Table "Output" has udf remappers, append is not allowed*/ INSERT INTO plato.Output SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-append_view_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-append_view_fail_/formatted.sql index 6d1f9753be8e..2fa03defd86e 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-append_view_fail_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-append_view_fail_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* multirun can not *//* custom error:Modification of "Output" view is not supported*/ +/* postgres can not */ +/* multirun can not */ +/* custom error:Modification of "Output" view is not supported*/ INSERT INTO plato.Output SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-append_with_read_udf_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-append_with_read_udf_fail_/formatted.sql index 5630432f0f75..79fa4b23b53a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-append_with_read_udf_fail_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-append_with_read_udf_fail_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* multirun can not *//* custom error:Table "Output" has udf remappers, append is not allowed*/ +/* postgres can not */ +/* multirun can not */ +/* custom error:Table "Output" has udf remappers, append is not allowed*/ INSERT INTO plato.Output SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-drop_sortness_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-drop_sortness_/formatted.sql index bb12595f9d4b..2e09b76a8e35 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-drop_sortness_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-drop_sortness_/formatted.sql @@ -1,6 +1,5 @@ /* postgres can not */ -INSERT INTO plato.Output - WITH truncate +INSERT INTO plato.Output WITH truncate SELECT value FROM plato.Input; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-fail_read_view_after_modify_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-fail_read_view_after_modify_/formatted.sql index e1d89579dbdf..e60f4c7f0a3e 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-fail_read_view_after_modify_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-fail_read_view_after_modify_/formatted.sql @@ -1,6 +1,7 @@ -/* postgres can not *//* syntax version 1 *//* custom error:Table "Output" cannot have any view after replacing its content*/ -INSERT INTO plato.Output - WITH truncate +/* postgres can not */ +/* syntax version 1 */ +/* custom error:Table "Output" cannot have any view after replacing its content*/ +INSERT INTO plato.Output WITH truncate SELECT * FROM plato.Input; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-insert_from_other_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-insert_from_other_/formatted.sql index c191b732c2de..bfd5b810c715 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-insert_from_other_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-insert_from_other_/formatted.sql @@ -1,6 +1,5 @@ /* postgres can not */ -INSERT INTO plato.Output - WITH truncate +INSERT INTO plato.Output WITH truncate SELECT * FROM plato.Input; 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 8b8905afb02d..57972ff4744f 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 @@ -1,4 +1,5 @@ -/* postgres can not */-- kikimr only: pragma kikimr.UnwrapReadTableValues = "false"; create table plato.Output (key varchar null, subkey varchar null, value varchar null, primary key (key)); commit; +/* postgres can not */ +-- kikimr only: pragma kikimr.UnwrapReadTableValues = "false"; create table plato.Output (key varchar null, subkey varchar null, value varchar null, primary key (key)); commit; INSERT INTO plato.Output ( key, subkey, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-keepmeta_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-keepmeta_/formatted.sql index 5ec982a06d9d..caf0d0b6d8c3 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-keepmeta_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-keepmeta_/formatted.sql @@ -1,6 +1,9 @@ -/* postgres can not *//* multirun can not */ -INSERT INTO plato.Output - WITH (truncate, keepmeta) +/* postgres can not */ +/* multirun can not */ +INSERT INTO plato.Output WITH ( + truncate, + keepmeta +) SELECT * FROM plato.Input; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-keepmeta_nonstrict_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-keepmeta_nonstrict_fail_/formatted.sql index ea7a6c083241..b6dc4bcc4e1d 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-keepmeta_nonstrict_fail_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-keepmeta_nonstrict_fail_/formatted.sql @@ -1,6 +1,10 @@ -/* postgres can not *//* multirun can not *//* custom error:Table "Output" has non-strict schema, truncate with keep meta is not allowed*/ -INSERT INTO plato.Output - WITH (truncate, keepmeta) +/* postgres can not */ +/* multirun can not */ +/* custom error:Table "Output" has non-strict schema, truncate with keep meta is not allowed*/ +INSERT INTO plato.Output WITH ( + truncate, + keepmeta +) SELECT * FROM plato.Input; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-keepmeta_proto_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-keepmeta_proto_fail_/formatted.sql index 7dd3194fc973..132d26027885 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-keepmeta_proto_fail_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-keepmeta_proto_fail_/formatted.sql @@ -1,6 +1,10 @@ -/* postgres can not *//* multirun can not *//* custom error:Table "Output" has udf remappers, truncate with keep meta is not allowed*/ -INSERT INTO plato.Output - WITH (truncate, keepmeta) +/* postgres can not */ +/* multirun can not */ +/* custom error:Table "Output" has udf remappers, truncate with keep meta is not allowed*/ +INSERT INTO plato.Output WITH ( + truncate, + keepmeta +) SELECT * FROM plato.Input; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-keepmeta_view_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-keepmeta_view_fail_/formatted.sql index 1c35293fb587..d08c001cd524 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-keepmeta_view_fail_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-keepmeta_view_fail_/formatted.sql @@ -1,6 +1,10 @@ -/* postgres can not *//* multirun can not *//* custom error:Modification of "Output" view is not supported*/ -INSERT INTO plato.Output - WITH (truncate, keepmeta) +/* postgres can not */ +/* multirun can not */ +/* custom error:Modification of "Output" view is not supported*/ +INSERT INTO plato.Output WITH ( + truncate, + keepmeta +) SELECT * FROM plato.Input; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-keepmeta_with_read_udf_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-keepmeta_with_read_udf_fail_/formatted.sql index 7dd3194fc973..132d26027885 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-keepmeta_with_read_udf_fail_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-keepmeta_with_read_udf_fail_/formatted.sql @@ -1,6 +1,10 @@ -/* postgres can not *//* multirun can not *//* custom error:Table "Output" has udf remappers, truncate with keep meta is not allowed*/ -INSERT INTO plato.Output - WITH (truncate, keepmeta) +/* postgres can not */ +/* multirun can not */ +/* custom error:Table "Output" has udf remappers, truncate with keep meta is not allowed*/ +INSERT INTO plato.Output WITH ( + truncate, + keepmeta +) SELECT * 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 3f2496a717d9..959f91ad8307 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 @@ -1,4 +1,5 @@ -/* postgres can not */-- kikimr only: pragma kikimr.UnwrapReadTableValues = "false"; create table plato.Output (key varchar null, subkey varchar null, value varchar null, primary key (key)); commit; +/* postgres can not */ +-- kikimr only: pragma kikimr.UnwrapReadTableValues = "false"; create table plato.Output (key varchar null, subkey varchar null, value varchar null, primary key (key)); commit; INSERT INTO plato.Output ( key, subkey, 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 dd821eecb8fb..2b454ffaf61d 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 @@ -1,4 +1,6 @@ -/* postgres can not *//* kikimr can not *//* ignore plan diff */ +/* postgres can not */ +/* kikimr can not */ +/* ignore plan diff */ USE plato; PRAGMA yt.ScriptCpu = "1.0"; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-multiappend_sorted_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-multiappend_sorted_/formatted.sql index b5992250a153..3f20b94ce6a7 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-multiappend_sorted_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-multiappend_sorted_/formatted.sql @@ -1,6 +1,6 @@ -/* postgres can not *//* multirun can not */ -INSERT INTO plato.Output - WITH truncate +/* postgres can not */ +/* multirun can not */ +INSERT INTO plato.Output WITH truncate SELECT * FROM plato.Input @@ -14,8 +14,7 @@ FROM plato.Input; COMMIT; ---------------------------------------- -INSERT INTO plato.Output - WITH truncate +INSERT INTO plato.Output WITH truncate SELECT * FROM plato.Input; @@ -29,8 +28,7 @@ ORDER BY COMMIT; ---------------------------------------- -INSERT INTO plato.Output - WITH truncate +INSERT INTO plato.Output WITH truncate SELECT * FROM plato.Input @@ -48,8 +46,7 @@ ORDER BY COMMIT; ---------------------------------------- -INSERT INTO plato.Output - WITH truncate +INSERT INTO plato.Output WITH truncate SELECT * FROM plato.Input @@ -65,8 +62,7 @@ ORDER BY COMMIT; ---------------------------------------- -INSERT INTO plato.Output - WITH truncate +INSERT INTO plato.Output WITH truncate SELECT * FROM plato.Input @@ -82,8 +78,7 @@ ORDER BY COMMIT; ---------------------------------------- -INSERT INTO plato.Output - WITH truncate +INSERT INTO plato.Output WITH truncate SELECT * FROM plato.Input @@ -99,8 +94,7 @@ ORDER BY COMMIT; ---------------------------------------- -INSERT INTO plato.Output - WITH truncate +INSERT INTO plato.Output WITH truncate SELECT * FROM plato.Input diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-override_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-override_/formatted.sql index c191b732c2de..bfd5b810c715 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-override_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-override_/formatted.sql @@ -1,6 +1,5 @@ /* postgres can not */ -INSERT INTO plato.Output - WITH truncate +INSERT INTO plato.Output WITH truncate SELECT * FROM plato.Input; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-override_view_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-override_view_fail_/formatted.sql index 3796ad5b7720..26df44756962 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-override_view_fail_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-override_view_fail_/formatted.sql @@ -1,6 +1,6 @@ -/* postgres can not *//* custom error:Modification of "Output" view is not supported*/ -INSERT INTO plato.Output - WITH truncate +/* postgres can not */ +/* custom error:Modification of "Output" view is not supported*/ +INSERT INTO plato.Output WITH truncate SELECT * FROM plato.Input; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-part_sortness_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-part_sortness_/formatted.sql index 67918cee1e8e..bbd180a20b01 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-part_sortness_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-part_sortness_/formatted.sql @@ -1,6 +1,5 @@ /* postgres can not */ -INSERT INTO plato.Output - WITH truncate +INSERT INTO plato.Output WITH truncate SELECT key, value 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 42bbfaa0083e..3f904e4b46ca 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 @@ -1,10 +1,10 @@ -/* postgres can not *//* kikimr can not */ +/* postgres can not */ +/* kikimr can not */ USE plato; PRAGMA yt.InferSchema; PRAGMA yt.InferSchemaTableCountThreshold = "100000"; -INSERT INTO Output - WITH truncate +INSERT INTO Output WITH truncate SELECT * FROM Output; 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 8936cf02b2fe..ab0c7f63507e 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 @@ -1,10 +1,10 @@ -/* postgres can not *//* kikimr can not */ +/* postgres can not */ +/* kikimr can not */ USE plato; PRAGMA yt.InferSchema; PRAGMA yt.InferSchemaTableCountThreshold = "0"; -INSERT INTO Output - WITH truncate +INSERT INTO Output WITH truncate SELECT * FROM Output; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-replace_ordered_by_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-replace_ordered_by_key_/formatted.sql index 771e510d5aab..e41b0630d29d 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-replace_ordered_by_key_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-replace_ordered_by_key_/formatted.sql @@ -1,6 +1,6 @@ -/* postgres can not */-- kikimr only: pragma kikimr.UnwrapReadTableValues = "false"; create table plato.Output (key varchar null, subkey varchar null, value varchar null, primary key (key)); commit; -INSERT INTO plato.Output - WITH truncate ( +/* postgres can not */ +-- kikimr only: pragma kikimr.UnwrapReadTableValues = "false"; create table plato.Output (key varchar null, subkey varchar null, value varchar null, primary key (key)); commit; +INSERT INTO plato.Output WITH truncate ( key, subkey, value diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-replace_ordered_by_key_desc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-replace_ordered_by_key_desc_/formatted.sql index 2c68b86ea3cc..ce02ac334be9 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-replace_ordered_by_key_desc_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-replace_ordered_by_key_desc_/formatted.sql @@ -1,6 +1,6 @@ -/* postgres can not */-- kikimr only: pragma kikimr.UnwrapReadTableValues = "false"; create table plato.Output (key varchar null, subkey varchar null, value varchar null, primary key (key)); commit; -INSERT INTO plato.Output - WITH truncate ( +/* postgres can not */ +-- kikimr only: pragma kikimr.UnwrapReadTableValues = "false"; create table plato.Output (key varchar null, subkey varchar null, value varchar null, primary key (key)); commit; +INSERT INTO plato.Output WITH truncate ( key, subkey, value 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 41eca9dac1f7..656b5b816241 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 @@ -1,4 +1,6 @@ -/* postgres can not *//* multirun can not */-- kikimr only: pragma kikimr.UnwrapReadTableValues = "false"; create table plato.Output (key varchar null, subkey varchar null, value varchar null, primary key (key)); commit; +/* postgres can not */ +/* multirun can not */ +-- kikimr only: pragma kikimr.UnwrapReadTableValues = "false"; create table plato.Output (key varchar null, subkey varchar null, value varchar null, primary key (key)); commit; INSERT INTO plato.Output ( key, subkey, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_after_replace_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_after_replace_/formatted.sql index d9993fb20674..e04ae578a819 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_after_replace_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_after_replace_/formatted.sql @@ -1,6 +1,7 @@ -/* postgres can not *//* multirun can not */-- kikimr only: pragma kikimr.UnwrapReadTableValues = "false"; create table plato.Output (key varchar null, subkey varchar null, value varchar null, primary key (key)); commit; -INSERT INTO plato.Output - WITH truncate ( +/* postgres can not */ +/* multirun can not */ +-- kikimr only: pragma kikimr.UnwrapReadTableValues = "false"; create table plato.Output (key varchar null, subkey varchar null, value varchar null, primary key (key)); commit; +INSERT INTO plato.Output WITH truncate ( key, subkey, value 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 c279867a7c1e..5bcbcd6491f2 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 @@ -1,6 +1,7 @@ -/* postgres can not *//* multirun can not */-- kikimr only: pragma kikimr.UnwrapReadTableValues = "false"; create table plato.Output (key varchar null, subkey varchar null, value varchar null, primary key (key)); commit; -INSERT INTO plato.Output - WITH truncate ( +/* postgres can not */ +/* multirun can not */ +-- kikimr only: pragma kikimr.UnwrapReadTableValues = "false"; create table plato.Output (key varchar null, subkey varchar null, value varchar null, primary key (key)); commit; +INSERT INTO plato.Output WITH truncate ( key, subkey, value 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 8ec1cb866007..b0654780b7f0 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 @@ -1,6 +1,5 @@ /* postgres can not */ -INSERT INTO plato.Output - WITH truncate +INSERT INTO plato.Output WITH truncate SELECT a + b + c AS a, coalesce(d, "") AS b, 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 cd4afde4f99b..1ef1f37c5c86 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 @@ -1,6 +1,6 @@ -/* postgres can not */-- kikimr only: pragma kikimr.UnwrapReadTableValues = "false"; create table plato.Output (key varchar null, subkey varchar null, value varchar null, primary key (key)); commit; -INSERT INTO plato.Output - WITH truncate ( +/* postgres can not */ +-- kikimr only: pragma kikimr.UnwrapReadTableValues = "false"; create table plato.Output (key varchar null, subkey varchar null, value varchar null, primary key (key)); commit; +INSERT INTO plato.Output WITH truncate ( key, subkey, value 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 b241c58f0148..ad15ccd8d77f 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 @@ -1,4 +1,5 @@ -/* postgres can not */-- kikimr only: pragma kikimr.UnwrapReadTableValues = "false"; create table plato.Output (key varchar null, subkey varchar null, value varchar null, primary key (key)); commit; +/* postgres can not */ +-- kikimr only: pragma kikimr.UnwrapReadTableValues = "false"; create table plato.Output (key varchar null, subkey varchar null, value varchar null, primary key (key)); commit; INSERT INTO plato.Output ( key, subkey, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-unique_distinct_hints_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-unique_distinct_hints_/formatted.sql index 3f01f8ee8a64..b6d9225cc52a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-unique_distinct_hints_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-unique_distinct_hints_/formatted.sql @@ -1,52 +1,44 @@ /* postgres can not */ USE plato; -INSERT INTO Output1 - WITH TRUNCATE +INSERT INTO Output1 WITH TRUNCATE SELECT /*+ unique() */ * FROM Input; -INSERT INTO Output2 - WITH TRUNCATE +INSERT INTO Output2 WITH TRUNCATE SELECT /*+ distinct() */ * FROM Input; -INSERT INTO Output3 - WITH TRUNCATE +INSERT INTO Output3 WITH TRUNCATE SELECT /*+ distinct(key subkey) unique(value) */ * FROM Input; -INSERT INTO Output4 - WITH TRUNCATE +INSERT INTO Output4 WITH TRUNCATE SELECT /*+ unique(key) distinct(subkey value) */ * FROM Input; -INSERT INTO Output5 - WITH TRUNCATE +INSERT INTO Output5 WITH TRUNCATE SELECT /*+ unique(key value) unique(subkey) */ * FROM Input; -INSERT INTO Output6 - WITH TRUNCATE +INSERT INTO Output6 WITH TRUNCATE SELECT /*+ distinct(key) distinct(subkey) */ * FROM Input; -- Bad case: missed column - ignore hint with warning. -INSERT INTO Output7 - WITH TRUNCATE +INSERT INTO Output7 WITH TRUNCATE SELECT /*+ unique(subkey value) */ key, value FROM Input; -INSERT INTO Output8 - WITH TRUNCATE +INSERT INTO Output8 WITH TRUNCATE SELECT /*+ distinct(key subkey) */ key, subkey diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-use_anon_table_before_commit_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-use_anon_table_before_commit_fail_/formatted.sql index 309a1b400e34..68d090f0515d 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-use_anon_table_before_commit_fail_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-use_anon_table_before_commit_fail_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* custom error:Anonymous table "@a" must be materialized. Use COMMIT before reading from it*/ +/* postgres can not */ +/* custom error:Anonymous table "@a" must be materialized. Use COMMIT before reading from it*/ USE plato; INSERT INTO @a diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-use_anon_table_without_fill_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-use_anon_table_without_fill_fail_/formatted.sql index be0fe85c1d53..6775c33f88ab 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-use_anon_table_without_fill_fail_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-use_anon_table_without_fill_fail_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* custom error:Anonymous table "@a" must be materialized. Use COMMIT before reading from it*/ +/* postgres can not */ +/* custom error:Anonymous table "@a" must be materialized. Use COMMIT before reading from it*/ USE plato; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-break_sort_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-break_sort_fail_/formatted.sql index ff3cb0c9c8f3..a7f69b809521 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-break_sort_fail_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-break_sort_fail_/formatted.sql @@ -1,8 +1,7 @@ /* custom error:Inserts with "monotonic_keys" setting must not change output table sorting*/ USE plato; -INSERT INTO Output - WITH MONOTONIC_KEYS +INSERT INTO Output WITH MONOTONIC_KEYS SELECT * FROM Input1; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-break_unique_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-break_unique_fail_/formatted.sql index f6a99de6f804..4b76513c9790 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-break_unique_fail_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-break_unique_fail_/formatted.sql @@ -1,8 +1,8 @@ -/* ytfile can not *//* custom error:Duplicate key*/ +/* ytfile can not */ +/* custom error:Duplicate key*/ USE plato; -INSERT INTO Output - WITH MONOTONIC_KEYS +INSERT INTO Output WITH MONOTONIC_KEYS SELECT DISTINCT * FROM Input diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-from_empty_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-from_empty_/formatted.sql index a02e9fec2946..05dd98ce9e31 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-from_empty_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-from_empty_/formatted.sql @@ -1,7 +1,6 @@ USE plato; -INSERT INTO Output - WITH MONOTONIC_KEYS +INSERT INTO Output WITH MONOTONIC_KEYS SELECT * FROM EmptyInput diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-keep_meta_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-keep_meta_/formatted.sql index e26579738eeb..66fbbfb9234a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-keep_meta_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-keep_meta_/formatted.sql @@ -1,7 +1,10 @@ USE plato; -INSERT INTO Output - WITH (MONOTONIC_KEYS, KEEP_META, TRUNCATE) +INSERT INTO Output WITH ( + MONOTONIC_KEYS, + KEEP_META, + TRUNCATE +) SELECT * FROM Input1 diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-keep_unique_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-keep_unique_/formatted.sql index 659996508ed1..14cc2cd34d8b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-keep_unique_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-keep_unique_/formatted.sql @@ -1,8 +1,8 @@ -/* ytfile can not *//* dqfile can not */ +/* ytfile can not */ +/* dqfile can not */ USE plato; -INSERT INTO Output - WITH MONOTONIC_KEYS +INSERT INTO Output WITH MONOTONIC_KEYS SELECT key, subkey, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-non_existing_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-non_existing_fail_/formatted.sql index ac4eb87f4405..61bd2bfd2182 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-non_existing_fail_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-non_existing_fail_/formatted.sql @@ -1,8 +1,7 @@ /* custom error:Insert with "monotonic_keys" setting cannot be used with a non-existent table*/ USE plato; -INSERT INTO Output - WITH MONOTONIC_KEYS +INSERT INTO Output WITH MONOTONIC_KEYS SELECT 1 AS key ORDER BY diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-not_all_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-not_all_fail_/formatted.sql index 69512bebe74f..c19845920fbc 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-not_all_fail_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-not_all_fail_/formatted.sql @@ -1,8 +1,7 @@ /* custom error:All appends within the same commit should have the same "monotonic_keys" flag*/ USE plato; -INSERT INTO Output - WITH MONOTONIC_KEYS +INSERT INTO Output WITH MONOTONIC_KEYS SELECT * FROM Input1 diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-overlaping_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-overlaping_fail_/formatted.sql index b365a4cf5165..9ace87e4325d 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-overlaping_fail_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-overlaping_fail_/formatted.sql @@ -1,8 +1,8 @@ -/* ytfile can not *//* custom error:job outputs overlap with original table*/ +/* ytfile can not */ +/* custom error:job outputs overlap with original table*/ USE plato; -INSERT INTO Output - WITH MONOTONIC_KEYS +INSERT INTO Output WITH MONOTONIC_KEYS SELECT * FROM Input diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-several1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-several1_/formatted.sql index 8e98d642c4cd..0018ff75bdb8 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-several1_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-several1_/formatted.sql @@ -1,7 +1,6 @@ USE plato; -INSERT INTO Output - WITH MONOTONIC_KEYS +INSERT INTO Output WITH MONOTONIC_KEYS SELECT * FROM Input1 diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-several2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-several2_/formatted.sql index dc404d281e6a..869629799216 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-several2_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-several2_/formatted.sql @@ -1,7 +1,6 @@ USE plato; -INSERT INTO Output - WITH MONOTONIC_KEYS +INSERT INTO Output WITH MONOTONIC_KEYS SELECT * FROM Input1 @@ -9,8 +8,7 @@ ORDER BY key, subkey; -INSERT INTO Output - WITH MONOTONIC_KEYS +INSERT INTO Output WITH MONOTONIC_KEYS SELECT * FROM Input2 diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-to_empty_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-to_empty_/formatted.sql index 0901faa84085..7af38109322d 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-to_empty_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-to_empty_/formatted.sql @@ -1,7 +1,6 @@ USE plato; -INSERT INTO EmptyOutput - WITH MONOTONIC_KEYS +INSERT INTO EmptyOutput WITH MONOTONIC_KEYS SELECT * FROM Input diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-truncate_and_append_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-truncate_and_append_/formatted.sql index 878fad6d321b..8ebbf10b1736 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-truncate_and_append_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-truncate_and_append_/formatted.sql @@ -1,7 +1,6 @@ USE plato; -INSERT INTO Output - WITH TRUNCATE +INSERT INTO Output WITH TRUNCATE SELECT * FROM Input1 @@ -9,8 +8,7 @@ ORDER BY key, subkey; -INSERT INTO Output - WITH MONOTONIC_KEYS +INSERT INTO Output WITH MONOTONIC_KEYS SELECT * FROM Input2 diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-truncate_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-truncate_fail_/formatted.sql index c64ab2a66f8d..011587c98d8e 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-truncate_fail_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert_monotonic-truncate_fail_/formatted.sql @@ -1,8 +1,10 @@ /* custom error:"monotonic_keys" setting can not be used with TRUNCATE mode*/ USE plato; -INSERT INTO Output - WITH (MONOTONIC_KEYS, TRUNCATE) +INSERT INTO Output WITH ( + MONOTONIC_KEYS, + TRUNCATE +) SELECT * FROM Input 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 8288e8f061e5..7e55e6c86821 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 @@ -23,7 +23,7 @@ FROM ( WHERE subkey != "foo" ) AS b - ON a.key = b.key AND a.subkey = b.subkey + ON a.key == b.key AND a.subkey == b.subkey ) GROUP COMPACT BY subkey1, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-alias_where_group_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-alias_where_group_/formatted.sql index 9f885b645c73..43193ee2433a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-alias_where_group_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-alias_where_group_/formatted.sql @@ -10,7 +10,7 @@ FROM Input3 INNER JOIN Input4 AS ib USING (key) -WHERE ib.subkey = '2' +WHERE ib.subkey == '2' GROUP BY ia.key AS key, ia.value AS subkey diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_common_dup_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_common_dup_/formatted.sql index 45d0ab8477e6..b970369ade4c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_common_dup_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_common_dup_/formatted.sql @@ -8,7 +8,7 @@ FROM Input1 AS a RIGHT JOIN Input2 AS b -ON a.k1 = b.k2 +ON a.k1 == b.k2 ORDER BY a.v1, b.v2; @@ -19,7 +19,7 @@ FROM ANY Input1 AS a RIGHT JOIN Input2 AS b -ON a.k1 = b.k2 +ON a.k1 == b.k2 ORDER BY a.v1, b.v2; @@ -30,7 +30,7 @@ FROM Input1 AS a RIGHT JOIN ANY Input2 AS b -ON a.k1 = b.k2 +ON a.k1 == b.k2 ORDER BY a.v1, b.v2; @@ -41,7 +41,7 @@ FROM ANY Input1 AS a RIGHT JOIN ANY Input2 AS b -ON a.k1 = b.k2 +ON a.k1 == b.k2 ORDER BY a.v1, b.v2; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_common_nodata_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_common_nodata_keys_/formatted.sql index d6a4c716c39b..c7aa04dbb363 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_common_nodata_keys_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_common_nodata_keys_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $a = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_common_nodup_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_common_nodup_/formatted.sql index 45d0ab8477e6..b970369ade4c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_common_nodup_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_common_nodup_/formatted.sql @@ -8,7 +8,7 @@ FROM Input1 AS a RIGHT JOIN Input2 AS b -ON a.k1 = b.k2 +ON a.k1 == b.k2 ORDER BY a.v1, b.v2; @@ -19,7 +19,7 @@ FROM ANY Input1 AS a RIGHT JOIN Input2 AS b -ON a.k1 = b.k2 +ON a.k1 == b.k2 ORDER BY a.v1, b.v2; @@ -30,7 +30,7 @@ FROM Input1 AS a RIGHT JOIN ANY Input2 AS b -ON a.k1 = b.k2 +ON a.k1 == b.k2 ORDER BY a.v1, b.v2; @@ -41,7 +41,7 @@ FROM ANY Input1 AS a RIGHT JOIN ANY Input2 AS b -ON a.k1 = b.k2 +ON a.k1 == b.k2 ORDER BY a.v1, b.v2; 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 d1dbca6024c5..23e74a1c7419 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 @@ -9,7 +9,7 @@ FROM Input1 AS a JOIN Input2 AS b -ON a.k1 = b.k2 +ON a.k1 == b.k2 ORDER BY a.v1, b.v2; @@ -20,7 +20,7 @@ FROM ANY Input1 AS a JOIN Input2 AS b -ON a.k1 = b.k2 +ON a.k1 == b.k2 ORDER BY a.v1, b.v2; @@ -31,7 +31,7 @@ FROM Input1 AS a JOIN ANY Input2 AS b -ON a.k1 = b.k2 +ON a.k1 == b.k2 ORDER BY a.v1, b.v2; @@ -42,7 +42,7 @@ FROM ANY Input1 AS a JOIN ANY Input2 AS b -ON a.k1 = b.k2 +ON a.k1 == b.k2 ORDER BY a.v1, b.v2; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_dis_in_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_dis_in_/formatted.sql index c93b97fef557..6b220083a1a4 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_dis_in_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_dis_in_/formatted.sql @@ -12,7 +12,7 @@ FROM ( AS i1 INNER JOIN Leaves AS i2 - ON i1.leaf = i2.key + ON i1.leaf == i2.key UNION ALL SELECT DISTINCT i1.key AS Key, @@ -22,7 +22,7 @@ FROM ( AS i1 INNER JOIN Branches AS i2 - ON i1.branch = i2.key + ON i1.branch == i2.key ) ORDER BY Key, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_dis_in_in_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_dis_in_in_/formatted.sql index da0fd5d011d0..2e2ea6935a1a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_dis_in_in_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_dis_in_in_/formatted.sql @@ -10,10 +10,10 @@ FROM Roots AS i1 INNER JOIN Leaves AS i2 -ON i1.leaf = i2.key +ON i1.leaf == i2.key INNER JOIN Branches AS i3 -ON i1.branch = i3.key +ON i1.branch == i3.key ORDER BY Leaf, Branch; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_dis_in_in_in_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_dis_in_in_in_/formatted.sql index 22511f4b961b..f517b39e03a3 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_dis_in_in_in_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_dis_in_in_in_/formatted.sql @@ -11,13 +11,13 @@ FROM Roots AS i1 INNER JOIN Leaves AS i2 -ON i1.leaf = i2.key +ON i1.leaf == i2.key INNER JOIN Branches AS i3 -ON i1.branch = i3.key +ON i1.branch == i3.key INNER JOIN Leaves AS i4 -ON i3.leaf = i4.key +ON i3.leaf == i4.key ORDER BY Leaf, Branch, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_in_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_in_/formatted.sql index 44e5347874fe..c8d584938564 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_in_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_in_/formatted.sql @@ -12,7 +12,7 @@ FROM ( AS i1 INNER JOIN Leaves AS i2 - ON i1.leaf = i2.key + ON i1.leaf == i2.key UNION ALL SELECT i1.key AS Key, @@ -22,7 +22,7 @@ FROM ( AS i1 INNER JOIN Branches AS i2 - ON i1.branch = i2.key + ON i1.branch == i2.key ) ORDER BY Key, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_in_in_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_in_in_/formatted.sql index 4fb3501fdb5c..668c0719db24 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_in_in_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_in_in_/formatted.sql @@ -10,10 +10,10 @@ FROM Roots AS i1 INNER JOIN Leaves AS i2 -ON i1.leaf = i2.key +ON i1.leaf == i2.key INNER JOIN Branches AS i3 -ON i1.branch = i3.key +ON i1.branch == i3.key ORDER BY Leaf, Branch; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_in_in_in_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_in_in_in_/formatted.sql index f4bbdbebe946..5c24518cf49b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_in_in_in_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_in_in_in_/formatted.sql @@ -11,10 +11,10 @@ FROM Roots AS i1 INNER JOIN Leaves AS i2 -ON i1.leaf = i2.key +ON i1.leaf == i2.key INNER JOIN Branches AS i3 -ON i1.branch = i3.key +ON i1.branch == i3.key INNER JOIN Leaves AS i4 -ON i3.leaf = i4.key; +ON i3.leaf == i4.key; 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 ce81640a278c..f2f556c10f59 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 @@ -15,8 +15,8 @@ SELECT InputD.value AS vald FROM InputA INNER JOIN InputD -ON InputA.Key2 = InputD.k +ON InputA.Key2 == InputD.k INNER JOIN InputB -ON InputA.Fk1 = InputB.k +ON InputA.Fk1 == InputB.k INNER JOIN InputC -ON InputA.Key1 = InputC.k; +ON InputA.Key1 == InputC.k; 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 b342d31d4d41..3516171d8a9f 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 @@ -16,8 +16,8 @@ SELECT InputD.value AS vald FROM InputA INNER JOIN InputD -ON InputA.Key2 = InputD.k +ON InputA.Key2 == InputD.k INNER JOIN InputB -ON InputA.Fk1 = InputB.k +ON InputA.Fk1 == InputB.k INNER JOIN InputC -ON InputA.Key1 = InputC.k; +ON InputA.Key1 == InputC.k; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-commonjoin_unused_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-commonjoin_unused_keys_/formatted.sql index a1ccf2e8145c..cfe3396d63dc 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-commonjoin_unused_keys_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-commonjoin_unused_keys_/formatted.sql @@ -7,9 +7,9 @@ FROM Input1 AS a JOIN Input2 AS b -ON (a.k1 = b.k2) +ON (a.k1 == b.k2) JOIN Input3 AS c -ON (a.k1 = c.k3) +ON (a.k1 == c.k3) ORDER BY v3; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-compact_join_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-compact_join_/formatted.sql index 19131ca34020..9d8a12c68d21 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-compact_join_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-compact_join_/formatted.sql @@ -7,7 +7,7 @@ $stream = a.v AS av FROM InputLeft AS a - INNER JOIN/*+ merge() compact() */ InputRight + INNER JOIN /*+ merge() compact() */ InputRight AS b USING (k, sk, v); @@ -16,7 +16,7 @@ SELECT ask, av FROM $stream -GROUP/*+ compact() */ BY +GROUP /*+ compact() */ BY (k, ask, av) ORDER BY k, 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 bfa6bf877bdb..47b8feb056b3 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 @@ -18,7 +18,7 @@ FROM as_table($a) AS a JOIN as_table($b) AS b -ON a.K = b.K AND a.V = b.V +ON a.K == b.K AND a.V == b.V ORDER BY a.K, b.V; 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 cf93be71ed15..1c627eeea047 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 @@ -30,7 +30,7 @@ FROM as_table($a) AS a JOIN as_table($b) AS b -ON a.K = b.K AND a.V = b.V +ON a.K == b.K AND a.V == b.V ORDER BY a.K, b.V; @@ -42,7 +42,7 @@ FROM as_table($aopt) AS a JOIN as_table($b) AS b -ON a.K = b.K AND a.V = b.V +ON a.K == b.K AND a.V == b.V ORDER BY a.K, b.V; @@ -54,7 +54,7 @@ FROM as_table($a) AS a JOIN as_table($bopt) AS b -ON a.K = b.K AND a.V = b.V +ON a.K == b.K AND a.V == b.V ORDER BY a.K, b.V; @@ -66,7 +66,7 @@ FROM as_table($aopt) AS a JOIN as_table($bopt) AS b -ON a.K = b.K AND a.V = b.V +ON a.K == b.K AND a.V == b.V ORDER BY a.K, b.V; 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 39d4b7376b11..fbbc43d5c2f1 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 @@ -22,8 +22,8 @@ $join_result = ( AS i2 ) AS i2 - ON i1.k1 == i2.k1 AND - i1.k2 == i2.k2 + ON i1.k1 == i2.k1 + AND i1.k2 == i2.k2 ); 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 f3cc86bda694..930ff6497bc3 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 @@ -43,7 +43,7 @@ FROM $results AS results INNER JOIN $bans AS bans -ON bans.ip == results.ip AND - bans.host == results.host +ON bans.ip == results.ip + AND bans.host == results.host ORDER BY fetcher_count DESC; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-emptyjoin_unused_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-emptyjoin_unused_keys_/formatted.sql index fdbbbb8ec088..7b8c4626e312 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-emptyjoin_unused_keys_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-emptyjoin_unused_keys_/formatted.sql @@ -15,9 +15,9 @@ FROM @Input1 AS a JOIN Input2 AS b -ON (a.k1 = b.k2) +ON (a.k1 == b.k2) RIGHT JOIN Input3 AS c -ON (a.k1 = c.k3) +ON (a.k1 == c.k3) ORDER BY v3; 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 34c7d391828a..1073dc7caa29 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 @@ -18,5 +18,5 @@ JOIN ( WHERE subkey != "foo" ) AS b -ON a.key = b.key +ON a.key == b.key WHERE a.key != "1" OR b.key != "2"; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-full_equal_not_null_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-full_equal_not_null_/formatted.sql index d952caccc96e..2ec7c6cb8349 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-full_equal_not_null_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-full_equal_not_null_/formatted.sql @@ -16,4 +16,4 @@ FULL JOIN ( FROM plato.Input1 ) AS b -ON a.v1 = b.v2; +ON a.v1 == b.v2; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-full_equal_null_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-full_equal_null_/formatted.sql index ac5705377274..6fcd7595b88c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-full_equal_null_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-full_equal_null_/formatted.sql @@ -16,4 +16,4 @@ FULL JOIN ( FROM plato.Input1 ) AS b -ON a.v1 = b.v2; +ON a.v1 == b.v2; 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 ad9dcd15a833..cdfb1e5d9a90 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 @@ -8,5 +8,5 @@ FROM plato.countries1 AS cntr JOIN plato.customers1 AS cust -ON cntr.country_id = cust.country_id -WHERE cntr.country_id = "11"; +ON cntr.country_id == cust.country_id +WHERE cntr.country_id == "11"; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-grace_join2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-grace_join2_/formatted.sql index 6e7bc5de52b6..9ad40469df63 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-grace_join2_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-grace_join2_/formatted.sql @@ -8,7 +8,7 @@ FROM plato.customers1 AS c1 JOIN plato.customers1 AS c2 -ON c1.country_id = c2.country_id +ON c1.country_id == c2.country_id ORDER BY c1.customer_id, c2.customer_id; 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 ee39846a0fe0..afeedb061251 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 @@ -23,7 +23,7 @@ FROM ( WHERE subkey != "foo" ) AS b - ON a.key = b.key AND a.subkey = b.subkey + ON a.key == b.key AND a.subkey == b.subkey ) GROUP COMPACT BY key1, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inner_on_key_only_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inner_on_key_only_/formatted.sql index c693a400c9df..8a94c2242665 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inner_on_key_only_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inner_on_key_only_/formatted.sql @@ -6,4 +6,4 @@ SELECT Input3.value FROM plato.Input1 INNER JOIN plato.Input3 -ON Input1.key = Input3.key; +ON Input1.key == Input3.key; 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 6e82aa9d0a9b..e6abbb842a9c 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 @@ -10,13 +10,13 @@ FROM Input1 AS i1 JOIN Input2 AS i2 -ON i1.key = i2.key +ON i1.key == i2.key JOIN Input3 AS i3 -ON i1.key = i3.key +ON i1.key == i3.key JOIN Input4 AS i4 -ON i1.key = i4.key +ON i1.key == i4.key ORDER BY i1.value, i2.value, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_comp_common_table_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_comp_common_table_/formatted.sql index 4a20ad293a22..f4f382113528 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_comp_common_table_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_comp_common_table_/formatted.sql @@ -21,7 +21,7 @@ FROM $i AS a INNER JOIN $j AS b -ON a.x = b.y +ON a.x == b.y ORDER BY zzz, fff; @@ -33,7 +33,7 @@ FROM $i AS a RIGHT JOIN $j AS b -ON a.x = b.y +ON a.x == b.y ORDER BY zzz, fff; @@ -45,7 +45,7 @@ FROM $i AS a LEFT JOIN $j AS b -ON a.x = b.y +ON a.x == b.y ORDER BY zzz, fff; @@ -56,7 +56,7 @@ FROM $i AS a LEFT SEMI JOIN $j AS b -ON a.x = b.y +ON a.x == b.y ORDER BY zzz; @@ -66,7 +66,7 @@ FROM $i AS a LEFT ONLY JOIN $j AS b -ON a.x = b.y +ON a.x == b.y ORDER BY zzz; @@ -76,7 +76,7 @@ FROM $i AS a RIGHT SEMI JOIN $j AS b -ON a.x = b.y +ON a.x == b.y ORDER BY fff; @@ -86,7 +86,7 @@ FROM $i AS a RIGHT ONLY JOIN $j AS b -ON a.x = b.y +ON a.x == b.y ORDER BY fff; @@ -97,7 +97,7 @@ FROM $i AS a FULL JOIN $j AS b -ON a.x = b.y +ON a.x == b.y ORDER BY zzz, fff; @@ -109,7 +109,7 @@ FROM $i AS a EXCLUSION JOIN $j AS b -ON a.x = b.y +ON a.x == b.y ORDER BY zzz, fff; 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 fa2d1be2a773..5a6bcac661f7 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 @@ -18,7 +18,7 @@ FROM $i AS a INNER JOIN $j AS b -ON a.x = b.y; +ON a.x == b.y; SELECT a.x AS zzz, @@ -27,7 +27,7 @@ FROM $i AS a RIGHT JOIN $j AS b -ON a.x = b.y; +ON a.x == b.y; SELECT a.x AS zzz, @@ -36,7 +36,7 @@ FROM $i AS a LEFT JOIN $j AS b -ON a.x = b.y; +ON a.x == b.y; SELECT a.x AS zzz @@ -44,7 +44,7 @@ FROM $i AS a LEFT SEMI JOIN $j AS b -ON a.x = b.y; +ON a.x == b.y; SELECT a.x AS zzz @@ -52,7 +52,7 @@ FROM $i AS a LEFT ONLY JOIN $j AS b -ON a.x = b.y; +ON a.x == b.y; SELECT b.y AS fff @@ -60,7 +60,7 @@ FROM $i AS a RIGHT SEMI JOIN $j AS b -ON a.x = b.y; +ON a.x == b.y; SELECT b.y AS fff @@ -68,7 +68,7 @@ FROM $i AS a RIGHT ONLY JOIN $j AS b -ON a.x = b.y; +ON a.x == b.y; SELECT a.x AS zzz, @@ -77,7 +77,7 @@ FROM $i AS a FULL JOIN $j AS b -ON a.x = b.y; +ON a.x == b.y; SELECT a.x AS zzz, @@ -86,4 +86,4 @@ FROM $i AS a EXCLUSION JOIN $j AS b -ON a.x = b.y; +ON a.x == b.y; 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 064d855c144d..d7bb37f88125 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 @@ -22,7 +22,7 @@ FROM $i AS a INNER JOIN $j AS b -ON a.x = b.y; +ON a.x == b.y; SELECT a.x AS zzz, @@ -31,7 +31,7 @@ FROM $i AS a RIGHT JOIN $j AS b -ON a.x = b.y; +ON a.x == b.y; SELECT a.x AS zzz, @@ -40,7 +40,7 @@ FROM $i AS a LEFT JOIN $j AS b -ON a.x = b.y; +ON a.x == b.y; SELECT a.x AS zzz @@ -48,7 +48,7 @@ FROM $i AS a LEFT SEMI JOIN $j AS b -ON a.x = b.y; +ON a.x == b.y; SELECT a.x AS zzz @@ -56,7 +56,7 @@ FROM $i AS a LEFT ONLY JOIN $j AS b -ON a.x = b.y; +ON a.x == b.y; SELECT b.y AS fff @@ -64,7 +64,7 @@ FROM $i AS a RIGHT SEMI JOIN $j AS b -ON a.x = b.y; +ON a.x == b.y; SELECT b.y AS fff @@ -72,4 +72,4 @@ FROM $i AS a RIGHT ONLY JOIN $j AS b -ON a.x = b.y; +ON a.x == b.y; 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 3396361bc8f5..76772934e6ef 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 @@ -8,7 +8,7 @@ FROM Input1 AS i1 LEFT JOIN Input2 AS i2 -ON i1.key = i2.key +ON i1.key == i2.key ORDER BY i1.value, i2.value; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_no_correlation_in_order_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_no_correlation_in_order_by_/formatted.sql index 7d7e0362ceee..f7188f1a5fc5 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_no_correlation_in_order_by_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_no_correlation_in_order_by_/formatted.sql @@ -17,7 +17,7 @@ SELECT FROM Input JOIN $data AS d -ON Input.subkey = d.kk +ON Input.subkey == d.kk ORDER BY key, val; 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 d70054b773c3..73bd429575d3 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 @@ -8,7 +8,7 @@ FROM Input1 AS i1 RIGHT JOIN Input2 AS i2 -ON i1.key = i2.key +ON i1.key == i2.key ORDER BY i1.value, i2.value; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_semi_correlation_in_order_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_semi_correlation_in_order_by_/formatted.sql index c9d43e3849a8..448493ddc694 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_semi_correlation_in_order_by_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_semi_correlation_in_order_by_/formatted.sql @@ -17,7 +17,7 @@ SELECT FROM Input JOIN $data AS d -ON Input.subkey = d.kk +ON Input.subkey == d.kk ORDER BY key, d.val; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_table_conflict_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_table_conflict_fail_/formatted.sql index 845689fd8e4e..8f4c300c9f1a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_table_conflict_fail_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_table_conflict_fail_/formatted.sql @@ -14,9 +14,8 @@ $data = ( --INSERT INTO Output SELECT value, - key --- value is conflicted between Input and d sources + key -- value is conflicted between Input and d sources FROM Input JOIN $data AS d -ON Input.subkey = d.kk; +ON Input.subkey == d.kk; 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 2143d9aa061c..b9f9e5f3284f 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 @@ -7,7 +7,7 @@ FROM SortedByKeySubkey AS a JOIN SortedByKey AS b -ON a.key = b.key AND a.subkey = b.key +ON a.key == b.key AND a.subkey == b.key SELECT * ORDER BY diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_without_column_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_without_column_/formatted.sql index 9152bf421612..43817de7bb79 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_without_column_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_without_column_/formatted.sql @@ -14,11 +14,11 @@ $data = ( --INSERT INTO Output SELECT * - WITHOUT - d.value +WITHOUT + d.value FROM Input JOIN $data AS d -ON Input.subkey = CAST(CAST(d.kk AS uint32) / 100 AS string) +ON Input.subkey == CAST(CAST(d.kk AS uint32) / 100 AS string) ORDER BY key; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_without_correlation_names_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_without_correlation_names_/formatted.sql index 3330e956d702..791755af743b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_without_correlation_names_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_without_correlation_names_/formatted.sql @@ -20,7 +20,7 @@ SELECT FROM Input JOIN $data AS d -ON Input.subkey = d.kk +ON Input.subkey == d.kk ORDER BY value, val; 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 d6a02ff94990..93e939bedda4 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 @@ -18,12 +18,12 @@ LEFT ONLY JOIN ( WHERE key < "010" ) AS b -ON a.subkey = b.subkey -JOIN/*+ merge() */ ( +ON a.subkey == b.subkey +JOIN /*+ merge() */ ( SELECT key, value FROM Input ) AS c -ON a.key = c.key; +ON a.key == c.key; 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 77e270fa85ba..a8a39c6d42ea 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $t = [<|"x": "150", "y": 1, "z": NULL|>, <|"x": "150", "y": 2, "z": NULL|>]; @@ -8,7 +9,7 @@ FROM Input1 AS a LEFT JOIN AS_TABLE($t) AS b -ON a.key = b.x +ON a.key == b.x ORDER BY key, y; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_right_pushdown_nested_left_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_right_pushdown_nested_left_/formatted.sql index 78ee05eb4e2c..4b4a472932a1 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_right_pushdown_nested_left_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_right_pushdown_nested_left_/formatted.sql @@ -12,8 +12,8 @@ FROM plato.Input1 AS t1 LEFT JOIN plato.Input2 AS t2 -ON t1.Fk1 = t2.Key +ON t1.Fk1 == t2.Key INNER JOIN plato.Input3 AS t3 -ON t1.Fk1 = t3.Key +ON t1.Fk1 == t3.Key WHERE t2.Value > 1001; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_right_pushdown_nested_right_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_right_pushdown_nested_right_/formatted.sql index 72e772186798..2c3474c1cf2e 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_right_pushdown_nested_right_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_right_pushdown_nested_right_/formatted.sql @@ -14,5 +14,5 @@ CROSS JOIN plato.Input3 AS t3 LEFT JOIN plato.Input2 AS t2 -ON t1.Fk1 = t2.Key +ON t1.Fk1 == t2.Key WHERE t2.Value > 1001; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_right_pushdown_no_opt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_right_pushdown_no_opt_/formatted.sql index 167ef993c1e7..c625d80dbb26 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_right_pushdown_no_opt_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_right_pushdown_no_opt_/formatted.sql @@ -11,7 +11,7 @@ FROM plato.Input2 AS t2 RIGHT JOIN plato.Input1 AS t1 -ON t2.Key = t1.Fk1 +ON t2.Key == t1.Fk1 WHERE t1.Key1 > 104 ORDER BY t1.Key1, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_right_pushdown_null_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_right_pushdown_null_/formatted.sql index 5f6aacd0c195..20174f9a8cb8 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_right_pushdown_null_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_right_pushdown_null_/formatted.sql @@ -11,7 +11,7 @@ FROM plato.Input1 AS t1 LEFT JOIN plato.Input2 AS t2 -ON t1.Fk1 = t2.Key +ON t1.Fk1 == t2.Key WHERE t2.Value IS NULL ORDER BY t1.Key1, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_only_semi_and_other_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_only_semi_and_other_/formatted.sql index 245662099f96..7158925fb268 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_only_semi_and_other_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_only_semi_and_other_/formatted.sql @@ -25,12 +25,12 @@ FROM $data1 AS i1 LEFT ONLY JOIN $data2 AS i2 -ON i1.key = i2.key +ON i1.key == i2.key LEFT SEMI JOIN $data1 AS i3 -ON i1.key = i3.key +ON i1.key == i3.key LEFT OUTER JOIN $data1 AS i4 -ON i1.key = i4.key +ON i1.key == i4.key ORDER BY i1.key; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_only_with_other_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_only_with_other_/formatted.sql index a0ecec7b1d08..196fb8d311e1 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_only_with_other_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_only_with_other_/formatted.sql @@ -25,7 +25,7 @@ FROM $data1 AS i1 LEFT ONLY JOIN $data2 AS i2 -ON i1.key = i2.key +ON i1.key == i2.key JOIN $data1 AS i3 -ON i1.key = i3.key; +ON i1.key == i3.key; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_semi_with_other_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_semi_with_other_/formatted.sql index 8d7238f15a25..d395c882548a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_semi_with_other_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_semi_with_other_/formatted.sql @@ -25,9 +25,9 @@ FROM $data1 AS i1 LEFT SEMI JOIN $data2 AS i2 -ON i1.key = i2.key +ON i1.key == i2.key LEFT OUTER JOIN $data1 AS i3 -ON i1.key = i3.key +ON i1.key == i3.key ORDER BY i1.key; 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 64ec60c6039a..ddccbf7de7c7 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 @@ -43,8 +43,8 @@ FROM @lottery AS lottery JOIN @campaigns AS campaigns -ON lottery.campaign_id = campaigns.id +ON lottery.campaign_id == campaigns.id JOIN @strategies AS strategies -ON lottery.strategy_id = strategies.id +ON lottery.strategy_id == strategies.id WHERE 1 < 0; 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 5175d42c10a9..02973c7dc6ef 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 @@ -42,7 +42,7 @@ FROM @lottery AS lottery JOIN @campaigns AS campaigns -ON lottery.campaign_id = campaigns.id +ON lottery.campaign_id == campaigns.id JOIN @strategies AS strategies -ON lottery.strategy_id = strategies.id; +ON lottery.strategy_id == strategies.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 78cf07c3adba..27255c01cf5b 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 @@ -11,4 +11,4 @@ FROM Input2 AS a INNER JOIN ANY Input1 AS b -ON a.k2 = b.k1; +ON a.k2 == b.k1; 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 0598b109c7aa..3c1fb43751c8 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 @@ -10,4 +10,4 @@ FROM Input2 AS a INNER JOIN Input1 AS b -ON a.k2 = b.k1 AND a.v2 = b.v1; +ON a.k2 == b.k1 AND a.v2 == b.v1; 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 0598b109c7aa..3c1fb43751c8 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 @@ -10,4 +10,4 @@ FROM Input2 AS a INNER JOIN Input1 AS b -ON a.k2 = b.k1 AND a.v2 = b.v1; +ON a.k2 == b.k1 AND a.v2 == b.v1; 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 0598b109c7aa..3c1fb43751c8 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 @@ -10,4 +10,4 @@ FROM Input2 AS a INNER JOIN Input1 AS b -ON a.k2 = b.k1 AND a.v2 = b.v1; +ON a.k2 == b.k1 AND a.v2 == b.v1; 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 0598b109c7aa..3c1fb43751c8 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 @@ -10,4 +10,4 @@ FROM Input2 AS a INNER JOIN Input1 AS b -ON a.k2 = b.k1 AND a.v2 = b.v1; +ON a.k2 == b.k1 AND a.v2 == b.v1; 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 fe9fbeda3cef..a3ccd8fa2122 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 @@ -11,7 +11,7 @@ INNER JOIN ( SELECT * FROM Input2 - WHERE k2 = "not_existent" + WHERE k2 == "not_existent" ) AS b -ON a.k1 = b.k2; +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 12655d5b33ba..725530bfab27 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 @@ -10,4 +10,4 @@ FROM Input1 AS a LEFT JOIN Input2 AS b -ON a.k1 = b.k2; +ON a.k1 == b.k2; 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 cff60b5abd2f..7badd23ddf9b 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 @@ -10,6 +10,6 @@ FROM Input1 AS a LEFT SEMI JOIN Input2 AS b -ON a.k1 = b.k2 +ON a.k1 == b.k2 ORDER BY a.k1; 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 cff60b5abd2f..7badd23ddf9b 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 @@ -10,6 +10,6 @@ FROM Input1 AS a LEFT SEMI JOIN Input2 AS b -ON a.k1 = b.k2 +ON a.k1 == b.k2 ORDER BY a.k1; 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 cff60b5abd2f..7badd23ddf9b 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 @@ -10,6 +10,6 @@ FROM Input1 AS a LEFT SEMI JOIN Input2 AS b -ON a.k1 = b.k2 +ON a.k1 == b.k2 ORDER BY a.k1; 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 cff60b5abd2f..7badd23ddf9b 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 @@ -10,6 +10,6 @@ FROM Input1 AS a LEFT SEMI JOIN Input2 AS b -ON a.k1 = b.k2 +ON a.k1 == b.k2 ORDER BY a.k1; 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 cff60b5abd2f..7badd23ddf9b 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 @@ -10,6 +10,6 @@ FROM Input1 AS a LEFT SEMI JOIN Input2 AS b -ON a.k1 = b.k2 +ON a.k1 == b.k2 ORDER BY a.k1; 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 bdadafad28ac..9245c1032e0c 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 @@ -15,6 +15,6 @@ LEFT SEMI JOIN ( WHERE k2 != "ccc" ) AS b -ON a.k1 = b.k2 +ON a.k1 == b.k2 ORDER BY a.k1; 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 70a7cc86d99e..93f613413ed5 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 @@ -9,9 +9,9 @@ FROM Input1 AS a JOIN Input2 AS b -ON (a.k1 = b.k2) +ON (a.k1 == b.k2) JOIN Input3 AS c -ON (a.k1 = c.k3) +ON (a.k1 == c.k3) ORDER BY 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 316701d96179..25f29e4d6115 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* kikimr can not */ +/* postgres can not */ +/* kikimr can not */ USE plato; PRAGMA DisableSimpleColumns; PRAGMA yt.LookupJoinLimit = "64k"; @@ -6,8 +7,7 @@ PRAGMA yt.LookupJoinMaxRows = "100"; PRAGMA yt.QueryCacheMode = "normal"; PRAGMA yt.QueryCacheUseForCalc = "true"; -INSERT INTO @tmp - WITH truncate +INSERT INTO @tmp WITH truncate SELECT * FROM Input @@ -22,7 +22,7 @@ FROM Input AS a INNER JOIN @tmp AS b -ON a.key = b.key +ON a.key == b.key ORDER BY a.key, a.subkey; 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 52e0392d864a..a2ee87da2da6 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 @@ -1,5 +1,6 @@ USE plato; -/* postgres can not *//* kikimr can not */ +/* postgres can not */ +/* kikimr can not */ PRAGMA DisableSimpleColumns; PRAGMA yt.MapJoinLimit = "1m"; @@ -9,4 +10,4 @@ FROM Input1 AS a JOIN Input2 AS b -ON a.key = b.key AND a.subkey = b.key; +ON a.key == b.key AND a.subkey == b.key; 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 e88774b00cb7..4bcc06537374 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 @@ -15,7 +15,7 @@ FROM Input AS a JOIN $subq AS b -ON a.subkey = b.subkey_plus_one +ON a.subkey == b.subkey_plus_one ORDER BY subkey, key; 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 4e3699b46c4d..735d8bb44fc2 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 @@ -14,10 +14,10 @@ FROM $subq AS a JOIN Dict1 AS d1 -ON a.subkey_plus_one = d1.subkey +ON a.subkey_plus_one == d1.subkey JOIN Dict2 AS d2 -ON a.key = d2.key +ON a.key == d2.key SELECT * ORDER BY 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 245b589d0db3..1bfb82637384 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 @@ -16,7 +16,7 @@ FROM Input AS a JOIN $subq AS b -ON a.subkey = b.subkey_plus_one +ON a.subkey == b.subkey_plus_one ORDER BY subkey, key; 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 c6858480b3cc..c43768bb6307 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA yt.MapJoinLimit = "1m"; USE plato; $t = [<|"x": "150", "y": 1, "z": NULL|>, <|"x": "150", "y": 2, "z": NULL|>]; @@ -9,7 +10,7 @@ FROM Input1 AS a LEFT JOIN AS_TABLE($t) AS b -ON a.key = b.x +ON a.key == b.x ORDER BY key, y; 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 42205109654f..f8847f6c732d 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* 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"|>]; @@ -8,6 +9,6 @@ FROM Input AS A LEFT ONLY JOIN AS_TABLE($t) AS B -ON AsTuple(A.key, AsTuple(A.subkey, A.subkey1)) = AsTuple(B.key, AsTuple(B.subkey, B.subkey1)) +ON AsTuple(A.key, AsTuple(A.subkey, A.subkey1)) == AsTuple(B.key, AsTuple(B.subkey, B.subkey1)) ORDER BY `key`; 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 0791afd4d003..186ce8eae977 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* 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"|>]; @@ -8,6 +9,6 @@ FROM Input AS A LEFT ONLY JOIN AS_TABLE($t) AS B -ON AsTuple(CAST(A.key AS uint64), CAST(A.subkey AS String)) = AsTuple(CAST(B.key AS int64), CAST(B.subkey AS Utf8)) +ON AsTuple(CAST(A.key AS uint64), CAST(A.subkey AS String)) == AsTuple(CAST(B.key AS int64), CAST(B.subkey AS Utf8)) ORDER BY `key`; 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 70d537228420..de00375c4d2f 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* 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"|>]; @@ -8,7 +9,7 @@ FROM Input AS A LEFT SEMI JOIN AS_TABLE($t) AS B -ON AsTuple(CAST(A.key AS uint64), CAST(A.subkey AS String)) = AsTuple(CAST(B.key AS int64), CAST(B.subkey AS Utf8)) AND - AsTuple(CAST(A.key1 AS uint64), CAST(A.subkey1 AS String)) = AsTuple(CAST(B.key1 AS int64), CAST(B.subkey1 AS Utf8)) +ON AsTuple(CAST(A.key AS uint64), CAST(A.subkey AS String)) == AsTuple(CAST(B.key AS int64), CAST(B.subkey AS Utf8)) + AND AsTuple(CAST(A.key1 AS uint64), CAST(A.subkey1 AS String)) == AsTuple(CAST(B.key1 AS int64), CAST(B.subkey1 AS Utf8)) ORDER BY `key`; 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 ba5b934b33cc..6a0ff4c91c09 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* 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"|>]; @@ -8,6 +9,6 @@ FROM Input AS A LEFT SEMI JOIN AS_TABLE($t) AS B -ON AsTuple(CAST(A.key AS uint64), CAST(A.subkey AS String)) = AsTuple(CAST(B.key AS int64), CAST(B.subkey AS Utf8)) +ON AsTuple(CAST(A.key AS uint64), CAST(A.subkey AS String)) == AsTuple(CAST(B.key AS int64), CAST(B.subkey AS Utf8)) ORDER BY `key`; 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 a733fc8cb48d..93326beec14b 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* 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"|>]; @@ -8,6 +9,6 @@ FROM Input AS A LEFT SEMI JOIN AS_TABLE($t) AS B -ON AsTuple(A.subkey, AsTuple(A.subkey1, AsTuple(CAST(A.key AS Int64), CAST(A.key1 AS Uint64)))) = AsTuple(B.subkey, AsTuple(B.subkey1, AsTuple(CAST(B.key AS Uint64), CAST(B.key1 AS Int64)))) +ON AsTuple(A.subkey, AsTuple(A.subkey1, AsTuple(CAST(A.key AS Int64), CAST(A.key1 AS Uint64)))) == AsTuple(B.subkey, AsTuple(B.subkey1, AsTuple(CAST(B.key AS Uint64), CAST(B.key1 AS Int64)))) ORDER BY `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 f47d45fd8523..217264212b78 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 @@ -1,5 +1,7 @@ PRAGMA DisableSimpleColumns; -/* postgres can not *//* kikimr can not *//* ignore runonopt plan diff */ +/* postgres can not */ +/* kikimr can not */ +/* ignore runonopt plan diff */ USE plato; PRAGMA yt.MapJoinLimit = "1m"; @@ -18,7 +20,7 @@ $join = ( AS a LEFT JOIN Input AS b - ON a.key = b.key + ON a.key == b.key ); SELECT 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 842824f036c9..7c70080aa492 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 @@ -1,7 +1,9 @@ USE plato; -/* postgres can not *//* kikimr can not */ +/* postgres can not */ +/* kikimr can not */ PRAGMA DisableSimpleColumns; -/* yt_local_var: MAP_JOIN_LIMIT = 30 *//* yqlrun_var: MAP_JOIN_LIMIT = 1000 */ +/* yt_local_var: MAP_JOIN_LIMIT = 30 */ +/* yqlrun_var: MAP_JOIN_LIMIT = 1000 */ PRAGMA yt.MapJoinLimit = "MAP_JOIN_LIMIT"; PRAGMA yt.MapJoinShardCount = "10"; @@ -11,4 +13,4 @@ FROM Input1 AS a JOIN Input2 AS b -ON a.key = b.key AND a.subkey = b.key; +ON a.key == b.key AND a.subkey == b.key; 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 f13d5fb27259..0586bbb93d62 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 @@ -9,9 +9,9 @@ FROM Input1 AS a JOIN Input2 AS b -ON (a.k1 = b.k2) +ON (a.k1 == b.k2) JOIN Input3 AS c -ON (a.k1 = c.k3) +ON (a.k1 == c.k3) ORDER BY 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 2f7899be204e..cafcd6aebef8 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* kikimr can not */ +/* postgres can not */ +/* kikimr can not */ USE plato; PRAGMA DisableSimpleColumns; PRAGMA yt.MapJoinLimit = "1m"; @@ -16,4 +17,4 @@ FROM Input AS a LEFT JOIN @tmp AS b -ON a.key = b.key; +ON a.key == b.key; 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 095e1183ea98..91597393acf4 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 @@ -1,5 +1,6 @@ PRAGMA DisableSimpleColumns; -/* postgres can not *//* kikimr can not */ +/* postgres can not */ +/* kikimr can not */ USE plato; PRAGMA yt.mapjoinlimit = "1m"; @@ -26,7 +27,7 @@ FROM Input AS a LEFT JOIN $in1 AS b -ON a.key = b.key; +ON a.key == b.key; $limit = ($cnt / 100) ?? 0; $in2 = ( @@ -43,4 +44,4 @@ FROM Input AS a LEFT ONLY JOIN $in2 AS b -ON a.key = b.key; +ON a.key == b.key; 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 237134ac01a4..0ed15df9ff71 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 @@ -1,5 +1,7 @@ PRAGMA DisableSimpleColumns; -/* postgres can not *//* kikimr can not *//* ignore yt detailed plan diff */ +/* postgres can not */ +/* kikimr can not */ +/* ignore yt detailed plan diff */ USE plato; PRAGMA yt.MapJoinLimit = "10M"; 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 49b8a51fce52..83348b5dcd39 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 @@ -11,7 +11,7 @@ FROM Input1 AS a JOIN Input2 AS b -ON a.k1 = b.k2 +ON a.k1 == b.k2 ORDER BY a.v1, b.v2; 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 f15a4b30e6eb..7af0913177bf 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 @@ -11,4 +11,4 @@ FROM Input1 AS a JOIN Input2 AS b -ON a.k1 = b.k2 AND a.v1 = b.v2; +ON a.k1 == b.k2 AND a.v1 == b.v2; 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 cf13f4582a13..f878dc50895a 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 @@ -10,7 +10,7 @@ FROM Input1 AS a JOIN Input2 AS b -ON a.k1 = b.k2 +ON a.k1 == b.k2 ORDER BY a.v1, b.v2; 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 994494bd6664..14eb3b2847f4 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 @@ -12,7 +12,7 @@ FROM Input1 AS a JOIN Input2 AS b -ON a.k1 = b.k2 +ON a.k1 == b.k2 ORDER BY a.v1, b.v2; 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 67e95082699d..788df213688b 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; PRAGMA yt.JoinMergeTablesLimit = "100"; PRAGMA yt.JoinMergeForce; @@ -33,7 +34,7 @@ FROM ( AS a JOIN @t3 AS c - ON a.k1 = c.k3 + ON a.k1 == c.k3 ) AS ac JOIN ( @@ -43,7 +44,7 @@ JOIN ( AS b JOIN @t4 AS d - ON b.k2 = d.k4 + ON b.k2 == d.k4 ) AS bd -ON ac.k1 = bd.k2 AND ac.k3 = bd.k4; +ON ac.k1 == bd.k2 AND ac.k3 == bd.k4; 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 ecc134de393e..74edb8adf995 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; PRAGMA yt.JoinMergeTablesLimit = "100"; @@ -22,9 +23,9 @@ SELECT * FROM @t2 AS b -LEFT JOIN/*+ merge() */ @t3 +LEFT JOIN /*+ merge() */ @t3 AS c -ON b.k2 = c.k3 +ON b.k2 == c.k3 LEFT JOIN @t1 AS a -ON a.k1 = b.k2 AND a.k1 = c.k3; +ON a.k1 == b.k2 AND a.k1 == c.k3; 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 70fab8322050..37bf3090c5d1 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; PRAGMA yt.JoinMergeTablesLimit = "100"; PRAGMA yt.JoinMergeForce; @@ -20,4 +21,4 @@ FROM @t1 AS a JOIN @t2 AS b -ON a.k1 = b.k2 AND a.v1 = b.v2; +ON a.k1 == b.k2 AND a.v1 == b.v2; 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 428cb485748f..d784a3cf8136 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; PRAGMA yt.JoinMergeTablesLimit = "10"; @@ -13,9 +14,9 @@ FROM Input1 AS a JOIN Input2 AS b -ON a.key = b.key -JOIN/*+ merge() */ Input3 +ON a.key == b.key +JOIN /*+ merge() */ Input3 AS c -ON b.key = c.key +ON b.key == c.key ORDER BY k3; 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 ba15d51a4107..9d5e582347cf 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA yt.JoinMergeTablesLimit = "10"; PRAGMA yt.JoinAllowColumnRenames = "true"; PRAGMA yt.JoinMergeUnsortedFactor = "5.0"; @@ -11,7 +12,7 @@ FROM Input1 AS a LEFT JOIN AS_TABLE($t) AS b -ON a.k1 = b.x +ON a.k1 == b.x ORDER BY k1, y; 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 8ee4c57ecefa..3be817f224dd 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 @@ -8,10 +8,10 @@ FROM Input3 AS c JOIN Input4 AS d -ON c.k3 = d.k4 +ON c.k3 == d.k4 RIGHT ONLY JOIN Input1 AS a -ON a.k1 = c.k3 AND a.v1 = c.v3 +ON a.k1 == c.k3 AND a.v1 == c.v3 SELECT * ORDER BY 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 8b502bc1f309..f1e936cb7493 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 @@ -9,7 +9,7 @@ FROM SortedBySubkeyValue AS a INNER JOIN SortedByKey AS b -ON a.subkey = b.key +ON a.subkey == b.key SELECT b.key, a.subkey, @@ -23,7 +23,7 @@ FROM SortedBySubkeyValue AS a RIGHT JOIN SortedByKey AS b -ON a.subkey = b.key +ON a.subkey == b.key SELECT b.key, a.subkey, @@ -35,7 +35,7 @@ FROM SortedBySubkeyValue AS a LEFT JOIN SortedByKey AS b -ON a.subkey = b.key +ON a.subkey == b.key SELECT b.key, a.subkey, @@ -48,7 +48,7 @@ FROM SortedBySubkeyValue AS a FULL JOIN SortedByKey AS b -ON a.subkey = b.key +ON a.subkey == b.key SELECT b.key, a.subkey, @@ -62,7 +62,7 @@ FROM SortedBySubkeyValue AS a RIGHT ONLY JOIN SortedByKey AS b -ON a.subkey = b.key +ON a.subkey == b.key SELECT b.key ORDER BY @@ -72,7 +72,7 @@ FROM SortedBySubkeyValue AS a LEFT ONLY JOIN SortedByKey AS b -ON a.subkey = b.key +ON a.subkey == b.key SELECT a.subkey, a.value @@ -84,7 +84,7 @@ FROM SortedBySubkeyValue AS a EXCLUSION JOIN SortedByKey AS b -ON a.subkey = b.key +ON a.subkey == b.key SELECT b.key, a.subkey, @@ -98,7 +98,7 @@ FROM SortedBySubkeyValue AS a RIGHT SEMI JOIN SortedByKey AS b -ON a.subkey = b.key +ON a.subkey == b.key SELECT b.key ORDER BY @@ -108,7 +108,7 @@ FROM SortedBySubkeyValue AS a LEFT SEMI JOIN SortedByKey AS b -ON a.subkey = b.key +ON a.subkey == b.key SELECT a.subkey, a.value 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 5cb32faa2be3..ceab66e653b8 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 @@ -9,7 +9,7 @@ FROM Input1 AS a JOIN Input2 AS b -ON b.k2 = a.k1 +ON b.k2 == a.k1 CROSS JOIN Input3 AS c SELECT 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 947be55d8b32..4b47a9b7b30e 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 @@ -9,10 +9,10 @@ FROM Input1 AS a JOIN Input2 AS b -ON b.k2 = a.k1 AND a.v1 = b.v2 +ON b.k2 == a.k1 AND a.v1 == b.v2 JOIN Input3 AS c -ON a.k1 = c.k3 AND a.v1 = c.v3 +ON a.k1 == c.k3 AND a.v1 == c.v3 SELECT c.k3 AS ck3, c.k3 AS ck3_extra, @@ -23,5 +23,5 @@ ORDER BY ck3, ck3_extra, ck3_extra2, - c.v3-- should be noop + c.v3 -- should be noop ; 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 30ceba5b0a32..5036f7cb5a80 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 @@ -9,11 +9,11 @@ FROM Input1 AS a JOIN Input2 AS b -ON b.k2 = a.k1 AND a.v1 = b.v2 +ON b.k2 == a.k1 AND a.v1 == b.v2 SELECT b.k2 AS bk2, b.v2 AS bv2, a.k1 AS ak1 ORDER BY - bv2-- should be a separate sort + bv2 -- should be a separate sort ; 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 534eef096b19..8d057ad6e474 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 @@ -11,16 +11,16 @@ $semi = AS c JOIN Input4 AS d - ON c.k3 = d.k4; + ON c.k3 == d.k4; FROM $semi AS semi RIGHT SEMI JOIN Input1 AS a -ON a.k1 = semi.k3 AND a.v1 = semi.v3 +ON a.k1 == semi.k3 AND a.v1 == semi.v3 JOIN Input2 AS b -ON b.k2 = a.k1 AND b.v2 = a.v1 +ON b.k2 == a.k1 AND b.v2 == a.v1 SELECT * ORDER BY 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 77bba7e40fbd..50c904f4f352 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 @@ -8,7 +8,7 @@ FROM Input1 AS a LEFT SEMI JOIN Input2 AS b -ON a.k1 = b.k2 AND a.v1 = b.v2 +ON a.k1 == b.k2 AND a.v1 == b.v2 SELECT * ORDER BY 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 22fe1af5d50f..2229a0dd2c10 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 @@ -11,7 +11,7 @@ FROM Input2 AS b JOIN Input1 AS a -ON a.k1 = b.k2 +ON a.k1 == b.k2 ORDER BY a.v1, b.v2; 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 7a6fb5c8e1bf..afdd4196ae60 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 @@ -9,7 +9,7 @@ $inner = ( AS a JOIN Input2 AS b - ON b.k2 = a.k1 AND a.v1 = b.v2 + ON b.k2 == a.k1 AND a.v1 == b.v2 SELECT b.k2 AS bk2, b.k2 AS bk2_extra, 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 0bfeb51b79ec..513289018bb9 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 @@ -8,7 +8,7 @@ $left = ( AS a LEFT JOIN Input2 AS b - ON b.k2 = a.k1 + ON b.k2 == a.k1 SELECT b.k2 AS bk2, b.k2 AS bk2_extra, 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 1b3dd71a6a45..d61031849fd5 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 @@ -8,7 +8,7 @@ FROM Input1 AS a JOIN Input2 AS b -ON b.k2 = a.k1 +ON b.k2 == a.k1 SELECT b.v2 AS bv2, a.k1 AS ak1 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 85c5c0798bb7..95887f1193e0 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 @@ -8,7 +8,7 @@ $right = ( AS a RIGHT JOIN Input2 AS b - ON b.k2 = a.k1 AND a.v1 = b.v2 + ON b.k2 == a.k1 AND a.v1 == b.v2 SELECT b.k2 AS bk2, b.k2 AS bk2_extra, 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 ac0e75f274e9..f59f387e1805 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 @@ -8,9 +8,9 @@ FROM Input1 AS a JOIN Input2 AS b -ON (a.k1 = b.k2) +ON (a.k1 == b.k2) JOIN Input3 AS c -ON (a.k1 = c.k3) +ON (a.k1 == c.k3) ORDER BY 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 a45ece18d68c..d74eee8557f3 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 @@ -8,7 +8,7 @@ FROM SortedBySubkeyValue AS a JOIN SortedByKey AS b -ON a.subkey = b.key +ON a.subkey == b.key SELECT * ORDER BY @@ -19,7 +19,7 @@ FROM SortedBySubkeyValue AS a JOIN SortedByKey AS b -ON a.subkey = b.key +ON a.subkey == b.key SELECT a.subkey, b.key @@ -31,7 +31,7 @@ FROM SortedBySubkeyValue AS a LEFT JOIN SortedByKey AS b -ON a.subkey = b.key +ON a.subkey == b.key SELECT * ORDER BY @@ -41,7 +41,7 @@ FROM SortedBySubkeyValue AS a RIGHT JOIN SortedByKey AS b -ON a.subkey = b.key +ON a.subkey == b.key SELECT * ORDER BY 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 b3a25bc93970..5a42789ae433 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 @@ -9,10 +9,10 @@ FROM Input AS a JOIN Input1 AS b -ON b.k1 = a.key +ON b.k1 == a.key JOIN Input2 AS c -ON a.key = c.k2 +ON a.key == c.k2 SELECT a.value AS avalue, b.v1, 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 3229e42356b7..9c36a70c49fa 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 @@ -16,7 +16,7 @@ FROM SortedBySubkeyValue AS a JOIN $unsorted AS b -ON a.subkey = b.sk AND a.value = b.val +ON a.subkey == b.sk AND a.value == b.val SELECT * ORDER BY 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 bc9e0d892988..c75d4bddc1cd 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 @@ -8,7 +8,7 @@ FROM SortedBySubkeyValue AS a JOIN SortedByKey AS b -ON a.subkey = b.key +ON a.subkey == b.key SELECT * ORDER BY @@ -19,7 +19,7 @@ FROM SortedBySubkeyValue AS a JOIN SortedByKey AS b -ON a.subkey = b.key +ON a.subkey == b.key SELECT a.subkey, b.key @@ -31,7 +31,7 @@ FROM SortedBySubkeyValue AS a LEFT JOIN SortedByKey AS b -ON a.subkey = b.key +ON a.subkey == b.key SELECT * ORDER BY @@ -41,7 +41,7 @@ FROM SortedBySubkeyValue AS a RIGHT JOIN SortedByKey AS b -ON a.subkey = b.key +ON a.subkey == b.key SELECT * ORDER BY diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-no_empty_join_for_dyn_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-no_empty_join_for_dyn_/formatted.sql index c5bbfabc9718..aa7242f2a822 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-no_empty_join_for_dyn_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-no_empty_join_for_dyn_/formatted.sql @@ -7,4 +7,4 @@ FROM plato.Input1 AS A INNER JOIN plato.Input2 AS B -ON A.key = B.key; +ON A.key == B.key; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-nopushdown_filter_over_inner_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-nopushdown_filter_over_inner_/formatted.sql index 15a39b663870..dc0e68fce0bb 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-nopushdown_filter_over_inner_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-nopushdown_filter_over_inner_/formatted.sql @@ -9,7 +9,7 @@ FROM Input1 AS a INNER JOIN Input2 AS b -ON a.key = b.key +ON a.key == b.key WHERE Unwrap(CAST(a.key AS Int32)) > 100 ORDER BY a.key; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-nopushdown_filter_with_depends_on_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-nopushdown_filter_with_depends_on_/formatted.sql index 8d22616f99f1..298a09b22bc6 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-nopushdown_filter_with_depends_on_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-nopushdown_filter_with_depends_on_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* hybridfile can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 4 */ +/* postgres can not */ +/* hybridfile can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 4 */ USE plato; -- should not pushdown diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_left_cross_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_left_cross_/formatted.sql index 287476c2097f..236204874777 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_left_cross_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_left_cross_/formatted.sql @@ -31,7 +31,7 @@ CROSS JOIN $two AS b LEFT JOIN $three AS c -ON (c.key = a.key AND c.value = b.value) +ON (c.key == a.key AND c.value == b.value) SELECT * ORDER BY 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 d408354f8ff5..cf65ff2c25c6 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 @@ -17,7 +17,7 @@ JOIN ( FROM Input2 ) AS b -ON a.k1 = b.k2 +ON a.k1 == b.k2 SELECT a.k1, a.u1, 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 686785c93757..ae04bb783748 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 @@ -17,7 +17,7 @@ LEFT SEMI JOIN ( FROM Input2 ) AS b -ON a.k1 = b.k2 +ON a.k1 == b.k2 SELECT * ORDER BY 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 60b92a2a90f8..f5091471dd05 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 @@ -17,7 +17,7 @@ JOIN ( FROM Input2 ) AS b -ON a.k1 = b.k2 +ON a.k1 == b.k2 SELECT a.k1, a.u1, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_exclusion_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_exclusion_/formatted.sql index 8ece22743c8d..72ab3f1d8d6b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_exclusion_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_exclusion_/formatted.sql @@ -17,7 +17,7 @@ EXCLUSION JOIN ( FROM Input2 ) AS b -ON a.key = b.key +ON a.key == b.key SELECT a.key AS akey, b.key AS bkey, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_inner_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_inner_/formatted.sql index 8b9f68abe021..0ad61ce90f1f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_inner_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_inner_/formatted.sql @@ -17,7 +17,7 @@ JOIN ( FROM Input2 ) AS b -ON a.key = b.key +ON a.key == b.key SELECT a.key AS akey, b.key AS bkey, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_left_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_left_/formatted.sql index c90e15826b1c..1785176206f8 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_left_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_left_/formatted.sql @@ -17,7 +17,7 @@ LEFT JOIN ( FROM Input2 ) AS b -ON a.key = b.key +ON a.key == b.key SELECT a.key AS akey, b.key AS bkey, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_left_semi_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_left_semi_/formatted.sql index b0b347de1d44..f76990cb5adf 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_left_semi_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_left_semi_/formatted.sql @@ -17,7 +17,7 @@ LEFT SEMI JOIN ( FROM Input2 ) AS b -ON a.key = b.key +ON a.key == b.key SELECT a.key AS akey, a.subkey diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_null_column_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_null_column_/formatted.sql index 1803ddb6b6d8..6df91327d392 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_null_column_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_null_column_/formatted.sql @@ -11,7 +11,7 @@ LEFT JOIN ( FROM Input2 ) AS b -ON a.key = b.key +ON a.key == b.key SELECT a.key AS akey, b.key AS bkey, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_renaming_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_renaming_/formatted.sql index 1691e42d9e08..ecafb6ad094a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_renaming_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_renaming_/formatted.sql @@ -19,7 +19,7 @@ LEFT JOIN ( FROM Input2 ) AS b -ON a.akey1 = b.bkey1 AND a.akey1 = b.bkey2 AND a.akey2 = b.bkey1 +ON a.akey1 == b.bkey1 AND a.akey1 == b.bkey2 AND a.akey2 == b.bkey1 SELECT a.akey1 AS akey1, b.bkey1 AS bkey1, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pushdown_filter_over_inner_with_assume_strict_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pushdown_filter_over_inner_with_assume_strict_/formatted.sql index ad422a2a678b..ea55520b4ec1 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pushdown_filter_over_inner_with_assume_strict_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pushdown_filter_over_inner_with_assume_strict_/formatted.sql @@ -9,7 +9,7 @@ FROM Input1 AS a INNER JOIN Input2 AS b -ON a.key = b.key +ON a.key == b.key WHERE AssumeStrict(Unwrap(CAST(a.key AS Int32))) > 100 ORDER BY a.key; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pushdown_filter_over_inner_with_strict_udf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pushdown_filter_over_inner_with_strict_udf_/formatted.sql index 72d644ca948f..f6f0542ba971 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pushdown_filter_over_inner_with_strict_udf_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pushdown_filter_over_inner_with_strict_udf_/formatted.sql @@ -9,7 +9,7 @@ FROM Input1 AS a INNER JOIN Input2 AS b -ON a.key = b.key +ON a.key == b.key WHERE Math::IsFinite(CAST(a.key AS Double)) ORDER BY a.key; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pushdown_filter_over_left_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pushdown_filter_over_left_/formatted.sql index 8b744140ddb2..3821f4f6f770 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pushdown_filter_over_left_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pushdown_filter_over_left_/formatted.sql @@ -9,7 +9,7 @@ FROM Input1 AS a LEFT JOIN Input2 AS b -ON a.key = b.key +ON a.key == b.key WHERE Unwrap(CAST(a.key AS Int32)) > 100 ORDER BY a.key; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-selfjoin_on_sorted_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-selfjoin_on_sorted_/formatted.sql index 16f017e0032c..27f2edef6d81 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-selfjoin_on_sorted_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-selfjoin_on_sorted_/formatted.sql @@ -6,4 +6,4 @@ FROM plato.Input AS a INNER JOIN plato.Input AS b -ON a.key = b.key; +ON a.key == b.key; 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 f899410a7cc2..764bed9926cb 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 @@ -14,4 +14,4 @@ FROM $in AS a INNER JOIN $in AS b -ON a.key = b.key; +ON a.key == b.key; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-selfjoin_on_sorted_with_rename_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-selfjoin_on_sorted_with_rename_/formatted.sql index 7703c80765d8..e47ba47322ae 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-selfjoin_on_sorted_with_rename_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-selfjoin_on_sorted_with_rename_/formatted.sql @@ -8,4 +8,4 @@ FROM plato.Input AS a INNER JOIN plato.Input AS b -ON a.key = b.key; +ON a.key == b.key; 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 17afcd326146..4e7bb2eb70c1 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 @@ -6,7 +6,7 @@ FROM Input1 AS a JOIN Input2 AS b -ON a.key = String::SplitToList(b.key, "_")[0] +ON 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 7706ce03bb81..f5e2ccd300d9 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 @@ -9,7 +9,7 @@ $rightSemi = AS b RIGHT SEMI JOIN Input1 AS a - ON a.v1 = b.v2 AND a.k1 = b.k2; + ON a.v1 == b.v2 AND a.k1 == b.k2; $leftOnly = SELECT @@ -18,7 +18,7 @@ $leftOnly = AS rs LEFT ONLY JOIN Input3 AS c - ON rs.k1 = c.k3 AND rs.v1 = c.v3; + ON rs.k1 == c.k3 AND rs.v1 == c.v3; $right = SELECT @@ -27,7 +27,7 @@ $right = AS d RIGHT JOIN $leftOnly AS lo - ON d.v4 = lo.v1 AND lo.k1 = d.k4; + ON d.v4 == lo.v1 AND lo.k1 == d.k4; $inner = SELECT @@ -36,7 +36,7 @@ $inner = AS r JOIN ANY Input5 AS e - ON r.k1 = e.k5 AND e.v5 = r.v1; + ON r.k1 == e.k5 AND e.v5 == r.v1; 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 afbecd0a352e..51b04b964a8b 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 @@ -6,10 +6,10 @@ FROM ANY Input2 AS b JOIN ANY Input1 AS a -ON b.k2 = a.k1 AND a.v1 = b.v2 +ON b.k2 == a.k1 AND a.v1 == b.v2 JOIN ANY Input3 AS c -ON a.k1 = c.k3 AND c.v3 = a.v1 +ON a.k1 == c.k3 AND c.v3 == a.v1 SELECT * ORDER BY 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 fa986f2eeb7f..c7bc09914e79 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 @@ -23,10 +23,10 @@ FROM ANY Input2 AS b JOIN ANY $a AS a -ON b.k2 = a.k1 AND a.v1 = b.v2 +ON b.k2 == a.k1 AND a.v1 == b.v2 JOIN ANY $c AS c -ON a.k1 = c.k3 AND c.v3 = a.v1 +ON a.k1 == c.k3 AND c.v3 == a.v1 SELECT * ORDER BY 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 afbecd0a352e..51b04b964a8b 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 @@ -6,10 +6,10 @@ FROM ANY Input2 AS b JOIN ANY Input1 AS a -ON b.k2 = a.k1 AND a.v1 = b.v2 +ON b.k2 == a.k1 AND a.v1 == b.v2 JOIN ANY Input3 AS c -ON a.k1 = c.k3 AND c.v3 = a.v1 +ON a.k1 == c.k3 AND c.v3 == a.v1 SELECT * ORDER BY 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 f1fbb284dc72..a324986843ff 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 @@ -9,7 +9,7 @@ $leftSemi = AS a LEFT SEMI JOIN Input2 AS b - ON b.k2 = a.k1 AND a.v1 = b.v2; + ON b.k2 == a.k1 AND a.v1 == b.v2; $rightOnly = SELECT @@ -18,7 +18,7 @@ $rightOnly = AS c RIGHT ONLY JOIN $leftSemi AS ls - ON ls.k1 = c.k3 AND ls.v1 = c.v3; + ON ls.k1 == c.k3 AND ls.v1 == c.v3; $left = SELECT @@ -27,7 +27,7 @@ $left = AS ro LEFT JOIN Input4 AS d - ON ro.v1 = d.v4 AND d.k4 = ro.k1; + ON ro.v1 == d.v4 AND d.k4 == ro.k1; $inner = SELECT @@ -36,7 +36,7 @@ $inner = AS e JOIN $left AS l - ON e.k5 = l.k1 AND l.v1 = e.v5; + ON e.k5 == l.k1 AND l.v1 == e.v5; 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 27fb7ba30d0a..67859727090e 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 @@ -10,7 +10,7 @@ $rightSemi = AS b RIGHT SEMI JOIN Input1 AS a - ON a.v1 = b.v2 AND a.k1 = b.k2; + ON a.v1 == b.v2 AND a.k1 == b.k2; $leftOnly = SELECT @@ -19,7 +19,7 @@ $leftOnly = AS rs LEFT ONLY JOIN Input3 AS c - ON rs.k1 = c.k3 AND rs.v1 = c.v3; + ON rs.k1 == c.k3 AND rs.v1 == c.v3; $right = SELECT @@ -28,7 +28,7 @@ $right = AS d RIGHT JOIN $leftOnly AS lo - ON d.v4 = lo.v1 AND lo.k1 = d.k4; + ON d.v4 == lo.v1 AND lo.k1 == d.k4; $chain1 = SELECT @@ -37,7 +37,7 @@ $chain1 = AS r JOIN ANY Input5 AS e - ON r.k1 = e.k5 AND e.v5 = r.v1; + ON r.k1 == e.k5 AND e.v5 == r.v1; -- second Star JOIN chain (mirror reflection of first one) $leftSemi = @@ -47,7 +47,7 @@ $leftSemi = AS a1 LEFT SEMI JOIN Input2 AS b1 - ON b1.k2 = a1.k1 AND a1.v1 = b1.v2; + ON b1.k2 == a1.k1 AND a1.v1 == b1.v2; $rightOnly = SELECT @@ -56,7 +56,7 @@ $rightOnly = AS c1 RIGHT ONLY JOIN $leftSemi AS ls - ON ls.k1 = c1.k3 AND ls.v1 = c1.v3; + ON ls.k1 == c1.k3 AND ls.v1 == c1.v3; $left = SELECT @@ -65,7 +65,7 @@ $left = AS ro LEFT JOIN Input4 AS d1 - ON ro.v1 = d1.v4 AND d1.k4 = ro.k1; + ON ro.v1 == d1.v4 AND d1.k4 == ro.k1; $chain2 = SELECT @@ -74,7 +74,7 @@ $chain2 = AS e1 JOIN $left AS l - ON e1.k5 = l.k1 AND l.v1 = e1.v5; + ON e1.k5 == l.k1 AND l.v1 == e1.v5; SELECT left.k1 AS k1, @@ -83,7 +83,7 @@ FROM $chain1 AS left JOIN $chain2 AS right -ON left.k1 = right.k1 AND left.v1 = right.v1 +ON left.k1 == right.k1 AND left.v1 == right.v1 ORDER BY k1, v1; 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 299e58519f7b..454e07ed4b1c 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 @@ -6,10 +6,10 @@ FROM Input1 AS a LEFT SEMI JOIN Input2 AS b -ON a.k1 = b.k2 +ON a.k1 == b.k2 LEFT ONLY JOIN Input3 AS c -ON a.k1 = c.k3 +ON a.k1 == c.k3 SELECT * ORDER BY 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 9b2b2f1c80cb..edaf58aecff2 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 @@ -31,10 +31,10 @@ FROM $a AS a LEFT SEMI JOIN $b AS b -ON a.k1 = b.k2 +ON a.k1 == b.k2 LEFT ONLY JOIN $c AS c -ON a.k1 = c.k3 +ON a.k1 == c.k3 SELECT * ORDER BY 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 77ea20a98994..8b6c70be771b 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 @@ -8,10 +8,10 @@ FROM Input1 AS a JOIN ANY Input2 AS b -ON a.k1 = b.k2 AND a.v1 = b.v2 +ON a.k1 == b.k2 AND a.v1 == b.v2 JOIN ANY Input3 AS c -ON a.k1 = c.k3 AND a.v1 = c.v3 +ON a.k1 == c.k3 AND a.v1 == c.v3 LEFT JOIN Input4 AS d -ON (c.v3, c.u3) = (d.v4, d.u4); +ON (c.v3, c.u3) == (d.v4, d.u4); 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 048bb9e02b50..7dbfa0357039 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 @@ -8,12 +8,12 @@ FROM ANY Input1 AS a JOIN ANY Input2 AS b -ON (a.k1 = b.k2 AND a.v1 = b.v2) +ON (a.k1 == b.k2 AND a.v1 == b.v2) JOIN ANY Input3 AS c -ON (a.k1 = c.k3 AND a.v1 = c.v3) +ON (a.k1 == c.k3 AND a.v1 == c.v3) JOIN Input4 AS d -ON (a.k1 = d.k4) +ON (a.k1 == d.k4) ORDER BY v3; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-three_equalities_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-three_equalities_/formatted.sql index aba691e2ff9a..00eb58e323bd 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-three_equalities_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-three_equalities_/formatted.sql @@ -7,8 +7,8 @@ FROM Input1 AS A JOIN Input2 AS B -ON A.key == B.key AND - (CAST(A.subkey AS int) + 1 == CAST(B.subkey AS int)) AND - A.value == B.value +ON A.key == B.key + AND (CAST(A.subkey AS int) + 1 == CAST(B.subkey AS int)) + AND A.value == B.value ORDER BY A.key; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-three_equalities_paren_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-three_equalities_paren_/formatted.sql index 3446c98c118d..96487cd95876 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-three_equalities_paren_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-three_equalities_paren_/formatted.sql @@ -7,6 +7,6 @@ FROM Input2 AS A JOIN Input4 AS B -ON (A.key == B.key) AND - (A.subkey == B.subkey) AND - (A.value == B.value); +ON (A.key == B.key) + AND (A.subkey == B.subkey) + AND (A.value == B.value); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-trivial_view_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-trivial_view_/formatted.sql index 69d072f99d97..c045e050aecf 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-trivial_view_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-trivial_view_/formatted.sql @@ -1,5 +1,6 @@ PRAGMA DisableSimpleColumns; -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; SELECT 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 6f9e8aa8d61d..a348746c6a1d 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 @@ -20,7 +20,7 @@ $join = WHERE subkey != "foo" ) AS b - ON a.key = b.key AND a.subkey = b.subkey; + ON a.key == b.key AND a.subkey == b.subkey; SELECT key1, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-10654_pullup_with_sys_columns_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-10654_pullup_with_sys_columns_/formatted.sql index 6bd5db19f8fb..af75d605c717 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-10654_pullup_with_sys_columns_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-10654_pullup_with_sys_columns_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; PRAGMA DisableSimpleColumns; 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 1085cc5ff816..33cab7715f2a 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; DEFINE SUBQUERY $sub($name) AS @@ -13,5 +14,5 @@ FROM $sub("Input") AS a INNER JOIN Input AS b -ON a.key = b.key +ON a.key == b.key WHERE JoinTableRow().`a.subkey` == "wat"; 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 603f6e008791..83fc420b4901 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 @@ -19,4 +19,4 @@ FROM $t AS l LEFT JOIN Input3 AS r -ON l.key = coalesce("" || r.key, ""); +ON l.key == coalesce("" || r.key, ""); 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 4cdc3bc36291..fad5d8d486dc 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 @@ -9,11 +9,11 @@ SELECT c.value FROM Input1 AS a -JOIN/*+ merge() */ Input2 +JOIN /*+ merge() */ Input2 AS b -ON a.key = b.key AND a.subkey = b.subkey +ON a.key == b.key AND a.subkey == b.subkey JOIN Input3 AS c -ON b.key = c.key AND b.subkey = c.subkey +ON b.key == c.key AND b.subkey == c.subkey ORDER BY c.value; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-6199_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-6199_/formatted.sql index 0eea5b241d35..1e633353f43e 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-6199_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-6199_/formatted.sql @@ -14,7 +14,7 @@ $j1 = ( AS a2 JOIN $i AS b - ON a2.key = b.key + ON a2.key == b.key ); SELECT @@ -23,7 +23,7 @@ FROM $j1 AS a JOIN $i AS d -ON a.k = d.key; +ON a.k == d.key; $j2 = ( SELECT @@ -33,7 +33,7 @@ $j2 = ( AS a JOIN $i AS b - ON a.key = b.key + ON a.key == b.key ); SELECT @@ -42,4 +42,4 @@ FROM $j2 AS a JOIN $i AS d -ON a.k = d.key; +ON a.k == d.key; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-6297_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-6297_/formatted.sql index 8081e288d8a4..c92fd53bb88a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-6297_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-6297_/formatted.sql @@ -19,8 +19,8 @@ FROM $input AS diff INNER JOIN $input AS taskSuite -ON diff.previousId = taskSuite.id +ON diff.previousId == taskSuite.id LEFT JOIN $input AS pedestrian -ON diff.taskId = pedestrian.id -WHERE diff.id = 1; +ON diff.taskId == pedestrian.id +WHERE diff.id == 1; 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 ebfd1c3022ae..5682cb61f7b0 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 @@ -21,9 +21,9 @@ FROM $foo AS R0 LEFT JOIN $foo AS R1 -ON R0.subkey = R1.key +ON R0.subkey == R1.key LEFT JOIN $foo AS R2 -ON R1.subkey = R2.key +ON R1.subkey == R2.key ORDER BY R0.key; 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 b54f876fecbc..0078e86f8ba6 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 @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not */-- Check that Json2::Parse/Serialize calls fold +/* syntax version 1 */ +/* postgres can not */ +-- Check that Json2::Parse/Serialize calls fold $json = CAST( @@{ "a": { 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 679d5295e84a..fabe3a8d5c79 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $json = Unwrap(CAST(@@{"x": 1}@@ AS Json)); SELECT 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 39de782e1036..4ae5096bcf62 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 @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not */-- Null handling +/* syntax version 1 */ +/* postgres can not */ +-- Null handling SELECT JSON_EXISTS (NULL, "strict $.key"), JSON_EXISTS (Nothing(Json?), "strict $.key"); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_exists_example_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_exists_example_/formatted.sql index 863ea2f45b6e..40e5f16e3969 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_exists_example_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_exists_example_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; -- These examples are taken from [ISO/IEC TR 19075-6:2017] standard (https://www.iso.org/standard/67367.html) 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 9a2816b6fa16..0291493f339a 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,9 +1,10 @@ -/* syntax version 1 *//* postgres can not */-- Accessing absent object member will cause jsonpath error in strict mode +/* syntax version 1 */ +/* postgres can not */ +-- Accessing absent object member will cause jsonpath error in strict mode $json = CAST("{}" AS Json); SELECT - JSON_EXISTS ($json, "strict $.key"), - -- defaults to FALSE 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 d70dd8bee0b1..fdd8c31419bf 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,4 +1,5 @@ -/* custom error:Member not found*/-- Accessing absent object member will cause jsonpath error in strict mode +/* custom error:Member not found*/ +-- Accessing absent object member will cause jsonpath error in strict mode $json = CAST("{}" AS Json); SELECT 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 599387bb72bd..a8441f86a100 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $json = CAST( @@{ "key": 123 @@ -21,6 +22,7 @@ SELECT CAST(9 AS Double) AS var9, CAST(10 AS Float) AS var10 ), + -- Time types JSON_EXISTS ( $json, @@ -34,21 +36,25 @@ SELECT $json, "strict $var" PASSING CAST("2020-02-18" AS Date) AS var ), + -- Utf8 JSON_EXISTS ( $json, "strict $var" PASSING CAST("привет" AS Utf8) AS var ), + -- Bool JSON_EXISTS ( $json, "strict $var" PASSING TRUE AS var ), + -- Json JSON_EXISTS ( $json, "strict $var" PASSING $json AS var ), + -- Nulls JSON_EXISTS ( $json, @@ -64,6 +70,7 @@ SELECT JSON_EXISTS ( $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 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 e799845b4de8..a5aac6d3ca03 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 @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not */-- Null handling +/* syntax version 1 */ +/* postgres can not */ +-- Null handling SELECT JSON_QUERY (NULL, "strict $.key"), JSON_QUERY (Nothing(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 310190463e23..5b961c4e9243 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; -- These examples are taken from [ISO/IEC TR 19075-6:2017] standard (https://www.iso.org/standard/67367.html) 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 76ec427bd3a3..469eb860f86a 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,9 +1,10 @@ -/* syntax version 1 *//* postgres can not */-- Accessing absent object member will cause empty result in lax mode +/* syntax version 1 */ +/* postgres can not */ +-- Accessing absent object member will cause empty result in lax mode $json = CAST("{}" AS Json); SELECT - JSON_QUERY ($json, "lax $.key"), - -- defaults to NULL 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 cdb91a971e76..362f6051ef85 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,4 +1,5 @@ -/* custom error:Empty result*/-- Accessing absent object member will cause empty result in lax mode +/* custom error:Empty result*/ +-- Accessing absent object member will cause empty result in lax mode $json = CAST("{}" AS Json); SELECT 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 9c34f5c883bf..d1b12e91dcab 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,9 +1,10 @@ -/* syntax version 1 *//* postgres can not */-- Accessing absent object member will cause jsonpath error in strict mode +/* syntax version 1 */ +/* postgres can not */ +-- Accessing absent object member will cause jsonpath error in strict mode $json = CAST("{}" AS Json); SELECT - JSON_QUERY ($json, "strict $.key"), - -- defaults to NULL 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 8cd635fbd4bc..98bd9c41bbed 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,4 +1,5 @@ -/* custom error:Member not found*/-- Accessing absent object member will cause jsonpath error in strict mode +/* custom error:Member not found*/ +-- Accessing absent object member will cause jsonpath error in strict mode $json = CAST("{}" AS Json); SELECT 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 3f95ca676dc6..84bbb7771af9 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $json = CAST( @@{ "key": 123 @@ -21,6 +22,7 @@ SELECT CAST(9 AS Double) AS var9, CAST(10 AS Float) AS var10 WITH UNCONDITIONAL ARRAY WRAPPER ), + -- Time types JSON_QUERY ( $json, @@ -34,21 +36,25 @@ SELECT $json, "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 ), + -- Bool JSON_QUERY ( $json, "strict $var" PASSING TRUE AS var WITH UNCONDITIONAL ARRAY WRAPPER ), + -- Json JSON_QUERY ( $json, "strict $var" PASSING $json AS var ), + -- Nulls JSON_QUERY ( $json, @@ -64,6 +70,7 @@ SELECT JSON_QUERY ( $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 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 7037729a444c..d92f0c45e742 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 @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* custom error:Expected data or optional of data, but got: Tuple*/ +/* syntax version 1 */ +/* postgres can not */ +/* custom error:Expected data or optional of data, but got: Tuple*/ $json = CAST( @@{ "key": 123 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 253d5c9923f3..659d5cf91b05 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $json = CAST( @@{ "object": {"key": 123}, @@ -10,39 +11,32 @@ $json = CAST( -- Check JSON_QUERY without wrapper SELECT - JSON_QUERY ($json, "strict $.array"), - -- defaults to 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"), -- 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 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 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 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 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 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); 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 bd2bab8f5f48..0abc8638a628 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 @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not */-- Null handling +/* syntax version 1 */ +/* postgres can not */ +-- Null handling SELECT JSON_VALUE (NULL, "strict $.key"), JSON_VALUE (Nothing(Json?), "strict $.key"); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_example_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_example_/formatted.sql index 17d7146c5163..e21c71b18ba9 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_example_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_example_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; -- These examples are taken from [ISO/IEC TR 19075-6:2017] standard (https://www.iso.org/standard/67367.html) @@ -36,6 +37,7 @@ SELECT T.K, JSON_VALUE (T.J, 'strict $.who') AS Who, JSON_VALUE (T.J, 'strict $.where' NULL ON EMPTY NULL ON ERROR) AS Nali, + -- NOTE: output for this particular column differs with standard. -- For row with T.K = 106 and T.J = { "who": "Louise", "where": "Iana" } output is "*** error ***", not NULL. -- This is because answer in standard (NULL) is not correct. Query "strict $.friends[*].name" is executed in strict mode @@ -54,6 +56,7 @@ FROM T; SELECT T.K, JSON_VALUE (T.J, 'lax $.who') AS Who, + -- NOTE: In the original example INTEGER type was used. YQL does not have INTEGER type, Int64 was used instead JSON_VALUE (T.J, 'lax $.friends[0].rank' RETURNING Int64 NULL ON EMPTY) AS Rank FROM T; 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 52a33c35094c..25db9077fb1a 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,9 +1,10 @@ -/* syntax version 1 *//* postgres can not */-- Accessing absent object member will cause empty result in lax mode +/* syntax version 1 */ +/* postgres can not */ +-- Accessing absent object member will cause empty result in lax mode $json = CAST("{}" AS Json); SELECT - JSON_VALUE ($json, "lax $.key"), - -- defaults to NULL 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); 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 d3c92391bd1f..d3ef21415ea0 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,9 +1,10 @@ -/* syntax version 1 *//* postgres can not */-- Accessing absent object member will cause jsonpath error in strict mode +/* syntax version 1 */ +/* postgres can not */ +-- Accessing absent object member will cause jsonpath error in strict mode $json = CAST("{}" AS Json); SELECT - JSON_VALUE ($json, "strict $.key"), - -- defaults to NULL 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); 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 68f3d53a1847..18731ae430f4 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 @@ -1,4 +1,5 @@ -/* custom error:Failed to cast default value from ON ERROR clause to target type Optional*/-- Here JsonPath engine returns error result and ON ERROR section must be used. +/* custom error:Failed to cast default value from ON ERROR clause to target type Optional*/ +-- 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); 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 dbed90477ed4..18323cd52a7e 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 @@ -1,4 +1,5 @@ -/* custom error:Cannot convert extracted JSON value to target type*/-- In this case call to Json2::SqlValueNumber will fail because "string" +/* custom error:Cannot convert extracted JSON value to target type*/ +-- In this case call to Json2::SqlValueNumber will fail because "string" -- does not represent Number value $json = CAST( @@{ 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 463a954fed5f..f06a5ce8dd37 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 @@ -1,4 +1,5 @@ -/* custom error:Failed to cast extracted JSON value to target type Optional*/-- In this case call to Json2::SqlValueNumber will be successfull, but cast +/* custom error:Failed to cast extracted JSON value to target type Optional*/ +-- In this case call to Json2::SqlValueNumber will be successfull, but cast -- of -123 to Uint16 will fail $json = CAST( @@{ 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 b2e2b2be9009..cfcdba47eaee 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $json = CAST( @@{ "key": 123 @@ -21,6 +22,7 @@ SELECT CAST(9 AS Double) AS var9, CAST(10 AS Float) AS var10 ), + -- Time types JSON_VALUE ( $json, @@ -34,21 +36,25 @@ SELECT $json, "strict $var" PASSING CAST("2020-02-18" AS Date) AS var ), + -- Utf8 JSON_VALUE ( $json, "strict $var" PASSING CAST("привет" AS Utf8) AS var ), + -- Bool JSON_VALUE ( $json, "strict $var" PASSING TRUE AS var ), + -- Json JSON_VALUE ( $json, "strict $var.key" PASSING $json AS var ), + -- Nulls JSON_VALUE ( $json, @@ -64,6 +70,7 @@ SELECT JSON_VALUE ( $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 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 66f1405976c6..432aa0b8da3e 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 @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* custom error:Expected data or optional of data, but got: Tuple*/ +/* syntax version 1 */ +/* postgres can not */ +/* custom error:Expected data or optional of data, but got: Tuple*/ $json = CAST( @@{ "key": 123 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 8d5caf6571c5..6456244a1142 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 @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not */-- Basic cases +/* syntax version 1 */ +/* postgres can not */ +-- Basic cases $bool_json = CAST( @@{ "key": true @@ -6,8 +8,7 @@ $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"), -- defaults to RETURNING Utf8 with cast to string value JSON_VALUE ($bool_json, "strict $.key" RETURNING Bool); $string_json = CAST( @@{ @@ -16,8 +17,7 @@ $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"), -- defaults to RETURNING Utf8 with cast to string value JSON_VALUE ($string_json, "strict $.key" RETURNING Utf8); $int64_json = CAST( @@{ @@ -26,8 +26,7 @@ $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"), -- defaults to RETURNING Utf8 with cast to string value JSON_VALUE ($int64_json, "strict $.key" RETURNING Int64); $double_json = CAST( @@{ @@ -36,8 +35,7 @@ $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"), -- defaults to RETURNING Utf8 with cast to string value JSON_VALUE ($double_json, "strict $.key" RETURNING Double); -- Casting of result value to different types diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-jsondocument_insert_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-jsondocument_insert_/formatted.sql index b3b9d061eb7d..92b8c7741361 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-jsondocument_insert_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-jsondocument_insert_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* multirun can not */ +/* postgres can not */ +/* multirun can not */ INSERT INTO plato.Output SELECT * 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 7da3705e8cd9..2837e7bbfb25 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $json = JsonDocument(@@{"a": {"b": 1}, "c": 2}@@); SELECT 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 961d57cac37f..8330957cc341 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $json = JsonDocument(@@{"a": {"b": 1}, "c": 2}@@); SELECT 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 77bc8086a278..b894dec53db8 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $json = JsonDocument(@@{"a": {"b": 1}, "c": 2}@@); SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-jsonpath_unicode_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-jsonpath_unicode_/formatted.sql index 912d6a211736..d433d3931d5d 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-jsonpath_unicode_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-jsonpath_unicode_/formatted.sql @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not */-- Check access to members with unicode keys +/* syntax version 1 */ +/* postgres can not */ +-- Check access to members with unicode keys $json = CAST( @@{ "привет": 123 diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-calc_dependent_with_tmp_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-calc_dependent_with_tmp_/formatted.sql index 6dbd21e25fd9..d81542c9c4c8 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-calc_dependent_with_tmp_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-calc_dependent_with_tmp_/formatted.sql @@ -19,4 +19,4 @@ $last_key = SELECT * FROM Input -WHERE key = $last_key; +WHERE key == $last_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 8d4aa6be6a58..9f1a8268d937 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 @@ -1,7 +1,7 @@ SELECT * FROM plato.Input -WHERE key IN ("023", "075", "150") AND (subkey = "1" OR subkey = "3") AND value >= "aaa" AND value <= "zzz" +WHERE 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_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 ede65a5ad4a9..c85f87614f12 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 @@ -1,4 +1,5 @@ -/* postgres can not */-- right side depends on row +/* postgres can not */ +-- right side depends on row SELECT * FROM plato.Input diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-convert_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-convert_/formatted.sql index a33db648cf94..b5c87baf278f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-convert_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-convert_/formatted.sql @@ -1,5 +1,5 @@ SELECT * FROM plato.Input -WHERE key = 3755112183455673684 OR - key = 10790819990820982188; +WHERE key == 3755112183455673684 + OR key == 10790819990820982188; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-datetime_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-datetime_/formatted.sql index 06d1c653d00c..ce6ee62912e9 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-datetime_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-datetime_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; INSERT INTO @d 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 e6a5ac1b3e0f..93180782f7f0 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $asIs = Python::asIs( Callable<(String) -> String>, @@ -22,36 +23,32 @@ FROM ( SELECT * FROM @decimal - WHERE value < Decimal("4.1", 15, 10) AND value > Decimal("10.5", 15, 10) - -- empty + WHERE 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 + WHERE value > Decimal("inf", 15, 10) -- empty UNION ALL SELECT * FROM @decimal - WHERE value < Decimal("-inf", 15, 10) - -- empty + WHERE value < Decimal("-inf", 15, 10) -- empty UNION ALL SELECT * FROM @decimal - WHERE value = Decimal("nan", 15, 10) - -- empty + WHERE value == Decimal("nan", 15, 10) -- empty UNION ALL SELECT * FROM @decimal - WHERE value = Decimal("inf", 15, 10) + WHERE value == Decimal("inf", 15, 10) UNION ALL SELECT * FROM @decimal - WHERE value = Decimal("-inf", 15, 10) + WHERE value == Decimal("-inf", 15, 10) UNION ALL SELECT * @@ -65,17 +62,17 @@ ORDER BY SELECT * FROM @decimal -WHERE value = CAST("6.6" AS Decimal (15, 10)); +WHERE value == CAST("6.6" AS Decimal (15, 10)); -- Safe key filter calc SELECT * FROM @decimal -WHERE value = CAST($asIs("3.3") AS Decimal (15, 10)); +WHERE value == CAST($asIs("3.3") AS Decimal (15, 10)); -- Unsafe key filter calc SELECT * FROM @decimal -WHERE value = CAST($asIs("bad") AS Decimal (15, 10)); +WHERE 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-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 14a22444a84f..2fd27381d158 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 @@ -1,4 +1,4 @@ SELECT * FROM plato.Input -WHERE key IS NULL OR key = "023"; +WHERE key IS NULL OR key == "023"; 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 0581b91769ce..beefd241abbf 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 @@ -11,5 +11,5 @@ INNER JOIN ( WHERE key == "075" ) AS b -ON a.subkey = b.subkey +ON a.subkey == b.subkey WHERE 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 867b1a7eedae..4eb58ef1ca66 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ $makeOpt = Python::makeOpt( Callable<(String, Bool) -> String?>, @@ 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 cf0b7c2ec8f2..a35ab0307e0e 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 @@ -4,9 +4,9 @@ USE plato; SELECT * FROM concat(Input, Input1, Input2, Input3) -WHERE key = "150" AND subkey = "1" AND value >= "aaa"; +WHERE key == "150" AND subkey == "1" AND value >= "aaa"; SELECT * FROM concat(Input, Input1, Input2, Input3) -WHERE subkey = "1" AND value >= "aaa"; +WHERE 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 2a80780ee48a..fa383de74789 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $l = ( @@ -7,8 +8,8 @@ $l = ( TableName() AS tn FROM CONCAT(Input1, Input2) AS t - WHERE key == '023' AND - subkey == "3" + WHERE key == '023' + AND subkey == "3" ); $r = ( @@ -17,8 +18,8 @@ $r = ( TableName() AS tn FROM CONCAT(Input1, Input2) AS t - WHERE key == '150' AND - subkey == "3" + WHERE key == '150' + AND subkey == "3" ); SELECT 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 e3d4cd95d259..0ef653242b79 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $src = 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 2480f9eeac40..f2e701e0d577 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $src = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-range_union_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-range_union_/formatted.sql index 75bb2196467c..e3e2b88145be 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-range_union_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-range_union_/formatted.sql @@ -5,182 +5,152 @@ FROM ( SELECT * FROM plato.Input - WHERE key = 8 OR key >= 9 - --[8,) + WHERE key == 8 OR key >= 9 --[8,) UNION ALL SELECT * FROM plato.Input - WHERE key = 8 OR key >= 8 - --[8,) + WHERE key == 8 OR key >= 8 --[8,) UNION ALL SELECT * FROM plato.Input - WHERE key = 8 OR key > 8 - --[8,) + WHERE key == 8 OR key > 8 --[8,) UNION ALL SELECT * FROM plato.Input - WHERE key = 8 OR key > 7 - --[8,) + WHERE key == 8 OR key > 7 --[8,) UNION ALL SELECT * FROM plato.Input - WHERE key = 8 OR key >= 7 - --[7,) + WHERE key == 8 OR key >= 7 --[7,) UNION ALL SELECT * FROM plato.Input - WHERE key = 8 OR key <= 7 - --(,9) + WHERE key == 8 OR key <= 7 --(,9) UNION ALL SELECT * FROM plato.Input - WHERE key = 8 OR key <= 8 - --(,9) + WHERE key == 8 OR key <= 8 --(,9) UNION ALL SELECT * FROM plato.Input - WHERE key = 8 OR key < 8 - --(,9) + WHERE key == 8 OR key < 8 --(,9) UNION ALL SELECT * FROM plato.Input - WHERE key = 8 OR key < 9 - --(,9) + WHERE key == 8 OR key < 9 --(,9) UNION ALL SELECT * FROM plato.Input - WHERE key = 8 OR key <= 9 - --(,10) + WHERE key == 8 OR key <= 9 --(,10) UNION ALL SELECT * FROM plato.Input - WHERE key > 8 OR key < 8 - --(,8),[9,) + WHERE key > 8 OR key < 8 --(,8),[9,) UNION ALL SELECT * FROM plato.Input - WHERE key > 8 OR key <= 8 - --(,) + WHERE key > 8 OR key <= 8 --(,) UNION ALL SELECT * FROM plato.Input - WHERE key > 8 OR key < 9 - --(,) + WHERE key > 8 OR key < 9 --(,) UNION ALL SELECT * FROM plato.Input - WHERE key > 7 OR key < 9 - --(,) + WHERE key > 7 OR key < 9 --(,) UNION ALL SELECT * FROM plato.Input - WHERE key >= 7 OR key < 9 - --(,) + WHERE key >= 7 OR key < 9 --(,) UNION ALL SELECT * FROM plato.Input - WHERE key > 7 OR key <= 9 - --(,) + WHERE key > 7 OR key <= 9 --(,) UNION ALL SELECT * FROM plato.Input - WHERE (key > 5 AND key < 7) OR (key > 4 AND key < 8) - -- [5,8) + WHERE (key > 5 AND key < 7) OR (key > 4 AND key < 8) -- [5,8) UNION ALL SELECT * FROM plato.Input - WHERE (key > 5 AND key < 7) OR (key > 5 AND key < 8) - -- [6,8) + WHERE (key > 5 AND key < 7) OR (key > 5 AND key < 8) -- [6,8) UNION ALL SELECT * FROM plato.Input - WHERE (key >= 5 AND key < 7) OR (key >= 5 AND key < 8) - -- [5,8) + WHERE (key >= 5 AND key < 7) OR (key >= 5 AND key < 8) -- [5,8) UNION ALL SELECT * FROM plato.Input - WHERE (key > 5 AND key <= 7) OR (key > 4 AND key < 8) - -- [5,8) + WHERE (key > 5 AND key <= 7) OR (key > 4 AND key < 8) -- [5,8) UNION ALL SELECT * FROM plato.Input - WHERE (key > 5 AND key <= 7) OR (key > 4 AND key <= 7) - -- [5,8) + WHERE (key > 5 AND key <= 7) OR (key > 4 AND key <= 7) -- [5,8) UNION ALL SELECT * FROM plato.Input - WHERE (key > 5 AND key < 8) OR (key > 4 AND key < 8) - -- [5,8) + WHERE (key > 5 AND key < 8) OR (key > 4 AND key < 8) -- [5,8) UNION ALL SELECT * FROM plato.Input - WHERE (key = 1 AND subkey < 4 AND subkey > 1) OR (key = 2 AND subkey < 4 AND subkey > 1) - --[{1,2},{1,4}),[{2,2},{2,4}) + WHERE (key == 1 AND subkey < 4 AND subkey > 1) OR (key == 2 AND subkey < 4 AND subkey > 1) --[{1,2},{1,4}),[{2,2},{2,4}) UNION ALL SELECT * FROM plato.Input - WHERE (key = 1 AND subkey < 3 AND subkey > 1) OR (key = 2 AND subkey < 3 AND subkey > 1) - --[{1,2}],[{2,2}] + WHERE (key == 1 AND subkey < 3 AND subkey > 1) OR (key == 2 AND subkey < 3 AND subkey > 1) --[{1,2}],[{2,2}] UNION ALL SELECT * FROM plato.Input - WHERE (key = 1 AND subkey > 1) OR (key = 2 AND subkey < 3) - --[{1,2},{1}],[{2},{2,3}) + WHERE (key == 1 AND subkey > 1) OR (key == 2 AND subkey < 3) --[{1,2},{1}],[{2},{2,3}) UNION ALL SELECT * FROM plato.Input - WHERE (key = 1 AND subkey < 3 AND subkey > 1) OR key = 1 - --[1] + WHERE (key == 1 AND subkey < 3 AND subkey > 1) OR key == 1 --[1] UNION ALL SELECT * FROM plato.Input - WHERE (key = 1 AND subkey > 1) OR key = 1 - --[1] + WHERE (key == 1 AND subkey > 1) OR key == 1 --[1] UNION ALL SELECT * FROM plato.Input - WHERE (key = 1 AND subkey < 4 AND subkey > 1) OR (key > 1) - --[{1,2},{1,4}),[2,) + WHERE (key == 1 AND subkey < 4 AND subkey > 1) OR (key > 1) --[{1,2},{1,4}),[2,) UNION ALL SELECT * FROM plato.Input - WHERE key = 1 AND (subkey BETWEEN 2 AND 3 OR subkey < 2) - --[{1},{1,3}] + WHERE key == 1 AND (subkey BETWEEN 2 AND 3 OR subkey < 2) --[{1},{1,3}] UNION ALL SELECT * FROM plato.Input - WHERE key = 1 AND (subkey >= 2 OR subkey < 2) ---[1] + WHERE key == 1 AND (subkey >= 2 OR subkey < 2) --[1] ) 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 f70d418170dc..cc441e73c427 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 @@ -6,4 +6,4 @@ SELECT "" AS subkey, "value:" || value AS value FROM concat(Input, Input, Input, Input) -WHERE key = "07" || "5"; +WHERE 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 46cc96e01e04..4a7ce346ef65 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 @@ -6,4 +6,4 @@ SELECT "" AS subkey, "value:" || value AS value FROM concat(Input, Input, Input) -WHERE key = "07" || "5"; +WHERE 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 331a57256292..3332438fe211 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT * FROM plato.Input 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 bee9db10fee2..db2c32125103 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; INSERT INTO @src 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 f21dd99700d2..817a1b498561 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA yt.UseNewPredicateExtraction = "false"; SELECT 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 9cbdae3fd47f..3aafc45f6acc 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $asIs = Python::asIs( Callable<(String) -> String>, @@ -22,25 +23,22 @@ FROM ( SELECT * FROM @tzdate - WHERE value < TzDate("1999-01-01,Europe/Moscow") AND value > TzDate("2011-01-01,Europe/Moscow") - -- empty + WHERE 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 + WHERE value > TzDate("2105-12-30,posixrules") -- empty UNION ALL SELECT * FROM @tzdate - WHERE value < TzDate("1970-01-01,GMT") - -- empty + WHERE value < TzDate("1970-01-01,GMT") -- empty UNION ALL SELECT * FROM @tzdate - WHERE value = TzDate("2018-02-01,GMT") + WHERE value == TzDate("2018-02-01,GMT") UNION ALL SELECT * @@ -50,8 +48,7 @@ FROM ( 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 + 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 ) ORDER BY value; @@ -60,17 +57,17 @@ ORDER BY SELECT * FROM @tzdate -WHERE value = CAST("1999-01-01,Europe/Moscow" AS TzDate); +WHERE value == CAST("1999-01-01,Europe/Moscow" AS TzDate); -- Safe key filter calc SELECT * FROM @tzdate -WHERE value = CAST($asIs("2105-12-30,America/Los_Angeles") AS TzDate); +WHERE value == CAST($asIs("2105-12-30,America/Los_Angeles") AS TzDate); -- Unsafe key filter calc SELECT * FROM @tzdate -WHERE value = CAST($asIs("bad") AS TzDate); +WHERE 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 e26409f257e1..22429bd739f2 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA yt.UseNewPredicateExtraction = "false"; SELECT 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 e7f97c7d8a2e..cc07ddaa96b5 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $asIs = Python::asIs( Callable<(String) -> String>, @@ -22,56 +23,47 @@ FROM ( SELECT * FROM @uuid - WHERE value < Uuid("00000000-0000-0000-0000-100000000000") AND value > Uuid("00000000-0000-0000-0000-400000000000") - -- empty + WHERE 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 + WHERE value > Uuid("FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFF") -- empty UNION ALL SELECT * FROM @uuid - WHERE value < Uuid("00000000-0000-0000-0000-000000000000") - -- empty + WHERE 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,) + WHERE 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,) + WHERE 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) + WHERE 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] + WHERE 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] + WHERE 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] + 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] ) ORDER BY value; @@ -80,17 +72,17 @@ ORDER BY SELECT * FROM @uuid -WHERE value = CAST("00000000-0000-0000-0000-100000000000" AS Uuid); +WHERE value == CAST("00000000-0000-0000-0000-100000000000" AS Uuid); -- Safe key filter calc SELECT * FROM @uuid -WHERE value = CAST($asIs("00000000-0000-0000-0000-200000000000") AS Uuid); +WHERE value == CAST($asIs("00000000-0000-0000-0000-200000000000") AS Uuid); -- Unsafe key filter calc SELECT * FROM @uuid -WHERE value = CAST($asIs("bad") AS Uuid); +WHERE 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 fa5bd30eee37..e8bc35a6c922 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; SELECT @@ -11,4 +12,4 @@ SELECT v1, v2 FROM RANGE("", "Input1", "Input2") -WHERE key == "150" AND subkey = "1"; +WHERE key == "150" AND subkey == "1"; 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 538fb5acc38a..84bef6802cd2 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 @@ -1,5 +1,5 @@ SELECT * FROM plato.Input -WHERE key = '023' AND - (value = "aaa" OR subkey = "3"); +WHERE key == '023' + AND (value == "aaa" OR subkey == "3"); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_brief_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_brief_/formatted.sql index 9512103f1961..30003cc139de 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_brief_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_brief_/formatted.sql @@ -1,3 +1,4 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ SELECT ($x, $y) -> ($x + $y)(1, 2); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_opt_args_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_opt_args_/formatted.sql index 4ff0a1414193..beb8900b739c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_opt_args_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_opt_args_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ $f = ($x, $y?) -> ($x + ($y ?? 0)); SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_udf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_udf_/formatted.sql index 7547c65988a5..32cf91a57924 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_udf_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_udf_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $shiftSteps = 1; $linear = ($x, $z) -> { 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 80c8be60cda8..898fa4ca5c00 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,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ 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 e9a96bebc247..eb86d53d47ef 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,4 +1,5 @@ -/* postgres can not *//* kikimr can not - range not supported */ +/* postgres can not */ +/* kikimr can not - range not supported */ 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_udf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_udf_/formatted.sql index 502e0b8b9201..7943f4b33450 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,4 +1,5 @@ -/* postgres can not *//* kikimr can not - range not supported */ +/* postgres can not */ +/* kikimr can not - range not supported */ 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 e9a96bebc247..eb86d53d47ef 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,4 +1,5 @@ -/* postgres can not *//* kikimr can not - range not supported */ +/* postgres can not */ +/* kikimr can not - range not supported */ 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_like-like_clause_escape_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_like-like_clause_escape_/formatted.sql index 0c1a009c54fa..9966e91bc6e7 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 @@ -3,6 +3,6 @@ SELECT subkey, value FROM plato.Input -WHERE value LIKE "!%z" ESCAPE "!" OR - value || "_" LIKE "_?_" ESCAPE "?" OR - value || "!" LIKE "ddd!!" ESCAPE "!"; +WHERE 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-regexp_clause_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_like-regexp_clause_/formatted.sql index 85fe265137e4..4d3d29628e81 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ SELECT key, subkey, 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 55985d711bcc..da13aa51117a 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $script = @@ def f(s): 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 ec33b3a8f412..335f339c1c4d 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 @@ -3,12 +3,12 @@ $in = ( SELECT * FROM plato.Input - WHERE key = "150" + WHERE key == "150" UNION ALL SELECT * FROM plato.Input - WHERE key = "075" + WHERE key == "075" ); SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-insert_with_limit_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-insert_with_limit_/formatted.sql index d70c4659fd6c..f1693811beb8 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-insert_with_limit_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-insert_with_limit_/formatted.sql @@ -1,6 +1,5 @@ /* postgres can not */ -INSERT INTO plato.Output - WITH truncate +INSERT INTO plato.Output WITH truncate SELECT * FROM plato.Input 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 06b88ddaa530..a608a0a22c2c 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 @@ -1,4 +1,6 @@ -/* postgres can not *//* hybridfile can not YQL-17743 *//* syntax version 1 */ +/* postgres can not */ +/* hybridfile can not YQL-17743 */ +/* syntax version 1 */ USE plato; $in = ( 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 daa33d5d9770..73b10fe3e76e 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 @@ -1,4 +1,6 @@ -/* postgres can not *//* ignore runonopt ast diff *//* ignore runonopt plan diff */ +/* postgres can not */ +/* ignore runonopt ast diff */ +/* ignore runonopt plan diff */ USE plato; $i = ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-sort_calc_limit_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-sort_calc_limit_/formatted.sql index bdd7bdf4f1c4..6e039ad907d4 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-sort_calc_limit_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-sort_calc_limit_/formatted.sql @@ -1,8 +1,7 @@ /* postgres can not */ USE plato; -INSERT INTO Output - WITH truncate +INSERT INTO Output WITH truncate SELECT * FROM Input 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 b8263ec1179f..a9225d1d3376 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 @@ -36,8 +36,7 @@ $tail = ( LIMIT IF($clean ?? 0 < 2, 2 - $clean ?? 0, 0) ); -INSERT INTO Output - WITH TRUNCATE +INSERT INTO Output WITH TRUNCATE SELECT key, subkey, 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 65675a57b87d..ff77f73ad1bc 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 @@ -10,7 +10,7 @@ $row_count = ( SELECT Yson::LookupInt64(Attributes, "row_count") FROM AS_TABLE($tableList) - WHERE Type = "table" + WHERE Type == "table" ); $bucket_size = unwrap(CAST($row_count / ListLength($buckets) AS Uint64)); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-flatten_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-flatten_by_/formatted.sql index fde34515dfd0..8d6481a605ed 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-flatten_by_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-flatten_by_/formatted.sql @@ -21,14 +21,12 @@ $subquery2 = value2 ); -INSERT INTO @tmp1 - WITH TRUNCATE +INSERT INTO @tmp1 WITH TRUNCATE SELECT * FROM $subquery1; -INSERT INTO @tmp2 - WITH TRUNCATE +INSERT INTO @tmp2 WITH TRUNCATE SELECT * FROM $subquery2; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-grouping_sets_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-grouping_sets_/formatted.sql index 0024855a10ea..f2d76f459120 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-grouping_sets_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-grouping_sets_/formatted.sql @@ -11,8 +11,7 @@ $data = (key, subkey), (subkey, value)); -INSERT INTO @tmp - WITH TRUNCATE +INSERT INTO @tmp WITH TRUNCATE SELECT b.value FROM $data diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-join_as_struct_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-join_as_struct_/formatted.sql index a9829198d6ee..df35cead1067 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-join_as_struct_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-join_as_struct_/formatted.sql @@ -19,6 +19,6 @@ FROM ( FROM plato.Input ) AS b - ON a.key = b.key + ON a.key == b.key ) FLATTEN COLUMNS; 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 2592827739d1..6a106936a25b 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,13 +1,12 @@ USE plato; $v = ($x) -> { - RETURN ListFilter(["a", "b"], ($y) -> ($y = $x)); + RETURN ListFilter(["a", "b"], ($y) -> ($y == $x)); }; $k = ($x) -> { RETURN $x; }; -INSERT INTO Output - WITH truncate +INSERT INTO Output WITH truncate SELECT $k(key) AS k, $v(value) AS v diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-scalar_context_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-scalar_context_/formatted.sql index 5e693e50470a..6ccdfab960ee 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-scalar_context_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-scalar_context_/formatted.sql @@ -4,7 +4,7 @@ $sub = ( SELECT key FROM Input - WHERE value = 'abc' + WHERE value == 'abc' ); INSERT INTO Output diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-select_join_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-select_join_/formatted.sql index f05cf0ebef4b..7782246ee253 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-select_join_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-select_join_/formatted.sql @@ -6,6 +6,6 @@ FROM plato.Input AS a JOIN plato.Input AS b -ON a.key = b.key +ON a.key == b.key ORDER BY x; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-unordered_subquery_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-unordered_subquery_/formatted.sql index 0b4f315c8ecf..33a5d3f21e1f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-unordered_subquery_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-unordered_subquery_/formatted.sql @@ -6,8 +6,7 @@ DEFINE SUBQUERY $f() AS FROM Input END DEFINE; -INSERT INTO Output - WITH truncate +INSERT INTO Output WITH truncate SELECT * FROM $f(); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-window_member_struct_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-window_member_struct_/formatted.sql index 51c2def54591..cb3d37ecb9e0 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-window_member_struct_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-window_member_struct_/formatted.sql @@ -1,5 +1,4 @@ -INSERT INTO plato.Output - WITH TRUNCATE +INSERT INTO plato.Output WITH TRUNCATE SELECT * FROM ( 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 617db65bf8ce..904398c16574 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 @@ -18,16 +18,16 @@ PRAGMA config.flags("MatchRecognizeStream", "force"); SELECT * FROM AS_TABLE($osquery_data) MATCH_RECOGNIZE (ORDER BY - CAST(dt AS Timestamp) MEASURES LAST(SUSPICIOUS_ACTION_SOON.dt) AS suspicious_action_dt, LAST(LOGIN_SUCCESS_REMOTE.host) AS remote_login_host, LAST(LOGIN_SUCCESS_REMOTE.user) AS remote_login_user, LAST(LOGIN_SUCCESS_REMOTE.dt) AS t, FIRST(LOGIN_FAILED_SAME_USER.dt) AS brutforce_begin, FIRST(LOGIN_SUCCESS_SAME_USER.dt) AS brutforce_end, LAST(LOGIN_SUCCESS_SAME_USER.user) AS brutforce_login ONE ROW PER MATCH AFTER MATCH SKIP TO NEXT ROW PATTERN (LOGIN_SUCCESS_REMOTE ANY_ROW * (SUSPICIOUS_ACTION_SOON | SUSPICIOUS_ACTION_TIMEOUT) | (LOGIN_FAILED_SAME_USER ANY_ROW *) {2,} LOGIN_SUCCESS_SAME_USER) DEFINE LOGIN_SUCCESS_REMOTE AS LOGIN_SUCCESS_REMOTE.ev_type = "login" AND - LOGIN_SUCCESS_REMOTE.ev_status = "success" AND - LOGIN_SUCCESS_REMOTE.vpn = 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.dt - LAST(LOGIN_SUCCESS_REMOTE.dt) < 1000, SUSPICIOUS_ACTION_TIMEOUT AS SUSPICIOUS_ACTION_TIMEOUT.dt - LAST(LOGIN_SUCCESS_REMOTE.dt) >= 1000, 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 - ), 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)) + CAST(dt AS Timestamp) MEASURES LAST(SUSPICIOUS_ACTION_SOON.dt) AS suspicious_action_dt, LAST(LOGIN_SUCCESS_REMOTE.host) AS remote_login_host, LAST(LOGIN_SUCCESS_REMOTE.user) AS remote_login_user, LAST(LOGIN_SUCCESS_REMOTE.dt) AS t, FIRST(LOGIN_FAILED_SAME_USER.dt) AS brutforce_begin, FIRST(LOGIN_SUCCESS_SAME_USER.dt) AS brutforce_end, LAST(LOGIN_SUCCESS_SAME_USER.user) AS brutforce_login ONE ROW PER MATCH AFTER MATCH SKIP TO NEXT ROW PATTERN (LOGIN_SUCCESS_REMOTE ANY_ROW * (SUSPICIOUS_ACTION_SOON | SUSPICIOUS_ACTION_TIMEOUT) | (LOGIN_FAILED_SAME_USER ANY_ROW *) {2,} LOGIN_SUCCESS_SAME_USER) DEFINE LOGIN_SUCCESS_REMOTE AS LOGIN_SUCCESS_REMOTE.ev_type == "login" + AND LOGIN_SUCCESS_REMOTE.ev_status == "success" + AND LOGIN_SUCCESS_REMOTE.vpn == 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.dt - LAST(LOGIN_SUCCESS_REMOTE.dt) < 1000, SUSPICIOUS_ACTION_TIMEOUT AS SUSPICIOUS_ACTION_TIMEOUT.dt - LAST(LOGIN_SUCCESS_REMOTE.dt) >= 1000, 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 + ), 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)) 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 521576707972..f54175cc92fc 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 @@ -18,16 +18,16 @@ PRAGMA config.flags("MatchRecognizeStream", "disable"); SELECT * FROM AS_TABLE($osquery_data) MATCH_RECOGNIZE (ORDER BY - CAST(dt AS Timestamp) MEASURES LAST(SUSPICIOUS_ACTION_SOON.dt) AS suspicious_action_dt, LAST(LOGIN_SUCCESS_REMOTE.host) AS remote_login_host, LAST(LOGIN_SUCCESS_REMOTE.user) AS remote_login_user, LAST(LOGIN_SUCCESS_REMOTE.dt) AS t, FIRST(LOGIN_FAILED_SAME_USER.dt) AS brutforce_begin, FIRST(LOGIN_SUCCESS_SAME_USER.dt) AS brutforce_end, LAST(LOGIN_SUCCESS_SAME_USER.user) AS brutforce_login ONE ROW PER MATCH AFTER MATCH SKIP TO NEXT ROW PATTERN (LOGIN_SUCCESS_REMOTE ANY_ROW * (SUSPICIOUS_ACTION_SOON | SUSPICIOUS_ACTION_TIMEOUT) | (LOGIN_FAILED_SAME_USER ANY_ROW *) {2,} LOGIN_SUCCESS_SAME_USER) DEFINE LOGIN_SUCCESS_REMOTE AS LOGIN_SUCCESS_REMOTE.ev_type = "login" AND - LOGIN_SUCCESS_REMOTE.ev_status = "success" AND - LOGIN_SUCCESS_REMOTE.vpn = 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.dt - LAST(LOGIN_SUCCESS_REMOTE.dt) < 1000, SUSPICIOUS_ACTION_TIMEOUT AS SUSPICIOUS_ACTION_TIMEOUT.dt - LAST(LOGIN_SUCCESS_REMOTE.dt) >= 1000, 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 - ), 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)) + CAST(dt AS Timestamp) MEASURES LAST(SUSPICIOUS_ACTION_SOON.dt) AS suspicious_action_dt, LAST(LOGIN_SUCCESS_REMOTE.host) AS remote_login_host, LAST(LOGIN_SUCCESS_REMOTE.user) AS remote_login_user, LAST(LOGIN_SUCCESS_REMOTE.dt) AS t, FIRST(LOGIN_FAILED_SAME_USER.dt) AS brutforce_begin, FIRST(LOGIN_SUCCESS_SAME_USER.dt) AS brutforce_end, LAST(LOGIN_SUCCESS_SAME_USER.user) AS brutforce_login ONE ROW PER MATCH AFTER MATCH SKIP TO NEXT ROW PATTERN (LOGIN_SUCCESS_REMOTE ANY_ROW * (SUSPICIOUS_ACTION_SOON | SUSPICIOUS_ACTION_TIMEOUT) | (LOGIN_FAILED_SAME_USER ANY_ROW *) {2,} LOGIN_SUCCESS_SAME_USER) DEFINE LOGIN_SUCCESS_REMOTE AS LOGIN_SUCCESS_REMOTE.ev_type == "login" + AND LOGIN_SUCCESS_REMOTE.ev_status == "success" + AND LOGIN_SUCCESS_REMOTE.vpn == 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.dt - LAST(LOGIN_SUCCESS_REMOTE.dt) < 1000, SUSPICIOUS_ACTION_TIMEOUT AS SUSPICIOUS_ACTION_TIMEOUT.dt - LAST(LOGIN_SUCCESS_REMOTE.dt) >= 1000, 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 + ), 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)) 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 50402c9405e7..d745bbd53f04 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 @@ -17,16 +17,16 @@ PRAGMA config.flags("MatchRecognizeStream", "disable"); SELECT * -FROM AS_TABLE($osquery_data) MATCH_RECOGNIZE (MEASURES LAST(SUSPICIOUS_ACTION_SOON.dt) AS suspicious_action_dt, LAST(LOGIN_SUCCESS_REMOTE.host) AS remote_login_host, LAST(LOGIN_SUCCESS_REMOTE.user) AS remote_login_user, LAST(LOGIN_SUCCESS_REMOTE.dt) AS t, FIRST(LOGIN_FAILED_SAME_USER.dt) AS brutforce_begin, FIRST(LOGIN_SUCCESS_SAME_USER.dt) AS brutforce_end, LAST(LOGIN_SUCCESS_SAME_USER.user) AS brutforce_login ONE ROW PER MATCH AFTER MATCH SKIP TO NEXT ROW PATTERN (LOGIN_SUCCESS_REMOTE ANY_ROW * (SUSPICIOUS_ACTION_SOON | SUSPICIOUS_ACTION_TIMEOUT) | (LOGIN_FAILED_SAME_USER ANY_ROW *) {2,} LOGIN_SUCCESS_SAME_USER) DEFINE LOGIN_SUCCESS_REMOTE AS LOGIN_SUCCESS_REMOTE.ev_type = "login" AND - LOGIN_SUCCESS_REMOTE.ev_status = "success" AND - LOGIN_SUCCESS_REMOTE.vpn = 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.dt - LAST(LOGIN_SUCCESS_REMOTE.dt) < 1000, SUSPICIOUS_ACTION_TIMEOUT AS SUSPICIOUS_ACTION_TIMEOUT.dt - LAST(LOGIN_SUCCESS_REMOTE.dt) >= 1000, 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 - ), 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)) +FROM AS_TABLE($osquery_data) MATCH_RECOGNIZE (MEASURES LAST(SUSPICIOUS_ACTION_SOON.dt) AS suspicious_action_dt, LAST(LOGIN_SUCCESS_REMOTE.host) AS remote_login_host, LAST(LOGIN_SUCCESS_REMOTE.user) AS remote_login_user, LAST(LOGIN_SUCCESS_REMOTE.dt) AS t, FIRST(LOGIN_FAILED_SAME_USER.dt) AS brutforce_begin, FIRST(LOGIN_SUCCESS_SAME_USER.dt) AS brutforce_end, LAST(LOGIN_SUCCESS_SAME_USER.user) AS brutforce_login ONE ROW PER MATCH AFTER MATCH SKIP TO NEXT ROW PATTERN (LOGIN_SUCCESS_REMOTE ANY_ROW * (SUSPICIOUS_ACTION_SOON | SUSPICIOUS_ACTION_TIMEOUT) | (LOGIN_FAILED_SAME_USER ANY_ROW *) {2,} LOGIN_SUCCESS_SAME_USER) DEFINE LOGIN_SUCCESS_REMOTE AS LOGIN_SUCCESS_REMOTE.ev_type == "login" + AND LOGIN_SUCCESS_REMOTE.ev_status == "success" + AND LOGIN_SUCCESS_REMOTE.vpn == 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.dt - LAST(LOGIN_SUCCESS_REMOTE.dt) < 1000, SUSPICIOUS_ACTION_TIMEOUT AS SUSPICIOUS_ACTION_TIMEOUT.dt - LAST(LOGIN_SUCCESS_REMOTE.dt) >= 1000, 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 + ), 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)) AS MATCHED; 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 cae553242055..3872fb15c053 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 @@ -16,5 +16,5 @@ PRAGMA FeatureR010 = "prototype"; SELECT * FROM AS_TABLE($data) MATCH_RECOGNIZE (ORDER BY - CAST(dt AS Timestamp) MEASURES FIRST(A.dt) AS a, FIRST(B.dt) AS b, FIRST(C.dt) AS c ONE ROW PER MATCH 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") + CAST(dt AS Timestamp) MEASURES FIRST(A.dt) AS a, FIRST(B.dt) AS b, FIRST(C.dt) AS c ONE ROW PER MATCH 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") 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 578c9916542c..4ef3af991f82 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 @@ -30,7 +30,7 @@ SELECT * FROM AS_TABLE($data) MATCH_RECOGNIZE (PARTITION BY host ORDER BY - CAST(dt AS Timestamp) MEASURES Last(Q.dt) AS T, First(Y.key) AS Key ONE ROW PER MATCH AFTER MATCH SKIP TO NEXT ROW PATTERN ((Y Q)) DEFINE Y AS (Y.key) % 3 = 0, Q AS (Q.key) % 3 <> 0) + CAST(dt AS Timestamp) MEASURES Last(Q.dt) AS T, First(Y.key) AS Key ONE ROW PER MATCH AFTER MATCH SKIP TO NEXT ROW PATTERN ((Y Q)) DEFINE Y AS (Y.key) % 3 == 0, Q AS (Q.key) % 3 != 0) AS MR ORDER BY MR.T; 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 42d3f1989cc1..71a753190864 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 @@ -30,7 +30,7 @@ SELECT * FROM AS_TABLE($data) MATCH_RECOGNIZE (PARTITION BY host ORDER BY - dt MEASURES Last(Q.dt) AS T, First(Y.key) AS Key ONE ROW PER MATCH AFTER MATCH SKIP TO NEXT ROW PATTERN ((Y Q)) DEFINE Y AS (Y.key) % 3 = 0, Q AS (Q.key) % 3 <> 0) + dt MEASURES Last(Q.dt) AS T, First(Y.key) AS Key ONE ROW PER MATCH AFTER MATCH SKIP TO NEXT ROW PATTERN ((Y Q)) DEFINE Y AS (Y.key) % 3 == 0, Q AS (Q.key) % 3 != 0) AS MR ORDER BY MR.T; 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 5a4c503b1127..802e1844fc33 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 @@ -10,7 +10,7 @@ $BadPredicate = FROM ( SELECT * - FROM AS_TABLE($data) MATCH_RECOGNIZE (ONE ROW PER MATCH AFTER MATCH SKIP TO NEXT ROW PATTERN (A) DEFINE A AS 123-- must fail, Bool expected + FROM AS_TABLE($data) MATCH_RECOGNIZE (ONE ROW PER MATCH AFTER MATCH SKIP TO NEXT ROW PATTERN (A) DEFINE A AS 123 -- must fail, Bool expected ) ); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-instant_contains_lookup_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-instant_contains_lookup_/formatted.sql index 4ef3bc58a3bc..adb51e241935 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-instant_contains_lookup_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-instant_contains_lookup_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ SELECT ListHas([1, 2, 3], 2), DictContains({4: 5, 6: 7, 8: 9}, 6), 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 8827040313dc..4ba988553f9e 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 @@ -12,4 +12,4 @@ FROM ( value FROM concat(Input1, Input2) ) -WHERE tbl = "Input" AND value != ""; +WHERE tbl == "Input" AND value != ""; 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 2bfa44740277..1241467844bd 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* kikimr can not - anon tables */ +/* postgres can not */ +/* kikimr can not - anon tables */ USE plato; INSERT INTO @a diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sort_by_nonstrict_const_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sort_by_nonstrict_const_/formatted.sql index 62e6c8d11d1f..3876a82dae4e 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sort_by_nonstrict_const_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sort_by_nonstrict_const_/formatted.sql @@ -1,4 +1,5 @@ -/* yt can not *//* custom error:Member not found: date*/ +/* yt can not */ +/* custom error:Member not found: date*/ USE plato; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sort_over_sorted_prefix_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sort_over_sorted_prefix_keys_/formatted.sql index d55498301487..504eee3fe359 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sort_over_sorted_prefix_keys_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sort_over_sorted_prefix_keys_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* kikimr can not - anon tables */ +/* postgres can not */ +/* kikimr can not - anon tables */ USE plato; INSERT INTO @a diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sort_over_sorted_same_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sort_over_sorted_same_keys_/formatted.sql index 5c0493f23256..078cda49ef6e 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sort_over_sorted_same_keys_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sort_over_sorted_same_keys_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* kikimr can not - anon tables */ +/* postgres can not */ +/* kikimr can not - anon tables */ USE plato; INSERT INTO @a 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 f552bfb4dff4..571243be1579 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 @@ -21,7 +21,7 @@ ORDER BY SELECT * FROM $ou -WHERE subkey > "0" AND - key != $a +WHERE 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 978579de7573..ded55a88baf5 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 @@ -21,8 +21,8 @@ ORDER BY SELECT * FROM $ou -WHERE subkey > "0" AND - key NOT IN COMPACT ( +WHERE subkey > "0" + AND key NOT IN COMPACT ( SELECT key FROM $a 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 b722ede6639a..6e2a9b262bb6 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 @@ -1,4 +1,5 @@ -/* syntax version 1 */-- not supported on windows +/* syntax version 1 */ +-- not supported on windows /* postgres can not */ $udfScript = @@ 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 b40e5139b4e4..24e979670692 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 @@ -2,7 +2,7 @@ $x = AsTuple(Double("nan"), 42); SELECT - $x = $x; + $x == $x; SELECT $x < $x; @@ -21,14 +21,14 @@ SELECT $x = AsStruct(Double("nan") AS a, 42 AS b); SELECT - $x = $x; + $x == $x; SELECT $x != $x; $x = AsTuple(Nothing(ParseType("Int32?")), 1); SELECT - $x = $x; + $x == $x; SELECT $x < $x; @@ -47,7 +47,7 @@ SELECT $x = Nothing(ParseType("Int32?")); SELECT - $x = $x; + $x == $x; SELECT $x < $x; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-10042_disable_flow_fuse_depends_on_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-10042_disable_flow_fuse_depends_on_/formatted.sql index e180e8648fdc..aa718e0403e6 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-10042_disable_flow_fuse_depends_on_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-10042_disable_flow_fuse_depends_on_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-10042_disable_fuse_depends_on_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-10042_disable_fuse_depends_on_/formatted.sql index b5193105ce70..9a9dcfb02e7f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-10042_disable_fuse_depends_on_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-10042_disable_fuse_depends_on_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ $data = AsList((1 AS a, 1 AS b)); SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-10074_dont_inline_lists_depends_on_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-10074_dont_inline_lists_depends_on_/formatted.sql index 32ec14f1f97a..3d751667364a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-10074_dont_inline_lists_depends_on_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-10074_dont_inline_lists_depends_on_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ SELECT a, b, 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 cd09e7cd44ae..8ce1004b1d88 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 @@ -1,4 +1,7 @@ -/* postgres can not *//* multirun can not *//* syntax version 1 *//* kikimr can not - table truncate */ +/* postgres can not */ +/* multirun can not */ +/* syntax version 1 */ +/* kikimr can not - table truncate */ USE plato; INSERT INTO @a @@ -11,8 +14,8 @@ SELECT x.*, "" AS Text, ListCreate(TypeOf(Attachments)) AS Attachments - WITHOUT - x.Text, - x.Attachments +WITHOUT + x.Text, + x.Attachments FROM @a AS x; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-12620_stage_multiuse_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-12620_stage_multiuse_/formatted.sql index 4abd17431b0a..d54624b7639d 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-12620_stage_multiuse_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-12620_stage_multiuse_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $a = 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 4658a7432869..fe7405bd9027 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 @@ -16,7 +16,7 @@ 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-16134_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-16134_/formatted.sql index 00c0a7e8c599..90fa1b7039d8 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-16134_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-16134_/formatted.sql @@ -1,4 +1,4 @@ /* postgres can not */ SELECT - Just(Just(TRUE)) = TRUE, + Just(Just(TRUE)) == TRUE, Just(FALSE) != Just(Just(FALSE)); 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 c4d4e818bb02..9d7922cef50c 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 @@ -1,7 +1,6 @@ USE plato; -INSERT INTO @tmp - WITH truncate +INSERT INTO @tmp WITH truncate SELECT "dummy" AS a, "1" AS b, 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 ae945a7af6ba..f6e0e8c2519b 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 @@ -66,7 +66,7 @@ $year_total = ( store_sales CROSS JOIN @customer customer - WHERE ss_sold_date_sk = d_date_sk AND c_customer_sk = ss_customer_sk + WHERE ss_sold_date_sk == d_date_sk AND c_customer_sk == ss_customer_sk GROUP BY customer.c_customer_id, customer.c_first_name, @@ -87,11 +87,11 @@ FROM $year_total t_s_firstyear CROSS JOIN $year_total t_s_secyear -WHERE t_s_secyear.customer_id = t_s_firstyear.customer_id AND - t_s_firstyear.sale_type = 's' AND - t_s_secyear.sale_type = 's' AND - t_s_firstyear.dyear = 1999 AND - t_s_secyear.dyear = 1999 + 1 +WHERE t_s_secyear.customer_id == t_s_firstyear.customer_id + AND t_s_firstyear.sale_type == 's' + AND t_s_secyear.sale_type == 's' + AND t_s_firstyear.dyear == 1999 + AND t_s_secyear.dyear == 1999 + 1 ORDER BY t_s_secyear.customer_id, t_s_secyear.customer_first_name, 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 aa021d985dd4..78d45302e422 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 @@ -5,9 +5,9 @@ $src = SELECT DISTINCT key FROM Input - WHERE value = 'ddd'; + WHERE value == 'ddd'; SELECT * FROM Input -WHERE key = $src; +WHERE key == $src; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-2171_aggregate_desc_sort_and_extract_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-2171_aggregate_desc_sort_and_extract_/formatted.sql index 41607f459a22..0cb7ddeb7124 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-2171_aggregate_desc_sort_and_extract_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-2171_aggregate_desc_sort_and_extract_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $data = ( @@ -29,6 +30,6 @@ FROM $top_users_by_age_dec AS top JOIN $data AS info -ON top.age_dec = info.age / 10 +ON top.age_dec == info.age / 10 ORDER BY name; 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 290606a01f88..075cefdc0d75 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 @@ -22,6 +22,6 @@ FROM $data AS a INNER JOIN Input2 AS b -ON a.key = b.key +ON a.key == b.key ORDER BY key; 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 a3fd56ed5aa2..dd21b1198de7 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $data = ( @@ -23,6 +24,6 @@ FROM $data AS a INNER JOIN Input2 AS b -ON a.key = b.key +ON a.key == b.key ORDER BY key; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-5833-table_content_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-5833-table_content_/formatted.sql index 95b0c02cbee2..39765d3e6d25 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-5833-table_content_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-5833-table_content_/formatted.sql @@ -10,4 +10,4 @@ $max_key = ( SELECT CAST(count(*) AS String) || ' (' || CAST($max_key AS String) || '/24)' FROM Input -WHERE key = $max_key; +WHERE key == $max_key; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-5978_fill_multi_usage_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-5978_fill_multi_usage_/formatted.sql index 3b453c23a877..4455f826d23b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-5978_fill_multi_usage_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-5978_fill_multi_usage_/formatted.sql @@ -8,8 +8,7 @@ $ctl = ( FROM Input ); -INSERT INTO Output - WITH TRUNCATE +INSERT INTO Output WITH TRUNCATE SELECT * FROM $ctl; 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 2a54870a573d..652d3f0d7bbc 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* multirun can not */ +/* postgres can not */ +/* multirun can not */ USE plato; INSERT INTO Output diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-6038_direct_row_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-6038_direct_row_/formatted.sql index 0943ed92f176..82627f73706a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-6038_direct_row_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-6038_direct_row_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $queries_0 = ( 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 a54c1a47ce05..ac104dee6469 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* multirun can not */ +/* postgres can not */ +/* multirun can not */ USE plato; $out = ( @@ -15,8 +16,7 @@ $row_count = ( ); $needed_row = COALESCE(CAST(CAST($row_count AS float) * 0.5 AS Uint64), 1); -INSERT INTO Output - WITH TRUNCATE +INSERT INTO Output WITH TRUNCATE SELECT * FROM $out 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 9814153d96ac..79a03a5a8dd2 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $to_int = ($x) -> { RETURN CAST($x AS Int32) @@ -12,7 +13,7 @@ $input = ( $to_in_list(key) AS event_ids, $to_in_list(subkey) AS test_ids FROM Input - WHERE value = "aaa" + WHERE 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 0954517d8957..ec47aae51ef7 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; SELECT 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 749fc9c77b2c..37b4c7e8c394 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; PRAGMA AnsiInForEmptyOrNullableItemsCollections; 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 d1f04471017c..4cd9fc530bb2 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 @@ -1,4 +1,6 @@ -/* postgres can not *//* multirun can not *//* kikimr can not - table truncate */ +/* postgres can not */ +/* multirun can not */ +/* kikimr can not - table truncate */ USE plato; INSERT INTO @a 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 0d5e480a2607..9c7c5ba757d9 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 @@ -21,6 +21,6 @@ LEFT JOIN ( WHERE key > "050" ) AS b -ON a.key = b.key +ON a.key == b.key ORDER BY a.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 a362be39e70f..07dd621a87a8 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,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* kikimr can not - yt pragma */ +/* syntax version 1 */ +/* postgres can not */ +/* kikimr can not - yt pragma */ PRAGMA yt.MinPublishedAvgChunkSize = "0"; PRAGMA yt.MinTempAvgChunkSize = "0"; USE plato; @@ -7,7 +9,7 @@ $i = ( SELECT subkey AS s FROM Input - WHERE key = "112" + WHERE key == "112" LIMIT 1 ); @@ -15,12 +17,12 @@ $j = ( SELECT subkey AS s FROM Input - WHERE key = "113" + WHERE key == "113" LIMIT 1 ); SELECT * FROM Input -WHERE CAST(TableRecordIndex() AS String) == $i OR - CAST(TableRecordIndex() AS String) == $j; +WHERE CAST(TableRecordIndex() AS String) == $i + OR CAST(TableRecordIndex() AS String) == $j; 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 9f2a42e3a3d2..829611e810af 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ $l = ($x) -> (ListMap($x, Yson::Serialize)); $d = ($x) -> (ToDict(ListMap(DictItems($x), ($i) -> (($i.0, Yson::Serialize($i.1)))))); 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 b289a4dc3885..4f3191b7c62f 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,19 +8,19 @@ SELECT YQL::ShuffleByKeys( $input, ($_) -> ("dsdsa"), - ($_) -> ([1])-- list + ($_) -> ([1]) -- list ); SELECT YQL::ShuffleByKeys( $input, ($_) -> (12), - ($_) -> (Just(2))-- optional + ($_) -> (Just(2)) -- optional ); SELECT YQL::ShuffleByKeys( $input, ($_) -> (TRUE), - ($_) -> (YQL::ToStream([3]))-- stream + ($_) -> (YQL::ToStream([3])) -- stream ); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-assume_cut_prefix_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-assume_cut_prefix_/formatted.sql index abb237872d33..f1e05d7f1e51 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-assume_cut_prefix_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-assume_cut_prefix_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* multirun can not *//* syntax version 1 */ +/* postgres can not */ +/* multirun can not */ +/* syntax version 1 */ USE plato; INSERT INTO Output diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-assume_over_input_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-assume_over_input_/formatted.sql index b4c509d56c73..f69465005d05 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-assume_over_input_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-assume_over_input_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* multirun can not *//* syntax version 1 */ +/* postgres can not */ +/* multirun can not */ +/* syntax version 1 */ USE plato; INSERT INTO Output diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-assume_over_input_desc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-assume_over_input_desc_/formatted.sql index 6bfaa241cf14..15455fbb8d9c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-assume_over_input_desc_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-assume_over_input_desc_/formatted.sql @@ -1,4 +1,7 @@ -/* postgres can not *//* multirun can not *//* syntax version 1 *//* hybridfile can not YQL-17743 */ +/* postgres can not */ +/* multirun can not */ +/* syntax version 1 */ +/* hybridfile can not YQL-17743 */ USE plato; INSERT INTO Output 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 9ea4aca6720b..7853586f8e39 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 @@ -1,4 +1,6 @@ -/* postgres can not *//* multirun can not *//* syntax version 1 */ +/* postgres can not */ +/* multirun can not */ +/* syntax version 1 */ USE plato; INSERT INTO Output diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-assume_with_transform_desc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-assume_with_transform_desc_/formatted.sql index 9826f0945e91..14d0a8d0c48d 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-assume_with_transform_desc_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-assume_with_transform_desc_/formatted.sql @@ -1,4 +1,7 @@ -/* postgres can not *//* hybridfile can not YQL-17743 *//* multirun can not *//* syntax version 1 */ +/* postgres can not */ +/* hybridfile can not YQL-17743 */ +/* multirun can not */ +/* syntax version 1 */ USE plato; INSERT INTO Output diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-extract_members_over_sort_desc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-extract_members_over_sort_desc_/formatted.sql index 6674b5b1fcfa..7985721c65a2 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-extract_members_over_sort_desc_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-extract_members_over_sort_desc_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* multirun can not */ +/* postgres can not */ +/* multirun can not */ USE plato; $top = ( 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 6f700320fdc3..97fb94962d06 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* hybridfile can not YQL-17743 */ +/* postgres can not */ +/* 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)); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_desc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_desc_/formatted.sql index 6fef4f7772f7..1ab09ebfc0b6 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_desc_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_desc_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* hybridfile can not YQL-17743 */ +/* postgres can not */ +/* hybridfile can not YQL-17743 */ USE plato; INSERT INTO Output diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_empty_list_sort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_empty_list_sort_/formatted.sql index cc06f4b4f0be..0d39168d467a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_empty_list_sort_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_empty_list_sort_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* multirun can not *//* syntax version 1 */ +/* postgres can not */ +/* multirun can not */ +/* syntax version 1 */ USE plato; $list = ListCreate(Struct); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_single_item_sort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_single_item_sort_/formatted.sql index 5563d71e79e4..29ebf961aa13 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_single_item_sort_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_single_item_sort_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* multirun can not *//* syntax version 1 */ +/* postgres can not */ +/* multirun can not */ +/* syntax version 1 */ USE plato; $t = AsList( AsStruct(1 AS key, 101 AS value) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_take_zero_sort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_take_zero_sort_/formatted.sql index 0fcd655d0228..fec3b5b7d246 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_take_zero_sort_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_take_zero_sort_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* multirun can not *//* syntax version 1 */ +/* postgres can not */ +/* multirun can not */ +/* syntax version 1 */ USE plato; $t = AsList( AsStruct(1 AS key, 101 AS value), diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_with_assume_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_with_assume_/formatted.sql index 03a4830f52ac..9590a75990ec 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_with_assume_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_with_assume_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* multirun can not *//* syntax version 1 */ +/* postgres can not */ +/* multirun can not */ +/* syntax version 1 */ USE plato; $t = AsList( AsStruct(1 AS key, 101 AS value), diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_with_assume_desc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_with_assume_desc_/formatted.sql index 5e992189d2db..28245b150e2a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_with_assume_desc_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_with_assume_desc_/formatted.sql @@ -1,4 +1,7 @@ -/* postgres can not *//* multirun can not *//* hybridfile can not YQL-17743 *//* syntax version 1 */ +/* postgres can not */ +/* multirun can not */ +/* hybridfile can not YQL-17743 */ +/* syntax version 1 */ USE plato; INSERT INTO Output diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-native_desc_assume_with_transform_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-native_desc_assume_with_transform_/formatted.sql index 7092d0b34d53..48644f57a93b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-native_desc_assume_with_transform_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-native_desc_assume_with_transform_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* multirun can not *//* syntax version 1 */ +/* postgres can not */ +/* multirun can not */ +/* syntax version 1 */ USE plato; PRAGMA yt.UseNativeDescSort; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_dynum_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_dynum_/formatted.sql index 30d9c9fd0cda..5e6e9ef20cf2 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_dynum_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_dynum_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ SELECT * FROM plato.Input diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_dynum_desc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_dynum_desc_/formatted.sql index 5376f84813a3..b956f71c5961 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_dynum_desc_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_dynum_desc_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ SELECT * FROM plato.Input diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_expr_with_deps_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_expr_with_deps_/formatted.sql index 6bfa8d4305ea..a43bbb754bc3 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_expr_with_deps_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_expr_with_deps_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $list = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_as_table_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_as_table_/formatted.sql index 2b074c730ea2..004bbf12eb08 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_as_table_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_as_table_/formatted.sql @@ -1,4 +1,8 @@ -/* syntax version 1 *//* postgres can not *//* dq can not *//* dqfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* dq can not */ +/* dqfile can not */ +/* yt can not */ $src = [ <|a: 4, b: 4, date: 4|>, <|a: 3, b: 3, date: 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 6f4cf5f9babb..7e92a08f12eb 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 @@ -1,4 +1,8 @@ -/* syntax version 1 *//* postgres can not *//* dq can not *//* dqfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* dq can not */ +/* dqfile can not */ +/* yt can not */ PRAGMA warning("disable", "4504"); $t = [<|k: 1, v: 2|>]; @@ -20,7 +24,7 @@ $src = AS a JOIN as_table($t) AS b - ON a.k = b.k + ON a.k == b.k ORDER BY b.u; @@ -35,7 +39,7 @@ $src = AS a JOIN as_table($t) AS b - ON a.k = b.k + ON a.k == b.k ORDER BY v; @@ -50,7 +54,7 @@ $src = AS a JOIN as_table($t) AS b - ON a.k = b.k + ON a.k == b.k ORDER BY z; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_join2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_join2_/formatted.sql index 9b7d509ae182..437f99aba129 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_join2_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_join2_/formatted.sql @@ -1,4 +1,8 @@ -/* syntax version 1 *//* postgres can not *//* dq can not *//* dqfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* dq can not */ +/* dqfile can not */ +/* yt can not */ $src = [ <|a: 5, b: 50, zz: 500|>, <|a: 4, b: 40, zz: 400|>, @@ -31,7 +35,7 @@ FROM $src AS x CROSS JOIN $src1 AS y -WHERE x.a = y.e +WHERE x.a == y.e ORDER BY zz, col1; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_join_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_join_/formatted.sql index 43df6f5806d4..592b5ac19b11 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_join_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_join_/formatted.sql @@ -1,4 +1,8 @@ -/* syntax version 1 *//* postgres can not *//* dq can not *//* dqfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* dq can not */ +/* dqfile can not */ +/* yt can not */ $src = [ <|a: 5, b: 50, zz: 500|>, <|a: 4, b: 40, zz: 400|>, @@ -41,28 +45,28 @@ ORDER BY SELECT * - WITHOUT - b, - a +WITHOUT + b, + a FROM $src ORDER BY zz + 1; SELECT * - WITHOUT - b, - a, - zz +WITHOUT + b, + a, + zz FROM $src ORDER BY zz + 1; SELECT * - WITHOUT - x.b, - x.a +WITHOUT + x.b, + x.a FROM $src AS x ORDER BY @@ -70,10 +74,10 @@ ORDER BY SELECT * - WITHOUT - x.b, - x.a, - zz +WITHOUT + x.b, + x.a, + zz FROM $src AS x ORDER BY @@ -83,9 +87,9 @@ SELECT a, b, x.* - WITHOUT - b, - a +WITHOUT + b, + a FROM $src AS x ORDER BY @@ -95,10 +99,10 @@ SELECT a, b, x.* - WITHOUT - b, - a, - x.zz +WITHOUT + b, + a, + x.zz FROM $src AS x ORDER BY @@ -108,10 +112,10 @@ SELECT a, b, x.* - WITHOUT - b, - a, - x.zz +WITHOUT + b, + a, + x.zz FROM $src AS x ORDER BY @@ -124,41 +128,41 @@ FROM $src AS x JOIN $src1 AS y -ON x.a = y.e +ON x.a == y.e ORDER BY x.zz; SELECT * - WITHOUT - x.a, - x.b, +WITHOUT + x.a, + x.b, FROM $src AS x JOIN $src1 AS y -ON x.a = y.e +ON x.a == y.e ORDER BY zz; SELECT x.* - WITHOUT - x.zz +WITHOUT + x.zz FROM $src AS x JOIN $src1 AS y -ON x.a = y.e +ON x.a == y.e ORDER BY x.zz; SELECT x.*, unwrap(x.zz) AS zz, - WITHOUT - x.a, - x.zz +WITHOUT + x.a, + x.zz FROM $src AS x ORDER BY @@ -167,27 +171,27 @@ ORDER BY SELECT x.*, unwrap(x.zz) AS zz, - WITHOUT - x.a, - x.zz +WITHOUT + x.a, + x.zz FROM $src AS x JOIN $src1 AS y -ON x.a = y.e +ON x.a == y.e ORDER BY x.zz; SELECT x.*, unwrap(x.zz) AS zz, - WITHOUT - x.a, - x.zz +WITHOUT + x.a, + x.zz FROM $src AS x JOIN $src1 AS y -ON x.a = y.e +ON x.a == y.e ORDER BY zz; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_join_types_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_join_types_/formatted.sql index 1fc9441d193a..43b767b442cd 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_join_types_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_join_types_/formatted.sql @@ -1,4 +1,8 @@ -/* syntax version 1 *//* postgres can not *//* dq can not *//* dqfile can not *//* yt can not */ +/* syntax version 1 */ +/* postgres can not */ +/* dq can not */ +/* dqfile can not */ +/* yt can not */ $src = [ <|a: 5, b: 50, date: 500|>, <|a: 4, b: 40, date: 400|>, @@ -41,28 +45,28 @@ ORDER BY SELECT * - WITHOUT - b, - a +WITHOUT + b, + a FROM $src ORDER BY date + 1; SELECT * - WITHOUT - b, - a, - date +WITHOUT + b, + a, + date FROM $src ORDER BY date + 1; SELECT * - WITHOUT - x.b, - x.a +WITHOUT + x.b, + x.a FROM $src AS x ORDER BY @@ -70,10 +74,10 @@ ORDER BY SELECT * - WITHOUT - x.b, - x.a, - date +WITHOUT + x.b, + x.a, + date FROM $src AS x ORDER BY @@ -83,9 +87,9 @@ SELECT a, b, x.* - WITHOUT - b, - a +WITHOUT + b, + a FROM $src AS x ORDER BY @@ -95,10 +99,10 @@ SELECT a, b, x.* - WITHOUT - b, - a, - x.date +WITHOUT + b, + a, + x.date FROM $src AS x ORDER BY @@ -108,10 +112,10 @@ SELECT a, b, x.* - WITHOUT - b, - a, - x.date +WITHOUT + b, + a, + x.date FROM $src AS x ORDER BY @@ -124,41 +128,41 @@ FROM $src AS x JOIN $src1 AS y -ON x.a = y.e +ON x.a == y.e ORDER BY x.date; SELECT * - WITHOUT - x.a, - x.b, +WITHOUT + x.a, + x.b, FROM $src AS x JOIN $src1 AS y -ON x.a = y.e +ON x.a == y.e ORDER BY date; SELECT x.* - WITHOUT - x.date +WITHOUT + x.date FROM $src AS x JOIN $src1 AS y -ON x.a = y.e +ON x.a == y.e ORDER BY x.date; SELECT x.*, unwrap(x.date) AS date, - WITHOUT - x.a, - x.date +WITHOUT + x.a, + x.date FROM $src AS x ORDER BY @@ -167,27 +171,27 @@ ORDER BY SELECT x.*, unwrap(x.date) AS date, - WITHOUT - x.a, - x.date +WITHOUT + x.a, + x.date FROM $src AS x JOIN $src1 AS y -ON x.a = y.e +ON x.a == y.e ORDER BY x.date; SELECT x.*, unwrap(x.date) AS date, - WITHOUT - x.a, - x.date +WITHOUT + x.a, + x.date FROM $src AS x JOIN $src1 AS y -ON x.a = y.e +ON x.a == y.e ORDER BY date; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_tablerecord_column_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_tablerecord_column_/formatted.sql index 9ebf8595d79f..e6ad67a97f52 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_tablerecord_column_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_tablerecord_column_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_tuple_expr_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_tuple_expr_/formatted.sql index dde78fbe4cb3..f5f333f0e7a8 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_tuple_expr_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_tuple_expr_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* multirun can not *//* syntax version 1 */ +/* postgres can not */ +/* multirun can not */ +/* syntax version 1 */ USE plato; $keys = ($key) -> { RETURN AsTuple($key, $key); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-ordered_fill_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-ordered_fill_/formatted.sql index 5dcefe41ecf1..2f0401316fa4 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-ordered_fill_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-ordered_fill_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* multirun can not */ +/* postgres can not */ +/* multirun can not */ USE plato; INSERT INTO Output @@ -17,4 +18,4 @@ COMMIT; SELECT * FROM Output -WHERE x = 50; +WHERE x == 50; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-singular_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-singular_/formatted.sql index 86d057b1efc1..0a5e1ec7d4fa 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-singular_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-singular_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* syntax version 1 *//* hybridfile can not YQL-17743 */ +/* postgres can not */ +/* syntax version 1 */ +/* hybridfile can not YQL-17743 */ USE plato; INSERT INTO @foo diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-sort_with_take_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-sort_with_take_/formatted.sql index 5bd73359b453..9a504703b94d 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-sort_with_take_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-sort_with_take_/formatted.sql @@ -1,8 +1,7 @@ /* postgres can not */ USE plato; -INSERT INTO Output - WITH truncate +INSERT INTO Output WITH truncate SELECT * FROM ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-sort_with_take_limit_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-sort_with_take_limit_/formatted.sql index c9d51bc5f7cc..40f351d91a5f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-sort_with_take_limit_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-sort_with_take_limit_/formatted.sql @@ -1,8 +1,7 @@ /* postgres can not */ USE plato; -INSERT INTO Output - WITH truncate +INSERT INTO Output WITH truncate SELECT * FROM ( 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 dca7acfec376..80b3a8052a32 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 @@ -5,7 +5,7 @@ DEFINE SUBQUERY $sample($product_type) AS SELECT * FROM Input - WHERE subkey = $product_type + WHERE subkey == $product_type ORDER BY key LIMIT 10; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-warn_offset_wo_sort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-warn_offset_wo_sort_/formatted.sql index a6be26e46679..acab9229f89f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-warn_offset_wo_sort_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-warn_offset_wo_sort_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* multirun can not *//* syntax version 1 */ +/* postgres can not */ +/* multirun can not */ +/* syntax version 1 */ USE plato; SELECT 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 d8d75a9809d2..b75d89008a58 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ DECLARE $input_json AS Json; DECLARE $int64_param AS Int64; DECLARE $double_param AS Double; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-variant_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-variant_/formatted.sql index c7a0e27d74f8..0613608d23d2 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-variant_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-variant_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 */-- underlying type is tuple +/* syntax version 1 */ +-- underlying type is tuple DECLARE $x1 AS Variant; DECLARE $x2 AS Variant; -- underlying type is struct diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-compare_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-compare_/formatted.sql index b33b488b67aa..6e0aea37b7a5 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-compare_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-compare_/formatted.sql @@ -3,9 +3,9 @@ SELECT 1p <= 2p, CAST(NULL AS pgint4) < 1p, CAST(NULL AS pgint4) <= 1p, - 1p = 2p, + 1p == 2p, 1p != 2p, - CAST(NULL AS pgint4) = 1p, + CAST(NULL AS pgint4) == 1p, CAST(NULL AS pgint4) != 1p, 1p > 2p, 1p >= 2p, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-nulls_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-nulls_/formatted.sql index 14909129b685..3d735a255149 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-nulls_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-nulls_/formatted.sql @@ -15,8 +15,8 @@ INSERT INTO @bar SELECT t.a + 1 AS a, t.* - WITHOUT - a +WITHOUT + a FROM @foo AS t; COMMIT; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-nulls_native_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-nulls_native_/formatted.sql index f263c7035ade..65f591b2ff95 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-nulls_native_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-nulls_native_/formatted.sql @@ -16,8 +16,8 @@ INSERT INTO @bar SELECT t.a + 1 AS a, t.* - WITHOUT - a +WITHOUT + a FROM @foo AS t; COMMIT; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-struct_tuple_cast_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-struct_tuple_cast_/formatted.sql index 2ef36919f7d7..f55e6e5d9621 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-struct_tuple_cast_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-struct_tuple_cast_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* dq can not *//* dqfile can not */ +/* postgres can not */ +/* dq can not */ +/* dqfile can not */ $s = <|foo: 1p|>; $t = (1p,); 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 872b2aa5bc5d..dbb366227305 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* custom error:Cannot parse string value from integer*/ +/* postgres can not */ +/* custom error:Cannot parse string value from integer*/ PRAGMA yson.Strict; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-discard_process_with_lambda_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-discard_process_with_lambda_/formatted.sql index 0d55cdf0240d..cbab5323264a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-discard_process_with_lambda_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-discard_process_with_lambda_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $udf = YQL::@@(lambda '(x) (FlatMap x (lambda '(y) (AsList y y)) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-native_desc_reduce_with_presort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-native_desc_reduce_with_presort_/formatted.sql index feb3457e7579..53191fa80c55 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-native_desc_reduce_with_presort_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-native_desc_reduce_with_presort_/formatted.sql @@ -14,8 +14,7 @@ FROM ( ON key, subkey - USING $udf(value) ---YtReduce + USING $udf(value) --YtReduce ) ORDER BY key, @@ -30,8 +29,7 @@ FROM ( value DESC ON key - USING $udf(value) ---YtReduce + USING $udf(value) --YtReduce ) ORDER BY key, @@ -46,8 +44,7 @@ FROM ( ON key, subkey - USING $udf(value) ---YtMapReduce + USING $udf(value) --YtMapReduce ) ORDER BY key, @@ -62,8 +59,7 @@ FROM ( ON key, subkey - USING $udf(value) ---YtMapReduce + USING $udf(value) --YtMapReduce ) ORDER BY key, 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 b0490a7467df..5193083555c7 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 @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* dq file can not */ +/* syntax version 1 */ +/* postgres can not */ +/* dq file can not */ $udfScript = @@ def MyFunc(stream): return stream 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 84cc6ae14de0..9f1e3d49b26b 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $udf = YQL::@@ (lambda '(stream) (PartitionByKey stream @@ -19,8 +20,7 @@ $udf = YQL::@@ ) @@; -INSERT INTO plato.Output - WITH TRUNCATE +INSERT INTO plato.Output WITH TRUNCATE PROCESS plato.Input0, ( SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_in_trivial_lambda_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_in_trivial_lambda_/formatted.sql index 230bd3df5677..cc921a4ddcad 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_in_trivial_lambda_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_in_trivial_lambda_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $lambda = ($x) -> { RETURN $x; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_out_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_out_/formatted.sql index b88b947c7967..d24cc6409502 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_out_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_out_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $udfScript = @@ def MyFunc(list): return [(int(x.key) % 2, x) for x in list] 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 56cf58b9c0b0..6861f27bcd7c 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $sorted = ($world, $input, $orderByColumns, $asc) -> { $n = ListLength($orderByColumns); 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 89cc58132bc8..5df53de7a22f 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $udfScript = @@ def processRow(row, tag, separator): return {"value":row.Name + separator + row.Value + separator + tag}; 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 d479bae8039e..4b4dbc7cb3e2 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $udfScript = @@ def processRows(prefix, rowList, separator): result = []; 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 af90aa3f9dad..2553f0e830fc 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 @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not */-- not supported on windows +/* syntax version 1 */ +/* postgres can not */ +-- not supported on windows $input = ( SELECT String::JoinFromList(AsList(key, subkey, value), ",") AS Data 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 5ef943df9dfb..a275f62a98c3 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 @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not */-- not supported on windows +/* syntax version 1 */ +/* postgres can not */ +-- not supported on windows $input = ( SELECT String::JoinFromList(AsList(key, subkey, value), ",") AS Data 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 46a3abf2c9b8..d465922e7c1c 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 @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not */-- not supported on windows +/* syntax version 1 */ +/* postgres can not */ +-- not supported on windows $script = @@ #!/bin/bash cat - | grep $1 | head -n 3 | grep [234] diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_assume_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_assume_/formatted.sql index 384c51472fed..741190031279 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_assume_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_assume_/formatted.sql @@ -1,12 +1,13 @@ -/* postgres can not *//* multirun can not *//* syntax version 1 */ +/* postgres can not */ +/* multirun can not */ +/* syntax version 1 */ USE plato; $udf = YQL::@@(lambda '(x) (FlatMap x (lambda '(y) (Just (AsStruct '('key (Concat (String '"0") (Member y 'key))) '('subkey (Member y 'subkey)) '('value (Member y 'value))))) ))@@; -INSERT INTO Output - WITH truncate +INSERT INTO Output WITH truncate PROCESS plato.Input USING $udf(TableRows()) ASSUME ORDER BY diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_lambda_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_lambda_/formatted.sql index eaff35daa816..dd3b81530b19 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_lambda_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_lambda_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $udf = YQL::@@(lambda '(x) (FlatMap x (lambda '(y) (AsList y y)) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_lambda_outstream_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_lambda_outstream_/formatted.sql index 2566eb8de65d..2cf3d1d5b67f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_lambda_outstream_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_lambda_outstream_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $f1 = ($r) -> { RETURN $r; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_python_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_python_/formatted.sql index eddcc7311f19..48f715852d30 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_python_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_python_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ $udfScript = @@ def Dup(s): return [{"value":s},{"value":s}] diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_python_as_struct_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_python_as_struct_/formatted.sql index 63a026033338..677d3f5b493c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_python_as_struct_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_python_as_struct_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ $udfScript = @@ def Dup(s): return [s, s]; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_python_stream_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_python_stream_/formatted.sql index 7e7cec3134fa..42040d8c78be 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_python_stream_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_python_stream_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* kikimr can not */ +/* syntax version 1 */ +/* kikimr can not */ USE plato; $udfScript = @@ def f(input,x): diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_/formatted.sql index bd0a6423a767..be805b67fd76 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_/formatted.sql @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* dqfile can not */ +/* syntax version 1 */ +/* postgres can not */ +/* dqfile can not */ USE plato; $udfScript = @@ import functools diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_expr_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_expr_/formatted.sql index 07d4efb5a296..a786eeb8513b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_expr_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_expr_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* syntax version 1 *//* dqfile can not */ +/* postgres can not */ +/* syntax version 1 */ +/* dqfile can not */ USE plato; $udfScript = @@ import functools diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_list_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_list_/formatted.sql index 0066f2d84d5d..d715a64b907a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_list_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_list_/formatted.sql @@ -1,4 +1,7 @@ -/* syntax version 1 *//* postgres can not *//* dq can not *//* dqfile can not */ +/* syntax version 1 */ +/* postgres can not */ +/* dq can not */ +/* dqfile can not */ USE plato; $udfScript = @@ import functools diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_list_stream_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_list_stream_/formatted.sql index fb81e0b4d0ca..f8ff07ab2ee2 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_list_stream_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_list_stream_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $udfScript = @@ import functools diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_multi_in_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_multi_in_/formatted.sql index 2a212c864be4..f6c20d56950a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_multi_in_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_multi_in_/formatted.sql @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* dqfile can not */ +/* syntax version 1 */ +/* postgres can not */ +/* dqfile can not */ USE plato; $udfScript = @@ import functools diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_opt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_opt_/formatted.sql index aa2374b055f4..0e5daa6010ad 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_opt_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_opt_/formatted.sql @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* dqfile can not */ +/* syntax version 1 */ +/* postgres can not */ +/* dqfile can not */ USE plato; $udfScript = @@ import functools diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_/formatted.sql index 8b1d686e7999..0c1c14059611 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $udf = YQL::@@ (lambda '(key stream) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_difftype_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_difftype_/formatted.sql index 27ac45d00036..67e79c875ca9 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_difftype_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_difftype_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $udf = YQL::@@ (lambda '(key stream) 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 e7e97b7efabc..9ed51e3437df 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $user_process = ($key, $t1, $t2, $t3) -> { RETURN AsStruct( @@ -42,8 +43,7 @@ $reducer = ($key, $stream) -> { RETURN $user_process($key, $rec.t1, $rec.t2, $rec.t3); }; -INSERT INTO Output - WITH TRUNCATE +INSERT INTO Output WITH TRUNCATE REDUCE ( SELECT key, 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 26d8552c408b..3e91ed0e86fd 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $user_process = ($key, $t1, $t2, $t3) -> { RETURN AsStruct( @@ -42,8 +43,7 @@ $reducer = ($key, $stream) -> { RETURN $user_process($key, $rec.t1, $rec.t2, $rec.t3); }; -INSERT INTO Output - WITH TRUNCATE +INSERT INTO Output WITH TRUNCATE REDUCE ( SELECT key, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_keytuple_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_keytuple_/formatted.sql index c6f2769fd5c0..9b8879f8c02f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_keytuple_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_keytuple_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $udf = YQL::@@ (lambda '(key stream) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_keytuple_difftype_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_keytuple_difftype_/formatted.sql index a3951a726425..e7d0b096f854 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_keytuple_difftype_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_keytuple_difftype_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $udf = YQL::@@ (lambda '(key stream) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_presort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_presort_/formatted.sql index eeb7c35c7780..940acf59afdc 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_presort_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_presort_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $udf = YQL::@@ (lambda '(key stream) 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 6297dedf23e1..d41b1783fcef 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $udf = YQL::@@ (lambda '(key stream) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_sampling_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_sampling_/formatted.sql index 302c48e6e460..e453dd84157f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_sampling_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_sampling_/formatted.sql @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 16 */ +/* syntax version 1 */ +/* postgres can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 16 */ USE plato; $udf = YQL::@@ (lambda '(key stream) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_stage_and_flatmap_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_stage_and_flatmap_/formatted.sql index 410243763647..3363b01f4ab2 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_stage_and_flatmap_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_stage_and_flatmap_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $udf = YQL::@@ (lambda '(key stream) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_out_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_out_/formatted.sql index 9d7e93bb16a4..91fc592977b9 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_out_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_out_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $udfScript = @@ import functools diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_subfields_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_subfields_/formatted.sql index 190661aa553e..663f8b652f3e 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_subfields_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_subfields_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $udfScript = @@ def f(key, input): 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 68a7f056cc17..fadcae1a7712 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 @@ -1,4 +1,6 @@ -/* postgres can not *//* syntax version 1 *//* ignore runonopt plan diff */ +/* postgres can not */ +/* syntax version 1 */ +/* ignore runonopt plan diff */ USE plato; PRAGMA warning("disable", "4510"); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_assume_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_assume_/formatted.sql index dd8837494508..101830dbbe36 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_assume_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_assume_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* multirun can not *//* syntax version 1 */ +/* postgres can not */ +/* multirun can not */ +/* syntax version 1 */ USE plato; $udf = YQL::@@(lambda '(key stream) (AsStruct '('key key) '('sum (Collect (Condense stream (Uint32 '0) (lambda '(item state) (Bool 'False)) (lambda '(item state) (Add state item))))) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_assume_in_subquery_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_assume_in_subquery_/formatted.sql index d66c81a6f612..38c211305f86 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_assume_in_subquery_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_assume_in_subquery_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $udf = YQL::@@(lambda '(key stream) (AsStruct '('key key) '('summ (Collect (Condense stream (Nothing (OptionalType (DataType 'String))) (lambda '(item state) (Bool 'False)) (lambda '(item state) (Coalesce state (Just item)))))) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_flat_lambda_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_flat_lambda_/formatted.sql index 01f1c979a92c..53f2d79e4c68 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_flat_lambda_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_flat_lambda_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* kikimr can not */ +/* syntax version 1 */ +/* kikimr can not */ USE plato; $udf_stream = ($input) -> { RETURN $input diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_flat_python_stream_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_flat_python_stream_/formatted.sql index dc8718a92b3a..5f7a18625b1b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_flat_python_stream_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_flat_python_stream_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* kikimr can not */ +/* syntax version 1 */ +/* kikimr can not */ USE plato; $udfScript = @@ def f(input): diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_presort_diff_order_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_presort_diff_order_/formatted.sql index c70a25beb2d6..c51ac4bb2e80 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_presort_diff_order_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_presort_diff_order_/formatted.sql @@ -53,8 +53,7 @@ FROM ( ON key, subkey - USING $udf(value1) ---YtReduce + USING $udf(value1) --YtReduce ) ORDER BY key, @@ -70,8 +69,7 @@ FROM ( ON key, subkey - USING $udf(value1) ---YtMapReduce + USING $udf(value1) --YtMapReduce ) ORDER BY key, @@ -87,8 +85,7 @@ FROM ( ON key, subkey - USING $udf(value1) ---YtMapReduce + USING $udf(value1) --YtMapReduce ) ORDER BY key, @@ -104,8 +101,7 @@ FROM ( ON key, subkey - USING $udf(value1) ---YtMapReduce + USING $udf(value1) --YtMapReduce ) ORDER BY key, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_/formatted.sql index f6f5e52f2ab9..9e9b5d90bc26 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $udfScript = @@ import functools diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_few_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_few_keys_/formatted.sql index 91dabfd3cd79..98a993162675 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_few_keys_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_few_keys_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ $udfScript = @@ import functools def Len(val_key, input): diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_few_keys_stream_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_few_keys_stream_/formatted.sql index 680069a90b8d..086e7c0b6e9a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_few_keys_stream_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_few_keys_stream_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $udfScript = @@ import functools diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_filter_and_having_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_filter_and_having_/formatted.sql index c0b72cdfe72f..c738bfcfbe23 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_filter_and_having_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_filter_and_having_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $udfScript = @@ import functools diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_having_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_having_/formatted.sql index 8d707c7adaf5..01a61e88ae65 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_having_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_having_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $udfScript = @@ import functools diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_presort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_presort_/formatted.sql index 1903b99b0614..df7ffcd8cdce 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_presort_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_presort_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $udfScript = @@ def Len(val_key, input): diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_presort_stream_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_presort_stream_/formatted.sql index 5a92ebe32635..810a4fe7d78b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_presort_stream_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_presort_stream_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $udfScript = @@ def Len(val_key, input): diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_row_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_row_/formatted.sql index 29479412e98f..a3c4ebfe054b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_row_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_row_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $udfScript = @@ import functools diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_row_repack_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_row_repack_/formatted.sql index c014f3fc1264..cebcb5ca5f49 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_row_repack_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_row_repack_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $udfScript = @@ import functools 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 7349bfc46588..7eb40b79a0ac 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ DEFINE SUBQUERY $t() AS SELECT * @@ -15,9 +16,9 @@ DEFINE SUBQUERY $split_formula_log($in) AS ) ); RETURN CASE - WHEN $row.key = "0" + WHEN $row.key == "0" THEN VARIANT ($row, "0", $varType) - WHEN $row.key = "1" + 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_default_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_default_/formatted.sql index aced49179f1c..9be27f7f93c8 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_default_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_default_/formatted.sql @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ +/* syntax version 1 */ +/* postgres can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ USE plato; $var = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_expr_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_expr_/formatted.sql index e96cc3213556..992fb686fd14 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_expr_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_expr_/formatted.sql @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ +/* syntax version 1 */ +/* postgres can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ USE plato; $count = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_expr_udf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_expr_udf_/formatted.sql index 7589a9ce5da1..ecd17ec97b3d 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_expr_udf_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_expr_udf_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $percent = Math::Ceil(0.2); 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 eb3ca3ee5a80..137eb516ffb6 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 @@ -1,4 +1,7 @@ -/* syntax version 1 *//* postgres can not *//* hybridfile can not YQL-17764 *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 3 */ +/* syntax version 1 */ +/* postgres can not */ +/* hybridfile can not YQL-17764 */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 3 */ USE plato; PRAGMA DisableSimpleColumns; 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 db7fb78b76b5..a687c1b664de 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 @@ -1,4 +1,7 @@ -/* syntax version 1 *//* postgres can not *//* hybridfile can not YQL-17764 *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 3 */ +/* syntax version 1 */ +/* postgres can not */ +/* hybridfile can not YQL-17764 */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 3 */ USE plato; PRAGMA DisableSimpleColumns; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_multiple_sample_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_multiple_sample_/formatted.sql index 0e9c447ba9b5..9e8153292591 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_multiple_sample_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_multiple_sample_/formatted.sql @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 20 */ +/* syntax version 1 */ +/* postgres can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 20 */ USE plato; $var = diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_small_rate_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_small_rate_/formatted.sql index dc7981fbe1ba..b21d348705bc 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_small_rate_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_small_rate_/formatted.sql @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 2 */ +/* syntax version 1 */ +/* postgres can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 2 */ $a = SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_topsort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_topsort_/formatted.sql index d6143195275e..0e1b4743e857 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_topsort_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_topsort_/formatted.sql @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ +/* syntax version 1 */ +/* postgres can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ $var = SELECT key, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-direct_read_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-direct_read_/formatted.sql index 9bfe002c738c..3d890a6b637c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-direct_read_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-direct_read_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ +/* postgres can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ PRAGMA direct_read; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-insert_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-insert_/formatted.sql index 05d70cef2ceb..72ba3205e5e7 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-insert_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-insert_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ +/* postgres can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ USE plato; INSERT INTO @tmp diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-join_left_sample_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-join_left_sample_/formatted.sql index f00e5cd36b52..2309bf6f081e 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-join_left_sample_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-join_left_sample_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 *//* ignore plan diff */ +/* postgres can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ +/* ignore plan diff */ USE plato; PRAGMA DisableSimpleColumns; @@ -9,4 +11,4 @@ FROM plato.Input SAMPLE 0.3 INNER JOIN plato.Input AS b -ON a.key = b.key; +ON a.key == b.key; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-join_right_sample_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-join_right_sample_/formatted.sql index 69c05b8d5d3c..a03bb7ca6e58 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-join_right_sample_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-join_right_sample_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 *//* syntax version 1 */ +/* postgres can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ +/* syntax version 1 */ USE plato; PRAGMA DisableSimpleColumns; @@ -9,4 +11,4 @@ FROM plato.Input INNER JOIN plato.Input AS b SAMPLE 0.3 -ON a.key = b.key; +ON a.key == b.key; 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 692317b5c9ec..56ca884861c7 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 8 */ +/* postgres can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 8 */ SELECT * FROM plato.Input 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 71f7525f6c0c..6d7953153eea 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ +/* postgres can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ USE plato; PRAGMA DisableSimpleColumns; PRAGMA yt.MapJoinLimit = "1m"; @@ -10,4 +11,4 @@ FROM plato.Input SAMPLE 0.3 INNER JOIN plato.Input AS b -ON a.key = b.key; +ON a.key == b.key; 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 ff9b36f3aeff..b6f6b895de6c 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 @@ -1,4 +1,6 @@ -/* postgres can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 *//* syntax version 1 */ +/* postgres can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ +/* syntax version 1 */ USE plato; PRAGMA yt.MapJoinLimit = "1m"; PRAGMA DisableSimpleColumns; @@ -10,4 +12,4 @@ FROM plato.Input INNER JOIN plato.Input AS b SAMPLE 0.3 -ON a.key = b.key; +ON a.key == b.key; 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 e934c9922c1d..affafd94fd38 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 @@ -1,4 +1,7 @@ -/* postgres can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 *//* ignore plan diff *//* syntax version 1 */ +/* postgres can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ +/* ignore plan diff */ +/* syntax version 1 */ USE plato; PRAGMA yt.JoinMergeTablesLimit = "2"; PRAGMA DisableSimpleColumns; @@ -10,4 +13,4 @@ FROM plato.Input SAMPLE 0.3 INNER JOIN plato.Input AS b -ON a.key = b.key; +ON a.key == b.key; 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 b3979ff12478..ecd8a2d0c516 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 @@ -1,4 +1,7 @@ -/* postgres can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 *//* ignore plan diff *//* syntax version 1 */ +/* postgres can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ +/* ignore plan diff */ +/* syntax version 1 */ USE plato; PRAGMA yt.JoinMergeTablesLimit = "2"; PRAGMA DisableSimpleColumns; @@ -10,4 +13,4 @@ FROM plato.Input INNER JOIN plato.Input AS b SAMPLE 0.3 -ON a.key = b.key; +ON a.key == b.key; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-read_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-read_/formatted.sql index 34f490580f54..cc82e62719d6 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-read_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-read_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ +/* postgres can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ SELECT * FROM plato.Input diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-reduce_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-reduce_/formatted.sql index 54f1a15a5c74..4ed78a5f0eca 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-reduce_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-reduce_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 8 */ +/* postgres can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 8 */ USE plato; $udf = YQL::@@(lambda '(key stream) (AsStruct '('key key) '('summ (Collect (Condense stream (Uint32 '0) (lambda '(item state) (Bool 'False)) (lambda '(item state) (Add state item))))) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-reduce_with_presort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-reduce_with_presort_/formatted.sql index a40f44421606..02afb9be0b1a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-reduce_with_presort_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-reduce_with_presort_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 8 */ +/* postgres can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 8 */ USE plato; $udf = YQL::@@(lambda '(key stream) (AsStruct '('key key) '('summ (Collect (Condense stream (Uint32 '0) (lambda '(item state) (Bool 'False)) (lambda '(item state) (Add state item))))) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-sort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-sort_/formatted.sql index ec122fe0d1ad..e927d6b2d186 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-sort_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-sort_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ +/* postgres can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ SELECT * FROM plato.Input diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_default_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_default_/formatted.sql index 1363ed2b8e2f..bbb3c81776ef 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_default_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_default_/formatted.sql @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ +/* syntax version 1 */ +/* postgres can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ SELECT * FROM ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_expr_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_expr_/formatted.sql index 288ba1e515f5..c8a7b412e87f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_expr_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_expr_/formatted.sql @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ +/* syntax version 1 */ +/* postgres can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ $count = SELECT COUNT(*) 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 b5304fec54a1..f74feadfac41 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 @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 8 */ +/* syntax version 1 */ +/* postgres can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 8 */ SELECT * FROM ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_limit_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_limit_/formatted.sql index b5ede1572e0c..1025b9d95be2 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_limit_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_limit_/formatted.sql @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 6 */ +/* syntax version 1 */ +/* postgres can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 6 */ SELECT * FROM ( 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 f3218b2fe5a8..92d0c1d5b63f 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 @@ -1,4 +1,7 @@ -/* syntax version 1 *//* postgres can not *//* hybridfile can not YQL-17764 *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ +/* syntax version 1 */ +/* postgres can not */ +/* hybridfile can not YQL-17764 */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ USE plato; PRAGMA DisableSimpleColumns; PRAGMA yt.MapJoinLimit = "1m"; @@ -12,6 +15,6 @@ FROM ( AS a INNER JOIN plato.Input AS b - ON a.key = b.key + ON a.key == b.key ) TABLESAMPLE BERNOULLI (30); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_multiple_sample_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_multiple_sample_/formatted.sql index 85a1905e2600..1109467c954f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_multiple_sample_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_multiple_sample_/formatted.sql @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ +/* syntax version 1 */ +/* postgres can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ SELECT * FROM ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_sort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_sort_/formatted.sql index f32f63450501..51ebc28e4451 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_sort_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_sort_/formatted.sql @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ +/* syntax version 1 */ +/* postgres can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ SELECT key FROM ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-system_sampling_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-system_sampling_/formatted.sql index f1169564eff6..e3976f08f76c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-system_sampling_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-system_sampling_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 100 *//* syntax version 1 */ +/* postgres can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 100 */ +/* syntax version 1 */ USE plato; EVALUATE FOR $_i IN ListFromRange(0, 10) diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-table_content_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-table_content_/formatted.sql index 0fa2a05312a9..dc124a6b0da8 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-table_content_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-table_content_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) == 1 */ +/* postgres can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) == 1 */ USE plato; $key = ( @@ -11,4 +12,4 @@ $key = ( SELECT * FROM Input -WHERE key = $key; +WHERE key == $key; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-take_with_sampling_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-take_with_sampling_/formatted.sql index c35a0068c9aa..c5db5cfd03a7 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-take_with_sampling_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-take_with_sampling_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ +/* postgres can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ SELECT * FROM plato.Input diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-topsort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-topsort_/formatted.sql index bbd91591edda..43f4cd2dea88 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-topsort_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-topsort_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ +/* postgres can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ SELECT * FROM plato.Input 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 ff0e3a89b8a8..cf30f1c3bcc6 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ +/* postgres can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */ USE plato; INSERT INTO @a 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 401045257a5c..cd165ea22119 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,4 +1,5 @@ -/* postgres can not *//* kikimr can not */ +/* postgres can not */ +/* kikimr can not */ 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 62300f1e044c..4b2ab4b8dcf2 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,4 +1,5 @@ -/* postgres can not *//* kikimr can not */ +/* postgres can not */ +/* kikimr can not */ PRAGMA yt.InferSchemaTableCountThreshold = "0"; PRAGMA yt.TmpFolder = "custom"; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-user_schema_override_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-user_schema_override_/formatted.sql index 8b2d40a71781..acb4794a539f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-user_schema_override_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-user_schema_override_/formatted.sql @@ -1,8 +1,7 @@ /* syntax version 1 */ USE plato; -INSERT INTO Input - WITH TRUNCATE +INSERT INTO Input WITH TRUNCATE SELECT * FROM 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 f1975820409f..1a40abb462bb 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* kikimr can not - no ref select mode */ +/* postgres can not */ +/* kikimr can not - no ref select mode */ SELECT key, subkey, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-autoextract_source_value_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-autoextract_source_value_/formatted.sql index 17daffbb54e1..dd67c271c7b7 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-autoextract_source_value_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-autoextract_source_value_/formatted.sql @@ -20,4 +20,4 @@ $data_one_key = ( SELECT * FROM Input -WHERE key = $data_one_key; +WHERE key == $data_one_key; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-autogen_columns_conflict_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-autogen_columns_conflict_/formatted.sql index 88798c8d7c56..01acd51d9b2b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-autogen_columns_conflict_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-autogen_columns_conflict_/formatted.sql @@ -1,4 +1,7 @@ -/* dq can not *//* dqfile can not *//* yt can not *//* postgres can not */ +/* dq can not */ +/* dqfile can not */ +/* yt can not */ +/* postgres can not */ $src = SELECT <|column0: 1|> AS x; @@ -44,6 +47,5 @@ USING (column0); SELECT 1 AS a, 2 AS b, - 3, - -- should be column2 + 3, -- should be column2 4 AS column1; 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 7452c90c037b..c3b7e4f2d802 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* can not check this with postgres becouse order of columns is not specified here */ +/* postgres can not */ +/* can not check this with postgres becouse order of columns is not specified here */ SELECT key, (value || "ab"), 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 7db73e64cbed..0f14e2a3492c 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 @@ -3,6 +3,6 @@ SELECT subkey, value AS key FROM plato.Input -WHERE value > "A" AND length(value) = CAST(3 AS smallint) +WHERE 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-const_subrequest_and_select_by_all_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-const_subrequest_and_select_by_all_/formatted.sql index 32369e4aeb17..6222128bc540 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-const_subrequest_and_select_by_all_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-const_subrequest_and_select_by_all_/formatted.sql @@ -18,4 +18,4 @@ FROM $input; SELECT * FROM Input -WHERE key = $input; +WHERE key == $input; 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 3dee0f5e8de2..9a8c05d7fa7a 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $dictList = ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-dict_lookup_by_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-dict_lookup_by_key_/formatted.sql index 08d67d1892f9..6a27e3b06f16 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-dict_lookup_by_key_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-dict_lookup_by_key_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $key_text = AsDict( ('911', 'emergency'), ('200', 'two hundred'), 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 ae385640429c..bfc6af98b7ad 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $key_text = AsDict( ('911', 'emergency'), ('200', 'two hundred'), diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-dict_lookup_column_names_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-dict_lookup_column_names_/formatted.sql index 205cfdb12ecf..ee517f1e54a4 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-dict_lookup_column_names_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-dict_lookup_column_names_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $dictList = ( 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 b124a431b5de..d36ea97437bf 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $dict = ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-exists_false_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-exists_false_/formatted.sql index 1ef828f1f51c..c92097f539f5 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-exists_false_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-exists_false_/formatted.sql @@ -3,6 +3,6 @@ SELECT SELECT * FROM plato.Input - WHERE key = 'none' + WHERE key == 'none' ) FROM plato.Input; 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 baaa928260ea..cef4b224212c 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,3 +1,4 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT 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 f02322733516..71fcce3fc4a8 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 @@ -14,10 +14,10 @@ $ru_hosts = ( host FROM $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 1f8c1cd9095e..86758c011917 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 @@ -15,10 +15,10 @@ $ru_hosts = ( host FROM $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-match_clause_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-match_clause_/formatted.sql index c42daf0e3886..7ffb9fc5d659 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ SELECT key, subkey, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-missing_with_nonpersist_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-missing_with_nonpersist_/formatted.sql index b9c11d337b5a..e5c142c6e3a0 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-missing_with_nonpersist_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-missing_with_nonpersist_/formatted.sql @@ -3,8 +3,7 @@ USE plato; $data = SELECT Yson::Parse(CAST(key AS Yson)) AS key, - text, - -- missing colums + text, -- missing colums subkey FROM Input; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-multi_source_issue_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-multi_source_issue_/formatted.sql index d9768cddbb54..39ceaf9d601f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-multi_source_issue_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-multi_source_issue_/formatted.sql @@ -17,7 +17,7 @@ $count_a = ( SELECT count(*) FROM $i - WHERE substring(value, 0, 1) = 'a' + WHERE substring(value, 0, 1) == 'a' ); --INSERT INTO Output diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-null_check_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-null_check_/formatted.sql index 1c6dfa6d644c..503d5b9a62e6 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-null_check_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-null_check_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* by correct way ;-) +/* postgres can not */ +/* by correct way ;-) E assert 'a;;a' == 'a;Void;b' E - a;;a E + a;Void;b diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-opt_list_access_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-opt_list_access_/formatted.sql index 818c6e2249b6..b3e206858dd9 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-opt_list_access_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-opt_list_access_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $data = ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-optional_as_warn_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-optional_as_warn_/formatted.sql index 7a9e14988e74..86555fb2202d 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-optional_as_warn_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-optional_as_warn_/formatted.sql @@ -1,4 +1,7 @@ -/* syntax version 1 *//* dq can not *//* dqfile can not *//* yt can not */ +/* syntax version 1 */ +/* dq can not */ +/* dqfile can not */ +/* yt can not */ USE plato; PRAGMA AnsiOptionalAs; 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 b03543259e68..764d4c806dcd 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* multirun can not */ +/* postgres can not */ +/* multirun can not */ USE plato; INSERT INTO @a @@ -18,14 +19,14 @@ 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"; +WHERE 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 2b848423f4d3..ea8cfeab6c98 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* multirun can not */ +/* postgres can not */ +/* multirun can not */ USE plato; INSERT INTO @a diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-qualified_all_and_group_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-qualified_all_and_group_by_/formatted.sql index 16b0d22aca81..9161c53a4fbe 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-qualified_all_and_group_by_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-qualified_all_and_group_by_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; PRAGMA DisableSimpleColumns; 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 18a245c06fd9..5e6fe8f35a54 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 @@ -1,4 +1,5 @@ -/* kikimr can not - no refs *//* postgres can not */ +/* kikimr can not - no refs */ +/* postgres can not */ USE plato; PRAGMA ResultRowsLimit = "2"; 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 30bf3cc672df..118f0a97e7ad 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* kikimr can not - no refs */ +/* postgres can not */ +/* kikimr can not - no refs */ USE plato; PRAGMA ResultSizeLimit = "25"; 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 a609a8ddefb9..860d733161f7 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* kikimr can not - no refs */ +/* postgres can not */ +/* kikimr can not - no refs */ USE plato; PRAGMA ResultSizeLimit = "25"; 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 f2dfce626584..73c1439a50eb 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 @@ -3,6 +3,7 @@ $query = ( SELECT AsTuple(count(*), min(value)) FROM plato.Input + --WHERE 1=0 ); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-scalar_subquery_with_star_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-scalar_subquery_with_star_/formatted.sql index d665accb0e08..ee81cabedec9 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-scalar_subquery_with_star_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-scalar_subquery_with_star_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ $single = ( SELECT key 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 a104c6d900ed..9913ffa2b833 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 @@ -1,4 +1,4 @@ SELECT * FROM plato.Input -WHERE value = "ddd"; +WHERE value == "ddd"; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-substring_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-substring_/formatted.sql index 97284cb05f24..e0740878b0b5 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-substring_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-substring_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ SELECT substring(key, 1, 1) AS char, substring(value, 1) AS tail diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-substring_v1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-substring_v1_/formatted.sql index a755edd9b899..c5fc6a257339 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-substring_v1_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-substring_v1_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* syntax version 1 */-- in v1 substring returns Null as a result for missing value +/* postgres can not */ +/* syntax version 1 */ +-- in v1 substring returns Null as a result for missing value SELECT substring(key, 1, 1) AS char, substring(value, 1) AS tail diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-table_content_from_double_opt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-table_content_from_double_opt_/formatted.sql index bc6d82fec9c6..2f07522c3e23 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-table_content_from_double_opt_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-table_content_from_double_opt_/formatted.sql @@ -1,8 +1,8 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; -INSERT INTO @tmp - WITH truncate +INSERT INTO @tmp WITH truncate SELECT Just(Just(key)) AS key FROM Input; @@ -16,4 +16,4 @@ $key = SELECT * FROM Input -WHERE key = $key; +WHERE key == $key; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-table_content_from_sort_desc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-table_content_from_sort_desc_/formatted.sql index 28f99760660e..9510cb7106de 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-table_content_from_sort_desc_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-table_content_from_sort_desc_/formatted.sql @@ -1,8 +1,8 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; -INSERT INTO @tmp - WITH truncate +INSERT INTO @tmp WITH truncate SELECT key FROM Input @@ -18,4 +18,4 @@ $key = SELECT * FROM Input -WHERE key = $key; +WHERE key == $key; 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 5d5fa61647ad..c7fadba62ba7 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* kikimr can not */ +/* postgres can not */ +/* kikimr can not */ USE plato; PRAGMA yt.MapJoinLimit = "1M"; PRAGMA yt.TmpFolder = "//custom_tmp"; 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 ef2887b8e81e..5f9ba3b5f660 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 @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* kikimr can not */ +/* syntax version 1 */ +/* postgres can not */ +/* kikimr can not */ USE plato; --insert into Output @@ -9,4 +11,4 @@ SELECT TableName("baz") AS table_name2, TableName() AS table_name3 FROM Input -WHERE key = '800'; +WHERE key == '800'; 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 0fd3ee65ab27..901f88bd377b 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; PRAGMA TablePathPrefix = "//"; $input = "In" || "put"; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-to_dict_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-to_dict_/formatted.sql index ed113061269a..5440739e12a9 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-to_dict_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-to_dict_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ SELECT key, ToDict(items) AS `dict`, 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 d0bfeb9043e9..c980dfd62a2c 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 @@ -5,4 +5,4 @@ SELECT FROM plato.Input GROUP BY key -HAVING Max(value) = "FOO"; +HAVING Max(value) == "FOO"; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-trivial_where_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-trivial_where_/formatted.sql index b8768f8d941d..827880a0f9fe 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-trivial_where_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-trivial_where_/formatted.sql @@ -3,4 +3,4 @@ SELECT subkey, value FROM plato.Input -WHERE key = subkey; +WHERE key == subkey; 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 8970416908eb..fd39ad8f85fd 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 @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* syntax version 1 */ +/* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-uncorrelated_subqueries_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-uncorrelated_subqueries_/formatted.sql index 8d237c9e74b5..46e78d08b6af 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-uncorrelated_subqueries_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-uncorrelated_subqueries_/formatted.sql @@ -20,4 +20,4 @@ $data_one_key = ( SELECT * FROM Input2 -WHERE key = $data_one_key; +WHERE key == $data_one_key; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-unlabeled_1000_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-unlabeled_1000_/formatted.sql index 543aa056fb25..ca7a5c8955d5 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-unlabeled_1000_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-unlabeled_1000_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* kikimr can not - no ref select mode */ +/* postgres can not */ +/* kikimr can not - no ref select mode */ SELECT key, subkey, 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 466e6434383e..58761902b02d 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 @@ -1,5 +1,5 @@ SELECT * FROM plato.Input -WHERE "1" IN (key, subkey, value) OR - value NOT IN (key, subkey, value); +WHERE "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_simple_columns-no_simple_columns_tablerow_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-no_simple_columns_tablerow_/formatted.sql index 8bcec721ef70..4c21ac63ac0d 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-no_simple_columns_tablerow_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-no_simple_columns_tablerow_/formatted.sql @@ -27,7 +27,7 @@ JOIN ( 2 AS v2 ) AS b -ON a.k = b.k; +ON a.k == b.k; SELECT * @@ -43,4 +43,4 @@ JOIN ( 2 AS v2 ) AS b -ON a.k = b.k; +ON a.k == b.k; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_base_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_base_fail_/formatted.sql index 516a1e7609a0..7f1ea916c30b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_base_fail_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_base_fail_/formatted.sql @@ -13,8 +13,7 @@ $req = ( --INSERT INTO Output SELECT ff.*, - subkey AS magic, - -- 'magic' is exist from ff.magic + subkey AS magic, -- 'magic' is exist from ff.magic value AS val FROM $req AS ff diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_all_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_all_/formatted.sql index 76cbaab63e8c..7b25987ce215 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_all_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_all_/formatted.sql @@ -17,7 +17,7 @@ SELECT FROM Input JOIN $data AS d -ON Input.subkey = CAST(CAST(d.kk AS uint32) / 100 AS string) +ON Input.subkey == CAST(CAST(d.kk AS uint32) / 100 AS string) ORDER BY key, val; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_all_1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_all_1_/formatted.sql index e04c83a173cb..476b3a27887f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_all_1_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_all_1_/formatted.sql @@ -19,6 +19,6 @@ FROM $foo AS foo JOIN $bar AS bar -ON foo.key = bar.key; +ON foo.key == bar.key; -- output key has type Int64 diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_all_2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_all_2_/formatted.sql index b16494ad646f..2f999814488f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_all_2_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_all_2_/formatted.sql @@ -19,6 +19,6 @@ FROM $foo AS foo JOIN $bar AS bar -ON foo.key = bar.key; +ON foo.key == bar.key; -- output key has type Int64 diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_bug8923_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_bug8923_/formatted.sql index 0270fc12dcfc..5801c73327c0 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_bug8923_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_bug8923_/formatted.sql @@ -25,7 +25,7 @@ FROM $foo AS foo JOIN $bar AS bar -ON CAST(foo.key AS Int32) = bar.key +ON CAST(foo.key AS Int32) == bar.key JOIN $baz AS baz -ON bar.key = baz.key; +ON bar.key == baz.key; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_qualified_all_disable_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_qualified_all_disable_/formatted.sql index 038cc4434846..a9c061a94982 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_qualified_all_disable_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_qualified_all_disable_/formatted.sql @@ -19,6 +19,6 @@ FROM $foo AS foo JOIN $bar AS bar -ON foo.key = bar.key; +ON foo.key == bar.key; -- output key has type Int32 diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_qualified_all_enable_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_qualified_all_enable_/formatted.sql index 9c08e0eba866..7eba15ca643a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_qualified_all_enable_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_qualified_all_enable_/formatted.sql @@ -19,6 +19,6 @@ FROM $foo AS foo JOIN $bar AS bar -ON foo.key = bar.key; +ON foo.key == bar.key; -- output key has type Int64 diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_1_/formatted.sql index 0fa129ac89e3..335f51ae66ee 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_1_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_1_/formatted.sql @@ -5,8 +5,8 @@ PRAGMA DisableCoalesceJoinKeysOnQualifiedAll; SELECT b.* - WITHOUT - b.x +WITHOUT + b.x FROM ( SELECT * @@ -39,8 +39,8 @@ ON a.x == b.x AND a.y == b.y; SELECT * - WITHOUT - b.x +WITHOUT + b.x FROM ( SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_2_/formatted.sql index 08d59f2cd89a..29c6546e4eb2 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_2_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_2_/formatted.sql @@ -5,8 +5,8 @@ PRAGMA CoalesceJoinKeysOnQualifiedAll; SELECT b.* - WITHOUT - b.x +WITHOUT + b.x FROM ( SELECT * @@ -39,8 +39,8 @@ ON a.x == b.x AND a.y == b.y; SELECT * - WITHOUT - b.x +WITHOUT + b.x FROM ( SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_left_semi_1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_left_semi_1_/formatted.sql index 45abc65531f3..5e75afcceb56 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_left_semi_1_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_left_semi_1_/formatted.sql @@ -5,9 +5,9 @@ PRAGMA DisableCoalesceJoinKeysOnQualifiedAll; SELECT a.* - WITHOUT - a.key, - a.value +WITHOUT + a.key, + a.value FROM Input AS a LEFT SEMI JOIN Input @@ -18,9 +18,9 @@ ORDER BY SELECT * - WITHOUT - a.key, - a.value +WITHOUT + a.key, + a.value FROM Input AS a LEFT SEMI JOIN Input diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_left_semi_2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_left_semi_2_/formatted.sql index 0e3dea3c8f48..8e1cb0bd3cbe 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_left_semi_2_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_left_semi_2_/formatted.sql @@ -5,9 +5,9 @@ PRAGMA CoalesceJoinKeysOnQualifiedAll; SELECT a.* - WITHOUT - a.key, - a.value +WITHOUT + a.key, + a.value FROM Input AS a LEFT SEMI JOIN Input @@ -18,9 +18,9 @@ ORDER BY SELECT * - WITHOUT - a.key, - a.value +WITHOUT + a.key, + a.value FROM Input AS a LEFT SEMI JOIN Input diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_fail_/formatted.sql index 9b915ba9fe44..f616ca64927a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_fail_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_fail_/formatted.sql @@ -14,12 +14,11 @@ $data = ( --INSERT INTO Output SELECT d.*, - Input.key AS kk --- 'kk' is exist from d.kk + Input.key AS kk -- 'kk' is exist from d.kk FROM Input JOIN $data AS d -ON Input.subkey = CAST(CAST(d.kk AS uint32) / 100 AS string) +ON Input.subkey == CAST(CAST(d.kk AS uint32) / 100 AS string) ORDER BY key, val; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_qualified_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_qualified_/formatted.sql index c18b3b9f6901..651921abdcba 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_qualified_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_qualified_/formatted.sql @@ -18,7 +18,7 @@ SELECT FROM Input JOIN $data AS d -ON Input.subkey = CAST(CAST(d.kk AS uint32) / 100 AS string) +ON Input.subkey == CAST(CAST(d.kk AS uint32) / 100 AS string) ORDER BY key, val; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_all_key_without_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_all_key_without_/formatted.sql index 9515242a91a2..93a2a03c5e88 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_all_key_without_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_all_key_without_/formatted.sql @@ -14,12 +14,12 @@ $data = ( --INSERT INTO Output SELECT * - WITHOUT - Input.value +WITHOUT + Input.value FROM Input JOIN $data AS d -ON Input.subkey = CAST(CAST(d.kk AS uint32) / 100 AS string) +ON Input.subkey == CAST(CAST(d.kk AS uint32) / 100 AS string) ORDER BY key, value; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_same_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_same_key_/formatted.sql index 9c2a9b016da0..2ca3a0412ca1 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_same_key_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_same_key_/formatted.sql @@ -18,7 +18,7 @@ SELECT FROM Input JOIN $data AS d -ON Input.key = d.key AND Input.value == d.value +ON Input.key == d.key AND Input.value == d.value ORDER BY key, value; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_same_key_by_all_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_same_key_by_all_/formatted.sql index 63ea4542c004..000500f9b7a0 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_same_key_by_all_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_same_key_by_all_/formatted.sql @@ -17,7 +17,7 @@ SELECT FROM Input JOIN $data AS d -ON Input.key = d.key AND Input.value == d.value +ON Input.key == d.key AND Input.value == d.value ORDER BY key, value; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_same_key_without_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_same_key_without_/formatted.sql index e579c60e1c5f..c355b428ab3e 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_same_key_without_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_same_key_without_/formatted.sql @@ -15,12 +15,12 @@ $data = ( SELECT Input.*, d.value AS val - WITHOUT - Input.subkey +WITHOUT + Input.subkey FROM Input JOIN $data AS d -ON Input.subkey = CAST(CAST(d.kk AS uint32) / 100 AS string) +ON Input.subkey == CAST(CAST(d.kk AS uint32) / 100 AS string) ORDER BY key, value; 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 3c18b7cd1117..a69f5734d5b3 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 @@ -16,12 +16,12 @@ SELECT Input.*, d.*, Input.value AS valueFromInput - WITHOUT - Input.value +WITHOUT + Input.value FROM Input JOIN $data AS d -ON Input.subkey = CAST(CAST(d.kk AS uint32) / 100 AS string) +ON Input.subkey == CAST(CAST(d.kk AS uint32) / 100 AS string) ORDER BY key, value; 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 29d2fa1ac3d6..4533746e4f57 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 @@ -18,14 +18,14 @@ SELECT d.*, Input.value AS valueFromInput, d.subkey AS subkeyFromD - WITHOUT - Input.value, - d.subkey, - d.key +WITHOUT + Input.value, + d.subkey, + d.key FROM Input JOIN $data AS d -ON Input.subkey = d.key +ON Input.subkey == d.key ORDER BY key, value; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_tablerow_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_tablerow_/formatted.sql index 4f8440d9dbdf..bad4057237e9 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_tablerow_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_tablerow_/formatted.sql @@ -27,7 +27,7 @@ JOIN ( 2 AS v2 ) AS b -ON a.k = b.k; +ON a.k == b.k; SELECT * @@ -43,4 +43,4 @@ JOIN ( 2 AS v2 ) AS b -ON a.k = b.k; +ON a.k == b.k; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_union_all_qualified_star_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_union_all_qualified_star_/formatted.sql index 4f7b95ee58a1..fa047dcfb715 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_union_all_qualified_star_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_union_all_qualified_star_/formatted.sql @@ -25,7 +25,7 @@ FROM @A AS A LEFT ONLY JOIN @B AS B -ON A.key = B.key +ON A.key == B.key UNION ALL SELECT B.* @@ -33,4 +33,4 @@ FROM @A AS A RIGHT ONLY JOIN @B AS B -ON A.key = B.key; +ON A.key == B.key; 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 29e9974bbebd..8cac07ce1cee 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 @@ -10,6 +10,6 @@ SELECT h.ip6 AS ip6 FROM Event AS e -LEFT JOIN/*+ streamlookup() */ Host +LEFT JOIN /*+ streamlookup() */ Host AS h ON (e.host == h.hostname); 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 93a9f0119478..ab9d450f08ea 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 @@ -10,6 +10,6 @@ SELECT h.ip6 AS ip6 FROM Event AS e -LEFT JOIN/*+ streamlookup() */ Host +LEFT JOIN /*+ streamlookup() */ Host AS h ON (e.host == h.hostname); 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 2b6928d2fff1..045edbcee389 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 @@ -1,4 +1,6 @@ -/* postgres can not *//* kikimr can not *//* multirun can not */ +/* postgres can not */ +/* kikimr can not */ +/* multirun can not */ USE plato; PRAGMA yt.MaxInputTables = "3"; PRAGMA yt.MaxInputTablesForSortedMerge = "2"; 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 30f26e70ebe3..65dafcc2e1ba 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 @@ -1,4 +1,6 @@ -/* postgres can not *//* kikimr can not *//* multirun can not */ +/* postgres can not */ +/* kikimr can not */ +/* multirun can not */ USE plato; PRAGMA yt.MaxInputTables = "3"; PRAGMA yt.MaxInputTablesForSortedMerge = "2"; 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 a404baef984d..e43aed108c3f 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* kikimr can not - range not supported */ +/* postgres can not */ +/* kikimr can not - range not supported */ SELECT * FROM plato.concat("Input1", "Input2") 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 fa0153249092..ef5062fe1284 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* kikimr can not - range not supported */ +/* postgres can not */ +/* kikimr can not - range not supported */ SELECT * FROM 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 2fea52b2a531..90bdc7cc1e08 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* kikimr can not - range not supported */ +/* syntax version 1 */ +/* kikimr can not - range not supported */ USE plato; SELECT 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 bbe047be6cac..43c1eea9a885 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 @@ -1,4 +1,6 @@ -/* syntax version 1 *//* kikimr can not - range not supported *//* custom error:The list of tables is empty*/ +/* syntax version 1 */ +/* kikimr can not - range not supported */ +/* custom error:The list of tables is empty*/ USE plato; SELECT 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 d2af8f378848..1fee6df9dd4e 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* kikimr can not */ +/* postgres can not */ +/* kikimr can not */ SELECT key, value, 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 9c33942e037b..f0df05d477b9 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 @@ -1,4 +1,6 @@ -/* postgres can not *//* kikimr can not - range not supported *//* syntax version 1 */ +/* postgres can not */ +/* kikimr can not - range not supported */ +/* syntax version 1 */ USE plato; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_over_filter_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_over_filter_/formatted.sql index d35a56e84f51..0f8b7286d4a6 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_over_filter_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_over_filter_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* syntax version 1 *//* kikimr can not - range not supported */ +/* postgres can not */ +/* syntax version 1 */ +/* kikimr can not - range not supported */ SELECT count(*) AS count FROM plato.filter(``, Unicode::IsUtf); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_over_filter_udf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_over_filter_udf_/formatted.sql index c3027d53075a..8f6becd4128b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_over_filter_udf_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_over_filter_udf_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* syntax version 1 *//* kikimr can not - range not supported */ +/* postgres can not */ +/* syntax version 1 */ +/* kikimr can not - range not supported */ $script = @@ def f(f): def ft(s): 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 f9bdcd97488d..8654fad412fa 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 @@ -1,4 +1,6 @@ -/* postgres can not *//* kikimr can not - range not supported *//* syntax version 1 */ +/* postgres can not */ +/* kikimr can not - range not supported */ +/* syntax version 1 */ SELECT count(*) AS count FROM 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 416927f861c0..803affbd1f8c 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 @@ -1,4 +1,6 @@ -/* postgres can not *//* kikimr can not - range not supported *//* syntax version 1 */ +/* postgres can not */ +/* kikimr can not - range not supported */ +/* syntax version 1 */ PRAGMA RegexUseRe2 = 'true'; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_tables_with_view_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_tables_with_view_/formatted.sql index 482d41d12320..8c706eccd5c5 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_tables_with_view_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_tables_with_view_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ SELECT count(*) AS count FROM plato.range(``, ``, ``, ``, ksv); 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 eb709437d415..591e51d4baea 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* kikimr can not - range not supported */ +/* postgres can not */ +/* kikimr can not - range not supported */ SELECT * FROM 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 c57ea2e29f76..8a373378dc3e 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; SELECT 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 080e4f224411..8137c2c87736 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* kikimr can not - range not supported */ +/* syntax version 1 */ +/* kikimr can not - range not supported */ USE plato; SELECT 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 7b56ce35c37d..ef1cebc02de9 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 @@ -17,9 +17,9 @@ $join1 = ( AS c JOIN plato.orders AS o - ON c.c_custkey = o.o_custkey - WHERE CAST(o.o_orderdate AS timestamp) >= $border AND - CAST(o.o_orderdate AS timestamp) < ($border + Interval("P90D")) + ON c.c_custkey == o.o_custkey + WHERE CAST(o.o_orderdate AS timestamp) >= $border + AND CAST(o.o_orderdate AS timestamp) < ($border + Interval("P90D")) ); $join2 = ( @@ -37,8 +37,8 @@ $join2 = ( AS j JOIN plato.lineitem AS l - ON l.l_orderkey = j.o_orderkey - WHERE l.l_returnflag = 'R' + ON l.l_orderkey == j.o_orderkey + WHERE l.l_returnflag == 'R' ); $join3 = ( @@ -57,7 +57,7 @@ $join3 = ( AS j JOIN plato.nation AS n - ON n.n_nationkey = j.c_nationkey + ON n.n_nationkey == j.c_nationkey ); SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q11_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q11_/formatted.sql index 854e578cae5c..5b530a491530 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q11_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q11_/formatted.sql @@ -13,7 +13,7 @@ $join1 = ( AS ps JOIN plato.supplier AS s - ON ps.ps_suppkey = s.s_suppkey + ON ps.ps_suppkey == s.s_suppkey ); $join2 = ( @@ -26,8 +26,8 @@ $join2 = ( AS j JOIN plato.nation AS n - ON n.n_nationkey = j.s_nationkey - WHERE n.n_name = 'CANADA' + ON n.n_nationkey == j.s_nationkey + WHERE n.n_name == 'CANADA' ); $threshold = ( 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 c9d05c1dae1f..b24fa179d488 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 @@ -20,26 +20,26 @@ SELECT l_shipmode, sum( CASE - WHEN o_orderpriority = '1-URGENT' OR - o_orderpriority = '2-HIGH' + WHEN o_orderpriority == '1-URGENT' + OR o_orderpriority == '2-HIGH' THEN 1 ELSE 0 END ) AS high_line_count, sum( CASE - WHEN o_orderpriority <> '1-URGENT' AND - o_orderpriority <> '2-HIGH' + WHEN o_orderpriority != '1-URGENT' + AND o_orderpriority != '2-HIGH' THEN 1 ELSE 0 END ) AS low_line_count FROM $join -WHERE (l_shipmode = 'MAIL' OR l_shipmode = 'TRUCK') 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")) +WHERE (l_shipmode == 'MAIL' OR l_shipmode == 'TRUCK') + 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")) 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 409775f506f8..7955643d1ab1 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 @@ -20,7 +20,7 @@ FROM ( AS c LEFT OUTER JOIN $orders AS o - ON c.c_custkey = o.o_custkey + ON c.c_custkey == o.o_custkey GROUP BY c.c_custkey ) 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 f94ebe4326c4..1e8accad4a7d 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 @@ -15,6 +15,6 @@ FROM plato.lineitem AS l JOIN plato.part AS p -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")); +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")); 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 c32ed93ae401..80846da7f52b 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 @@ -10,8 +10,8 @@ $revenue0 = ( sum(l_extendedprice * (1 - l_discount)) AS total_revenue, CAST(sum(l_extendedprice * (1 - l_discount)) AS Uint64) AS total_revenue_approx FROM plato.lineitem - WHERE CAST(l_shipdate AS timestamp) >= $border AND - CAST(l_shipdate AS timestamp) < ($border + Interval("P92D")) + WHERE CAST(l_shipdate AS timestamp) >= $border + AND CAST(l_shipdate AS timestamp) < ($border + Interval("P92D")) GROUP BY l_suppkey ); @@ -34,7 +34,7 @@ $join1 = ( AS s JOIN $revenue0 AS r - ON s.s_suppkey = r.supplier_no + ON s.s_suppkey == r.supplier_no ); SELECT @@ -47,6 +47,6 @@ FROM $join1 AS j JOIN $max_revenue AS m -ON j.total_revenue_approx = m.max_revenue +ON j.total_revenue_approx == m.max_revenue ORDER BY s_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 4cf533ff93c7..1aee7dc729c6 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 @@ -9,7 +9,7 @@ $join = ( AS ps LEFT JOIN plato.supplier AS w - ON w.s_suppkey = ps.ps_suppkey + ON w.s_suppkey == ps.ps_suppkey WHERE NOT (s_comment LIKE "%Customer%Complaints%") ); @@ -22,10 +22,10 @@ FROM $join AS j JOIN plato.part AS p -ON p.p_partkey = j.ps_partkey -WHERE p.p_brand <> 'Brand#33' AND - (NOT StartsWith(p.p_type, 'PROMO POLISHED')) AND - (p.p_size = 20 OR p.p_size = 27 OR p.p_size = 11 OR p.p_size = 45 OR p.p_size = 40 OR p.p_size = 41 OR p.p_size = 34 OR p.p_size = 36) +ON p.p_partkey == j.ps_partkey +WHERE p.p_brand != 'Brand#33' + AND (NOT StartsWith(p.p_type, 'PROMO POLISHED')) + AND (p.p_size == 20 OR p.p_size == 27 OR p.p_size == 11 OR p.p_size == 45 OR p.p_size == 40 OR p.p_size == 41 OR p.p_size == 34 OR p.p_size == 36) GROUP BY p.p_brand, p.p_type, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q17_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q17_/formatted.sql index c7973851bfa8..803a052fcddf 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q17_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q17_/formatted.sql @@ -19,9 +19,9 @@ $join1 = ( AS l JOIN plato.part AS p - ON p.p_partkey = l.l_partkey - WHERE p.p_brand = 'Brand#35' AND - p.p_container = 'LG DRUM' + ON p.p_partkey == l.l_partkey + WHERE p.p_brand == 'Brand#35' + AND p.p_container == 'LG DRUM' ); SELECT @@ -30,5 +30,5 @@ FROM $join1 AS j JOIN $threshold AS t -ON j.p_partkey = t.l_partkey +ON j.p_partkey == t.l_partkey WHERE j.l_quantity < t.threshold; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q18_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q18_/formatted.sql index 2fae13fed8ed..3477c7f03b01 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q18_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q18_/formatted.sql @@ -22,7 +22,7 @@ $join1 = ( AS c JOIN plato.orders AS o - ON c.c_custkey = o.o_custkey + ON c.c_custkey == o.o_custkey ); SELECT @@ -36,7 +36,7 @@ FROM $join1 AS j JOIN $in AS i -ON i.l_orderkey = j.o_orderkey +ON i.l_orderkey == j.o_orderkey GROUP BY j.c_name, j.c_custkey, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q19_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q19_/formatted.sql index 7f21f82bc746..5a0822ccbc66 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q19_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q19_/formatted.sql @@ -7,30 +7,30 @@ FROM plato.lineitem AS l JOIN plato.part AS p -ON p.p_partkey = l.l_partkey +ON p.p_partkey == l.l_partkey WHERE ( - p.p_brand = 'Brand#23' AND - (p.p_container = 'SM CASE' OR p.p_container = 'SM BOX' OR p.p_container = 'SM PACK' OR p.p_container = 'SM PKG') AND - l.l_quantity >= 7 AND l.l_quantity <= 7 + 10 AND - p.p_size BETWEEN 1 AND 5 AND - (l.l_shipmode = 'AIR' OR l.l_shipmode = 'AIR REG') AND - l.l_shipinstruct = 'DELIVER IN PERSON' + p.p_brand == 'Brand#23' + AND (p.p_container == 'SM CASE' OR p.p_container == 'SM BOX' OR p.p_container == 'SM PACK' OR p.p_container == 'SM PKG') + AND l.l_quantity >= 7 AND l.l_quantity <= 7 + 10 + AND p.p_size BETWEEN 1 AND 5 + AND (l.l_shipmode == 'AIR' OR l.l_shipmode == 'AIR REG') + AND l.l_shipinstruct == 'DELIVER IN PERSON' ) OR ( - p.p_brand = 'Brand#15' AND - (p.p_container = 'MED BAG' OR p.p_container = 'MED BOX' OR p.p_container = 'MED PKG' OR p.p_container = 'MED PACK') AND - l.l_quantity >= 17 AND l.l_quantity <= 17 + 10 AND - p.p_size BETWEEN 1 AND 10 AND - (l.l_shipmode = 'AIR' OR l.l_shipmode = 'AIR REG') AND - l.l_shipinstruct = 'DELIVER IN PERSON' + p.p_brand == 'Brand#15' + AND (p.p_container == 'MED BAG' OR p.p_container == 'MED BOX' OR p.p_container == 'MED PKG' OR p.p_container == 'MED PACK') + AND l.l_quantity >= 17 AND l.l_quantity <= 17 + 10 + AND p.p_size BETWEEN 1 AND 10 + AND (l.l_shipmode == 'AIR' OR l.l_shipmode == 'AIR REG') + AND l.l_shipinstruct == 'DELIVER IN PERSON' ) OR ( - p.p_brand = 'Brand#44' AND - (p.p_container = 'LG CASE' OR p.p_container = 'LG BOX' OR p.p_container = 'LG PACK' OR p.p_container = 'LG PKG') AND - l.l_quantity >= 25 AND l.l_quantity <= 25 + 10 AND - p.p_size BETWEEN 1 AND 15 AND - (l.l_shipmode = 'AIR' OR l.l_shipmode = 'AIR REG') AND - l.l_shipinstruct = 'DELIVER IN PERSON' + p.p_brand == 'Brand#44' + AND (p.p_container == 'LG CASE' OR p.p_container == 'LG BOX' OR p.p_container == 'LG PACK' OR p.p_container == 'LG PKG') + AND l.l_quantity >= 25 AND l.l_quantity <= 25 + 10 + AND p.p_size BETWEEN 1 AND 15 + AND (l.l_shipmode == 'AIR' OR l.l_shipmode == 'AIR REG') + AND l.l_shipinstruct == 'DELIVER IN PERSON' ); 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 4a1852a78b0e..918aee2b7715 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 @@ -9,8 +9,8 @@ $threshold = ( l_partkey AS l_partkey, l_suppkey AS l_suppkey FROM plato.lineitem - WHERE CAST(l_shipdate AS timestamp) >= $border AND - CAST(l_shipdate AS timestamp) < ($border + Interval("P365D")) + WHERE CAST(l_shipdate AS timestamp) >= $border + AND CAST(l_shipdate AS timestamp) < ($border + Interval("P365D")) GROUP BY l_partkey, l_suppkey @@ -32,7 +32,7 @@ $join1 = ( AS ps JOIN ANY $parts AS p - ON ps.ps_partkey = p.p_partkey + ON ps.ps_partkey == p.p_partkey ); $join2 = ( @@ -42,7 +42,7 @@ $join2 = ( AS j JOIN ANY $threshold AS t - ON j.ps_partkey = t.l_partkey AND j.ps_suppkey = t.l_suppkey + ON j.ps_partkey == t.l_partkey AND j.ps_suppkey == t.l_suppkey WHERE j.ps_availqty > t.threshold ); @@ -56,7 +56,7 @@ $join3 = ( AS j JOIN ANY plato.supplier AS s - ON j.ps_suppkey = s.s_suppkey + ON j.ps_suppkey == s.s_suppkey ); SELECT @@ -66,7 +66,7 @@ FROM $join3 AS j JOIN plato.nation AS n -ON j.s_nationkey = n.n_nationkey -WHERE n.n_name = 'VIETNAM' +ON j.s_nationkey == n.n_nationkey +WHERE n.n_name == 'VIETNAM' ORDER BY s_name; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q21_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q21_/formatted.sql index 9634bcba8798..f0a676b52621 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q21_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q21_/formatted.sql @@ -5,7 +5,7 @@ $n = SELECT n_nationkey FROM plato.nation - WHERE n_name = 'EGYPT'; + WHERE n_name == 'EGYPT'; $s = SELECT @@ -15,7 +15,7 @@ $s = AS supplier JOIN $n AS nation - ON supplier.s_nationkey = nation.n_nationkey; + ON supplier.s_nationkey == nation.n_nationkey; $l = SELECT @@ -33,7 +33,7 @@ $j1 = AS l1 JOIN $s AS supplier - ON l1.l_suppkey = supplier.s_suppkey; + ON l1.l_suppkey == supplier.s_suppkey; $j1_1 = SELECT @@ -42,8 +42,8 @@ $j1_1 = AS l1 JOIN $l AS l3 - ON l1.l_orderkey = l3.l_orderkey - WHERE l3.l_suppkey <> l1.l_suppkey; + ON l1.l_orderkey == l3.l_orderkey + WHERE l3.l_suppkey != l1.l_suppkey; $j2 = SELECT @@ -54,7 +54,7 @@ $j2 = AS l1 LEFT ONLY JOIN $j1_1 AS l3 - ON l1.l_orderkey = l3.l_orderkey; + ON l1.l_orderkey == l3.l_orderkey; $j2_1 = SELECT @@ -63,8 +63,8 @@ $j2_1 = AS l1 JOIN plato.lineitem AS l2 - ON l1.l_orderkey = l2.l_orderkey - WHERE l2.l_suppkey <> l1.l_suppkey; + ON l1.l_orderkey == l2.l_orderkey + WHERE l2.l_suppkey != l1.l_suppkey; $j3 = SELECT @@ -75,7 +75,7 @@ $j3 = AS l1 LEFT SEMI JOIN $j2_1 AS l2 - ON l1.l_orderkey = l2.l_orderkey; + ON l1.l_orderkey == l2.l_orderkey; $j4 = SELECT @@ -84,8 +84,8 @@ $j4 = AS l1 JOIN plato.orders AS orders - ON orders.o_orderkey = l1.l_orderkey - WHERE o_orderstatus = 'F'; + ON orders.o_orderkey == l1.l_orderkey + WHERE o_orderstatus == 'F'; SELECT s_name, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q22_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q22_/formatted.sql index f56a5aae51c1..97288da9bae8 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q22_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q22_/formatted.sql @@ -7,7 +7,7 @@ $customers = ( c_custkey, Substring(c_phone, 0u, 2u) AS cntrycode FROM plato.customer - WHERE (Substring(c_phone, 0u, 2u) = '31' OR Substring(c_phone, 0u, 2u) = '29' OR Substring(c_phone, 0u, 2u) = '30' OR Substring(c_phone, 0u, 2u) = '26' OR Substring(c_phone, 0u, 2u) = '28' OR Substring(c_phone, 0u, 2u) = '25' OR Substring(c_phone, 0u, 2u) = '15') + WHERE (Substring(c_phone, 0u, 2u) == '31' OR Substring(c_phone, 0u, 2u) == '29' OR Substring(c_phone, 0u, 2u) == '30' OR Substring(c_phone, 0u, 2u) == '26' OR Substring(c_phone, 0u, 2u) == '28' OR Substring(c_phone, 0u, 2u) == '25' OR Substring(c_phone, 0u, 2u) == '15') ); $avg = ( @@ -38,7 +38,7 @@ $join2 = ( AS j LEFT ONLY JOIN plato.orders AS o - ON o.o_custkey = j.c_custkey + ON o.o_custkey == j.c_custkey ); SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q2_/formatted.sql index 87314d98935a..30430a0905a8 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q2_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q2_/formatted.sql @@ -4,7 +4,7 @@ $r = ( SELECT r_regionkey FROM plato.region - WHERE r_name = 'AMERICA' + WHERE r_name == 'AMERICA' ); $j1 = ( @@ -15,7 +15,7 @@ $j1 = ( AS n JOIN $r AS r - ON n.n_regionkey = r.r_regionkey + ON n.n_regionkey == r.r_regionkey ); $j2 = ( @@ -31,7 +31,7 @@ $j2 = ( AS s JOIN $j1 AS j - ON s.s_nationkey = j.n_nationkey + ON s.s_nationkey == j.n_nationkey ); $j3 = ( @@ -48,7 +48,7 @@ $j3 = ( AS ps JOIN $j2 AS j - ON ps.ps_suppkey = j.s_suppkey + ON ps.ps_suppkey == j.s_suppkey ); $min_ps_supplycost = ( @@ -65,8 +65,8 @@ $p = ( p_partkey, p_mfgr FROM plato.part - WHERE p_size = 10 AND - p_type LIKE '%COPPER' + WHERE p_size == 10 + AND p_type LIKE '%COPPER' ); $j4 = ( @@ -83,11 +83,11 @@ $j4 = ( AS p JOIN $j3 AS j - ON p.p_partkey = j.ps_partkey + ON p.p_partkey == j.ps_partkey JOIN $min_ps_supplycost AS m - ON p.p_partkey = m.ps_partkey - WHERE min_ps_supplycost = ps_supplycost + ON p.p_partkey == m.ps_partkey + WHERE min_ps_supplycost == ps_supplycost ); SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q3_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q3_/formatted.sql index e95c2f17753d..e446d3e66f40 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q3_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q3_/formatted.sql @@ -11,7 +11,7 @@ $join1 = ( AS c JOIN plato.orders AS o - ON c.c_custkey = o.o_custkey + ON c.c_custkey == o.o_custkey ); $join2 = ( @@ -27,7 +27,7 @@ $join2 = ( AS j1 JOIN plato.lineitem AS l - ON l.l_orderkey = j1.o_orderkey + ON l.l_orderkey == j1.o_orderkey ); SELECT @@ -36,9 +36,9 @@ SELECT o_orderdate, o_shippriority FROM $join2 -WHERE c_mktsegment = 'MACHINERY' AND - CAST(o_orderdate AS Timestamp) < Date('1995-03-08') AND - CAST(l_shipdate AS Timestamp) > Date('1995-03-08') +WHERE c_mktsegment == 'MACHINERY' + AND CAST(o_orderdate AS Timestamp) < Date('1995-03-08') + AND CAST(l_shipdate AS Timestamp) > Date('1995-03-08') GROUP BY l_orderkey, o_orderdate, 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 dac6c320dcbb..fd6adb911c1b 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 @@ -13,16 +13,16 @@ $join = ( AS o JOIN ANY plato.lineitem AS l - ON o.o_orderkey = l.l_orderkey + ON o.o_orderkey == l.l_orderkey ); SELECT o_orderpriority, count(*) AS order_count FROM $join -WHERE CAST(o_orderdate AS Timestamp) >= $border AND - CAST(o_orderdate AS Timestamp) < DateTime::MakeDate(DateTime::ShiftMonths($border, 3)) AND - l_commitdate < l_receiptdate +WHERE CAST(o_orderdate AS Timestamp) >= $border + AND CAST(o_orderdate AS Timestamp) < DateTime::MakeDate(DateTime::ShiftMonths($border, 3)) + AND l_commitdate < l_receiptdate GROUP BY o_orderpriority ORDER BY 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 b86bdd7b6ef3..1ed66d026c14 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 @@ -10,7 +10,7 @@ $join1 = ( AS c JOIN plato.orders AS o - ON c.c_custkey = o.o_custkey + ON c.c_custkey == o.o_custkey ); $join2 = ( @@ -25,7 +25,7 @@ $join2 = ( AS j JOIN plato.lineitem AS l - ON l.l_orderkey = j.o_orderkey + ON l.l_orderkey == j.o_orderkey ); $join3 = ( @@ -41,7 +41,7 @@ $join3 = ( AS j JOIN plato.supplier AS s - ON j.l_suppkey = s.s_suppkey + ON j.l_suppkey == s.s_suppkey ); $join4 = ( @@ -59,8 +59,8 @@ $join4 = ( AS j JOIN plato.nation AS n - ON j.s_nationkey = n.n_nationkey AND - j.c_nationkey = n.n_nationkey + ON j.s_nationkey == n.n_nationkey + AND j.c_nationkey == n.n_nationkey ); $join5 = ( @@ -79,7 +79,7 @@ $join5 = ( AS j JOIN plato.region AS r - ON j.n_regionkey = r.r_regionkey + ON j.n_regionkey == r.r_regionkey ); $border = Date("1995-01-01"); @@ -87,9 +87,9 @@ SELECT n_name, sum(l_extendedprice * (1 - l_discount)) AS revenue FROM $join5 -WHERE r_name = 'AFRICA' AND - CAST(o_orderdate AS Timestamp) >= $border AND - CAST(o_orderdate AS Timestamp) < ($border + Interval("P365D")) +WHERE r_name == 'AFRICA' + AND CAST(o_orderdate AS Timestamp) >= $border + 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 6d93e0da6be1..58301e5beb84 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 @@ -6,7 +6,7 @@ $border = Date("1995-01-01"); SELECT sum(l_extendedprice * l_discount) AS revenue FROM plato.lineitem -WHERE CAST(l_shipdate AS Timestamp) >= $border 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; +WHERE CAST(l_shipdate AS Timestamp) >= $border + 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_tpch-q7_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q7_/formatted.sql index c53437fa8b7b..38fcaa4b0a35 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q7_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q7_/formatted.sql @@ -7,7 +7,7 @@ $n = n_nationkey FROM plato.nation AS n - WHERE n_name = 'PERU' OR n_name = 'MOZAMBIQUE'; + WHERE n_name == 'PERU' OR n_name == 'MOZAMBIQUE'; $l = SELECT @@ -27,7 +27,7 @@ $j1 = AS supplier JOIN $n AS n1 - ON supplier.s_nationkey = n1.n_nationkey; + ON supplier.s_nationkey == n1.n_nationkey; $j2 = SELECT @@ -37,7 +37,7 @@ $j2 = AS customer JOIN $n AS n2 - ON customer.c_nationkey = n2.n_nationkey; + ON customer.c_nationkey == n2.n_nationkey; $j3 = SELECT @@ -47,7 +47,7 @@ $j3 = AS orders JOIN $j2 AS customer - ON orders.o_custkey = customer.c_custkey; + ON orders.o_custkey == customer.c_custkey; $j4 = SELECT @@ -60,7 +60,7 @@ $j4 = AS lineitem JOIN $j3 AS orders - ON lineitem.l_orderkey = orders.o_orderkey; + ON lineitem.l_orderkey == orders.o_orderkey; $j5 = SELECT @@ -72,9 +72,9 @@ $j5 = AS lineitem JOIN $j1 AS supplier - ON lineitem.l_suppkey = supplier.s_suppkey - WHERE (supp_nation = 'PERU' AND cust_nation = 'MOZAMBIQUE') OR - (supp_nation = 'MOZAMBIQUE' AND cust_nation = 'PERU'); + ON lineitem.l_suppkey == supplier.s_suppkey + WHERE (supp_nation == 'PERU' AND cust_nation == 'MOZAMBIQUE') + OR (supp_nation == 'MOZAMBIQUE' AND cust_nation == 'PERU'); SELECT supp_nation, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q8_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q8_/formatted.sql index 6c4e66933e10..7437c3aa636d 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q8_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q8_/formatted.sql @@ -10,8 +10,8 @@ $join1 = ( AS p JOIN plato.lineitem AS l - ON p.p_partkey = l.l_partkey - WHERE p.p_type = 'ECONOMY PLATED COPPER' + ON p.p_partkey == l.l_partkey + WHERE p.p_type == 'ECONOMY PLATED COPPER' ); $join2 = ( @@ -23,7 +23,7 @@ $join2 = ( AS j JOIN plato.supplier AS s - ON s.s_suppkey = j.l_suppkey + ON s.s_suppkey == j.l_suppkey ); $join3 = ( @@ -35,7 +35,7 @@ $join3 = ( AS j JOIN plato.nation AS n - ON n.n_nationkey = j.s_nationkey + ON n.n_nationkey == j.s_nationkey ); $join4 = ( @@ -48,7 +48,7 @@ $join4 = ( AS j JOIN plato.orders AS o - ON o.o_orderkey = j.l_orderkey + ON o.o_orderkey == j.l_orderkey WHERE CAST(CAST(o_orderdate AS Timestamp) AS Date) BETWEEN Date('1995-01-01') AND Date('1996-12-31') ); @@ -62,7 +62,7 @@ $join5 = ( AS j JOIN plato.customer AS c - ON c.c_custkey = j.o_custkey + ON c.c_custkey == j.o_custkey ); $join6 = ( @@ -75,7 +75,7 @@ $join6 = ( AS j JOIN plato.nation AS n - ON n.n_nationkey = j.c_nationkey + ON n.n_nationkey == j.c_nationkey ); $join7 = ( @@ -87,15 +87,15 @@ $join7 = ( AS j JOIN plato.region AS r - ON r.r_regionkey = j.n_regionkey - WHERE r.r_name = 'AFRICA' + ON r.r_regionkey == j.n_regionkey + WHERE r.r_name == 'AFRICA' ); SELECT o_year, sum( CASE - WHEN nation = 'MOZAMBIQUE' + WHEN nation == 'MOZAMBIQUE' THEN volume ELSE 0 END diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q9_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q9_/formatted.sql index b31661254177..b9448995cd38 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q9_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q9_/formatted.sql @@ -18,7 +18,7 @@ $j1 = ( AS ps JOIN $p AS p - ON ps.ps_partkey = p.p_partkey + ON ps.ps_partkey == p.p_partkey ); $j2 = ( @@ -34,7 +34,7 @@ $j2 = ( AS l JOIN $j1 AS j - ON l.l_suppkey = j.ps_suppkey AND l.l_partkey = j.ps_partkey + ON l.l_suppkey == j.ps_suppkey AND l.l_partkey == j.ps_partkey ); $j3 = ( @@ -49,7 +49,7 @@ $j3 = ( AS s JOIN $j2 AS j - ON j.l_suppkey = s.s_suppkey + ON j.l_suppkey == s.s_suppkey ); $j4 = ( @@ -64,7 +64,7 @@ $j4 = ( AS o JOIN $j3 AS j - ON o.o_orderkey = j.l_orderkey + ON o.o_orderkey == j.l_orderkey ); $j5 = ( @@ -79,7 +79,7 @@ $j5 = ( AS n JOIN $j4 AS j - ON j.s_nationkey = n.n_nationkey + ON j.s_nationkey == n.n_nationkey ); $profit = ( 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 3c7d244c5c1e..95cf9fcbfab9 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* do not execute */ +/* syntax version 1 */ +/* do not execute */ CREATE TABLE plato.Output ( c_void Void, c_unit Unit, 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 3b672ffdf587..e25b9f555926 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* do not execute */ +/* syntax version 1 */ +/* do not execute */ DECLARE $c_void AS Void; DECLARE $c_unit AS Unit; DECLARE $c_bool AS Bool; 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 ccf08efece21..4c36491bea95 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 @@ -1,4 +1,6 @@ -/* syntax version 1 *//* multirun can not *//* postgres can not */ +/* syntax version 1 */ +/* multirun can not */ +/* postgres can not */ USE plato; PRAGMA yt.UseNativeYtTypes = "1"; PRAGMA yt.NativeYtTypeCompatibility = "date"; 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 91aa214a9e3e..598596dfe49c 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 @@ -1,4 +1,5 @@ -/* multirun can not *//* postgres can not */ +/* multirun can not */ +/* postgres can not */ USE plato; PRAGMA yt.UseNativeYtTypes = "1"; PRAGMA yt.NativeYtTypeCompatibility = "complex"; 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 a96e3e3f34e5..f8087ebbfb06 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 @@ -1,4 +1,5 @@ -/* multirun can not *//* postgres can not */ +/* multirun can not */ +/* postgres can not */ USE plato; PRAGMA yt.UseNativeYtTypes = "1"; PRAGMA yt.NativeYtTypeCompatibility = "complex"; 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 682e419ef094..ff7b03b98085 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 @@ -1,4 +1,7 @@ -/* syntax version 1 *//* multirun can not *//* postgres can not *//* custom check: len(yt_res_yson[0]['Write'][0]['Data']) == 10 */ +/* syntax version 1 */ +/* multirun can not */ +/* postgres can not */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) == 10 */ USE plato; PRAGMA yt.UseNativeYtTypes = "1"; 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 49df8c07349d..27592247a451 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,7 +1,6 @@ PRAGMA yt.UseNativeYtTypes = "true"; -INSERT INTO plato.Output - WITH truncate +INSERT INTO plato.Output WITH truncate SELECT Decimal("3.1415", 5, 4), Decimal("2.9999999999", 12, 10), 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 f1a02d763135..41b9e905e0dc 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; PRAGMA yt.UseNativeYtTypes = "1"; PRAGMA config.flags("LLVM", ""); 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 0cd853081d6f..fd906274d300 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; PRAGMA yt.UseNativeYtTypes = "1"; PRAGMA config.flags("LLVM", "OFF"); 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 6632e812e2cc..370f8abe8872 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; PRAGMA yt.UseNativeYtTypes = "1"; 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 a5ec4211f752..b72f72cba314 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; SELECT 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 ca5d44d1d33b..b370963f4752 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; PRAGMA yt.IgnoreTypeV3; 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 1b0c774567a4..2ddb1f3760a4 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 @@ -1,16 +1,17 @@ -/* syntax version 1 *//* multirun can not *//* postgres can not *//* kikimr can not */ +/* syntax version 1 */ +/* multirun can not */ +/* postgres can not */ +/* kikimr can not */ USE plato; PRAGMA yt.UseNativeYtTypes = "1"; -INSERT INTO @a - WITH truncate +INSERT INTO @a WITH truncate SELECT * FROM concat(Input1, Input2); COMMIT; -INSERT INTO @a - WITH truncate +INSERT INTO @a WITH truncate SELECT * FROM Input1; 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 43e2dbafad66..6f2e6444b4ef 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 @@ -1,16 +1,17 @@ -/* syntax version 1 *//* multirun can not *//* postgres can not *//* kikimr can not */ +/* syntax version 1 */ +/* multirun can not */ +/* postgres can not */ +/* kikimr can not */ USE plato; PRAGMA yt.UseNativeYtTypes = "0"; -INSERT INTO Output - WITH truncate +INSERT INTO Output WITH truncate SELECT * FROM concat(Input1, Input2); COMMIT; -INSERT INTO Output - WITH truncate +INSERT INTO Output WITH truncate SELECT * FROM Input1; 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 aabee14bd7ac..7c35b875bf85 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; PRAGMA yt.UseNativeYtTypes = "1"; 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 aaac30aa3207..d8da6069ad06 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; PRAGMA yt.JoinMergeTablesLimit = "100"; PRAGMA yt.JoinMergeForce = "true"; 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 142c3729d445..f1c6ee3a026f 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 @@ -1,4 +1,6 @@ -/* syntax version 1 *//* multirun can not *//* postgres can not */ +/* syntax version 1 */ +/* multirun can not */ +/* postgres can not */ USE plato; PRAGMA yt.UseNativeYtTypes = "1"; PRAGMA yt.NativeYtTypeCompatibility = "complex"; 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 d8a182adcba2..341804787b2d 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 @@ -1,4 +1,5 @@ -/* multirun can not *//* postgres can not */ +/* multirun can not */ +/* postgres can not */ USE plato; PRAGMA yt.UseNativeYtTypes = "1"; PRAGMA yt.NativeYtTypeCompatibility = "complex"; @@ -26,21 +27,27 @@ $i, $j, $k = ( USING $udf(TableRows()) ); -INSERT INTO Output1 - WITH (truncate, keepmeta) +INSERT INTO Output1 WITH ( + truncate, + keepmeta +) SELECT * FROM $i; -INSERT INTO Output2 - WITH (truncate, keepmeta) +INSERT INTO Output2 WITH ( + truncate, + keepmeta +) SELECT * FROM $j LIMIT 2; -INSERT INTO Output3 - WITH (truncate, keepmeta) +INSERT INTO Output3 WITH ( + truncate, + keepmeta +) SELECT * FROM $k; 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 d98a1e9a006a..3cde364b2f37 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 @@ -1,11 +1,12 @@ -/* syntax version 1 *//* multirun can not *//* postgres can not */ +/* syntax version 1 */ +/* multirun can not */ +/* postgres can not */ USE plato; PRAGMA yt.UseNativeYtTypes = "1"; PRAGMA yt.NativeYtTypeCompatibility = "complex"; PRAGMA yt.MaxInputTables = "2"; -INSERT INTO Output - WITH truncate +INSERT INTO Output WITH truncate SELECT key FROM range("") 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 1bf89387965e..d7f9d0afccf5 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; PRAGMA yt.UseNativeYtTypes = "1"; PRAGMA yt.NativeYtTypeCompatibility = "uuid"; 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 3ec00bf39297..82d24020b270 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT String::CollapseText("abc", 1); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-named_args_for_script_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-named_args_for_script_/formatted.sql index 76e76a79e2ac..5f566b3cc93f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-named_args_for_script_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-named_args_for_script_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $udfScript = @@ def AppendInfo(a_name, a_age = None, a_region = None): diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-named_args_for_script_with_posargs2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-named_args_for_script_with_posargs2_/formatted.sql index 8c5d89f457c9..35e078350855 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-named_args_for_script_with_posargs2_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-named_args_for_script_with_posargs2_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $udfScript = @@ def AppendInfo(a_name, a_age = None, a_region = None): diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-named_args_for_script_with_posargs_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-named_args_for_script_with_posargs_/formatted.sql index b1fc168ee335..daafed3dbbf9 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-named_args_for_script_with_posargs_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-named_args_for_script_with_posargs_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $udfScript = @@ def AppendInfo(a_name, a_age = None, a_region = None): diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-python_script_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-python_script_/formatted.sql index c58fe77a2956..bdcccb8548cf 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-python_script_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-python_script_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $udfScript = @@ def AppendNum(name, age): 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 6ffd38d4cae4..bf7a60a51035 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $udfScript = FileContent("python_script.py"); $udf = Python::AppendNum(Callable<(String, Int32?) -> String>, $udfScript); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-sqlproject_grounds_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-sqlproject_grounds_/formatted.sql index dca87dfce933..a877deaecadf 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-sqlproject_grounds_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-sqlproject_grounds_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $ts_bytes = String::HexDecode('0a0b0c0d'); $ts_int = FromBytes($ts_bytes, Uint32); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-trivial_udf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-trivial_udf_/formatted.sql index 4ec3664b69f8..8ed79f0b4784 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-trivial_udf_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-trivial_udf_/formatted.sql @@ -1,3 +1,4 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT Unicode::ToUpper("foo"u); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_/formatted.sql index 6b7b731ec634..9c35d3b2ee61 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ $script = @@ import heapq import json 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 a391fd3acd34..c191cc93412a 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 @@ -1,4 +1,6 @@ -/* syntax version 1 *//* postgres can not *//* syntax version 1 */ +/* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ $create = ($item, $_parent) -> { RETURN AsList($item) }; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_distinct_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_distinct_/formatted.sql index b9feb43dd6ef..f5fae7cd05a6 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_distinct_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_distinct_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ $script = @@ import heapq import json diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_short_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_short_/formatted.sql index f602a21ea415..e0fd34d94270 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_short_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_short_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ $script = @@ def create(item): return item diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udf_call_with_group_and_limit_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udf_call_with_group_and_limit_/formatted.sql index 58624ff3fd31..06af796ffb09 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udf_call_with_group_and_limit_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udf_call_with_group_and_limit_/formatted.sql @@ -6,5 +6,5 @@ FROM plato.Input GROUP BY key ORDER BY - key -/* sort for stable results only */ LIMIT 2; + key /* sort for stable results only */ +LIMIT 2; 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 795babd14b96..15540faffeea 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 @@ -1,4 +1,6 @@ -/* postgres can not *//* custom error:Callable expected at most 3 argument(s)*/-- Find has optional args +/* postgres can not */ +/* custom error:Callable expected at most 3 argument(s)*/ +-- Find has optional args SELECT String::ReplaceAll(); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-mix_map_and_project_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-mix_map_and_project_/formatted.sql index 8e6350c1f507..83b81eb2fc0c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-mix_map_and_project_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-mix_map_and_project_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* kikimr can not */ +/* postgres can not */ +/* kikimr can not */ PRAGMA yt.InferSchema; SELECT 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 b9916d2d0a36..9f46c8f8f5ef 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-union_all_with_discard_into_result_ansi_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-union_all_with_discard_into_result_ansi_/formatted.sql index b011d85ba032..443c25a358e9 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-union_all_with_discard_into_result_ansi_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-union_all_with_discard_into_result_ansi_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; PRAGMA AnsiOrderByLimitInUnionAll; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-union_all_with_top_level_limits_ansi_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-union_all_with_top_level_limits_ansi_/formatted.sql index 8a49a5d455a2..735a88edabe8 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-union_all_with_top_level_limits_ansi_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-union_all_with_top_level_limits_ansi_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; PRAGMA AnsiOrderByLimitInUnionAll; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_version-version_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_version-version_/formatted.sql index a310643a5b3a..aa82674abfdc 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_version-version_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_version-version_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* yt can not */ +/* postgres can not */ +/* yt can not */ USE plato; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-all_from_view_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-all_from_view_/formatted.sql index 2dcd0465233e..9bc3dadf1224 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-all_from_view_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-all_from_view_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ SELECT * FROM plato.`Input` diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_eval_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_eval_/formatted.sql index f58f9e47c682..0ad61a4b2dc4 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_eval_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_eval_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* syntax version 1 *//* custom error:FileContent function can't be used inside generated code in views*/ +/* postgres can not */ +/* syntax version 1 */ +/* custom error:FileContent function can't be used inside generated code in views*/ PRAGMA yt.ViewIsolation = 'true'; USE plato; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_inner_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_inner_/formatted.sql index ddf6c4688c9b..ab122d487ca1 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_inner_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_inner_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ PRAGMA yt.ViewIsolation = 'true'; USE plato; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_inner_library_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_inner_library_/formatted.sql index 7abf6e7bede5..ed1dfc10a063 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_inner_library_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_inner_library_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ PRAGMA yt.ViewIsolation = 'true'; USE plato; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_inner_udf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_inner_udf_/formatted.sql index 502e3791483d..129e13448919 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_inner_udf_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_inner_udf_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ PRAGMA yt.ViewIsolation = 'true'; USE plato; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_outer_library_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_outer_library_/formatted.sql index 1ad22cf12ab1..2c645264b304 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_outer_library_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_outer_library_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* syntax version 1 *//* custom error: does not exist*/ +/* postgres can not */ +/* syntax version 1 */ +/* custom error: does not exist*/ PRAGMA yt.ViewIsolation = 'true'; USE plato; PRAGMA library('mylib.sql'); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-system_udf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-system_udf_/formatted.sql index e50094e42d58..b448e9459e06 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-system_udf_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-system_udf_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ PRAGMA yt.ViewIsolation = 'true'; USE plato; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-trivial_view_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-trivial_view_/formatted.sql index 06e5dffdf631..6f17e4cbb95f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-trivial_view_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-trivial_view_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-trivial_view_concat_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-trivial_view_concat_/formatted.sql index aece4fcc0e35..918fd7f96721 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-trivial_view_concat_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-trivial_view_concat_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; SELECT 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 7bd2ef9cbd08..0728a103da31 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,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ PRAGMA yt.InferSchema = "2"; USE plato; @@ -6,5 +7,5 @@ SELECT WeakField(key, "String", "funny"), WeakField(subkey, "String", "bunny"), WeakField(value, "String", "boom") -FROM RANGE(``, ``, ``)--FROM Concat(Input1, Input2) +FROM RANGE(``, ``, ``) --FROM Concat(Input1, Input2) ; 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 1f961f2e924b..db3b03857d41 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; SELECT 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 e6cf36b99189..cbc653f6324b 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* kikimr can not */ +/* postgres can not */ +/* kikimr can not */ USE plato; PRAGMA yt.InferSchema; 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 b6132791d537..442b90b7ef3a 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,6 +2,5 @@ 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-yql-7888_mapfieldsubset_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-yql-7888_mapfieldsubset_/formatted.sql index eb41832c82ea..a3c8b80092f7 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; DEFINE SUBQUERY $input() AS @@ -9,8 +10,8 @@ DEFINE SUBQUERY $input() AS key, subkey FROM concat(Input, Input) - WHERE key IN ("heartbeat", "show", "click") AND - subkey IN ("native", "gif"); + WHERE key IN ("heartbeat", "show", "click") + AND subkey IN ("native", "gif"); END DEFINE; -- Native: @@ -20,8 +21,8 @@ DEFINE SUBQUERY $native_show_and_clicks($input) AS strongest_id, key FROM $input() - WHERE subkey == "native" AND - key IN ("click", "show"); + WHERE subkey == "native" + AND key IN ("click", "show"); END DEFINE; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_aggregations_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_aggregations_/formatted.sql index 26ae8f396d19..20beddf69904 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_aggregations_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_aggregations_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT value, SUM(unwrap(CAST(subkey AS uint32))) OVER w1 AS sum1, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_aggregations_leadlag_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_aggregations_leadlag_/formatted.sql index 966c859d31c8..6eba486d27a2 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_aggregations_leadlag_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_aggregations_leadlag_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT value, SUM(unwrap(CAST(subkey AS uint32))) OVER w1 AS sum1, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_ansi_current_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_ansi_current_/formatted.sql index ec0d80215b42..77e125846ab8 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_ansi_current_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_ansi_current_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA AnsiCurrentRow; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_ansi_current_mixed_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_ansi_current_mixed_/formatted.sql index 1da298b93a74..9cf6ecc1d521 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_ansi_current_mixed_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_ansi_current_mixed_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA AnsiCurrentRow; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_ansi_current_with_win_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_ansi_current_with_win_/formatted.sql index 15618d013921..16eb286f992a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_ansi_current_with_win_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_ansi_current_with_win_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA AnsiCurrentRow; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_session_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_session_/formatted.sql index 101173fc0778..0f0983786c8a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_session_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_session_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT user, ts, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_session_aliases_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_session_aliases_/formatted.sql index f0b39199d3ee..5441587eefb4 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_session_aliases_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_session_aliases_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT user, ts, 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 987bb33f7f32..a5a27e02db7b 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $init = ($row) -> (AsStruct($row.ts ?? 0 AS value, 1 AS count)); $calculate = ($_row, $state) -> ($state.value); -- split partition into two-element grooups, make session key to be cumulative sum of ts from partition start diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_session_incompat_sort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_session_incompat_sort_/formatted.sql index 5fcabe548028..e2e2700b263f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_session_incompat_sort_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_session_incompat_sort_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT user, ts, 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 ac967ceb6293..384d754f7ece 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; PRAGMA DistinctOverWindow; @@ -14,6 +15,7 @@ SELECT subkey, key, value, + -- assuming ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW count(DISTINCT key) OVER ( PARTITION BY diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-distinct_over_window_full_frames_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-distinct_over_window_full_frames_/formatted.sql index ca2e8b8979e6..8347c1166aef 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-distinct_over_window_full_frames_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-distinct_over_window_full_frames_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; PRAGMA DistinctOverWindow; @@ -14,6 +15,7 @@ SELECT subkey, key, value, + -- assuming ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING count(DISTINCT key) OVER () AS cnt_distinct_total, sum(DISTINCT key) OVER () AS sum_distinct_total, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-distinct_over_window_struct_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-distinct_over_window_struct_/formatted.sql index b5f5af5e2276..c88a4425ecda 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-distinct_over_window_struct_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-distinct_over_window_struct_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; PRAGMA DistinctOverWindow; $input = AsList( @@ -17,6 +18,7 @@ SELECT key, subkey, col, + -- assuming ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW count(DISTINCT col) OVER ( PARTITION BY @@ -38,6 +40,7 @@ SELECT key, subkey, col, + -- assuming ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING count(DISTINCT col) OVER ( PARTITION 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 bec6f356a890..a76f8ad3b258 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA warning("disable", "4520"); SELECT 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 b82a39422ba3..b26879e853a6 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA warning("disable", "4520"); SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_aggregations_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_aggregations_/formatted.sql index d676a40337a2..9dbd8675773c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_aggregations_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_aggregations_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT value, SUM(unwrap(CAST(subkey AS uint32))) OVER w1 AS sum1, @@ -10,7 +11,7 @@ FROM ( SELECT * FROM plato.Input - WHERE key = '1' + WHERE key == '1' ) WINDOW w1 AS (), diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_aggregations_compact_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_aggregations_compact_/formatted.sql index 96bc55d0f794..f70ee198a91c 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_aggregations_compact_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_aggregations_compact_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT value, SUM(unwrap(CAST(subkey AS uint32))) OVER w1 AS sum1, @@ -10,7 +11,7 @@ FROM ( SELECT * FROM plato.Input - WHERE key = '1' + WHERE key == '1' ) WINDOW w1 AS ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_aggregations_leadlag_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_aggregations_leadlag_/formatted.sql index 41cc79e8b73f..f6102e49b66f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_aggregations_leadlag_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_aggregations_leadlag_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT value, SUM(unwrap(CAST(subkey AS uint32))) OVER w1 AS sum1, @@ -9,7 +10,7 @@ FROM ( SELECT * FROM plato.Input - WHERE key = '1' + WHERE key == '1' ) WINDOW w1 AS ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_aggregations_leadlag_compact_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_aggregations_leadlag_compact_/formatted.sql index c4808b26efdd..182b681ee2c1 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_aggregations_leadlag_compact_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_aggregations_leadlag_compact_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT value, SUM(unwrap(CAST(subkey AS uint32))) OVER w1 AS sum1, @@ -9,7 +10,7 @@ FROM ( SELECT * FROM plato.Input - WHERE key = '1' + WHERE key == '1' ) WINDOW w1 AS ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_leadlag_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_leadlag_/formatted.sql index a232e50444d9..faa3585150f1 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_leadlag_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_leadlag_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $in = SELECT value, @@ -10,7 +11,7 @@ $in = SELECT * FROM plato.Input - WHERE key = '1' + WHERE key == '1' ) WINDOW w1 AS ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_leadlag_compact_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_leadlag_compact_/formatted.sql index a48580752026..46710ca01210 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_leadlag_compact_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_leadlag_compact_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $in = SELECT value, @@ -10,11 +11,11 @@ $in = SELECT * FROM plato.Input - WHERE key = '1' + WHERE key == '1' ) WINDOW w1 AS ( - PARTITION/*+ COMPACT() */ BY + PARTITION /*+ COMPACT() */ BY () ORDER BY 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 fe77d9dd16a4..45fa0bdda5d3 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 @@ -1,9 +1,10 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $input = ( SELECT * FROM plato.Input - WHERE key = '1' + WHERE key == '1' UNION ALL SELECT NULL AS key, 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 987cad75e674..a9d267517c79 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 @@ -1,9 +1,10 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $input = ( SELECT * FROM plato.Input - WHERE key = '1' + WHERE key == '1' UNION ALL SELECT NULL AS key, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_noncompact_with_tablerow_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_noncompact_with_tablerow_/formatted.sql index 9797452a3d79..79a161e164d6 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_noncompact_with_tablerow_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_noncompact_with_tablerow_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT key, subkey, 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 750775102070..e0cfe164371f 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; -- add non-optional partition key diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_session_aliases_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_session_aliases_/formatted.sql index c4fb9011cc6d..f621c99c77e2 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_session_aliases_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_session_aliases_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT user, ts, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_session_aliases_compact_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_session_aliases_compact_/formatted.sql index be5c637df54f..6f5b7427c922 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_session_aliases_compact_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_session_aliases_compact_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT user, ts, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_session_compact_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_session_compact_/formatted.sql index 148ef620a73e..5cc7d15f7f76 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_session_compact_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_session_compact_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT user, ts, 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 a6c817cd58e1..368981590e05 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; -- add non-optional partition key diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_syscolumns_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_syscolumns_/formatted.sql index 2492879a265b..7334ebdb159b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_syscolumns_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-full_syscolumns_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-generic_aggregations_after_current_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-generic_aggregations_after_current_/formatted.sql index d11ddd8535b0..6f9ad697d407 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-generic_aggregations_after_current_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-generic_aggregations_after_current_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT value, SUM(unwrap(CAST(subkey AS uint32))) OVER w1 AS sum1, @@ -10,7 +11,7 @@ FROM ( SELECT * FROM plato.Input - WHERE key = '1' + WHERE key == '1' ) WINDOW w1 AS ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-generic_aggregations_before_current_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-generic_aggregations_before_current_/formatted.sql index 3d2c5a094fc3..f54e80677e24 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-generic_aggregations_before_current_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-generic_aggregations_before_current_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT value, SUM(unwrap(CAST(subkey AS uint32))) OVER w1 AS sum1, @@ -10,7 +11,7 @@ FROM ( SELECT * FROM plato.Input - WHERE key = '1' + WHERE key == '1' ) WINDOW w1 AS ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-generic_aggregations_include_current_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-generic_aggregations_include_current_/formatted.sql index de00bf47b6e4..eb7f52c2e5a0 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-generic_aggregations_include_current_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-generic_aggregations_include_current_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT value, SUM(unwrap(CAST(subkey AS uint32))) OVER w1 AS sum1, @@ -10,7 +11,7 @@ FROM ( SELECT * FROM plato.Input - WHERE key = '1' + WHERE key == '1' ) WINDOW w1 AS ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-generic_aggregations_mixed_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-generic_aggregations_mixed_/formatted.sql index 068b33e14069..9b38af2ba4b4 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-generic_aggregations_mixed_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-generic_aggregations_mixed_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT value, SUM(unwrap(CAST(subkey AS uint32))) OVER w1 AS sum1, @@ -10,7 +11,7 @@ FROM ( SELECT * FROM plato.Input - WHERE key = '1' + WHERE key == '1' ) WINDOW w1 AS ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-generic_aggregations_mixed_leadlag_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-generic_aggregations_mixed_leadlag_/formatted.sql index 4fdc7d423541..de912360c967 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-generic_aggregations_mixed_leadlag_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-generic_aggregations_mixed_leadlag_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT value, SUM(unwrap(CAST(subkey AS uint32))) OVER w1 AS sum1, @@ -9,7 +10,7 @@ FROM ( SELECT * FROM plato.Input - WHERE key = '1' + WHERE key == '1' ) WINDOW w1 AS ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-generic_session_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-generic_session_/formatted.sql index c92da7d8c104..f548a836d6ae 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-generic_session_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-generic_session_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT user, ts, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-generic_session_aliases_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-generic_session_aliases_/formatted.sql index 1873d931e4af..156e92b6d032 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-generic_session_aliases_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-generic_session_aliases_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT user, ts, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-lagging_aggregations_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-lagging_aggregations_/formatted.sql index bc21fbbe0d5e..7809969a5fa1 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-lagging_aggregations_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-lagging_aggregations_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT value, SUM(unwrap(CAST(subkey AS uint32))) OVER w1 AS sum1, @@ -10,7 +11,7 @@ FROM ( SELECT * FROM plato.Input - WHERE key = '1' + WHERE key == '1' ) WINDOW w1 AS ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-lagging_aggregations_leadlag_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-lagging_aggregations_leadlag_/formatted.sql index 9d2369ab7625..f8ceb6c9765b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-lagging_aggregations_leadlag_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-lagging_aggregations_leadlag_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT value, SUM(unwrap(CAST(subkey AS uint32))) OVER w1 AS sum1, @@ -9,7 +10,7 @@ FROM ( SELECT * FROM plato.Input - WHERE key = '1' + WHERE key == '1' ) WINDOW w1 AS ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-leading_aggregations_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-leading_aggregations_/formatted.sql index dff1534e92c8..8a528df4962a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-leading_aggregations_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-leading_aggregations_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT value, SUM(unwrap(CAST(subkey AS uint32))) OVER w1 AS sum1, @@ -10,7 +11,7 @@ FROM ( SELECT * FROM plato.Input - WHERE key = '1' + WHERE key == '1' ) WINDOW w1 AS ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-leading_aggregations_leadlag_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-leading_aggregations_leadlag_/formatted.sql index 2e887641bfbe..9db81c5b82e3 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-leading_aggregations_leadlag_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-leading_aggregations_leadlag_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT value, SUM(unwrap(CAST(subkey AS uint32))) OVER w1 AS sum1, @@ -9,7 +10,7 @@ FROM ( SELECT * FROM plato.Input - WHERE key = '1' + WHERE key == '1' ) WINDOW w1 AS ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-mixed_aggregations_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-mixed_aggregations_/formatted.sql index 47f4f9391b4f..4d614f8a22b3 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-mixed_aggregations_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-mixed_aggregations_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT value, SUM(unwrap(CAST(subkey AS uint32))) OVER w1 AS sum1, @@ -9,7 +10,7 @@ FROM ( SELECT * FROM plato.Input - WHERE key = '1' + WHERE key == '1' ) WINDOW w1 AS ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-null_type_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-null_type_/formatted.sql index 9ccd62a35bfa..b409685a2ff5 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-null_type_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-null_type_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT min(x) OVER w, count(x) OVER w, 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 49576b82c745..b9666bb9a9ed 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA warning("disable", "4520"); PRAGMA AnsiRankForNullableKeys; 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 e5544df194a6..801f181accdc 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA warning("disable", "4520"); PRAGMA DisableAnsiRankForNullableKeys; 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 144571bd8433..77473247bc14 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA warning("disable", "4520"); PRAGMA AnsiRankForNullableKeys; @@ -19,7 +20,7 @@ FROM ( subkey, value FROM plato.Input - WHERE key = '1' + WHERE key == '1' ) WINDOW w1 AS ( 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 bcc8f6b2a0b0..a3eed096bb91 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA warning("disable", "4520"); PRAGMA AnsiRankForNullableKeys; @@ -17,7 +18,7 @@ FROM ( SELECT * FROM plato.Input - WHERE key = '1' + WHERE key == '1' ) WINDOW w1 AS ( 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 9b996dfa3c53..08a109001b97 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,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA warning("disable", "4520"); PRAGMA warning("disable", "4521"); PRAGMA AnsiRankForNullableKeys; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-row_number_to_map_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-row_number_to_map_/formatted.sql index 13c641636d0c..112318500709 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-row_number_to_map_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-row_number_to_map_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-row_number_to_map_multiple_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-row_number_to_map_multiple_/formatted.sql index a8892c09543a..d9fff213695a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-row_number_to_map_multiple_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-row_number_to_map_multiple_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-row_number_to_map_noncompact_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-row_number_to_map_noncompact_/formatted.sql index e4d7e5e48b02..f952a8c53546 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-row_number_to_map_noncompact_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-row_number_to_map_noncompact_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; 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 995679911659..37e1683ef3d3 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,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ $f = AggregationFactory( "UDAF", ($item, $_) -> ($item), diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-udaf_window_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-udaf_window_/formatted.sql index 3f5d5ce54728..8f9fe8c8d278 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-udaf_window_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-udaf_window_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ $script = @@ import heapq import json 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 0ee1be5eac1e..50b442f9d9dc 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $data = ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_by_all_avg_interval_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_by_all_avg_interval_/formatted.sql index ab8329d6feb8..7dd02abc0b92 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_by_all_avg_interval_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_by_all_avg_interval_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $data = ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_by_all_percentile_interval_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_by_all_percentile_interval_/formatted.sql index d8e93e2c2b10..4771849c7186 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_by_all_percentile_interval_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_by_all_percentile_interval_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $zero = unwrap(CAST(0 AS Interval)); diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_expr_bounds_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_expr_bounds_/formatted.sql index 8ff421d05902..42cc844cd30d 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_expr_bounds_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_expr_bounds_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; DECLARE $begin AS Int32; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_auto_arg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_auto_arg_/formatted.sql index 20d7f03bc45b..2548487b4edc 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_auto_arg_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_auto_arg_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; PRAGMA DisableAnsiRankForNullableKeys; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_auto_arg_selective_rank_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_auto_arg_selective_rank_/formatted.sql index 6774304dd161..ffbc24f51f83 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_auto_arg_selective_rank_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_auto_arg_selective_rank_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; PRAGMA DisableSimpleColumns; PRAGMA DisableAnsiRankForNullableKeys; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_auto_arg_two_sort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_auto_arg_two_sort_/formatted.sql index b063bd37f707..ea0ee596caf5 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_auto_arg_two_sort_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_auto_arg_two_sort_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; PRAGMA DisableAnsiRankForNullableKeys; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_first_last_over_nonopt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_first_last_over_nonopt_/formatted.sql index c9c9cb002014..0bc972ed3777 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_first_last_over_nonopt_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_first_last_over_nonopt_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ SELECT key, FIRST_VALUE(key) RESPECT NULLS OVER w1, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_order_by_udf_empty_rank_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_order_by_udf_empty_rank_/formatted.sql index 25b0aadf201a..1d2ceae6601e 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_order_by_udf_empty_rank_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_order_by_udf_empty_rank_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA DisableAnsiRankForNullableKeys; USE plato; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_over_group_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_over_group_by_/formatted.sql index 399675162a96..e2395849803d 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_over_group_by_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_over_group_by_/formatted.sql @@ -19,6 +19,7 @@ FROM $data GROUP BY region, SUBSTRING(name, 0, 1) AS prefix + -- how to use single avg_age? WINDOW w1 AS ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_over_group_by_compl_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_over_group_by_compl_/formatted.sql index 5a8f4465108a..e5dba381aab6 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_over_group_by_compl_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_over_group_by_compl_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $data = ( @@ -14,6 +15,7 @@ SELECT prefix, region, region + 2 AS region_2, + --age, avg(age) AS avg_age, sum(age) AS sum_age, @@ -25,6 +27,7 @@ FROM $data GROUP BY region, SUBSTRING(name, 0, 1) AS prefix + -- how to use single avg_age? WINDOW w1 AS ( @@ -33,6 +36,7 @@ WINDOW ORDER BY avg(age) DESC ) + --window w1 as (order by avg(age) desc) ORDER BY region, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_over_group_by_list_names_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_over_group_by_list_names_/formatted.sql index 9a488e061f77..d5900048c233 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_over_group_by_list_names_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_over_group_by_list_names_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $data = ( @@ -14,6 +15,7 @@ SELECT prefix, region, region + 2 AS region_2, + --age, avg(age) AS avg_age, sum(age) AS sum_age, @@ -27,6 +29,7 @@ FROM $data GROUP BY region, SUBSTRING(name, 0, 1) AS prefix + -- how to use single avg_age? WINDOW w1 AS ( @@ -36,6 +39,7 @@ WINDOW avg(age) DESC, prefix ) + --window w1 as (order by avg(age) desc) ORDER BY region, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_over_group_by_list_names_order_prefix_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_over_group_by_list_names_order_prefix_/formatted.sql index 17337461eb2b..15a95079bd79 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_over_group_by_list_names_order_prefix_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_over_group_by_list_names_order_prefix_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; $data = ( diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_part_by_expr_new_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_part_by_expr_new_/formatted.sql index 1c9a5669ee9e..f819eb219605 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_part_by_expr_new_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_part_by_expr_new_/formatted.sql @@ -1,4 +1,6 @@ -/* postgres can not *//* syntax version 1 */-- YQL-1977 +/* postgres can not */ +/* syntax version 1 */ +-- YQL-1977 USE plato; --insert into Output diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_all_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_all_/formatted.sql index 441845b0e153..f04b1a1db6b5 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_all_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_all_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; PRAGMA DisableAnsiRankForNullableKeys; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_opt_all_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_opt_all_/formatted.sql index ea216d29a043..6a0656a329d0 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_opt_all_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_opt_all_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; PRAGMA DisableAnsiRankForNullableKeys; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_opt_part_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_opt_part_/formatted.sql index b73c88382676..aed0e1e2d136 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_opt_part_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_opt_part_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; PRAGMA DisableAnsiRankForNullableKeys; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_part_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_part_/formatted.sql index c99af90e5f87..5624c1157792 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_part_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_part_/formatted.sql @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; PRAGMA DisableAnsiRankForNullableKeys; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_fuse_window_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_fuse_window_/formatted.sql index f50aa7410a19..138e04b83fe0 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_fuse_window_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_fuse_window_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; $data = ( @@ -46,15 +47,13 @@ WINDOW ORDER BY value ROWS UNBOUNDED PRECEDING - ), - -- = w1 + ), -- = w1 w4 AS ( ORDER BY key, subkey ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW - ), - -- = w2 + ), -- = w2 w5 AS ( PARTITION BY subkey, @@ -62,8 +61,7 @@ WINDOW ORDER BY value ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW - ) --- = w1 + ) -- = w1 ORDER BY key, subkey; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_group_peephole_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_group_peephole_/formatted.sql index db93813a8728..9c9674047843 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_group_peephole_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_group_peephole_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = SELECT 'john' AS name, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_over_joined_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_over_joined_/formatted.sql index d915371d490b..e23af8700d8a 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_over_joined_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_over_joined_/formatted.sql @@ -11,7 +11,7 @@ JOIN ( 0 AS id ) AS m -ON r.id = m.id +ON r.id == m.id WINDOW w AS ( PARTITION BY diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_peephole_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_peephole_/formatted.sql index b27bfd5cd229..d6ce1e0861d7 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_peephole_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_peephole_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t = SELECT 'john' AS name, diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_peephole_double_usage_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_peephole_double_usage_/formatted.sql index 79eae5071c29..8231d89052c6 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_peephole_double_usage_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_peephole_double_usage_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $input = SELECT * diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-yql-14479_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-yql-14479_/formatted.sql index e6bcbe9b5a8e..34fbd88cc91b 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-yql-14479_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-yql-14479_/formatted.sql @@ -1,4 +1,5 @@ -/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 4 *//* ignore plan diff */ +/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 4 */ +/* ignore plan diff */ USE plato; SELECT 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 9eb4b1262b35..fd8e500fe8b1 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 @@ -1,4 +1,5 @@ -/* postgres can not *//* syntax version 1 */ +/* postgres can not */ +/* syntax version 1 */ USE plato; SELECT 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 0492f289ea20..f37aee64dd98 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 @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ USE plato; INSERT INTO @tmp diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-yql-18879_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-yql-18879_/formatted.sql index b4a210eb4ce4..a9dfcd25e717 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-yql-18879_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-yql-18879_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ $t1 = AsList( AsStruct(100 AS itemid, 20 AS duration, 2 AS start_shows, 1 AS day), AsStruct(1001 AS itemid, 10 AS duration, 2 AS start_shows, 1 AS day), diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ypath-complex_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ypath-complex_/formatted.sql index f6895d1f860a..ab48e4a38742 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ypath-complex_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ypath-complex_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT * FROM plato.`Input[#0:#2,"075",#7:#9,("150","2"):("150","5")]`; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ypath-direct_read_from_dynamic_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ypath-direct_read_from_dynamic_/formatted.sql index 54f2aeedda4c..b13cfb870171 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ypath-direct_read_from_dynamic_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ypath-direct_read_from_dynamic_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ PRAGMA direct_read; SELECT diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ypath-limit_with_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ypath-limit_with_key_/formatted.sql index 4e136cef4142..5d75270c575f 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ypath-limit_with_key_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ypath-limit_with_key_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT * FROM plato.`Input["150"]` diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ypath-limit_with_range_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ypath-limit_with_range_/formatted.sql index 5b335782e875..ff2204d63b60 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ypath-limit_with_range_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ypath-limit_with_range_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT * FROM plato.`Input[#1:#4]` diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ypath-multi_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ypath-multi_key_/formatted.sql index cfaa9c87c827..efe3cadb8d95 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ypath-multi_key_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ypath-multi_key_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT * FROM plato.`Input[("150","2"):("150","5"),"075"]`; diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ypath-multi_range_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ypath-multi_range_/formatted.sql index 98dde1a98baa..3399e8d83aaf 100644 --- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ypath-multi_range_/formatted.sql +++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ypath-multi_range_/formatted.sql @@ -1,4 +1,5 @@ -/* syntax version 1 *//* postgres can not */ +/* syntax version 1 */ +/* postgres can not */ SELECT * FROM plato.`Input[#0:#2,#4:#7]`; diff --git a/yql/essentials/tools/sql_formatter/sql_formatter.cpp b/yql/essentials/tools/sql_formatter/sql_formatter.cpp index e5182cd1f010..1cbde29ab39f 100644 --- a/yql/essentials/tools/sql_formatter/sql_formatter.cpp +++ b/yql/essentials/tools/sql_formatter/sql_formatter.cpp @@ -52,7 +52,7 @@ int RunFormat(int argc, char* argv[]) { ++errors; Cerr << "Error formatting query: " << issues.ToString() << Endl; } else { - out << frm_query << Endl; + out << frm_query; } return errors; From aef70c15939a1fa89935914b733f13936c45f19d Mon Sep 17 00:00:00 2001 From: robot-piglet Date: Wed, 27 Nov 2024 08:31:00 +0300 Subject: [PATCH 7/9] Intermediate changes commit_hash:021a1111fd99e9a49c82003d252a68932f4db9f0 --- contrib/python/contourpy/.dist-info/METADATA | 72 +++++++++---------- .../python/contourpy/contourpy/_contourpy.pyi | 3 +- .../python/contourpy/contourpy/_version.py | 2 +- contrib/python/contourpy/contourpy/array.py | 4 +- contrib/python/contourpy/contourpy/convert.py | 3 +- .../contourpy/util/bokeh_renderer.py | 7 +- .../contourpy/contourpy/util/mpl_renderer.py | 3 +- .../contourpy/contourpy/util/mpl_util.py | 3 +- contrib/python/contourpy/ya.make | 2 +- 9 files changed, 51 insertions(+), 48 deletions(-) diff --git a/contrib/python/contourpy/.dist-info/METADATA b/contrib/python/contourpy/.dist-info/METADATA index 55e5c6d8e0e3..fa2550faeadd 100644 --- a/contrib/python/contourpy/.dist-info/METADATA +++ b/contrib/python/contourpy/.dist-info/METADATA @@ -1,44 +1,44 @@ Metadata-Version: 2.1 Name: contourpy -Version: 1.3.0 +Version: 1.3.1 Summary: Python library for calculating contours of 2D quadrilateral grids Author-Email: Ian Thomas License: BSD 3-Clause License - - Copyright (c) 2021-2024, ContourPy Developers. - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - 3. Neither the name of the copyright holder nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + Copyright (c) 2021-2024, ContourPy Developers. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + 3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + Classifier: Development Status :: 5 - Production/Stable Classifier: Intended Audience :: Developers Classifier: Intended Audience :: Science/Research Classifier: License :: OSI Approved :: BSD License Classifier: Programming Language :: C++ Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.9 Classifier: Programming Language :: Python :: 3.10 Classifier: Programming Language :: Python :: 3.11 Classifier: Programming Language :: Python :: 3.12 @@ -50,30 +50,30 @@ Project-URL: Homepage, https://github.com/contourpy/contourpy Project-URL: Changelog, https://contourpy.readthedocs.io/en/latest/changelog.html Project-URL: Documentation, https://contourpy.readthedocs.io Project-URL: Repository, https://github.com/contourpy/contourpy -Requires-Python: >=3.9 +Requires-Python: >=3.10 Requires-Dist: numpy>=1.23 +Provides-Extra: docs Requires-Dist: furo; extra == "docs" Requires-Dist: sphinx>=7.2; extra == "docs" Requires-Dist: sphinx-copybutton; extra == "docs" +Provides-Extra: bokeh Requires-Dist: bokeh; extra == "bokeh" Requires-Dist: selenium; extra == "bokeh" +Provides-Extra: mypy Requires-Dist: contourpy[bokeh,docs]; extra == "mypy" Requires-Dist: docutils-stubs; extra == "mypy" Requires-Dist: mypy==1.11.1; extra == "mypy" Requires-Dist: types-Pillow; extra == "mypy" +Provides-Extra: test Requires-Dist: contourpy[test-no-images]; extra == "test" Requires-Dist: matplotlib; extra == "test" Requires-Dist: Pillow; extra == "test" +Provides-Extra: test-no-images Requires-Dist: pytest; extra == "test-no-images" Requires-Dist: pytest-cov; extra == "test-no-images" Requires-Dist: pytest-rerunfailures; extra == "test-no-images" Requires-Dist: pytest-xdist; extra == "test-no-images" Requires-Dist: wurlitzer; extra == "test-no-images" -Provides-Extra: docs -Provides-Extra: bokeh -Provides-Extra: mypy -Provides-Extra: test -Provides-Extra: test-no-images Description-Content-Type: text/markdown ContourPy diff --git a/contrib/python/contourpy/contourpy/_contourpy.pyi b/contrib/python/contourpy/contourpy/_contourpy.pyi index c79cf8251a60..5f44eace52ab 100644 --- a/contrib/python/contourpy/contourpy/_contourpy.pyi +++ b/contrib/python/contourpy/contourpy/_contourpy.pyi @@ -1,8 +1,7 @@ -from typing import ClassVar, NoReturn +from typing import ClassVar, NoReturn, TypeAlias import numpy as np import numpy.typing as npt -from typing_extensions import TypeAlias import contourpy._contourpy as cpy diff --git a/contrib/python/contourpy/contourpy/_version.py b/contrib/python/contourpy/contourpy/_version.py index 67bc602abf06..9c73af26be70 100644 --- a/contrib/python/contourpy/contourpy/_version.py +++ b/contrib/python/contourpy/contourpy/_version.py @@ -1 +1 @@ -__version__ = "1.3.0" +__version__ = "1.3.1" diff --git a/contrib/python/contourpy/contourpy/array.py b/contrib/python/contourpy/contourpy/array.py index 5b41fb2589b3..a7054fae1dc2 100644 --- a/contrib/python/contourpy/contourpy/array.py +++ b/contrib/python/contourpy/contourpy/array.py @@ -1,6 +1,6 @@ from __future__ import annotations -from itertools import chain +from itertools import chain, pairwise from typing import TYPE_CHECKING import numpy as np @@ -258,4 +258,4 @@ def split_points_at_nan(points: cpy.PointArray) -> list[cpy.PointArray]: return [points] else: nan_offsets = np.concatenate(([-1], nan_offsets, [len(points)])) - return [points[s+1:e] for s, e in zip(nan_offsets[:-1], nan_offsets[1:])] + return [points[s+1:e] for s, e in pairwise(nan_offsets)] diff --git a/contrib/python/contourpy/contourpy/convert.py b/contrib/python/contourpy/contourpy/convert.py index 92adbbb5b660..ebdb1af8bf2f 100644 --- a/contrib/python/contourpy/contourpy/convert.py +++ b/contrib/python/contourpy/contourpy/convert.py @@ -1,5 +1,6 @@ from __future__ import annotations +from itertools import pairwise from typing import TYPE_CHECKING, cast import numpy as np @@ -212,7 +213,7 @@ def _convert_filled_from_ChunkCombinedOffsetOffset( assert outer_offsets is not None if len(outer_offsets) > 2: separate_offsets += [offsets[s:e+1] - offsets[s] for s, e in - zip(outer_offsets[:-1], outer_offsets[1:])] + pairwise(outer_offsets)] else: separate_offsets.append(offsets) separate_points += arr.split_points_by_offsets(points, offsets[outer_offsets]) diff --git a/contrib/python/contourpy/contourpy/util/bokeh_renderer.py b/contrib/python/contourpy/contourpy/util/bokeh_renderer.py index a8a10e8ad358..e20dc9cfe585 100644 --- a/contrib/python/contourpy/contourpy/util/bokeh_renderer.py +++ b/contrib/python/contourpy/contourpy/util/bokeh_renderer.py @@ -162,8 +162,9 @@ def grid( list(np.stack((y[:-1, 1:].ravel(), ymid, y[1:, :-1].ravel()), axis=1)), **kwargs) if point_color is not None: - fig.circle( - x=x.ravel(), y=y.ravel(), fill_color=color, line_color=None, alpha=alpha, size=8) + fig.scatter( + x=x.ravel(), y=y.ravel(), fill_color=color, line_color=None, alpha=alpha, + marker="circle", size=8) def lines( self, @@ -221,7 +222,7 @@ def mask( fig = self._get_figure(ax) color = self._convert_color(color) x, y = self._grid_as_2d(x, y) - fig.circle(x[mask], y[mask], fill_color=color, size=10) + fig.scatter(x[mask], y[mask], fill_color=color, marker="circle", size=10) def save( self, diff --git a/contrib/python/contourpy/contourpy/util/mpl_renderer.py b/contrib/python/contourpy/contourpy/util/mpl_renderer.py index e078ca28f7ae..401c9056ffe4 100644 --- a/contrib/python/contourpy/contourpy/util/mpl_renderer.py +++ b/contrib/python/contourpy/contourpy/util/mpl_renderer.py @@ -1,6 +1,7 @@ from __future__ import annotations import io +from itertools import pairwise from typing import TYPE_CHECKING, Any, cast import matplotlib.collections as mcollections @@ -404,7 +405,7 @@ def filled( for points, offsets in zip(*filled): if points is None: continue - for start, end in zip(offsets[:-1], offsets[1:]): + for start, end in pairwise(offsets): xys = points[start:end] ax.plot(xys[:, 0], xys[:, 1], c=line_color, alpha=line_alpha) diff --git a/contrib/python/contourpy/contourpy/util/mpl_util.py b/contrib/python/contourpy/contourpy/util/mpl_util.py index 10a2ccdb2357..d8587798c499 100644 --- a/contrib/python/contourpy/contourpy/util/mpl_util.py +++ b/contrib/python/contourpy/contourpy/util/mpl_util.py @@ -1,5 +1,6 @@ from __future__ import annotations +from itertools import pairwise from typing import TYPE_CHECKING, cast import matplotlib.path as mpath @@ -67,7 +68,7 @@ def lines_to_mpl_paths(lines: LineReturn, line_type: LineType) -> list[mpath.Pat continue nan_offsets = np.nonzero(np.isnan(points[:, 0]))[0] nan_offsets = np.concatenate([[-1], nan_offsets, [len(points)]]) - for s, e in zip(nan_offsets[:-1], nan_offsets[1:]): + for s, e in pairwise(nan_offsets): line = points[s+1:e] closed = line[0, 0] == line[-1, 0] and line[0, 1] == line[-1, 1] paths.append(mpath.Path(line, closed=closed)) diff --git a/contrib/python/contourpy/ya.make b/contrib/python/contourpy/ya.make index 7c9cf3ac75e2..ef656cef3db7 100644 --- a/contrib/python/contourpy/ya.make +++ b/contrib/python/contourpy/ya.make @@ -2,7 +2,7 @@ PY3_LIBRARY() -VERSION(1.3.0) +VERSION(1.3.1) LICENSE(BSD-3-Clause) From ff78bafb462422627b4d50a16d045c3300f2e9de Mon Sep 17 00:00:00 2001 From: robot-contrib Date: Wed, 27 Nov 2024 08:31:01 +0300 Subject: [PATCH 8/9] Update contrib/libs/googleapis-common-protos to 1.66.0 commit_hash:49a8384b9b799da61f479b8e4cdf8c370bcb9b6f --- .../googleapis-common-protos/CHANGELOG.md | 11 +++++++ .../google/api/client.proto | 17 ++++++++++ .../google/api/error_reason.proto | 33 +++++++++++++++++++ .../google/api/httpbody.proto | 1 - .../google/api/metric.proto | 19 +++++++++++ .../google/api/policy.proto | 6 ++-- .../google/api/quota.proto | 4 +-- contrib/libs/googleapis-common-protos/ya.make | 4 +-- 8 files changed, 86 insertions(+), 9 deletions(-) diff --git a/contrib/libs/googleapis-common-protos/CHANGELOG.md b/contrib/libs/googleapis-common-protos/CHANGELOG.md index 299993a24b05..e90da5a94aa0 100644 --- a/contrib/libs/googleapis-common-protos/CHANGELOG.md +++ b/contrib/libs/googleapis-common-protos/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## [1.66.0](https://github.com/googleapis/python-api-common-protos/compare/v1.65.0...v1.66.0) (2024-11-12) + + +### Features + +* Add `MISSING_ORIGIN` and `OVERLOADED_CREDENTIALS` to `ErrorReason` enum ([d0478d8](https://github.com/googleapis/python-api-common-protos/commit/d0478d8beacb6c53aa29aa0ac14b949421de8112)) +* Add field `protobuf_pythonic_types_enabled` to `ExperimentalFeatures` message ([d0478d8](https://github.com/googleapis/python-api-common-protos/commit/d0478d8beacb6c53aa29aa0ac14b949421de8112)) +* Add field `selective_gapic_generation` to `CommonLanguageSettings` message ([d0478d8](https://github.com/googleapis/python-api-common-protos/commit/d0478d8beacb6c53aa29aa0ac14b949421de8112)) +* Add field `time_series_resource_hierarchy_level` to `MetricDescriptorMetadata` message ([d0478d8](https://github.com/googleapis/python-api-common-protos/commit/d0478d8beacb6c53aa29aa0ac14b949421de8112)) +* Add message `SelectiveGapicGeneration` ([d0478d8](https://github.com/googleapis/python-api-common-protos/commit/d0478d8beacb6c53aa29aa0ac14b949421de8112)) + ## [1.65.0](https://github.com/googleapis/python-api-common-protos/compare/v1.64.0...v1.65.0) (2024-08-27) diff --git a/contrib/libs/googleapis-common-protos/google/api/client.proto b/contrib/libs/googleapis-common-protos/google/api/client.proto index 211575880c1e..6003be5307af 100644 --- a/contrib/libs/googleapis-common-protos/google/api/client.proto +++ b/contrib/libs/googleapis-common-protos/google/api/client.proto @@ -124,6 +124,9 @@ message CommonLanguageSettings { // The destination where API teams want this client library to be published. repeated ClientLibraryDestination destinations = 2; + + // Configuration for which RPCs should be generated in the GAPIC client. + SelectiveGapicGeneration selective_gapic_generation = 3; } // Details about how and where to publish client libraries. @@ -272,6 +275,12 @@ message PythonSettings { // This feature will be enabled by default 1 month after launching the // feature in preview packages. bool rest_async_io_enabled = 1; + + // Enables generation of protobuf code using new types that are more + // Pythonic which are included in `protobuf>=5.29.x`. This feature will be + // enabled by default 1 month after launching the feature in preview + // packages. + bool protobuf_pythonic_types_enabled = 2; } // Some settings. @@ -443,3 +452,11 @@ enum ClientLibraryDestination { // Publish the library to package managers like nuget.org and npmjs.com. PACKAGE_MANAGER = 20; } + +// This message is used to configure the generation of a subset of the RPCs in +// a service for client libraries. +message SelectiveGapicGeneration { + // An allowlist of the fully qualified names of RPCs that should be included + // on public client surfaces. + repeated string methods = 1; +} diff --git a/contrib/libs/googleapis-common-protos/google/api/error_reason.proto b/contrib/libs/googleapis-common-protos/google/api/error_reason.proto index a5a8ca57c837..e442c7b30563 100644 --- a/contrib/libs/googleapis-common-protos/google/api/error_reason.proto +++ b/contrib/libs/googleapis-common-protos/google/api/error_reason.proto @@ -586,4 +586,37 @@ enum ErrorReason { // "locations/asia-northeast3" violates at least one location policy. // The troubleshooting guidance is provided in the Help links. LOCATION_POLICY_VIOLATED = 31; + + // The request is denied because origin request header is missing. + // + // Example of an ErrorInfo when + // accessing "pubsub.googleapis.com" service with an empty "Origin" request + // header. + // + // { + // reason: "MISSING_ORIGIN" + // domain: "googleapis.com" + // metadata { + // "consumer":"projects/123456" + // "service": "pubsub.googleapis.com" + // } + // } + MISSING_ORIGIN = 33; + + // The request is denied because the request contains more than one credential + // type that are individually acceptable, but not together. The customer + // should retry their request with only one set of credentials. + // + // Example of an ErrorInfo when + // accessing "pubsub.googleapis.com" service with overloaded credentials. + // + // { + // reason: "OVERLOADED_CREDENTIALS" + // domain: "googleapis.com" + // metadata { + // "consumer":"projects/123456" + // "service": "pubsub.googleapis.com" + // } + // } + OVERLOADED_CREDENTIALS = 34; } diff --git a/contrib/libs/googleapis-common-protos/google/api/httpbody.proto b/contrib/libs/googleapis-common-protos/google/api/httpbody.proto index 920612dc7225..32952715de5b 100644 --- a/contrib/libs/googleapis-common-protos/google/api/httpbody.proto +++ b/contrib/libs/googleapis-common-protos/google/api/httpbody.proto @@ -18,7 +18,6 @@ package google.api; import "google/protobuf/any.proto"; -option cc_enable_arenas = true; option go_package = "google.golang.org/genproto/googleapis/api/httpbody;httpbody"; option java_multiple_files = true; option java_outer_classname = "HttpBodyProto"; diff --git a/contrib/libs/googleapis-common-protos/google/api/metric.proto b/contrib/libs/googleapis-common-protos/google/api/metric.proto index 126f526cd076..c393a421c54f 100644 --- a/contrib/libs/googleapis-common-protos/google/api/metric.proto +++ b/contrib/libs/googleapis-common-protos/google/api/metric.proto @@ -80,6 +80,21 @@ message MetricDescriptor { // Additional annotations that can be used to guide the usage of a metric. message MetricDescriptorMetadata { + // The resource hierarchy level of the timeseries data of a metric. + enum TimeSeriesResourceHierarchyLevel { + // Do not use this default value. + TIME_SERIES_RESOURCE_HIERARCHY_LEVEL_UNSPECIFIED = 0; + + // Scopes a metric to a project. + PROJECT = 1; + + // Scopes a metric to an organization. + ORGANIZATION = 2; + + // Scopes a metric to a folder. + FOLDER = 3; + } + // Deprecated. Must use the // [MetricDescriptor.launch_stage][google.api.MetricDescriptor.launch_stage] // instead. @@ -95,6 +110,10 @@ message MetricDescriptor { // age are guaranteed to be ingested and available to be read, excluding // data loss due to errors. google.protobuf.Duration ingest_delay = 3; + + // The scope of the timeseries data of the metric. + repeated TimeSeriesResourceHierarchyLevel + time_series_resource_hierarchy_level = 4; } // The resource name of the metric descriptor. diff --git a/contrib/libs/googleapis-common-protos/google/api/policy.proto b/contrib/libs/googleapis-common-protos/google/api/policy.proto index 25b75f3a47de..f55e0cae3fe0 100644 --- a/contrib/libs/googleapis-common-protos/google/api/policy.proto +++ b/contrib/libs/googleapis-common-protos/google/api/policy.proto @@ -25,16 +25,14 @@ option java_outer_classname = "PolicyProto"; option java_package = "com.google.api"; option objc_class_prefix = "GAPI"; -// Provides `google.api.field_policy` annotation at proto fields. extend google.protobuf.FieldOptions { // See [FieldPolicy][]. - FieldPolicy field_policy = 158361448; + google.api.FieldPolicy field_policy = 158361448; } -// Provides `google.api.method_policy` annotation at proto methods. extend google.protobuf.MethodOptions { // See [MethodPolicy][]. - MethodPolicy method_policy = 161893301; + google.api.MethodPolicy method_policy = 161893301; } // Google API Policy Annotation diff --git a/contrib/libs/googleapis-common-protos/google/api/quota.proto b/contrib/libs/googleapis-common-protos/google/api/quota.proto index eb80cb6f0270..25adb344cd9f 100644 --- a/contrib/libs/googleapis-common-protos/google/api/quota.proto +++ b/contrib/libs/googleapis-common-protos/google/api/quota.proto @@ -161,8 +161,8 @@ message QuotaLimit { string metric = 8; // Specify the unit of the quota limit. It uses the same syntax as - // [Metric.unit][]. The supported unit kinds are determined by the quota - // backend system. + // [MetricDescriptor.unit][google.api.MetricDescriptor.unit]. The supported + // unit kinds are determined by the quota backend system. // // Here are some examples: // * "1/min/{project}" for quota per minute per project. diff --git a/contrib/libs/googleapis-common-protos/ya.make b/contrib/libs/googleapis-common-protos/ya.make index a26cbeebcc20..32513d48a792 100644 --- a/contrib/libs/googleapis-common-protos/ya.make +++ b/contrib/libs/googleapis-common-protos/ya.make @@ -6,9 +6,9 @@ LICENSE(Apache-2.0) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(1.65.0) +VERSION(1.66.0) -ORIGINAL_SOURCE(https://github.com/googleapis/python-api-common-protos/archive/v1.65.0.tar.gz) +ORIGINAL_SOURCE(https://github.com/googleapis/python-api-common-protos/archive/v1.66.0.tar.gz) PY_NAMESPACE(.) From c4749b04e0f7b0c64f0e18e78b2f95b13af35050 Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Wed, 27 Nov 2024 09:43:09 +0000 Subject: [PATCH 9/9] Import libraries 241127-0941 --- ydb/ci/rightlib.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ydb/ci/rightlib.txt b/ydb/ci/rightlib.txt index e030d03f44fc..48acab7cd5ab 100644 --- a/ydb/ci/rightlib.txt +++ b/ydb/ci/rightlib.txt @@ -1 +1 @@ -340bba021b6bfc06bd2e90baed24cd3ea899f8de +ff78bafb462422627b4d50a16d045c3300f2e9de