Merge pull request #12088 from ydb-platform/mergelibs-241128-1021

Library import 241128-1021

1366 files changed, 6950 insertions, 4717 deletions

diff --git a/yql/essentials/core/common_opt/yql_co_pgselect.cpp b/yql/essentials/core/common_opt/yql_co_pgselect.cpp
index 23bda07d7a..93b307aab7 100644
--- a/yql/essentials/core/common_opt/yql_co_pgselect.cpp
+++ b/yql/essentials/core/common_opt/yql_co_pgselect.cpp
@@ -818,7 +818,9 @@ TExprNode::TPtr NormalizeColumnOrder(const TExprNode::TPtr& node, const TColumnO
 }
 
 TExprNode::TPtr ExpandPositionalUnionAll(const TExprNode& node, const TVector<TColumnOrder>& columnOrders,
-    TExprNode::TListType children, TExprContext& ctx, TOptimizeContext& optCtx) {
+    TExprNode::TListType children, TExprContext& ctx, TOptimizeContext& optCtx)
+{
+    YQL_ENSURE(node.IsCallable({"UnionAllPositional", "UnionMergePositional"}));
     auto targetColumnOrder = optCtx.Types->LookupColumnOrder(node);
     YQL_ENSURE(targetColumnOrder);
 
@@ -828,7 +830,7 @@ TExprNode::TPtr ExpandPositionalUnionAll(const TExprNode& node, const TVector<TC
         child = NormalizeColumnOrder(child, childColumnOrder, *targetColumnOrder, ctx);
     }
 
-    auto res = ctx.NewCallable(node.Pos(), "UnionAll", std::move(children));
+    auto res = ctx.NewCallable(node.Pos(), node.IsCallable("UnionAllPositional") ? "UnionAll" : "UnionMerge", std::move(children));
     return KeepColumnOrder(res, node, ctx, *optCtx.Types);
 }
 
@@ -1575,7 +1577,7 @@ std::tuple<TVector<ui32>, TExprNode::TListType> BuildJoinGroups(TPositionHandle
             for (auto e: leftIdxs) {
                 newIndexes.emplace(e);
             }
-            
+
             auto cartesian = JoinColumns(pos, current, with, nullptr, {}, ctx);
             if (joinType == "cross") {
                 stackInputIdxs.emplace_back(std::move(newIndexes));
@@ -3222,7 +3224,7 @@ TExprNode::TPtr EnumerateForExtColumns(TPositionHandle pos, const TExprNode::TPt
 TExprNode::TPtr ApplyOffsetLimitOverEnumerated(TPositionHandle pos, const TExprNode::TPtr& list,
     const TExprNode::TPtr& offsetValue, const TExprNode::TPtr& limitValue, TExprContext& ctx) {
     auto arg = ctx.NewArgument(pos, "row");
-    auto member = ctx.NewCallable(pos, "SafeCast", { 
+    auto member = ctx.NewCallable(pos, "SafeCast", {
         ctx.NewCallable(pos, "Member", { arg, ctx.NewAtom(pos, "_yql_row_number") }),
         ctx.NewAtom(pos, "Int64")});
     auto int8type = ctx.NewCallable(pos, "PgType", { ctx.NewAtom(pos, "int8")});
@@ -3898,7 +3900,7 @@ TExprNode::TPtr ExpandPgSelectImpl(const TExprNode::TPtr& node, TExprContext& ct
 
                 auto directions = BuildSortDirections(node->Pos(), sort, ctx);
                 if (!finalExtTypes) {
-                    list = BuildSort(node->Pos(), list, directions, sortLambdaRoot, sortLambda->HeadPtr(), ctx);    
+                    list = BuildSort(node->Pos(), list, directions, sortLambdaRoot, sortLambda->HeadPtr(), ctx);
                 } else if (onlyOneSetItem && finalExtTypes) {
                     finalSortDirections = directions;
                     finalSortLambda = sortLambda;
diff --git a/yql/essentials/core/common_opt/yql_co_simple1.cpp b/yql/essentials/core/common_opt/yql_co_simple1.cpp
index 00432ffc5b..76c39f5f82 100644
--- a/yql/essentials/core/common_opt/yql_co_simple1.cpp
+++ b/yql/essentials/core/common_opt/yql_co_simple1.cpp
@@ -6505,7 +6505,7 @@ void RegisterCoSimpleCallables1(TCallableOptimizerMap& map) {
         return node;
     };
 
-    map["UnionAllPositional"] = [](const TExprNode::TPtr& node, TExprContext& ctx, TOptimizeContext& optCtx) {
+    map["UnionAllPositional"] = map["UnionMergePositional"] = [](const TExprNode::TPtr& node, TExprContext& ctx, TOptimizeContext& optCtx) {
         YQL_CLOG(DEBUG, Core) << "Expand " << node->Content();
         if (node->ChildrenSize() == 1) {
             return node->HeadPtr();
diff --git a/yql/essentials/core/facade/yql_facade.h b/yql/essentials/core/facade/yql_facade.h
index 3c2092e699..23aa2bd2b4 100644
--- a/yql/essentials/core/facade/yql_facade.h
+++ b/yql/essentials/core/facade/yql_facade.h
@@ -386,9 +386,9 @@ private:
 
     TAstNode* AstRoot_;
     std::unique_ptr<TMemoryPool> AstPool_;
-    const IModuleResolver::TPtr Modules_;
     TAutoPtr<TExprContext> ExprCtx_;
     TTypeAnnotationContextPtr TypeCtx_;
+    const IModuleResolver::TPtr Modules_;
 
     TVector<TDataProviderInitializer> DataProvidersInit_;
     TAdaptiveLock DataProvidersLock_;
diff --git a/yql/essentials/core/type_ann/type_ann_core.cpp b/yql/essentials/core/type_ann/type_ann_core.cpp
index 810f5f70be..2474f046ae 100644
--- a/yql/essentials/core/type_ann/type_ann_core.cpp
+++ b/yql/essentials/core/type_ann/type_ann_core.cpp
@@ -12741,6 +12741,7 @@ template <NKikimr::NUdf::EDataSlot DataSlot>
         ExtFunctions["AssumeColumnOrderPartial"] = &AssumeColumnOrderWrapper;
         ExtFunctions["UnionAllPositional"] = &UnionAllPositionalWrapper;
         ExtFunctions["UnionPositional"] = &UnionAllPositionalWrapper;
+        ExtFunctions["UnionMergePositional"] = &UnionAllPositionalWrapper;
         ExtFunctions["SafeCast"] = &CastWrapper<false>;
         ExtFunctions["StrictCast"] = &CastWrapper<true>;
         ExtFunctions["Version"] = &VersionWrapper;
diff --git a/yql/essentials/minikql/comp_nodes/mkql_wide_combine.cpp b/yql/essentials/minikql/comp_nodes/mkql_wide_combine.cpp
index 75e5e0dd6f..af9e1d4ce0 100644
--- a/yql/essentials/minikql/comp_nodes/mkql_wide_combine.cpp
+++ b/yql/essentials/minikql/comp_nodes/mkql_wide_combine.cpp
@@ -16,6 +16,9 @@
 
 #include <util/string/cast.h>
 
+
+#include <contrib/libs/xxhash/xxhash.h>
+
 namespace NKikimr {
 namespace NMiniKQL {
 
@@ -315,6 +318,7 @@ public:
         CurrentPage = &Storage.emplace_back(RowSize() * CountRowsOnPage, NUdf::TUnboxedValuePod());
         CurrentPosition = 0;
         Tongue = CurrentPage->data();
+        StoredDataSize = 0;
 
         CleanupCurrentContext();
         return true;
@@ -345,6 +349,7 @@ public:
     EFetchResult InputStatus = EFetchResult::One;
     NUdf::TUnboxedValuePod* Tongue = nullptr;
     NUdf::TUnboxedValuePod* Throat = nullptr;
+    i64 StoredDataSize = 0;
 
 private:
     std::optional<TStorageIterator> ExtractIt;
@@ -485,8 +490,7 @@ public:
             return isNew ? ETasteResult::Init : ETasteResult::Update;
         }
 
-        auto hash = Hasher(ViewForKeyAndState.data());
-        auto bucketId = hash % SpilledBucketCount;
+        auto bucketId = ChooseBucket(ViewForKeyAndState.data());
         auto& bucket = SpilledBuckets[bucketId];
 
         if (bucket.BucketState == TSpilledBucket::EBucketState::InMemory) {
@@ -530,7 +534,14 @@ public:
 
         return value;
     }
+
 private:
+    ui64 ChooseBucket(const NUdf::TUnboxedValuePod *const key) {
+        auto provided_hash = Hasher(key);
+        XXH64_hash_t bucket = XXH64(&provided_hash, sizeof(provided_hash), 0) % SpilledBucketCount;
+        return bucket;
+    }
+
     EUpdateResult FlushSpillingBuffersAndWait() {
         UpdateSpillingBuckets();
 
@@ -593,14 +604,17 @@ private:
             SplitStateSpillingBucket = -1;
         }
         while (const auto keyAndState = static_cast<NUdf::TUnboxedValue *>(InMemoryProcessingState.Extract())) {
-            auto hash = Hasher(keyAndState); //Hasher uses only key for hashing
-            auto bucketId = hash % SpilledBucketCount;
+            auto bucketId = ChooseBucket(keyAndState);  // This uses only key for hashing
             auto& bucket = SpilledBuckets[bucketId];
 
             bucket.LineCount++;
 
             if (bucket.BucketState != TSpilledBucket::EBucketState::InMemory) {
-                bucket.BucketState = TSpilledBucket::EBucketState::SpillingState;
+                if (bucket.BucketState != TSpilledBucket::EBucketState::SpillingState) {
+                    bucket.BucketState = TSpilledBucket::EBucketState::SpillingState;
+                    SpillingBucketsCount++;
+                }
+
                 bucket.AsyncWriteOperation = bucket.SpilledState->WriteWideItem({keyAndState, KeyAndStateType->GetElementsCount()});
                 for (size_t i = 0; i < KeyAndStateType->GetElementsCount(); ++i) {
                     //releasing values stored in unsafe TUnboxedValue buffer
@@ -629,10 +643,11 @@ private:
                 ui32 bucketNumToSpill = GetLargestInMemoryBucketNumber();
 
                 SplitStateSpillingBucket = bucketNumToSpill;
-                InMemoryBucketsCount--;
 
                 auto& bucket = SpilledBuckets[bucketNumToSpill];
                 bucket.BucketState = TSpilledBucket::EBucketState::SpillingState;
+                SpillingBucketsCount++;
+                InMemoryBucketsCount--;
 
                 while (const auto keyAndState = static_cast<NUdf::TUnboxedValue*>(bucket.InMemoryProcessingState->Extract())) {
                     bucket.AsyncWriteOperation = bucket.SpilledState->WriteWideItem({keyAndState, KeyAndStateType->GetElementsCount()});
@@ -662,6 +677,7 @@ private:
                 bucket.InMemoryProcessingState->ReadMore<false>();
 
                 bucket.BucketState = TSpilledBucket::EBucketState::SpillingData;
+                SpillingBucketsCount--;
             }
         }
 
@@ -846,6 +862,12 @@ private:
                 YQL_LOG(INFO) << "switching Memory mode to ProcessSpilled";
                 MKQL_ENSURE(EOperatingMode::Spilling == Mode, "Internal logic error");
                 MKQL_ENSURE(SpilledBuckets.size() == SpilledBucketCount, "Internal logic error");
+
+                std::sort(SpilledBuckets.begin(), SpilledBuckets.end(), [](const TSpilledBucket& lhs, const TSpilledBucket& rhs) {
+                    bool lhs_in_memory = lhs.BucketState == TSpilledBucket::EBucketState::InMemory;
+                    bool rhs_in_memory = rhs.BucketState == TSpilledBucket::EBucketState::InMemory;
+                    return lhs_in_memory > rhs_in_memory;
+                });
                 break;
             }
 
@@ -904,6 +926,7 @@ private:
     llvm::IntegerType* ValueType;
     llvm::PointerType* PtrValueType;
     llvm::IntegerType* StatusType;
+    llvm::IntegerType* StoredType;
 protected:
     using TBase::Context;
 public:
@@ -912,6 +935,7 @@ public:
         result.emplace_back(StatusType); //status
         result.emplace_back(PtrValueType); //tongue
         result.emplace_back(PtrValueType); //throat
+        result.emplace_back(StoredType); //StoredDataSize
         result.emplace_back(Type::getInt32Ty(Context)); //size
         result.emplace_back(Type::getInt32Ty(Context)); //size
         return result;
@@ -929,11 +953,16 @@ public:
         return ConstantInt::get(Type::getInt32Ty(Context), TBase::GetFieldsCount() + 2);
     }
 
+    llvm::Constant* GetStored() {
+        return ConstantInt::get(Type::getInt32Ty(Context), TBase::GetFieldsCount() + 3);
+    }
+
     TLLVMFieldsStructureState(llvm::LLVMContext& context)
         : TBase(context)
         , ValueType(Type::getInt128Ty(Context))
         , PtrValueType(PointerType::getUnqual(ValueType))
-        , StatusType(Type::getInt32Ty(Context)) {
+        , StatusType(Type::getInt32Ty(Context))
+        , StoredType(Type::getInt64Ty(Context)) {
 
     }
 };
@@ -988,6 +1017,10 @@ public:
                     ptr->InputStatus = Flow->FetchValues(ctx, fields);
                     if constexpr (SkipYields) {
                         if (EFetchResult::Yield == ptr->InputStatus) {
+                            if (MemLimit) {
+                                const auto currentUsage = ctx.HolderFactory.GetMemoryUsed();
+                                ptr->StoredDataSize += currentUsage > initUsage ? currentUsage - initUsage : 0;
+                            }
                             return EFetchResult::Yield;
                         } else if (EFetchResult::Finish == ptr->InputStatus) {
                             break;
@@ -1000,7 +1033,7 @@ public:
 
                     Nodes.ExtractKey(ctx, fields, static_cast<NUdf::TUnboxedValue*>(ptr->Tongue));
                     Nodes.ProcessItem(ctx, ptr->TasteIt() ? nullptr : static_cast<NUdf::TUnboxedValue*>(ptr->Tongue), static_cast<NUdf::TUnboxedValue*>(ptr->Throat));
-                } while (!ctx.template CheckAdjustedMemLimit<TrackRss>(MemLimit, initUsage));
+                } while (!ctx.template CheckAdjustedMemLimit<TrackRss>(MemLimit, initUsage - ptr->StoredDataSize));
 
                 ptr->PushStat(ctx.Stats);
             }
@@ -1019,6 +1052,7 @@ public:
         const auto valueType = Type::getInt128Ty(context);
         const auto ptrValueType = PointerType::getUnqual(valueType);
         const auto statusType = Type::getInt32Ty(context);
+        const auto storedType = Type::getInt64Ty(context);
 
         TLLVMFieldsStructureState stateFields(context);
         const auto stateType = StructType::get(context, stateFields.GetFieldsArray());
@@ -1113,6 +1147,28 @@ public:
 
                 block = save;
 
+                if (MemLimit) {
+                    const auto storedPtr = GetElementPtrInst::CreateInBounds(stateType, stateArg, { stateFields.This(), stateFields.GetStored() }, "stored_ptr", block);
+                    const auto lastStored = new LoadInst(storedType, storedPtr, "last_stored", block);
+                    const auto currentUsage = GetMemoryUsed(MemLimit, ctx, block);
+
+
+                    const auto skipSavingUsed = BasicBlock::Create(context, "skip_saving_used", ctx.Func);
+                    const auto saveUsed = BasicBlock::Create(context, "save_used", ctx.Func);
+                    const auto check = CmpInst::Create(Instruction::ICmp, ICmpInst::ICMP_UGE, currentUsage, used, "check", block);
+                    BranchInst::Create(saveUsed, skipSavingUsed, check, block);
+
+                    block = saveUsed;
+
+                    const auto usedMemory = BinaryOperator::CreateSub(GetMemoryUsed(MemLimit, ctx, block), used, "used_memory", block);
+                    const auto inc = BinaryOperator::CreateAdd(lastStored, usedMemory, "inc", block);
+                    new StoreInst(inc, storedPtr, block);
+
+                    BranchInst::Create(skipSavingUsed, block);
+
+                    block = skipSavingUsed;
+                }
+
                 new StoreInst(ConstantInt::get(statusType, static_cast<i32>(EFetchResult::Yield)), statusPtr, block);
                 result->addIncoming(ConstantInt::get(statusType, static_cast<i32>(EFetchResult::Yield)), block);
                 BranchInst::Create(over, block);
@@ -1249,7 +1305,14 @@ public:
 
             block = test;
 
-            const auto check = CheckAdjustedMemLimit<TrackRss>(MemLimit, used, ctx, block);
+            auto totalUsed = used;
+            if (MemLimit) {
+                const auto storedPtr = GetElementPtrInst::CreateInBounds(stateType, stateArg, { stateFields.This(), stateFields.GetStored() }, "stored_ptr", block);
+                const auto lastStored = new LoadInst(storedType, storedPtr, "last_stored", block);
+                totalUsed = BinaryOperator::CreateSub(used, lastStored, "decr", block);
+            }
+
+            const auto check = CheckAdjustedMemLimit<TrackRss>(MemLimit, totalUsed, ctx, block);
             BranchInst::Create(done, loop, check, block);
 
             block = done;
diff --git a/yql/essentials/minikql/comp_nodes/ut/mkql_wide_combine_ut.cpp b/yql/essentials/minikql/comp_nodes/ut/mkql_wide_combine_ut.cpp
index 904f38ac67..55cb6babbf 100644
--- a/yql/essentials/minikql/comp_nodes/ut/mkql_wide_combine_ut.cpp
+++ b/yql/essentials/minikql/comp_nodes/ut/mkql_wide_combine_ut.cpp
@@ -15,8 +15,13 @@ namespace NMiniKQL {
 namespace {
 
 constexpr auto border = 9124596000000000ULL;
-constexpr ui64 g_Yield = std::numeric_limits<ui64>::max();
-constexpr ui64 g_TestYieldStreamData[] = {0, 1, 0, 2, g_Yield, 0, g_Yield, 1, 2, 0, 1, 3, 0, g_Yield, 1, 2};
+
+struct TTestStreamParams {
+    static constexpr ui64 Yield = std::numeric_limits<ui64>::max();
+
+    ui64 StringSize = 1;
+    std::vector<ui64> TestYieldStreamData;
+};
 
 class TTestStreamWrapper: public TMutableComputationNode<TTestStreamWrapper> {
 using TBaseComputation = TMutableComputationNode<TTestStreamWrapper>;
@@ -25,19 +30,19 @@ public:
     public:
         using TBase = TComputationValue<TStreamValue>;
 
-        TStreamValue(TMemoryUsageInfo* memInfo, TComputationContext& compCtx)
-            : TBase(memInfo), CompCtx(compCtx)
+        TStreamValue(TMemoryUsageInfo* memInfo, TComputationContext& compCtx, TTestStreamParams& params)
+            : TBase(memInfo), CompCtx(compCtx), Params(params)
         {}
     private:
         NUdf::EFetchStatus Fetch(NUdf::TUnboxedValue& result) override {
 
-            constexpr auto size = Y_ARRAY_SIZE(g_TestYieldStreamData);
+            auto size = Params.TestYieldStreamData.size();
             if (Index == size) {
                 return NUdf::EFetchStatus::Finish;
             }
 
-            const auto val = g_TestYieldStreamData[Index];
-            if (g_Yield == val) {
+            const auto val = Params.TestYieldStreamData[Index];
+            if (Params.Yield == val) {
                 ++Index;
                 return NUdf::EFetchStatus::Yield;
             }
@@ -45,7 +50,7 @@ public:
             NUdf::TUnboxedValue* items = nullptr;
             result = CompCtx.HolderFactory.CreateDirectArrayHolder(2, items);
             items[0] = NUdf::TUnboxedValuePod(val);
-            items[1] =  NUdf::TUnboxedValuePod(MakeString(ToString(val)));
+            items[1] = NUdf::TUnboxedValuePod(MakeString(ToString(val) * Params.StringSize));
 
             ++Index;
 
@@ -55,27 +60,31 @@ public:
     private:
         TComputationContext& CompCtx;
         ui64 Index = 0;
+        TTestStreamParams& Params;
     };
 
-    TTestStreamWrapper(TComputationMutables& mutables)
+    TTestStreamWrapper(TComputationMutables& mutables, TTestStreamParams& params)
         : TBaseComputation(mutables)
+        , Params(params)
     {}
 
     NUdf::TUnboxedValuePod DoCalculate(TComputationContext& ctx) const {
-        return ctx.HolderFactory.Create<TStreamValue>(ctx);
+        return ctx.HolderFactory.Create<TStreamValue>(ctx, Params);
     }
 private:
     void RegisterDependencies() const final {}
+
+    TTestStreamParams& Params;
 };
 
-IComputationNode* WrapTestStream(const TComputationNodeFactoryContext& ctx) {
-    return new TTestStreamWrapper(ctx.Mutables);
+IComputationNode* WrapTestStream(const TComputationNodeFactoryContext& ctx, TTestStreamParams& params) {
+    return new TTestStreamWrapper(ctx.Mutables, params);
 }
 
-TComputationNodeFactory GetNodeFactory() {
-    return [](TCallable& callable, const TComputationNodeFactoryContext& ctx) -> IComputationNode* {
+TComputationNodeFactory GetNodeFactory(TTestStreamParams& params) {
+    return [&params](TCallable& callable, const TComputationNodeFactoryContext& ctx) -> IComputationNode* {
         if (callable.GetType()->GetName() == "TestYieldStream") {
-            return WrapTestStream(ctx);
+            return WrapTestStream(ctx, params);
         }
         return GetBuiltinFactory()(callable, ctx);
     };
@@ -456,7 +465,9 @@ Y_UNIT_TEST_SUITE(TMiniKQLWideCombinerTest) {
     }
 #if !defined(MKQL_RUNTIME_VERSION) || MKQL_RUNTIME_VERSION >= 46u
     Y_UNIT_TEST_LLVM(TestHasLimitButPasstroughtYields) {
-        TSetup<LLVM> setup(GetNodeFactory());
+        TTestStreamParams params;
+        params.TestYieldStreamData = {0, 1, 0, 2, TTestStreamParams::Yield, 0, TTestStreamParams::Yield, 1, 2, 0, 1, 3, 0, TTestStreamParams::Yield, 1, 2};
+        TSetup<LLVM> setup(GetNodeFactory(params));
         TProgramBuilder& pb = *setup.PgmBuilder;
 
         const auto stream = MakeStream<LLVM>(setup);
@@ -486,6 +497,40 @@ Y_UNIT_TEST_SUITE(TMiniKQLWideCombinerTest) {
         UNIT_ASSERT_EQUAL(streamVal.Fetch(result), NUdf::EFetchStatus::Finish);
     }
 #endif
+#if !defined(MKQL_RUNTIME_VERSION) || MKQL_RUNTIME_VERSION >= 46u
+    Y_UNIT_TEST_LLVM(TestSkipYieldRespectsMemLimit) {
+        TTestStreamParams params;
+        params.StringSize = 50000;
+        params.TestYieldStreamData = {0, TTestStreamParams::Yield, 2, TTestStreamParams::Yield, 3, TTestStreamParams::Yield, 4};
+        TSetup<LLVM> setup(GetNodeFactory(params));
+        TProgramBuilder& pb = *setup.PgmBuilder;
+
+        const auto stream = MakeStream<LLVM>(setup);
+        const auto pgmReturn = pb.FromFlow(pb.NarrowMap(pb.WideCombiner(pb.ExpandMap(pb.ToFlow(stream),
+            [&](TRuntimeNode item) -> TRuntimeNode::TList { return {pb.Member(item, "a"), pb.Member(item, "b")}; }), -100000LL,
+            [&](TRuntimeNode::TList items) -> TRuntimeNode::TList { return {items.front()}; },
+            [&](TRuntimeNode::TList, TRuntimeNode::TList items) -> TRuntimeNode::TList { return items; },
+            [&](TRuntimeNode::TList, TRuntimeNode::TList items, TRuntimeNode::TList state) -> TRuntimeNode::TList { return {state.front(), pb.AggrConcat(state.back(), items.back())}; },
+            [&](TRuntimeNode::TList, TRuntimeNode::TList state) -> TRuntimeNode::TList { return state; }),
+            [&](TRuntimeNode::TList items) { return items.back(); }
+        ));
+        const auto graph = setup.BuildGraph(pgmReturn);
+        const auto streamVal = graph->GetValue();
+        NUdf::TUnboxedValue result;
+
+        // skip first 2 yields
+        UNIT_ASSERT_VALUES_EQUAL(streamVal.Fetch(result), NUdf::EFetchStatus::Yield);
+        UNIT_ASSERT_EQUAL(streamVal.Fetch(result), NUdf::EFetchStatus::Yield);
+        // return all the collected values
+        UNIT_ASSERT_EQUAL(streamVal.Fetch(result), NUdf::EFetchStatus::Ok);
+        UNIT_ASSERT_EQUAL(streamVal.Fetch(result), NUdf::EFetchStatus::Ok);
+        UNIT_ASSERT_EQUAL(streamVal.Fetch(result), NUdf::EFetchStatus::Ok);
+        UNIT_ASSERT_EQUAL(streamVal.Fetch(result), NUdf::EFetchStatus::Yield);
+        UNIT_ASSERT_EQUAL(streamVal.Fetch(result), NUdf::EFetchStatus::Ok);
+        UNIT_ASSERT_EQUAL(streamVal.Fetch(result), NUdf::EFetchStatus::Finish);
+        UNIT_ASSERT_EQUAL(streamVal.Fetch(result), NUdf::EFetchStatus::Finish);
+    }
+#endif
 }
 
 Y_UNIT_TEST_SUITE(TMiniKQLWideCombinerPerfTest) {
@@ -1351,6 +1396,63 @@ Y_UNIT_TEST_SUITE(TMiniKQLWideLastCombinerTest) {
         const auto fetchStatus = streamVal.Fetch(item);
         UNIT_ASSERT_EQUAL(fetchStatus, NUdf::EFetchStatus::Finish);
     }
+
+    Y_UNIT_TEST_LLVM(TestSpillingBucketsDistribution) {
+        const size_t expectedBucketsCount = 128;
+        const size_t sampleSize = 8 * 128;
+
+        TSetup<LLVM, true> setup;
+
+        std::vector<std::pair<ui64, ui64>> samples(sampleSize);
+        std::generate(samples.begin(), samples.end(), [key = (ui64)1] () mutable -> std::pair<ui64, ui64> {
+            key += 64;
+            return {key, 1};
+        });
+
+        TProgramBuilder& pb = *setup.PgmBuilder;
+
+        const auto listType = pb.NewListType(pb.NewTupleType({pb.NewDataType(NUdf::TDataType<ui64>::Id), pb.NewDataType(NUdf::TDataType<ui64>::Id)}));
+        const auto list = TCallableBuilder(pb.GetTypeEnvironment(), "TestList", listType).Build();
+
+        const auto pgmReturn = pb.FromFlow(pb.NarrowMap(pb.WideLastCombinerWithSpilling(pb.ExpandMap(pb.ToFlow(TRuntimeNode(list, false)),
+            [&](TRuntimeNode item) -> TRuntimeNode::TList { return { pb.Nth(item, 0U), pb.Nth(item, 1U) }; }),
+            [&](TRuntimeNode::TList items) -> TRuntimeNode::TList { return {items.front()}; },
+            [&](TRuntimeNode::TList, TRuntimeNode::TList items) -> TRuntimeNode::TList { return {items.back()}; },
+            [&](TRuntimeNode::TList, TRuntimeNode::TList items, TRuntimeNode::TList state) -> TRuntimeNode::TList { return {pb.AggrAdd(state.front(), items.back())}; },
+            [&](TRuntimeNode::TList keys, TRuntimeNode::TList state) -> TRuntimeNode::TList { return {keys.front(), state.front()}; }),
+            [&](TRuntimeNode::TList items) -> TRuntimeNode { return pb.NewTuple(items); }
+        ));
+
+        const auto spillerFactory = std::make_shared<TMockSpillerFactory>();
+        const auto graph = setup.BuildGraph(pgmReturn, {list});
+        graph->GetContext().SpillerFactory = spillerFactory;
+
+        NUdf::TUnboxedValue* items = nullptr;
+        graph->GetEntryPoint(0, true)->SetValue(graph->GetContext(), graph->GetHolderFactory().CreateDirectArrayHolder(samples.size(), items));
+        for (const auto& sample : samples) {
+            NUdf::TUnboxedValue* pair = nullptr;
+            *items++ = graph->GetHolderFactory().CreateDirectArrayHolder(2U, pair);
+            pair[0] = NUdf::TUnboxedValuePod(sample.first);
+            pair[1] = NUdf::TUnboxedValuePod(sample.second);
+        }
+
+        const auto& value = graph->GetValue();
+
+        NUdf::TUnboxedValue item;
+        while (value.Fetch(item) != NUdf::EFetchStatus::Finish) {
+            ;
+        }
+
+        UNIT_ASSERT_EQUAL_C(spillerFactory->GetCreatedSpillers().size(), 1, "WideLastCombiner expected to create one spiller ");
+        const auto wideCombinerSpiller = std::dynamic_pointer_cast<TMockSpiller>(spillerFactory->GetCreatedSpillers()[0]);
+        UNIT_ASSERT_C(wideCombinerSpiller != nullptr, "MockSpillerFactory expected to create only MockSpillers");
+
+        auto flushedBucketsSizes = wideCombinerSpiller->GetPutSizes();
+        UNIT_ASSERT_EQUAL_C(flushedBucketsSizes.size(), expectedBucketsCount, "Spiller doesn't Put expected number of buckets");
+
+        auto anyEmpty = std::any_of(flushedBucketsSizes.begin(), flushedBucketsSizes.end(), [](size_t size) { return size == 0; });
+        UNIT_ASSERT_C(!anyEmpty, "Spiller flushed empty bucket");
+    }
 }
 
 Y_UNIT_TEST_SUITE(TMiniKQLWideLastCombinerPerfTest) {
diff --git a/yql/essentials/minikql/comp_nodes/ya.make.inc b/yql/essentials/minikql/comp_nodes/ya.make.inc
index 3c1531eac7..518f5f3c43 100644
--- a/yql/essentials/minikql/comp_nodes/ya.make.inc
+++ b/yql/essentials/minikql/comp_nodes/ya.make.inc
@@ -143,7 +143,7 @@ COPY(
     AUTO
     FROM ${ORIG_SRC_DIR}
     ${ORIG_SOURCES}
-    OUTPUT_INCLUDES 
+    OUTPUT_INCLUDES
     ${BINDIR}/yql/essentials/minikql/computation/mkql_computation_node_codegen.h
     ${BINDIR}/yql/essentials/minikql/computation/mkql_block_impl_codegen.h
     ${BINDIR}/yql/essentials/minikql/computation/mkql_llvm_base.h
@@ -154,6 +154,7 @@ COPY(
 
 PEERDIR(
     contrib/libs/apache/arrow
+    contrib/libs/xxhash
     yql/essentials/types/binary_json
     yql/essentials/minikql
     yql/essentials/minikql/arrow
diff --git a/yql/essentials/minikql/computation/mkql_spiller_adapter.h b/yql/essentials/minikql/computation/mkql_spiller_adapter.h
index 462a2a7c5e..8ddcfe46be 100644
--- a/yql/essentials/minikql/computation/mkql_spiller_adapter.h
+++ b/yql/essentials/minikql/computation/mkql_spiller_adapter.h
@@ -28,12 +28,12 @@ public:
     ///    In this case a caller must wait operation completion and call StoreCompleted.
     ///    Design note: not using Subscribe on a Future here to avoid possible race condition
     std::optional<NThreading::TFuture<ISpiller::TKey>> WriteWideItem(const TArrayRef<NUdf::TUnboxedValuePod>& wideItem) {
-       Packer.AddWideItem(wideItem.data(), wideItem.size());
-       if(Packer.PackedSizeEstimate() > SizeLimit) {
-           return Spiller->Put(std::move(Packer.Finish()));
-       } else {
+        Packer.AddWideItem(wideItem.data(), wideItem.size());
+        if (Packer.PackedSizeEstimate() > SizeLimit) {
+            return Spiller->Put(std::move(Packer.Finish()));
+        } else {
            return std::nullopt;
-       }
+        }
     }
 
     std::optional<NThreading::TFuture<ISpiller::TKey>> FinishWriting() {
diff --git a/yql/essentials/minikql/computation/mock_spiller_factory_ut.h b/yql/essentials/minikql/computation/mock_spiller_factory_ut.h
index c053b2c52e..4b0b2ed24a 100644
--- a/yql/essentials/minikql/computation/mock_spiller_factory_ut.h
+++ b/yql/essentials/minikql/computation/mock_spiller_factory_ut.h
@@ -12,8 +12,17 @@ public:
     }
 
     ISpiller::TPtr CreateSpiller() override {
-        return CreateMockSpiller();
+        auto new_spiller = CreateMockSpiller();
+        Spillers_.push_back(new_spiller);
+        return new_spiller;
     }
+
+    const std::vector<ISpiller::TPtr>& GetCreatedSpillers() const {
+        return Spillers_;
+    }
+
+private:
+    std::vector<ISpiller::TPtr> Spillers_;
 };
 
 } // namespace NKikimr::NMiniKQL
diff --git a/yql/essentials/minikql/computation/mock_spiller_ut.h b/yql/essentials/minikql/computation/mock_spiller_ut.h
index 42846eab1f..715018f3e0 100644
--- a/yql/essentials/minikql/computation/mock_spiller_ut.h
+++ b/yql/essentials/minikql/computation/mock_spiller_ut.h
@@ -11,22 +11,23 @@ namespace NKikimr::NMiniKQL {
 class TMockSpiller: public ISpiller{
 public:
     TMockSpiller()
-        : NextKey(0)
+        : NextKey_(0)
     {}
 
     NThreading::TFuture<TKey> Put(NYql::TChunkedBuffer&& blob) override {
         auto promise = NThreading::NewPromise<ISpiller::TKey>();
 
-        auto key = NextKey;
-        Storage[key] = std::move(blob);
-        NextKey++;
+        auto key = NextKey_;
+        Storage_[key] = std::move(blob);
+        PutSizes_.push_back(Storage_[key].Size());
+        NextKey_++;
         promise.SetValue(key);
         return promise.GetFuture();;
     }
 
     NThreading::TFuture<std::optional<NYql::TChunkedBuffer>> Get(TKey key) override {
         auto promise = NThreading::NewPromise<std::optional<NYql::TChunkedBuffer>>();
-        if (auto it = Storage.find(key); it != Storage.end()) {
+        if (auto it = Storage_.find(key); it != Storage_.end()) {
             promise.SetValue(it->second);
         } else {
             promise.SetValue(std::nullopt);
@@ -37,9 +38,9 @@ public:
 
     NThreading::TFuture<std::optional<NYql::TChunkedBuffer>> Extract(TKey key) override {
         auto promise = NThreading::NewPromise<std::optional<NYql::TChunkedBuffer>>();
-        if (auto it = Storage.find(key); it != Storage.end()) {
+        if (auto it = Storage_.find(key); it != Storage_.end()) {
             promise.SetValue(std::move(it->second));
-            Storage.erase(it);
+            Storage_.erase(it);
         } else {
             promise.SetValue(std::nullopt);
         }
@@ -49,12 +50,17 @@ public:
     NThreading::TFuture<void> Delete(TKey key) override {
         auto promise = NThreading::NewPromise<void>();
         promise.SetValue();
-        Storage.erase(key);
+        Storage_.erase(key);
         return promise.GetFuture();
     }
+
+    const std::vector<size_t>& GetPutSizes() const {
+        return PutSizes_;
+    }
 private:
-    ISpiller::TKey NextKey;
-    std::unordered_map<ISpiller::TKey, NYql::TChunkedBuffer> Storage;
+    ISpiller::TKey NextKey_;
+    std::unordered_map<ISpiller::TKey, NYql::TChunkedBuffer> Storage_;
+    std::vector<size_t> PutSizes_;
 };
 inline ISpiller::TPtr CreateMockSpiller() {
     return std::make_shared<TMockSpiller>();
diff --git a/yql/essentials/sql/v1/SQLv1.g.in b/yql/essentials/sql/v1/SQLv1.g.in
index d58f184ec0..b31594eba3 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 64be15d0b7..87cbcaed3d 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/context.cpp b/yql/essentials/sql/v1/context.cpp
index ab880f4315..64eca540d7 100644
--- a/yql/essentials/sql/v1/context.cpp
+++ b/yql/essentials/sql/v1/context.cpp
@@ -65,6 +65,7 @@ THashMap<TStringBuf, TPragmaField> CTX_PRAGMA_FIELDS = {
     {"ValidateUnusedExprs", &TContext::ValidateUnusedExprs},
     {"AnsiImplicitCrossJoin", &TContext::AnsiImplicitCrossJoin},
     {"DistinctOverWindow", &TContext::DistinctOverWindow},
+    {"EmitUnionMerge", &TContext::EmitUnionMerge},
     {"SeqMode", &TContext::SeqMode},
 };
 
diff --git a/yql/essentials/sql/v1/context.h b/yql/essentials/sql/v1/context.h
index 61b2e4def3..6f5ce7b8f4 100644
--- a/yql/essentials/sql/v1/context.h
+++ b/yql/essentials/sql/v1/context.h
@@ -321,11 +321,12 @@ namespace NSQLTranslationV1 {
         bool BlockEngineForce = false;
         bool UnorderedResult = false;
         ui64 ParallelModeCount = 0;
-        bool CompactNamedExprs = false;
+        bool CompactNamedExprs = true;
         bool ValidateUnusedExprs = false;
         bool AnsiImplicitCrossJoin = false; // select * from A,B
         bool DistinctOverWindow = false;
         bool SeqMode = false;
+        bool EmitUnionMerge = false;
     };
 
     class TColumnRefScope {
diff --git a/yql/essentials/sql/v1/format/sql_format.cpp b/yql/essentials/sql/v1/format/sql_format.cpp
index 3cc18b141b..7422b37a93 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 @@ public:
         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 @@ private:
     }
 
     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 @@ private:
     }
 
     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 @@ private:
         }
     }
 
-    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 @@ private:
     }
 
     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 @@ private:
     }
 
     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 @@ private:
         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 @@ private:
     }
 
     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 @@ private:
     }
 
     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 @@ private:
     }
 
     void VisitDelete(const TRule_delete_stmt& msg) {
-        PosFromToken(msg.GetToken1());
         NewLine();
         Visit(msg.GetToken1());
         Visit(msg.GetToken2());
@@ -1129,31 +1093,39 @@ private:
     }
 
     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 @@ private:
     }
 
     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 @@ private:
     }
 
     void VisitDo(const TRule_do_stmt& msg) {
-        PosFromToken(msg.GetToken1());
         NewLine();
         VisitKeyword(msg.GetToken1());
         switch (msg.GetBlock2().Alt_case()) {
@@ -1230,7 +1199,6 @@ private:
     }
 
     void VisitAction(const TRule_define_action_or_subquery_stmt& msg) {
-        PosFromToken(msg.GetToken1());
         NewLine();
         VisitKeyword(msg.GetToken1());
         VisitKeyword(msg.GetToken2());
@@ -1253,12 +1221,6 @@ private:
     }
 
     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 @@ private:
     }
 
     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 @@ private:
     }
 
     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 @@ private:
     }
 
     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 @@ private:
     }
 
     void VisitAlterTopic(const TRule_alter_topic_stmt& msg) {
-        PosFromToken(msg.GetToken1());
         NewLine();
         VisitKeyword(msg.GetToken1());
         VisitKeyword(msg.GetToken2());
@@ -1454,19 +1394,16 @@ private:
     }
 
     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 @@ private:
     }
 
     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 @@ private:
     }
 
     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 @@ private:
     }
 
     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 @@ private:
     }
 
     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 @@ private:
         VisitAllFieldsImpl<TPrettyVisitor, &TPrettyVisitor::Visit>(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 @@ private:
     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 @@ private:
         AfterQuestion = (str == "?");
         AfterLess = (str == "<");
         AfterKeyExpr = false;
+        AfterComment = false;
 
         if (forceKeyword) {
             str = to_upper(str);
@@ -1737,9 +1654,22 @@ private:
             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 @@ private:
             Visit(msg.GetBlock7());
         }
 
+        PopCurrentIndent();
+
         if (msg.HasBlock8()) {
             NewLine();
             Visit(msg.GetBlock8());
         }
 
-        PopCurrentIndent();
         if (msg.HasBlock9()) {
             NewLine();
             Visit(msg.GetBlock9());
@@ -2082,13 +2013,37 @@ private:
         }
     }
 
+    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 @@ private:
         }
 
         Visit(msg.GetToken3());
+        ExprLineIndent = CurrentIndent;
+
         Visit(msg.GetRule_expr4());
         VisitRepeated(msg.GetBlock5());
 
+        ExprLineIndent = 0;
+
         PopCurrentIndent();
         NewLine();
     }
@@ -2572,6 +2531,19 @@ private:
         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 @@ private:
                 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 @@ private:
                 }
 
                 Visit(alt.GetRule_double_question1());
-                PosFromParsedToken(ParsedTokens[TokenIndex]);
                 if (hasFirstNewline || hasSecondNewline) {
                     NewLine();
                     if (!pushedIndent) {
@@ -2701,8 +2671,8 @@ private:
     template <typename TExpr, typename TGetOp, typename TGetExpr, typename TIter>
     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 @@ private:
             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 @@ private:
 
     void PushCurrentIndent() {
         CurrentIndent += OneIndent;
+
+        BlockFirstLine = OutLine;
+        if (OutColumn > 0) {
+            ++BlockFirstLine;
+        }
     }
 
     void PopCurrentIndent() {
@@ -2770,9 +2740,13 @@ private:
     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 fc919b38c4..bed9e055ab 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<user:int32> select 1 as user",
-            "INSERT INTO user\n\tWITH SCHEMA Struct<user: int32>\nSELECT\n\t1 AS user;\n"},
+            "INSERT INTO user WITH SCHEMA Struct<user: int32>\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<int32>??;declare $_y AS int32 ? ? ;select 1<>2, 1??2,"
             "formattype(list<int32>), formattype(resource<user>),formattype(tuple<>), formattype(tuple<  >), formattype(int32 ? ? )",
-            "DECLARE $_x AS list<int32>??;\nDECLARE $_y AS int32??;\n\nSELECT\n\t1 <> 2,\n\t1 ?? 2,\n\tformattype(list<int32>),"
+            "DECLARE $_x AS list<int32>??;\nDECLARE $_y AS int32??;\n\nSELECT\n\t1 != 2,\n\t1 ?? 2,\n\tformattype(list<int32>),"
         "\n\tformattype(resource<user>),\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<foo:integer, Bar:list<string?>> where key<0",
             "SELECT\n\t*\nFROM plato.T\n\tWITH SCHEMA struct<foo: integer, Bar: list<string?>>\nWHERE key < 0;\n"},
         {"select * from plato.T with (foo=bar, x=$y, a=(a, b, c), u='aaa', schema (foo int32, bar list<string>))",
-            "SELECT\n\t*\nFROM plato.T\n\tWITH (foo = bar, x = $y, a = (a, b, c), u = 'aaa', SCHEMA (foo int32, bar list<string>));\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<string>)\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/sql/v1/select.cpp b/yql/essentials/sql/v1/select.cpp
index 552a74cb07..d2e4c0a874 100644
--- a/yql/essentials/sql/v1/select.cpp
+++ b/yql/essentials/sql/v1/select.cpp
@@ -2800,7 +2800,11 @@ public:
     TNodePtr Build(TContext& ctx) override {
         TPtr res;
         if (QuantifierAll) {
-            res = ctx.PositionalUnionAll ? Y("UnionAllPositional") : Y("UnionAll");
+            if (ctx.EmitUnionMerge) {
+                res = ctx.PositionalUnionAll ? Y("UnionMergePositional") : Y("UnionMerge");
+            } else {
+                res = ctx.PositionalUnionAll ? Y("UnionAllPositional") : Y("UnionAll");
+            }
         } else {
             res = ctx.PositionalUnionAll ? Y("UnionPositional") : Y("Union");
         }
@@ -2848,8 +2852,8 @@ private:
 };
 
 TSourcePtr BuildUnion(
-    TPosition pos, 
-    TVector<TSourcePtr>&& sources, 
+    TPosition pos,
+    TVector<TSourcePtr>&& sources,
     bool quantifierAll,
     const TWriteSettings& settings
 ) {
diff --git a/yql/essentials/sql/v1/sql_query.cpp b/yql/essentials/sql/v1/sql_query.cpp
index 4d9f30a452..37cd7ea1eb 100644
--- a/yql/essentials/sql/v1/sql_query.cpp
+++ b/yql/essentials/sql/v1/sql_query.cpp
@@ -3047,6 +3047,9 @@ TNodePtr TSqlQuery::PragmaStatement(const TRule_pragma_stmt& stmt, bool& success
             Ctx.CompactNamedExprs = true;
             Ctx.IncrementMonCounter("sql_pragma", "CompactNamedExprs");
         } else if (normalizedPragma == "disablecompactnamedexprs") {
+            Ctx.Warning(Ctx.Pos(), TIssuesIds::YQL_DEPRECATED_PRAGMA)
+                << "Deprecated pragma DisableCompactNamedExprs - it will be removed soon. "
+                   "Consider submitting bug report if CompactNamedExprs doesn't work for you";
             Ctx.CompactNamedExprs = false;
             Ctx.IncrementMonCounter("sql_pragma", "DisableCompactNamedExprs");
         } else if (normalizedPragma == "validateunusedexprs") {
@@ -3073,6 +3076,12 @@ TNodePtr TSqlQuery::PragmaStatement(const TRule_pragma_stmt& stmt, bool& success
         } else if (normalizedPragma == "disableseqmode") {
             Ctx.SeqMode = false;
             Ctx.IncrementMonCounter("sql_pragma", "DisableSeqMode");
+        } else if (normalizedPragma == "emitunionmerge") {
+            Ctx.EmitUnionMerge = true;
+            Ctx.IncrementMonCounter("sql_pragma", "EmitUnionMerge");
+        } else if (normalizedPragma == "disableemitunionmerge") {
+            Ctx.EmitUnionMerge = false;
+            Ctx.IncrementMonCounter("sql_pragma", "DisableEmitUnionMerge");
         } else {
             Error() << "Unknown pragma: " << pragma;
             Ctx.IncrementMonCounter("sql_errors", "UnknownPragma");
diff --git a/yql/essentials/sql/v1/sql_ut.cpp b/yql/essentials/sql/v1/sql_ut.cpp
index 2acc9e722a..f2cde62e79 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"
@@ -1385,7 +1385,7 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) {
     }
 
     Y_UNIT_TEST(UnionAllTest) {
-        NYql::TAstParseResult res = SqlToYql("SELECT key FROM plato.Input UNION ALL select subkey FROM plato.Input;");
+        NYql::TAstParseResult res = SqlToYql("PRAGMA DisableEmitUnionMerge; SELECT key FROM plato.Input UNION ALL select subkey FROM plato.Input;");
         UNIT_ASSERT(res.Root);
 
         TWordCountHive elementStat = {{TString("UnionAll"), 0}};
@@ -1393,6 +1393,15 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) {
         UNIT_ASSERT_VALUES_EQUAL(1, elementStat["UnionAll"]);
     }
 
+    Y_UNIT_TEST(UnionAllMergeTest) {
+        NYql::TAstParseResult res = SqlToYql("PRAGMA EmitUnionMerge; SELECT key FROM plato.Input UNION ALL select subkey FROM plato.Input;");
+        UNIT_ASSERT(res.Root);
+
+        TWordCountHive elementStat = {{TString("UnionMerge"), 0}};
+        VerifyProgram(res, elementStat, {});
+        UNIT_ASSERT_VALUES_EQUAL(1, elementStat["UnionMerge"]);
+    }
+
     Y_UNIT_TEST(UnionTest) {
         NYql::TAstParseResult res = SqlToYql("SELECT key FROM plato.Input UNION select subkey FROM plato.Input;");
         UNIT_ASSERT(res.Root);
@@ -1404,6 +1413,7 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) {
 
     Y_UNIT_TEST(UnionAggregationTest) {
         NYql::TAstParseResult res = SqlToYql(R"(
+            PRAGMA DisableEmitUnionMerge;
             SELECT 1
             UNION ALL
                 SELECT 1 UNION ALL SELECT 1 UNION ALL SELECT 1
@@ -1420,6 +1430,25 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) {
         UNIT_ASSERT_VALUES_EQUAL(3, elementStat["Union"]);
     }
 
+    Y_UNIT_TEST(UnionMergeAggregationTest) {
+        NYql::TAstParseResult res = SqlToYql(R"(
+            PRAGMA EmitUnionMerge;
+            SELECT 1
+            UNION ALL
+                SELECT 1 UNION ALL SELECT 1 UNION ALL SELECT 1
+            UNION
+                SELECT 1 UNION SELECT 1 UNION SELECT 1 UNION SELECT 1
+            UNION ALL
+                SELECT 1 UNION ALL SELECT 1 UNION ALL SELECT 1;
+        )");
+        UNIT_ASSERT(res.Root);
+
+        TWordCountHive elementStat = {{TString("Union"), 0}, {TString("UnionMerge"), 0}};
+        VerifyProgram(res, elementStat, {});
+        UNIT_ASSERT_VALUES_EQUAL(2, elementStat["UnionMerge"]);
+        UNIT_ASSERT_VALUES_EQUAL(3, elementStat["Union"]);
+    }
+
     Y_UNIT_TEST(DeclareDecimalParameter) {
         NYql::TAstParseResult res = SqlToYql("declare $value as Decimal(22,9); select $value as cnt;");
         UNIT_ASSERT(res.Root);
diff --git a/yql/essentials/sql/v1/sql_ut_antlr4.cpp b/yql/essentials/sql/v1/sql_ut_antlr4.cpp
index 1cd05a7ea5..4781156091 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"
@@ -1385,7 +1385,7 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) {
     }
 
     Y_UNIT_TEST(UnionAllTest) {
-        NYql::TAstParseResult res = SqlToYql("SELECT key FROM plato.Input UNION ALL select subkey FROM plato.Input;");
+        NYql::TAstParseResult res = SqlToYql("PRAGMA DisableEmitUnionMerge; SELECT key FROM plato.Input UNION ALL select subkey FROM plato.Input;");
         UNIT_ASSERT(res.Root);
 
         TWordCountHive elementStat = {{TString("UnionAll"), 0}};
@@ -1393,6 +1393,15 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) {
         UNIT_ASSERT_VALUES_EQUAL(1, elementStat["UnionAll"]);
     }
 
+    Y_UNIT_TEST(UnionAllMergeTest) {
+        NYql::TAstParseResult res = SqlToYql("PRAGMA EmitUnionMerge; SELECT key FROM plato.Input UNION ALL select subkey FROM plato.Input;");
+        UNIT_ASSERT(res.Root);
+
+        TWordCountHive elementStat = {{TString("UnionMerge"), 0}};
+        VerifyProgram(res, elementStat, {});
+        UNIT_ASSERT_VALUES_EQUAL(1, elementStat["UnionMerge"]);
+    }
+
     Y_UNIT_TEST(UnionTest) {
         NYql::TAstParseResult res = SqlToYql("SELECT key FROM plato.Input UNION select subkey FROM plato.Input;");
         UNIT_ASSERT(res.Root);
@@ -1404,6 +1413,7 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) {
 
     Y_UNIT_TEST(UnionAggregationTest) {
         NYql::TAstParseResult res = SqlToYql(R"(
+            PRAGMA DisableEmitUnionMerge;
             SELECT 1
             UNION ALL
                 SELECT 1 UNION ALL SELECT 1 UNION ALL SELECT 1
@@ -1420,6 +1430,25 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) {
         UNIT_ASSERT_VALUES_EQUAL(3, elementStat["Union"]);
     }
 
+    Y_UNIT_TEST(UnionMergeAggregationTest) {
+        NYql::TAstParseResult res = SqlToYql(R"(
+            PRAGMA EmitUnionMerge;
+            SELECT 1
+            UNION ALL
+                SELECT 1 UNION ALL SELECT 1 UNION ALL SELECT 1
+            UNION
+                SELECT 1 UNION SELECT 1 UNION SELECT 1 UNION SELECT 1
+            UNION ALL
+                SELECT 1 UNION ALL SELECT 1 UNION ALL SELECT 1;
+        )");
+        UNIT_ASSERT(res.Root);
+
+        TWordCountHive elementStat = {{TString("Union"), 0}, {TString("UnionMerge"), 0}};
+        VerifyProgram(res, elementStat, {});
+        UNIT_ASSERT_VALUES_EQUAL(2, elementStat["UnionMerge"]);
+        UNIT_ASSERT_VALUES_EQUAL(3, elementStat["Union"]);
+    }
+
     Y_UNIT_TEST(DeclareDecimalParameter) {
         NYql::TAstParseResult res = SqlToYql("declare $value as Decimal(22,9); select $value as cnt;");
         UNIT_ASSERT(res.Root);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/result.json b/yql/essentials/tests/sql/sql2yql/canondata/result.json
index 7b8bcbdcbf..238bb5a5bb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/result.json
+++ b/yql/essentials/tests/sql/sql2yql/canondata/result.json
@@ -1,30 +1,30 @@
 {
     "test_sql2yql.test[action-action_eval_cluster_and_table]": [
         {
-            "checksum": "e50e5e3c29832cb8e71135afa0f904cc",
-            "size": 1415,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-action_eval_cluster_and_table_/sql.yql"
+            "checksum": "439661fa2cdc754fd475bd7ec0b3d3aa",
+            "size": 1463,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-action_eval_cluster_and_table_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-action_eval_cluster_table]": [
         {
-            "checksum": "7719b45af40c3a4dca80cbdebe31ce36",
-            "size": 1541,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-action_eval_cluster_table_/sql.yql"
+            "checksum": "19491897d12c5f2187f386fcc98253aa",
+            "size": 1449,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-action_eval_cluster_table_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-action_eval_cluster_table_for]": [
         {
-            "checksum": "285801684e62983b2e73c42baadae366",
-            "size": 1754,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-action_eval_cluster_table_for_/sql.yql"
+            "checksum": "7716237475366f4b37932317b8d01631",
+            "size": 1711,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-action_eval_cluster_table_for_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-action_eval_cluster_use]": [
         {
-            "checksum": "a88edb9b716efe2fc4bceedacaedf0f5",
-            "size": 1416,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-action_eval_cluster_use_/sql.yql"
+            "checksum": "19491897d12c5f2187f386fcc98253aa",
+            "size": 1449,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-action_eval_cluster_use_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-action_eval_cluster_use_compact_named_exprs]": [
@@ -36,79 +36,79 @@
     ],
     "test_sql2yql.test[action-action_nested_query]": [
         {
-            "checksum": "be11fad7523cd4cac5b1e0c82b7a02e4",
-            "size": 1927,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-action_nested_query_/sql.yql"
+            "checksum": "310b977010fd0c3728dc07ab2cf16a33",
+            "size": 1967,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-action_nested_query_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-action_opt_args]": [
         {
-            "checksum": "bfe8d454cfdaebf1ba6bd5bd15bd0ded",
-            "size": 2167,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-action_opt_args_/sql.yql"
+            "checksum": "1f6dffbf81cbbcb87883cda24b3e83fd",
+            "size": 1303,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-action_opt_args_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-action_udf_args]": [
         {
-            "checksum": "68155538125dd6e446b38f4e82235ef3",
-            "size": 1205,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-action_udf_args_/sql.yql"
+            "checksum": "99dd88b881eddf97b041cd8cf8dfc5e5",
+            "size": 1281,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-action_udf_args_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-closure_action]": [
         {
-            "checksum": "2c799836d1e20f39bcfb8eed7e3b2b48",
-            "size": 2845,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-closure_action_/sql.yql"
+            "checksum": "80c3e98fa30465ff13f846bac7b0b4ff",
+            "size": 2963,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-closure_action_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-combine_subqueries_with_table_param]": [
         {
-            "checksum": "9d73e7ab6ed2a3ae51c39b9ad2c03953",
-            "size": 2531,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-combine_subqueries_with_table_param_/sql.yql"
+            "checksum": "41ef6052268326b5de14976cae227fde",
+            "size": 2467,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-combine_subqueries_with_table_param_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-define_simple_action]": [
         {
-            "checksum": "a882791835d53e4dd5178a673f50faff",
-            "size": 2759,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-define_simple_action_/sql.yql"
+            "checksum": "1507b6620f700d693f49d7972c5779ec",
+            "size": 2837,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-define_simple_action_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-dep_world_action_quote]": [
         {
-            "checksum": "4453d1effa01c4d0986faf0d8caac8ac",
-            "size": 2780,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-dep_world_action_quote_/sql.yql"
+            "checksum": "3f8db7332f40f076e697d486f43bf067",
+            "size": 2892,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-dep_world_action_quote_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-dep_world_quote_code]": [
         {
-            "checksum": "e04239ef0184f4c981a8ba6a522d97a6",
-            "size": 6868,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-dep_world_quote_code_/sql.yql"
+            "checksum": "972ddeae925c5c2eed5c0f1c27e89fbc",
+            "size": 3624,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-dep_world_quote_code_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-discard]": [
         {
-            "checksum": "3139fe2e69aea0091b46fa3ab699a41c",
-            "size": 8298,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-discard_/sql.yql"
+            "checksum": "4c5a1f92dcc8511a644f971ba4374150",
+            "size": 7834,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-discard_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-empty_do]": [
         {
-            "checksum": "f0d4f7fed38b9a80f5ba3649cbc5761d",
-            "size": 410,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-empty_do_/sql.yql"
+            "checksum": "4737257986625a2833757686de360274",
+            "size": 482,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-empty_do_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-eval_anon_table]": [
         {
-            "checksum": "da515a0f6a5961645d690d89b69c1ea6",
-            "size": 2104,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-eval_anon_table_/sql.yql"
+            "checksum": "bfa5406acab5729a3f835c8acc227603",
+            "size": 2176,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-eval_anon_table_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-eval_asatom]": [
@@ -127,9 +127,9 @@
     ],
     "test_sql2yql.test[action-eval_atom_wrong_type_expr]": [
         {
-            "checksum": "b4b21da25a4134e889b70fedca46a59e",
-            "size": 1162,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-eval_atom_wrong_type_expr_/sql.yql"
+            "checksum": "5eb7336a8e5868a7031cf615e700ba86",
+            "size": 1198,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-eval_atom_wrong_type_expr_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-eval_atom_wrong_type_param]": [
@@ -141,16 +141,16 @@
     ],
     "test_sql2yql.test[action-eval_capture]": [
         {
-            "checksum": "d3fa86b48aff09d6bf644ad95e6494aa",
-            "size": 1347,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-eval_capture_/sql.yql"
+            "checksum": "29329c0e5eeaa3d281583b32a495a244",
+            "size": 1383,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-eval_capture_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-eval_code]": [
         {
-            "checksum": "4bfb0a8c2a5abaa88a9ffaebb2650bca",
-            "size": 3493,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-eval_code_/sql.yql"
+            "checksum": "697336426d07d99aed52437a905283ae",
+            "size": 3455,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-eval_code_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-eval_code_nested]": [
@@ -162,9 +162,9 @@
     ],
     "test_sql2yql.test[action-eval_column]": [
         {
-            "checksum": "10e66e962832cc28472e28e043b6771d",
-            "size": 13041,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-eval_column_/sql.yql"
+            "checksum": "32c8700359c4d776de5715add2896cf0",
+            "size": 12463,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-eval_column_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-eval_drop]": [
@@ -176,9 +176,9 @@
     ],
     "test_sql2yql.test[action-eval_each_input_table]": [
         {
-            "checksum": "4667f4a319d4ae5f60f8f752c69ced78",
-            "size": 3087,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-eval_each_input_table_/sql.yql"
+            "checksum": "da85c456ef24660177c7fd22f4c76719",
+            "size": 3151,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-eval_each_input_table_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-eval_ensuretype]": [
@@ -190,16 +190,16 @@
     ],
     "test_sql2yql.test[action-eval_extract]": [
         {
-            "checksum": "ed5395cf598bbae899fea1870633880e",
-            "size": 1274,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-eval_extract_/sql.yql"
+            "checksum": "95b86a4e261e3e65171b93c309bf2c27",
+            "size": 1310,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-eval_extract_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-eval_filter]": [
         {
-            "checksum": "4384c882e8696a7486044ad034e46f9f",
-            "size": 1568,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-eval_filter_/sql.yql"
+            "checksum": "9fd3cef8b039bda15632610d082558b2",
+            "size": 1708,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-eval_filter_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-eval_folder]": [
@@ -218,58 +218,58 @@
     ],
     "test_sql2yql.test[action-eval_folder_via_file_in_job]": [
         {
-            "checksum": "174b80d7ac819df2635367e4a9cf517f",
-            "size": 3366,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-eval_folder_via_file_in_job_/sql.yql"
+            "checksum": "3aa417b29cc1b727b29aab6555cd7069",
+            "size": 3410,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-eval_folder_via_file_in_job_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-eval_for]": [
         {
-            "checksum": "cc6fa5a44dd964d6da0b9e9890787bf1",
-            "size": 6672,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-eval_for_/sql.yql"
+            "checksum": "77563f4e5e120f11b2464b68582448f0",
+            "size": 2297,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-eval_for_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-eval_for_over_subquery]": [
         {
-            "checksum": "d6a044767f10eb14a4953a83a87f58a1",
-            "size": 2164,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-eval_for_over_subquery_/sql.yql"
+            "checksum": "4ae303d0b2fea0617ce9d2b05b234660",
+            "size": 2204,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-eval_for_over_subquery_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-eval_if]": [
         {
-            "checksum": "e571b20b130bcb6a0ecab035b6d1bd35",
-            "size": 4464,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-eval_if_/sql.yql"
+            "checksum": "0722e5dbc9691462362fb6d90af553a4",
+            "size": 1999,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-eval_if_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-eval_if_guard]": [
         {
-            "checksum": "bb36d4785c506551adcda3f5c454dbc0",
-            "size": 1810,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-eval_if_guard_/sql.yql"
+            "checksum": "1febda63c92198881f389c852fd2ea7e",
+            "size": 1843,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-eval_if_guard_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-eval_input_output_table]": [
         {
-            "checksum": "2a146fa8c1095e9d60d1ce3e660b3bd5",
-            "size": 1810,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-eval_input_output_table_/sql.yql"
+            "checksum": "bfef40067557a1d449d3c57879c4fdc6",
+            "size": 1882,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-eval_input_output_table_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-eval_input_output_table_subquery]": [
         {
-            "checksum": "b8c5e0df2a92ec1829ea0e3970bf76a9",
-            "size": 3262,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-eval_input_output_table_subquery_/sql.yql"
+            "checksum": "896350639d55091f0a770e487b56e284",
+            "size": 3334,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-eval_input_output_table_subquery_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-eval_like]": [
         {
-            "checksum": "9b8ece2bd43f133bfb73472da9046cdc",
-            "size": 1707,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-eval_like_/sql.yql"
+            "checksum": "32b1030751a386b6c5446b104ff6af7f",
+            "size": 1851,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-eval_like_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-eval_on_modif_table_fail]": [
@@ -281,51 +281,51 @@
     ],
     "test_sql2yql.test[action-eval_percentile]": [
         {
-            "checksum": "a9efbefc3f360d32d7be1d04fe8e9ad8",
-            "size": 2285,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-eval_percentile_/sql.yql"
+            "checksum": "2b8fc922b23509371f02e4b987215861",
+            "size": 2321,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-eval_percentile_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-eval_pragma]": [
         {
-            "checksum": "8732e5bc3c31840d01420c4e5c0ee68f",
-            "size": 449,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-eval_pragma_/sql.yql"
+            "checksum": "c4d20d9d235d2653f044479de108ff50",
+            "size": 485,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-eval_pragma_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-eval_python3_ann]": [
         {
-            "checksum": "99b67de19863bcc652e76a543a7eed77",
-            "size": 1312,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-eval_python3_ann_/sql.yql"
+            "checksum": "1b0510cb01f7f9b4a85ecd031c0b6662",
+            "size": 1360,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-eval_python3_ann_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-eval_python3_signature]": [
         {
-            "checksum": "254b2c21cef633129776102f9f2a63fe",
-            "size": 1305,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-eval_python3_signature_/sql.yql"
+            "checksum": "a71356e30baef6c51a1f2da73bc24f4c",
+            "size": 1353,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-eval_python3_signature_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-eval_python_signature]": [
         {
-            "checksum": "254b2c21cef633129776102f9f2a63fe",
-            "size": 1305,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-eval_python_signature_/sql.yql"
+            "checksum": "a71356e30baef6c51a1f2da73bc24f4c",
+            "size": 1353,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-eval_python_signature_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-eval_range]": [
         {
-            "checksum": "ad2e9de23317aee0b3e73d490bcb99bc",
-            "size": 1799,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-eval_range_/sql.yql"
+            "checksum": "0ab43452afdcb46bf53f498b7f2bc699",
+            "size": 1979,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-eval_range_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-eval_regexp]": [
         {
-            "checksum": "ecb23a7e6f3b35d26d8a389d87153c6c",
-            "size": 1667,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-eval_regexp_/sql.yql"
+            "checksum": "43ab395233d63584d260c2553c508186",
+            "size": 1811,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-eval_regexp_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-eval_resourcetype]": [
@@ -337,16 +337,16 @@
     ],
     "test_sql2yql.test[action-eval_result_label]": [
         {
-            "checksum": "847fb097bf5ef1173f737506c09372a6",
-            "size": 1111,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-eval_result_label_/sql.yql"
+            "checksum": "54a8252be62af10fbc518ff20f332df0",
+            "size": 1147,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-eval_result_label_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-eval_sample]": [
         {
-            "checksum": "94c303b64a1ac246646620bf52bd2d59",
-            "size": 1579,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-eval_sample_/sql.yql"
+            "checksum": "994484c9708525a932a74ee3ed3c7da9",
+            "size": 1615,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-eval_sample_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-eval_skip_take]": [
@@ -358,9 +358,9 @@
     ],
     "test_sql2yql.test[action-eval_table_with_view]": [
         {
-            "checksum": "205947b4c48a2563592170cbf5483cd3",
-            "size": 1235,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-eval_table_with_view_/sql.yql"
+            "checksum": "4149a32d2893f385182d5f615082ce90",
+            "size": 1264,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-eval_table_with_view_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-eval_taggedtype]": [
@@ -379,44 +379,44 @@
     ],
     "test_sql2yql.test[action-eval_typeof_output_table]": [
         {
-            "checksum": "94c5cd255eab26de473082744b27e6c3",
-            "size": 4413,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-eval_typeof_output_table_/sql.yql"
+            "checksum": "5a75f43901cd8028299e0889b465b975",
+            "size": 4485,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-eval_typeof_output_table_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-eval_unresolved_type_arg]": [
         {
-            "checksum": "768f12507eb2dff7ca0119964d399db8",
-            "size": 1811,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-eval_unresolved_type_arg_/sql.yql"
+            "checksum": "db59c035e8ff63481dc6bb4a478964b3",
+            "size": 1767,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-eval_unresolved_type_arg_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-eval_values_output_table_subquery]": [
         {
-            "checksum": "8236cdf04fb89d284eb847f71f191e3e",
-            "size": 1473,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-eval_values_output_table_subquery_/sql.yql"
+            "checksum": "aca4c8b1d22d86f029cb27054a276edb",
+            "size": 1509,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-eval_values_output_table_subquery_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-eval_variant]": [
         {
-            "checksum": "e4b54a40b466c510a2e43c1fe976d5ec",
-            "size": 1218,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-eval_variant_/sql.yql"
+            "checksum": "8a2b8b8ee5e724ce07efff4f5d37cc20",
+            "size": 1254,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-eval_variant_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-evaluate_match_type]": [
         {
-            "checksum": "651d5e052e8417f950782d37c33119f5",
-            "size": 2032,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-evaluate_match_type_/sql.yql"
+            "checksum": "3a5d8df5533295699394389666b537fd",
+            "size": 1998,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-evaluate_match_type_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-evaluate_pure]": [
         {
-            "checksum": "c39ed2cd19b6cc47e8e7639d7d9d7f81",
-            "size": 7362,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-evaluate_pure_/sql.yql"
+            "checksum": "0cfe5f70a04d6ffc8c96c319ad5b80c3",
+            "size": 7333,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-evaluate_pure_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-evaluate_queries]": [
@@ -477,37 +477,37 @@
     ],
     "test_sql2yql.test[action-mixed_eval_typeof_world1]": [
         {
-            "checksum": "e685d404e8aa4f6cc4a51c8cf25a3a17",
-            "size": 3918,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-mixed_eval_typeof_world1_/sql.yql"
+            "checksum": "446f72c27a8027efd934ffa34d60ac6c",
+            "size": 3921,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-mixed_eval_typeof_world1_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-nested_action]": [
         {
-            "checksum": "6c61b14667cb3dade1fdbabda5624467",
-            "size": 2198,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-nested_action_/sql.yql"
+            "checksum": "d954a4717b873480ad9bec0700922cf7",
+            "size": 2322,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-nested_action_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-nested_eval]": [
         {
-            "checksum": "4d011a063ff8e80aee97048655f36324",
-            "size": 1871,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-nested_eval_/sql.yql"
+            "checksum": "6c2da8b2019c33c7ea859802e28de436",
+            "size": 1887,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-nested_eval_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-nested_rewrite_io]": [
         {
-            "checksum": "ab5d19654b8b2cb3c238746040526e7e",
-            "size": 4053,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-nested_rewrite_io_/sql.yql"
+            "checksum": "b9db5ced518623af829fb583388fc14b",
+            "size": 3941,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-nested_rewrite_io_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-nested_subquery]": [
         {
-            "checksum": "574c815da0ba8a2fb290512b8abb3dce",
-            "size": 1709,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-nested_subquery_/sql.yql"
+            "checksum": "051c9aa26d272e520e69bb6dc7d6364d",
+            "size": 1603,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-nested_subquery_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-parallel_for]": [
@@ -519,16 +519,16 @@
     ],
     "test_sql2yql.test[action-pass_action_as_param]": [
         {
-            "checksum": "dfed60badf56b73cb7a389936ddac70d",
-            "size": 1398,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-pass_action_as_param_/sql.yql"
+            "checksum": "2d050f00861799267a54000d3a48f44d",
+            "size": 1376,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-pass_action_as_param_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-pass_subquery_as_param]": [
         {
-            "checksum": "7699c858f5ccd0a01b40396f5dca1304",
-            "size": 3161,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-pass_subquery_as_param_/sql.yql"
+            "checksum": "aa821e4b47567a354eddab4577b55416",
+            "size": 2913,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-pass_subquery_as_param_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-pending_arg_fail]": [
@@ -540,16 +540,16 @@
     ],
     "test_sql2yql.test[action-process_from_subquery_with_orderby]": [
         {
-            "checksum": "d0caebfc95011c979d066cc3247c5755",
-            "size": 1508,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-process_from_subquery_with_orderby_/sql.yql"
+            "checksum": "106a90acf5858a3a9f31e1152dd565b3",
+            "size": 1456,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-process_from_subquery_with_orderby_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-runtime_apply_quoted_code]": [
         {
-            "checksum": "3f3aff837a5de1987692974e60e34599",
-            "size": 3508,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-runtime_apply_quoted_code_/sql.yql"
+            "checksum": "54ad0faf23cb598793c471cd2302c1a4",
+            "size": 2690,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-runtime_apply_quoted_code_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-runtime_for_select]": [
@@ -561,9 +561,9 @@
     ],
     "test_sql2yql.test[action-runtime_format_free_args_code]": [
         {
-            "checksum": "85f04c7458d2fdbe3bd04185b1e1b972",
-            "size": 1210,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-runtime_format_free_args_code_/sql.yql"
+            "checksum": "7021d9dd7d9e1e75bd46fe0e318f88f3",
+            "size": 1216,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-runtime_format_free_args_code_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-runtime_format_type]": [
@@ -575,9 +575,9 @@
     ],
     "test_sql2yql.test[action-runtime_if_select]": [
         {
-            "checksum": "54a4f40dcf1fcd919aff8e828da4854f",
-            "size": 7566,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-runtime_if_select_/sql.yql"
+            "checksum": "5bc7e1f47003ce3d0f9cc0ce82760dc5",
+            "size": 7524,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-runtime_if_select_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-runtime_make_code]": [
@@ -603,9 +603,9 @@
     ],
     "test_sql2yql.test[action-runtime_repr_code]": [
         {
-            "checksum": "c99478c489792096faf2459e1112ed9f",
-            "size": 1195,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-runtime_repr_code_/sql.yql"
+            "checksum": "660f938e4a5d63224f38736971b62e02",
+            "size": 1211,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-runtime_repr_code_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-runtime_serialize_type]": [
@@ -624,107 +624,107 @@
     ],
     "test_sql2yql.test[action-runtime_type_splitmake]": [
         {
-            "checksum": "cc928926bdc4b56ad00c69952de5fb4b",
-            "size": 9297,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-runtime_type_splitmake_/sql.yql"
+            "checksum": "3788c9a386cfa0eb8a6fca3b1fb6d582",
+            "size": 9341,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-runtime_type_splitmake_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-select_from_subquery_with_orderby]": [
         {
-            "checksum": "f322ab348559128611152746853d191d",
-            "size": 3869,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-select_from_subquery_with_orderby_/sql.yql"
+            "checksum": "798809fe59e33c4afddfe01b5af84078",
+            "size": 3681,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-select_from_subquery_with_orderby_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-subquery]": [
         {
-            "checksum": "6e780de239fbefdd86b34db80c4d85e2",
-            "size": 6831,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-subquery_/sql.yql"
+            "checksum": "c7c2b0b58149008e1cb5cca88ed897fa",
+            "size": 4995,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-subquery_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-subquery_accessnode]": [
         {
-            "checksum": "0722e2a656501e6c1caebbe2d9f84804",
-            "size": 1999,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-subquery_accessnode_/sql.yql"
+            "checksum": "ef92cc55196f0681b4140237581dfb95",
+            "size": 1923,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-subquery_accessnode_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-subquery_assumeorderby]": [
         {
-            "checksum": "7337267d6cfde1050f20cbf323c083b9",
-            "size": 1491,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-subquery_assumeorderby_/sql.yql"
+            "checksum": "43c4aa5508fc4990a6b7a3016b373ff2",
+            "size": 1487,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-subquery_assumeorderby_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-subquery_extend_over_extend_for]": [
         {
-            "checksum": "22945804b00472fc10fd0bcdf11fefa8",
-            "size": 2089,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-subquery_extend_over_extend_for_/sql.yql"
+            "checksum": "d4c970c57f248bd8514cd4fc242efec8",
+            "size": 1519,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-subquery_extend_over_extend_for_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-subquery_merge1]": [
         {
-            "checksum": "b69efcde25358cef187576c81c5d778c",
-            "size": 6963,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-subquery_merge1_/sql.yql"
+            "checksum": "3d30976466ed370183a8e6ee13979ee8",
+            "size": 3774,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-subquery_merge1_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-subquery_merge2]": [
         {
-            "checksum": "a9bee587f1071ece039913fb27de5dff",
-            "size": 4587,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-subquery_merge2_/sql.yql"
+            "checksum": "1a2159936c4153f0aa2224c10b25872d",
+            "size": 2769,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-subquery_merge2_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-subquery_merge_evaluate]": [
         {
-            "checksum": "be01002ae16b2dadded6b6207371f0de",
-            "size": 2531,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-subquery_merge_evaluate_/sql.yql"
+            "checksum": "4b909eb2df45ea5509835643ec3edf59",
+            "size": 2507,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-subquery_merge_evaluate_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-subquery_merge_nested_subquery]": [
         {
-            "checksum": "c0666d12d8cb4c76dd0463f8c523886c",
-            "size": 2441,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-subquery_merge_nested_subquery_/sql.yql"
+            "checksum": "978eab8aef7609a5d7079c88f2d3f3dd",
+            "size": 2219,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-subquery_merge_nested_subquery_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-subquery_merge_nested_world]": [
         {
-            "checksum": "54c3a4cecc1ea4b1bf1fc7ed4b67d9a9",
-            "size": 3613,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-subquery_merge_nested_world_/sql.yql"
+            "checksum": "1a6296846e6e652b2bfc7204e6390628",
+            "size": 3417,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-subquery_merge_nested_world_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-subquery_opt_args]": [
         {
-            "checksum": "c04566da790ceb5afbdaaedfa4d93372",
-            "size": 2435,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-subquery_opt_args_/sql.yql"
+            "checksum": "366311ed19ee06ea3a10ab33324ec10c",
+            "size": 1673,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-subquery_opt_args_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-subquery_orderby0]": [
         {
-            "checksum": "0004974fa838ff2efa3d184719e99e09",
-            "size": 2864,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-subquery_orderby0_/sql.yql"
+            "checksum": "4e6c2f0e89d3aa58a6b7cab776dacea0",
+            "size": 2010,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-subquery_orderby0_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-subquery_orderby1]": [
         {
-            "checksum": "f49b5112e3599f0b5a8be77c2865c876",
-            "size": 1486,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-subquery_orderby1_/sql.yql"
+            "checksum": "af945cf7886b6628671594a43deda49a",
+            "size": 1482,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-subquery_orderby1_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-subquery_orderby2]": [
         {
-            "checksum": "fbcf7931a5cab6df4b3e066086aa4fe0",
-            "size": 1589,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_action-subquery_orderby2_/sql.yql"
+            "checksum": "af8331f5d9497f34c6802414af8a398c",
+            "size": 1585,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_action-subquery_orderby2_/sql.yql"
         }
     ],
     "test_sql2yql.test[action-table_content_before_from_folder]": [
@@ -1226,79 +1226,79 @@
     ],
     "test_sql2yql.test[aggr_factory-avg]": [
         {
-            "checksum": "d07eee6e77cc794727dda8ea1da39ab1",
-            "size": 4639,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-avg_/sql.yql"
+            "checksum": "abedcf6486221c6816141ea96a6efbf4",
+            "size": 4397,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-avg_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-avg_distinct_expr]": [
         {
-            "checksum": "3d3759dbee308e41831f2c145cee0fb6",
-            "size": 2664,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-avg_distinct_expr_/sql.yql"
+            "checksum": "2ca29a3aeb848de2acf26451c59526ca",
+            "size": 2736,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-avg_distinct_expr_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-avg_if]": [
         {
-            "checksum": "546aae1b807857494b2e30531b536e91",
-            "size": 3710,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-avg_if_/sql.yql"
+            "checksum": "8a32622eaecf87a49c951c194b4edf5d",
+            "size": 3473,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-avg_if_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-bitand]": [
         {
-            "checksum": "a594a416ed9522cb3338044822679820",
-            "size": 4657,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-bitand_/sql.yql"
+            "checksum": "bdec1d17a5df5a3f1653191eb5c290ee",
+            "size": 4403,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-bitand_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-bitor]": [
         {
-            "checksum": "775c2c027a4e1646c8691d8464504d3f",
-            "size": 4654,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-bitor_/sql.yql"
+            "checksum": "baa4078de3cae52992114eb11591873a",
+            "size": 4402,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-bitor_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-bitxor]": [
         {
-            "checksum": "4092c7f28e86e608c05a3080440b817e",
-            "size": 4657,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-bitxor_/sql.yql"
+            "checksum": "3cb5c31a2c4271b6ed39082e83d556fe",
+            "size": 4403,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-bitxor_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-booland]": [
         {
-            "checksum": "97b4c5b6747623995d6fd8bbbb47b325",
-            "size": 4654,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-booland_/sql.yql"
+            "checksum": "48fe6c9fb9ecc38baf405f5f763dd89c",
+            "size": 4402,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-booland_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-boolor]": [
         {
-            "checksum": "213b60e73247eb008c6e25e85b096669",
-            "size": 4651,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-boolor_/sql.yql"
+            "checksum": "69626c6524815d8ec83e966907aadc95",
+            "size": 4401,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-boolor_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-bottom]": [
         {
-            "checksum": "293e858bd69c4e3165eda283934a6c1e",
-            "size": 5263,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-bottom_/sql.yql"
+            "checksum": "67fde7acf42cdc505071565783cde282",
+            "size": 4605,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-bottom_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-bottom_by]": [
         {
-            "checksum": "8e4e690680041de799af4865dc4f3a88",
-            "size": 4568,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-bottom_by_/sql.yql"
+            "checksum": "f21b987a747cab053fc45ce9ff48d457",
+            "size": 3747,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-bottom_by_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-container]": [
         {
-            "checksum": "86ce314eb8b0b0885c6560e7d6f5527b",
-            "size": 16630,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-container_/sql.yql"
+            "checksum": "0f08e327b77c1079758e44d20ea56a71",
+            "size": 15658,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-container_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-container_empty]": [
@@ -1310,135 +1310,135 @@
     ],
     "test_sql2yql.test[aggr_factory-corellation]": [
         {
-            "checksum": "8e71bff68d270d93ebca162c82084be7",
-            "size": 3530,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-corellation_/sql.yql"
+            "checksum": "30d61e95e2cb7344746a5d5841ad2caf",
+            "size": 3372,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-corellation_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-count]": [
         {
-            "checksum": "6030d0c709e9e3ef76a805efe554a488",
-            "size": 4645,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-count_/sql.yql"
+            "checksum": "05834cbd2b9016b497c962232dce9883",
+            "size": 4399,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-count_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-count_if]": [
         {
-            "checksum": "c49620415a7fa87c9795664c741e9844",
-            "size": 4669,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-count_if_/sql.yql"
+            "checksum": "6e752395079e76f3afda1f9ac54166ee",
+            "size": 4407,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-count_if_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-def_value_full_table]": [
         {
-            "checksum": "f88c95f4903c32187fc381bda1336b46",
-            "size": 7322,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-def_value_full_table_/sql.yql"
+            "checksum": "037aaf20f4f8789d7998f92a309d0232",
+            "size": 7452,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-def_value_full_table_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-def_value_with_keys]": [
         {
-            "checksum": "ade829860b226398a4d468e42ad95d17",
-            "size": 7477,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-def_value_with_keys_/sql.yql"
+            "checksum": "66f358423c9cea04df01653d25f2bdf4",
+            "size": 7607,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-def_value_with_keys_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-every]": [
         {
-            "checksum": "97b4c5b6747623995d6fd8bbbb47b325",
-            "size": 4654,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-every_/sql.yql"
+            "checksum": "48fe6c9fb9ecc38baf405f5f763dd89c",
+            "size": 4402,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-every_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-flatten]": [
         {
-            "checksum": "9c37d0c0dd131b62d811072c2acec670",
-            "size": 6196,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-flatten_/sql.yql"
+            "checksum": "10fd8b19c2745683567ecd5939088bf5",
+            "size": 5414,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-flatten_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-histogram]": [
         {
-            "checksum": "990f8a35ba13989f374f3f1a39b6cb34",
-            "size": 5048,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-histogram_/sql.yql"
+            "checksum": "27c98d33b39f6b3f327c2bfd1aa9243e",
+            "size": 4672,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-histogram_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-hll]": [
         {
-            "checksum": "3af44ffb806052f3089c47a156dde64a",
-            "size": 5916,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-hll_/sql.yql"
+            "checksum": "e8dba820c617d8e46fa27a014c27a135",
+            "size": 5540,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-hll_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-linear_histogram]": [
         {
-            "checksum": "d12aa8d072194d90950cfb5aeea84994",
-            "size": 4816,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-linear_histogram_/sql.yql"
+            "checksum": "644664c1946d6d1e3d30de3c4658a39c",
+            "size": 4510,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-linear_histogram_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-list]": [
         {
-            "checksum": "8a9d983b3df24a0fcb11ace066bf528a",
-            "size": 6328,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-list_/sql.yql"
+            "checksum": "26c8173871433eb2aa0b8b58c1438f56",
+            "size": 5790,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-list_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-log_histogram]": [
         {
-            "checksum": "93e55416533a31f25af5bb5796650f85",
-            "size": 4833,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-log_histogram_/sql.yql"
+            "checksum": "8f1843530e3f8012c800dda3e827cca2",
+            "size": 4521,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-log_histogram_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-logariphmic_histogram]": [
         {
-            "checksum": "93e55416533a31f25af5bb5796650f85",
-            "size": 4833,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-logariphmic_histogram_/sql.yql"
+            "checksum": "8f1843530e3f8012c800dda3e827cca2",
+            "size": 4521,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-logariphmic_histogram_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-max]": [
         {
-            "checksum": "d33fc3dd86fcdac07d2418a03bd9e58b",
-            "size": 4639,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-max_/sql.yql"
+            "checksum": "4ee35f304526d899c4c9e09f82769299",
+            "size": 4397,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-max_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-max_by]": [
         {
-            "checksum": "e87589b2c8d253d7fde7782930c13e3f",
-            "size": 5448,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-max_by_/sql.yql"
+            "checksum": "5bd43172cfb9d10c8789b2553ff110b2",
+            "size": 4798,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-max_by_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-median]": [
         {
-            "checksum": "84204167df53a5aa4941b637918105bf",
-            "size": 5925,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-median_/sql.yql"
+            "checksum": "7ecb35c258575e07ab7f7b5b1f626225",
+            "size": 5543,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-median_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-min]": [
         {
-            "checksum": "0919651d3a0ca05b25b99f6caee73182",
-            "size": 4639,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-min_/sql.yql"
+            "checksum": "514d1a960661c6a1846730745a782f18",
+            "size": 4397,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-min_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-min_by]": [
         {
-            "checksum": "0329b59f3d3c15dd25d6a14be1218f63",
-            "size": 5448,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-min_by_/sql.yql"
+            "checksum": "b73e7b75ca3570460ff3d3daabe57533",
+            "size": 4798,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-min_by_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-mode]": [
         {
-            "checksum": "1f31f9f9249522d602e5f4eef014dc62",
-            "size": 6875,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-mode_/sql.yql"
+            "checksum": "913b688a5c76068b1188d08e0451b192",
+            "size": 6055,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-mode_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-multi]": [
@@ -1464,9 +1464,9 @@
     ],
     "test_sql2yql.test[aggr_factory-multi_list_nulls]": [
         {
-            "checksum": "43ca6e4d9d1c014f1b917a87dd60c1ac",
-            "size": 5158,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-multi_list_nulls_/sql.yql"
+            "checksum": "df9baaa53172411b1b760a057f75b79c",
+            "size": 4927,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-multi_list_nulls_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-multi_minmaxby]": [
@@ -1478,9 +1478,9 @@
     ],
     "test_sql2yql.test[aggr_factory-multi_struct_nulls]": [
         {
-            "checksum": "36279b7570a3c407df9300328afeeccf",
-            "size": 5316,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-multi_struct_nulls_/sql.yql"
+            "checksum": "8286be08667f278a5971bcaa315ff155",
+            "size": 5006,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-multi_struct_nulls_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-multi_tuple]": [
@@ -1492,86 +1492,86 @@
     ],
     "test_sql2yql.test[aggr_factory-multi_tuple_nulls]": [
         {
-            "checksum": "50a2acc33a879b08939abaa4f867003c",
-            "size": 5004,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-multi_tuple_nulls_/sql.yql"
+            "checksum": "c68e2125014a50e6bf1c5a455676bc68",
+            "size": 4850,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-multi_tuple_nulls_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-some]": [
         {
-            "checksum": "24f4628a38ced15408114abae1f1e1af",
-            "size": 4642,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-some_/sql.yql"
+            "checksum": "c5f0a1cc2e8eefb2a3b23d6598b64891",
+            "size": 4398,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-some_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-stddev]": [
         {
-            "checksum": "c1ab6221c942ec5d3af5764bea819aa9",
-            "size": 4666,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-stddev_/sql.yql"
+            "checksum": "43d116eaa556f6e9e984d8a5a1fc2459",
+            "size": 4406,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-stddev_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-sum_if]": [
         {
-            "checksum": "770ae0b9459a77a40e655d848b8f7c58",
-            "size": 3710,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-sum_if_/sql.yql"
+            "checksum": "44342b7dab8c9ff4257572dc8b4436a1",
+            "size": 3473,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-sum_if_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-top]": [
         {
-            "checksum": "7379441a28ef20f2e7c50a1a77ae32aa",
-            "size": 5254,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-top_/sql.yql"
+            "checksum": "5b6b85561a0f1c8b105d15fee4c2d813",
+            "size": 4602,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-top_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-top_by]": [
         {
-            "checksum": "b8d2487a696cce8718120f94005ae290",
-            "size": 4562,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-top_by_/sql.yql"
+            "checksum": "3144a52bfaebc4b18953780a1a6a1933",
+            "size": 3744,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-top_by_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-transform_input]": [
         {
-            "checksum": "a5c4974dc6e7f9a3a60b2c112169802f",
-            "size": 3388,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-transform_input_/sql.yql"
+            "checksum": "feff4db73852189f4a5abe869aecc390",
+            "size": 3272,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-transform_input_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-transform_output]": [
         {
-            "checksum": "a9071c30b1361bb977749e7981a66d36",
-            "size": 3388,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-transform_output_/sql.yql"
+            "checksum": "968b166d75c4d5c2cd5e669d835cde3c",
+            "size": 3272,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-transform_output_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-udaf]": [
         {
-            "checksum": "9226a10f74a1e86d761b3c95c0fc9bd7",
-            "size": 9935,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-udaf_/sql.yql"
+            "checksum": "013e3142a8b04b7ac58e0269f963bf29",
+            "size": 6576,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-udaf_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-udaf_distinct_expr]": [
         {
-            "checksum": "0ec684dcd0dd090e1a41bfae6489a929",
-            "size": 3622,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-udaf_distinct_expr_/sql.yql"
+            "checksum": "7d73067f299579ccd00492ae7ff2dbb0",
+            "size": 3788,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-udaf_distinct_expr_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-udaf_in_udaf]": [
         {
-            "checksum": "e4584f918269cb28aed231695618e154",
-            "size": 8524,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-udaf_in_udaf_/sql.yql"
+            "checksum": "2a9263a7d2e2a898014f42f4f466da29",
+            "size": 3695,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-udaf_in_udaf_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-variance]": [
         {
-            "checksum": "2cd863bce78d02e391327a91a217323e",
-            "size": 4666,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggr_factory-variance_/sql.yql"
+            "checksum": "36d724d67b42c24be23bfac04cb20818",
+            "size": 4406,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggr_factory-variance_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggregate-GroupByOneField]": [
@@ -1625,9 +1625,9 @@
     ],
     "test_sql2yql.test[aggregate-aggregate_by_column_lookup_in_const_dict]": [
         {
-            "checksum": "b2d1bd12f38c00295e6b8c9544bda528",
-            "size": 1573,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggregate-aggregate_by_column_lookup_in_const_dict_/sql.yql"
+            "checksum": "2711be4b70cec9d878a1147edaf963c4",
+            "size": 1609,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggregate-aggregate_by_column_lookup_in_const_dict_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggregate-aggregate_by_one_column]": [
@@ -1744,16 +1744,16 @@
     ],
     "test_sql2yql.test[aggregate-aggregate_with_lambda]": [
         {
-            "checksum": "c1e2baa1b236589afd58fe45d64b1890",
-            "size": 1526,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggregate-aggregate_with_lambda_/sql.yql"
+            "checksum": "04cb98e5a839ca9ca97eaf4f5f5daf62",
+            "size": 1542,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggregate-aggregate_with_lambda_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggregate-aggregate_with_lambda_inside_avg]": [
         {
-            "checksum": "57e6460c0f3d3b423a1f630aa2316539",
-            "size": 1404,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggregate-aggregate_with_lambda_inside_avg_/sql.yql"
+            "checksum": "034c003f95ae1100a1240bc334c535b8",
+            "size": 1464,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggregate-aggregate_with_lambda_inside_avg_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggregate-aggregation_and_order]": [
@@ -1772,9 +1772,9 @@
     ],
     "test_sql2yql.test[aggregate-aggregation_with_named_node]": [
         {
-            "checksum": "a7e95dce3919d157f3f5b42f01b15bf6",
-            "size": 2517,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggregate-aggregation_with_named_node_/sql.yql"
+            "checksum": "a1484316f182395180b57f93434d0c8b",
+            "size": 2552,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggregate-aggregation_with_named_node_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggregate-aggrs_no_grouping]": [
@@ -2304,9 +2304,9 @@
     ],
     "test_sql2yql.test[aggregate-group_by_rollup_grouping_hum_bind]": [
         {
-            "checksum": "a8efd089a88c161112b6ceea39f41b1b",
-            "size": 6552,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggregate-group_by_rollup_grouping_hum_bind_/sql.yql"
+            "checksum": "a61e46e19f8fb1db6eba9465afda4cfa",
+            "size": 6568,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggregate-group_by_rollup_grouping_hum_bind_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggregate-group_by_rollup_key_check]": [
@@ -2444,23 +2444,23 @@
     ],
     "test_sql2yql.test[aggregate-group_by_session_extended]": [
         {
-            "checksum": "fc0127819e614b7d10f08ca15177eb12",
-            "size": 3523,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggregate-group_by_session_extended_/sql.yql"
+            "checksum": "d8c8b3890bff4f3ea37d7eb7118267c0",
+            "size": 3583,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggregate-group_by_session_extended_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggregate-group_by_session_extended_subset]": [
         {
-            "checksum": "701e8d88ae3e1ed4c01599d30d7e1143",
-            "size": 3513,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggregate-group_by_session_extended_subset_/sql.yql"
+            "checksum": "8c344186fc5e3b97ce8308ce7822a90e",
+            "size": 3573,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggregate-group_by_session_extended_subset_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggregate-group_by_session_extended_tuple]": [
         {
-            "checksum": "a5a9f92c1a2ff4dab11aeaccd1d65062",
-            "size": 4241,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggregate-group_by_session_extended_tuple_/sql.yql"
+            "checksum": "aa8f1b0a1b31e260bc813738ef62bac7",
+            "size": 4373,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggregate-group_by_session_extended_tuple_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggregate-group_by_session_nopush]": [
@@ -2507,9 +2507,9 @@
     ],
     "test_sql2yql.test[aggregate-group_by_with_udf_by_aggregate]": [
         {
-            "checksum": "90dbbd9cb690e296aca9e5120692ff57",
-            "size": 2332,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggregate-group_by_with_udf_by_aggregate_/sql.yql"
+            "checksum": "84e2909592cc9677e8eb3370f07caa16",
+            "size": 2340,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggregate-group_by_with_udf_by_aggregate_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggregate-group_by_with_where]": [
@@ -2640,9 +2640,9 @@
     ],
     "test_sql2yql.test[aggregate-percentile_interval]": [
         {
-            "checksum": "a8095f04d1a346b02c949833efa12ed4",
-            "size": 7720,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggregate-percentile_interval_/sql.yql"
+            "checksum": "e255398d5fcbe0e1e4b10c97dee5dce9",
+            "size": 7792,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggregate-percentile_interval_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggregate-percentiles_containers]": [
@@ -2703,9 +2703,9 @@
     ],
     "test_sql2yql.test[aggregate-yql-18511]": [
         {
-            "checksum": "cca030f77b003f0ee9f627e04304fad1",
-            "size": 21501,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_aggregate-yql-18511_/sql.yql"
+            "checksum": "1a3c719c618b32c163bb7c899b9df77b",
+            "size": 20415,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_aggregate-yql-18511_/sql.yql"
         }
     ],
     "test_sql2yql.test[ansi_idents-basic_columns]": [
@@ -2731,9 +2731,9 @@
     ],
     "test_sql2yql.test[ansi_idents-inplace_yql]": [
         {
-            "checksum": "928dbb1e2bf5b917b07d8ff8207e13ed",
-            "size": 1136,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_ansi_idents-inplace_yql_/sql.yql"
+            "checksum": "612423b92077332d156e5905d6046b5d",
+            "size": 1165,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_ansi_idents-inplace_yql_/sql.yql"
         }
     ],
     "test_sql2yql.test[ansi_idents-join_using]": [
@@ -2759,16 +2759,16 @@
     ],
     "test_sql2yql.test[ansi_idents-struct_access]": [
         {
-            "checksum": "952c35bdc2517f4a23064e96da7fc768",
-            "size": 1119,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_ansi_idents-struct_access_/sql.yql"
+            "checksum": "7c8f2a7e374f134c4f652cdde1603435",
+            "size": 1155,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_ansi_idents-struct_access_/sql.yql"
         }
     ],
     "test_sql2yql.test[bigdate-arithmetic]": [
         {
-            "checksum": "dd71cf80379fd120f899f51a8d4185e0",
-            "size": 55200,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_bigdate-arithmetic_/sql.yql"
+            "checksum": "bde736268fc5c0950539439a885161fd",
+            "size": 40450,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_bigdate-arithmetic_/sql.yql"
         }
     ],
     "test_sql2yql.test[bigdate-bitcast_date32]": [
@@ -2801,9 +2801,9 @@
     ],
     "test_sql2yql.test[bigdate-common_type]": [
         {
-            "checksum": "8a97f33a7587893afc48c941e6986b0b",
-            "size": 13879,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_bigdate-common_type_/sql.yql"
+            "checksum": "0013be65e4b15c49bbbbb1ec3ee58206",
+            "size": 10752,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_bigdate-common_type_/sql.yql"
         }
     ],
     "test_sql2yql.test[bigdate-compare_big_big]": [
@@ -2857,16 +2857,16 @@
     ],
     "test_sql2yql.test[bigdate-explicit_cast]": [
         {
-            "checksum": "e48eb770e3f95146c8e6c9f0f1a3c731",
-            "size": 22917,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_bigdate-explicit_cast_/sql.yql"
+            "checksum": "1d24da1f19ed64863e0c1b5819f84db3",
+            "size": 21390,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_bigdate-explicit_cast_/sql.yql"
         }
     ],
     "test_sql2yql.test[bigdate-implicit_cast_callable]": [
         {
-            "checksum": "85b90c1d9433e047074a97050e5a95fd",
-            "size": 14792,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_bigdate-implicit_cast_callable_/sql.yql"
+            "checksum": "aefef6555390f163bf72549adce212e6",
+            "size": 11668,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_bigdate-implicit_cast_callable_/sql.yql"
         }
     ],
     "test_sql2yql.test[bigdate-input_date32]": [
@@ -2899,9 +2899,9 @@
     ],
     "test_sql2yql.test[bigdate-int_cast]": [
         {
-            "checksum": "ad1eec5f8085df20b8edff19b0c24dd2",
-            "size": 22193,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_bigdate-int_cast_/sql.yql"
+            "checksum": "f78eb8029febc21c194928276b96366b",
+            "size": 21215,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_bigdate-int_cast_/sql.yql"
         }
     ],
     "test_sql2yql.test[bigdate-int_literals]": [
@@ -2913,9 +2913,9 @@
     ],
     "test_sql2yql.test[bigdate-misc]": [
         {
-            "checksum": "0e7968fec2e862b2ca4f1d86f9a10214",
-            "size": 6867,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_bigdate-misc_/sql.yql"
+            "checksum": "11decb8a5b420275d0358f58156e1a3e",
+            "size": 7155,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_bigdate-misc_/sql.yql"
         }
     ],
     "test_sql2yql.test[bigdate-output_date32]": [
@@ -2948,16 +2948,16 @@
     ],
     "test_sql2yql.test[bigdate-presort]": [
         {
-            "checksum": "df7cc615afa4db1659ba17ff01bd99a3",
-            "size": 3864,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_bigdate-presort_/sql.yql"
+            "checksum": "86246c800ce225506c0c872e006a8625",
+            "size": 4058,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_bigdate-presort_/sql.yql"
         }
     ],
     "test_sql2yql.test[bigdate-round]": [
         {
-            "checksum": "2af83c0ecf1bea79db47fd9e1b0ff149",
-            "size": 47690,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_bigdate-round_/sql.yql"
+            "checksum": "f0977aae3164d89763c90be1fed38c80",
+            "size": 40103,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_bigdate-round_/sql.yql"
         }
     ],
     "test_sql2yql.test[bigdate-table_arithmetic]": [
@@ -3039,9 +3039,9 @@
     ],
     "test_sql2yql.test[bigdate-tz_table_fill]": [
         {
-            "checksum": "ae7e8ab4b24539855a66a897c2ce337a",
-            "size": 1532,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_bigdate-tz_table_fill_/sql.yql"
+            "checksum": "e9d53948211727eaa968a6a0c98965b7",
+            "size": 1571,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_bigdate-tz_table_fill_/sql.yql"
         }
     ],
     "test_sql2yql.test[bigdate-tz_table_pull]": [
@@ -3088,16 +3088,16 @@
     ],
     "test_sql2yql.test[binding-anon_table_binding]": [
         {
-            "checksum": "cf1e9ee529d4fcca3781cc85b3e555d8",
-            "size": 1856,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_binding-anon_table_binding_/sql.yql"
+            "checksum": "cab464e929792fe81af541f6d00f40bf",
+            "size": 1885,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_binding-anon_table_binding_/sql.yql"
         }
     ],
     "test_sql2yql.test[binding-bind_cast]": [
         {
-            "checksum": "60f14e62cbb5f7598ef23f0b1fec8ab9",
-            "size": 1017,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_binding-bind_cast_/sql.yql"
+            "checksum": "5746b907b21ba8d8f05c143f2cb9985b",
+            "size": 1053,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_binding-bind_cast_/sql.yql"
         }
     ],
     "test_sql2yql.test[binding-bind_select]": [
@@ -3130,23 +3130,23 @@
     ],
     "test_sql2yql.test[binding-drop_binding]": [
         {
-            "checksum": "75cf90a7c8914e5b41f1df89ab444492",
-            "size": 409,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_binding-drop_binding_/sql.yql"
+            "checksum": "4b0b4372f54adc8e6e98f65131391167",
+            "size": 438,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_binding-drop_binding_/sql.yql"
         }
     ],
     "test_sql2yql.test[binding-insert_binding]": [
         {
-            "checksum": "5a60dcb2694f86bd242f8270635ca4f4",
-            "size": 1257,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_binding-insert_binding_/sql.yql"
+            "checksum": "809cd7fa92952ed2171b7a873150d2e1",
+            "size": 1286,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_binding-insert_binding_/sql.yql"
         }
     ],
     "test_sql2yql.test[binding-named_callable]": [
         {
-            "checksum": "b65aaf70c66a54051bd54ce7cb6fae4d",
-            "size": 1094,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_binding-named_callable_/sql.yql"
+            "checksum": "0be99c8b1bc6a288cf525bcd1913e612",
+            "size": 1110,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_binding-named_callable_/sql.yql"
         }
     ],
     "test_sql2yql.test[binding-named_expr_input]": [
@@ -3165,93 +3165,93 @@
     ],
     "test_sql2yql.test[binding-table_concat_binding]": [
         {
-            "checksum": "deced763977276663a6dee6c8255e137",
-            "size": 2432,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_binding-table_concat_binding_/sql.yql"
+            "checksum": "bb642623c60ebfadf5fd2555719cc657",
+            "size": 2490,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_binding-table_concat_binding_/sql.yql"
         }
     ],
     "test_sql2yql.test[binding-table_concat_strict_binding]": [
         {
-            "checksum": "16c41cbf6f00feee623c9d7156790c23",
-            "size": 2406,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_binding-table_concat_strict_binding_/sql.yql"
+            "checksum": "b88ebdfef577163fa9fd4ab3e6da1841",
+            "size": 2464,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_binding-table_concat_strict_binding_/sql.yql"
         }
     ],
     "test_sql2yql.test[binding-table_filter_binding]": [
         {
-            "checksum": "28db0395be7c19afdb8042473d41d68c",
-            "size": 4968,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_binding-table_filter_binding_/sql.yql"
+            "checksum": "3dd9e64e39df5805ba894138a4ab9d71",
+            "size": 5421,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_binding-table_filter_binding_/sql.yql"
         }
     ],
     "test_sql2yql.test[binding-table_filter_strict_binding]": [
         {
-            "checksum": "a02d62004784ed35ae10426e6233c5b9",
-            "size": 4992,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_binding-table_filter_strict_binding_/sql.yql"
+            "checksum": "0230f2b60005aa3b5990d49d4a7c88e8",
+            "size": 5475,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_binding-table_filter_strict_binding_/sql.yql"
         }
     ],
     "test_sql2yql.test[binding-table_from_binding]": [
         {
-            "checksum": "2407aef4c435e1e71daf33f654bcd063",
-            "size": 1299,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_binding-table_from_binding_/sql.yql"
+            "checksum": "6aeacfc5e945d5e89b7b6bf0d3dac389",
+            "size": 1328,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_binding-table_from_binding_/sql.yql"
         }
     ],
     "test_sql2yql.test[binding-table_from_binding_inferscheme]": [
         {
-            "checksum": "0bc11fc73b0835002805000d14054260",
-            "size": 1384,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_binding-table_from_binding_inferscheme_/sql.yql"
+            "checksum": "3412d54f4ad3fff93e70c606a37260d7",
+            "size": 1413,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_binding-table_from_binding_inferscheme_/sql.yql"
         }
     ],
     "test_sql2yql.test[binding-table_range_binding]": [
         {
-            "checksum": "094cd332df180206b18beab326db4574",
-            "size": 7216,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_binding-table_range_binding_/sql.yql"
+            "checksum": "a89dd82d6522ba01f9e10d0e5289f0b6",
+            "size": 8106,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_binding-table_range_binding_/sql.yql"
         }
     ],
     "test_sql2yql.test[binding-table_range_strict_binding]": [
         {
-            "checksum": "f39865d2168d407ab07dbe3e914a04dc",
-            "size": 7252,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_binding-table_range_strict_binding_/sql.yql"
+            "checksum": "2d935ce2f01ae5f8696b2100890640f5",
+            "size": 8142,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_binding-table_range_strict_binding_/sql.yql"
         }
     ],
     "test_sql2yql.test[binding-table_regexp_binding]": [
         {
-            "checksum": "bffbef0f1c639485f5b00f9f3d6bbf7b",
-            "size": 2536,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_binding-table_regexp_binding_/sql.yql"
+            "checksum": "e63773d1d250cc1610fb425c7bed3ed8",
+            "size": 2768,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_binding-table_regexp_binding_/sql.yql"
         }
     ],
     "test_sql2yql.test[binding-table_regexp_strict_binding]": [
         {
-            "checksum": "a40500adec3350f774ac137bd975cb7e",
-            "size": 2548,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_binding-table_regexp_strict_binding_/sql.yql"
+            "checksum": "2e0d5f4ce951028be23ebeec3fd39aee",
+            "size": 2780,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_binding-table_regexp_strict_binding_/sql.yql"
         }
     ],
     "test_sql2yql.test[binding-tie]": [
         {
-            "checksum": "efdb5d916324fe19ce040be7c0f6845d",
-            "size": 1495,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_binding-tie_/sql.yql"
+            "checksum": "7c09744b611b2751fd44f37e763d943c",
+            "size": 1425,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_binding-tie_/sql.yql"
         }
     ],
     "test_sql2yql.test[binding-tie_bad_count_fail]": [
         {
-            "checksum": "83bb57727063e53f4cafe80be1b83ca1",
-            "size": 1276,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_binding-tie_bad_count_fail_/sql.yql"
+            "checksum": "c4e3bd8c7b55e1f5d2fcd1a9eef05d42",
+            "size": 1259,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_binding-tie_bad_count_fail_/sql.yql"
         }
     ],
     "test_sql2yql.test[binding-tie_scalar_context]": [
         {
-            "checksum": "c5f06c08152af69566d3049aa8161654",
-            "size": 3224,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_binding-tie_scalar_context_/sql.yql"
+            "checksum": "b4a2cd14342eb4019ed6b19730c976c7",
+            "size": 3105,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_binding-tie_scalar_context_/sql.yql"
         }
     ],
     "test_sql2yql.test[bitcast_implicit-add_bitcast]": [
@@ -3417,9 +3417,9 @@
     ],
     "test_sql2yql.test[blocks-coalesce_complex]": [
         {
-            "checksum": "330e6a811d9436634b03bd8d83970b80",
-            "size": 5732,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_blocks-coalesce_complex_/sql.yql"
+            "checksum": "67b126b29ea72676ad6fb2e42ca906ed",
+            "size": 5804,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_blocks-coalesce_complex_/sql.yql"
         }
     ],
     "test_sql2yql.test[blocks-coalesce_ints]": [
@@ -4068,9 +4068,9 @@
     ],
     "test_sql2yql.test[blocks-lazy_nonstrict_basic]": [
         {
-            "checksum": "5caa66e617dc7319578383a1c5c2bbd8",
-            "size": 4167,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_blocks-lazy_nonstrict_basic_/sql.yql"
+            "checksum": "c599f9dfcce4ee3a966f621e94de7586",
+            "size": 3987,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_blocks-lazy_nonstrict_basic_/sql.yql"
         }
     ],
     "test_sql2yql.test[blocks-lazy_nonstrict_nested]": [
@@ -4369,16 +4369,16 @@
     ],
     "test_sql2yql.test[blocks-type_and_callable_stats]": [
         {
-            "checksum": "9efa02df55deb6b8dbdca1b440e96fc1",
-            "size": 2601,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_blocks-type_and_callable_stats_/sql.yql"
+            "checksum": "6c1af4d84c135ce64df473d3bbf565ac",
+            "size": 2673,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_blocks-type_and_callable_stats_/sql.yql"
         }
     ],
     "test_sql2yql.test[case-case_many_val]": [
         {
-            "checksum": "bda507979f30604c929d345df0b011e0",
-            "size": 16340,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_case-case_many_val_/sql.yql"
+            "checksum": "5f8779f0da7f0741fe0c6d2d0831c8e8",
+            "size": 16382,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_case-case_many_val_/sql.yql"
         }
     ],
     "test_sql2yql.test[case-case_multi_val]": [
@@ -4453,9 +4453,9 @@
     ],
     "test_sql2yql.test[coalesce-coalesce_few_real]": [
         {
-            "checksum": "144c79f1c0abab4fea6a442318034a06",
-            "size": 3258,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_coalesce-coalesce_few_real_/sql.yql"
+            "checksum": "8f34bf75c5395aae52b5103f4dde8e56",
+            "size": 3260,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_coalesce-coalesce_few_real_/sql.yql"
         }
     ],
     "test_sql2yql.test[coalesce-coalesce_sugar]": [
@@ -4467,9 +4467,9 @@
     ],
     "test_sql2yql.test[coalesce-coalesce_symmetry]": [
         {
-            "checksum": "65e6e43c25df70d11bcabfeed142e2b3",
-            "size": 6986,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_coalesce-coalesce_symmetry_/sql.yql"
+            "checksum": "2873f42edb5f890ed9c15231bc5089cd",
+            "size": 6708,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_coalesce-coalesce_symmetry_/sql.yql"
         }
     ],
     "test_sql2yql.test[column_group-groups]": [
@@ -4649,9 +4649,9 @@
     ],
     "test_sql2yql.test[column_order-insert_reorder_without_columnorder]": [
         {
-            "checksum": "d3105827a0ca8e095bcecc797540f34e",
-            "size": 1553,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_column_order-insert_reorder_without_columnorder_/sql.yql"
+            "checksum": "202d2f9238fe0291e52f9f01b73a1385",
+            "size": 1589,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_column_order-insert_reorder_without_columnorder_/sql.yql"
         }
     ],
     "test_sql2yql.test[column_order-insert_tmp]": [
@@ -4768,9 +4768,9 @@
     ],
     "test_sql2yql.test[column_order-select_subquery]": [
         {
-            "checksum": "85afc1b9edbd369e5f31526fa36e4a10",
-            "size": 2061,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_column_order-select_subquery_/sql.yql"
+            "checksum": "7882c9d39ff784a85a765eb62d6145f9",
+            "size": 1961,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_column_order-select_subquery_/sql.yql"
         }
     ],
     "test_sql2yql.test[column_order-select_where]": [
@@ -4838,9 +4838,9 @@
     ],
     "test_sql2yql.test[compute_range-decimal]": [
         {
-            "checksum": "7b38fdbd8556b4d1f136cc4fb8b3c17f",
-            "size": 1347,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_compute_range-decimal_/sql.yql"
+            "checksum": "37a4eb0959706aa9f13e85cfe9db49c0",
+            "size": 1435,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_compute_range-decimal_/sql.yql"
         }
     ],
     "test_sql2yql.test[compute_range-huge_in]": [
@@ -4859,9 +4859,9 @@
     ],
     "test_sql2yql.test[compute_range-in3]": [
         {
-            "checksum": "b8aec5c840ce0795c726d808480bc21e",
-            "size": 4939,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_compute_range-in3_/sql.yql"
+            "checksum": "2f09d4d9e58ac19ab7a0cc68eb1daa77",
+            "size": 5047,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_compute_range-in3_/sql.yql"
         }
     ],
     "test_sql2yql.test[compute_range-in]": [
@@ -4901,9 +4901,9 @@
     ],
     "test_sql2yql.test[compute_range-multiply_limit_with_dups]": [
         {
-            "checksum": "67cde096290f154b719746730b5d80d0",
-            "size": 1775,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_compute_range-multiply_limit_with_dups_/sql.yql"
+            "checksum": "c7034d75d788de75a773e6312d4fe03c",
+            "size": 1823,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_compute_range-multiply_limit_with_dups_/sql.yql"
         }
     ],
     "test_sql2yql.test[compute_range-multiply_limit_with_nulls]": [
@@ -4915,9 +4915,9 @@
     ],
     "test_sql2yql.test[compute_range-norange]": [
         {
-            "checksum": "71b43dd28b7bb836b2e592479eb10bbe",
-            "size": 3034,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_compute_range-norange_/sql.yql"
+            "checksum": "98442a3291efe0873e4ae275bd4b9013",
+            "size": 2636,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_compute_range-norange_/sql.yql"
         }
     ],
     "test_sql2yql.test[compute_range-pg_compare]": [
@@ -4978,9 +4978,9 @@
     ],
     "test_sql2yql.test[compute_range-tuples_compare]": [
         {
-            "checksum": "239eb01d4ee3ec52a09fab13fa47fa56",
-            "size": 9794,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_compute_range-tuples_compare_/sql.yql"
+            "checksum": "e2d399b3480430f3b9acf3f36c390953",
+            "size": 8060,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_compute_range-tuples_compare_/sql.yql"
         }
     ],
     "test_sql2yql.test[compute_range-tztypes]": [
@@ -4992,9 +4992,9 @@
     ],
     "test_sql2yql.test[compute_range-yql-12941]": [
         {
-            "checksum": "71434e1fd933100873eb8b2292393b88",
-            "size": 2418,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_compute_range-yql-12941_/sql.yql"
+            "checksum": "830a50b51de49300a443b8a0023dd89b",
+            "size": 2354,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_compute_range-yql-12941_/sql.yql"
         }
     ],
     "test_sql2yql.test[compute_range-yql-13489]": [
@@ -5272,16 +5272,16 @@
     ],
     "test_sql2yql.test[csee-yql-7237]": [
         {
-            "checksum": "c424229c8c737dedeb9ffc1ceba3a473",
-            "size": 7220,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_csee-yql-7237_/sql.yql"
+            "checksum": "cc199a80a112ea5b0993fbcf79d8af80",
+            "size": 6312,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_csee-yql-7237_/sql.yql"
         }
     ],
     "test_sql2yql.test[datetime-all_timezones]": [
         {
-            "checksum": "aa9b33e10ef430c1b1528c31a1156b8f",
-            "size": 1332,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_datetime-all_timezones_/sql.yql"
+            "checksum": "2b78d3efdfdfdac6b70ff9449f473a62",
+            "size": 1356,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_datetime-all_timezones_/sql.yql"
         }
     ],
     "test_sql2yql.test[datetime-current_date]": [
@@ -5671,9 +5671,9 @@
     ],
     "test_sql2yql.test[dq-precompute_result]": [
         {
-            "checksum": "043145e8db2d44a158f122c3a724e034",
-            "size": 2202,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_dq-precompute_result_/sql.yql"
+            "checksum": "f69b77afef5206bc63245399136a71af",
+            "size": 2238,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_dq-precompute_result_/sql.yql"
         }
     ],
     "test_sql2yql.test[dq-precompute_tree]": [
@@ -5706,23 +5706,23 @@
     ],
     "test_sql2yql.test[dq-wrong_script]": [
         {
-            "checksum": "447f152b50e5bf2e449eee11723e41bc",
-            "size": 1255,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_dq-wrong_script_/sql.yql"
+            "checksum": "373ac6259fd92a22f507a21576648dae",
+            "size": 1337,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_dq-wrong_script_/sql.yql"
         }
     ],
     "test_sql2yql.test[dq-wrong_script_segf]": [
         {
-            "checksum": "c7f9c7b7799a9bdadedb37ccb77681a9",
-            "size": 1395,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_dq-wrong_script_segf_/sql.yql"
+            "checksum": "26305cd03b46478d2327f9c6296c2b90",
+            "size": 1617,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_dq-wrong_script_segf_/sql.yql"
         }
     ],
     "test_sql2yql.test[dq-wrong_script_timeout]": [
         {
-            "checksum": "aaa85a47a6a73c6d2a4c5639ce92e8c1",
-            "size": 1289,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_dq-wrong_script_timeout_/sql.yql"
+            "checksum": "065786b4451eeb2786759ed1bfd038df",
+            "size": 1405,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_dq-wrong_script_timeout_/sql.yql"
         }
     ],
     "test_sql2yql.test[epochs-read_modified]": [
@@ -5755,9 +5755,9 @@
     ],
     "test_sql2yql.test[expr-as_dict_dict_key]": [
         {
-            "checksum": "4d065f5e56c8b63be0d3411d410e04c4",
-            "size": 7149,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-as_dict_dict_key_/sql.yql"
+            "checksum": "5c390ab85a18422f647aed44377febcc",
+            "size": 4502,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-as_dict_dict_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-as_dict_implicit_cast]": [
@@ -5769,16 +5769,16 @@
     ],
     "test_sql2yql.test[expr-as_dict_list_key]": [
         {
-            "checksum": "ee728b6f722b9f81ca9bc2a517453c5c",
-            "size": 4607,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-as_dict_list_key_/sql.yql"
+            "checksum": "5f63b2f9924d2246e0159c0632179741",
+            "size": 3827,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-as_dict_list_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-as_dict_tuple_key]": [
         {
-            "checksum": "c0d292bcee6cc7a26c59abeca7df713d",
-            "size": 11258,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-as_dict_tuple_key_/sql.yql"
+            "checksum": "daa8a9f8f5c9ae5752f6fea2cc533824",
+            "size": 10170,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-as_dict_tuple_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-as_set]": [
@@ -5797,23 +5797,23 @@
     ],
     "test_sql2yql.test[expr-as_table]": [
         {
-            "checksum": "0bf324f10bc30b8e1f5478a034e3d97c",
-            "size": 3361,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-as_table_/sql.yql"
+            "checksum": "1e07bd8a5b84eea9a1dc20fb9671d03a",
+            "size": 3096,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-as_table_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-as_table_bad_columns_fail]": [
         {
-            "checksum": "9ac5c63ddeb8f92972228168b69fc7b1",
-            "size": 1446,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-as_table_bad_columns_fail_/sql.yql"
+            "checksum": "39735febb6d19f7a7aa51a8f5a949a2f",
+            "size": 1482,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-as_table_bad_columns_fail_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-as_table_bad_row_type_fail]": [
         {
-            "checksum": "2810cae7bca8511c3a14913e20362f1f",
-            "size": 1188,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-as_table_bad_row_type_fail_/sql.yql"
+            "checksum": "9022a9776741ead91a836a439adfb8af",
+            "size": 1224,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-as_table_bad_row_type_fail_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-as_table_emptylist2]": [
@@ -5867,9 +5867,9 @@
     ],
     "test_sql2yql.test[expr-callable]": [
         {
-            "checksum": "8b20e5233de85a6f058137c59e2a51f5",
-            "size": 1959,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-callable_/sql.yql"
+            "checksum": "5510e3c3565ed978e4c85920ead279fe",
+            "size": 1605,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-callable_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-cast_dynumber]": [
@@ -5888,9 +5888,9 @@
     ],
     "test_sql2yql.test[expr-cast_longint]": [
         {
-            "checksum": "c400508584c8e0b34fabf51691acd652",
-            "size": 1649,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-cast_longint_/sql.yql"
+            "checksum": "30e779393ac508f3d3923e76a4f86434",
+            "size": 1644,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-cast_longint_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-cast_reverse_list]": [
@@ -5909,16 +5909,16 @@
     ],
     "test_sql2yql.test[expr-cast_struct]": [
         {
-            "checksum": "5ee2144d92ae31654276aee7373a05a9",
-            "size": 2439,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-cast_struct_/sql.yql"
+            "checksum": "02bac4d4147e4a80efffbb91ed2fa22c",
+            "size": 2088,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-cast_struct_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-cast_type_bind]": [
         {
-            "checksum": "98d89ab067086837de7e2ca29dd4835a",
-            "size": 1050,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-cast_type_bind_/sql.yql"
+            "checksum": "31b6cc45b74cc77d22c8339f7c485a39",
+            "size": 1086,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-cast_type_bind_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-cast_utf8]": [
@@ -5930,9 +5930,9 @@
     ],
     "test_sql2yql.test[expr-cast_variant]": [
         {
-            "checksum": "2b71ea0a9eed5a0099a2d05f1a253f0f",
-            "size": 2026,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-cast_variant_/sql.yql"
+            "checksum": "787b40409a02a534a06a3d2a2f5c8ab9",
+            "size": 2248,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-cast_variant_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-checked_ops]": [
@@ -5972,9 +5972,9 @@
     ],
     "test_sql2yql.test[expr-convert_to_lambda_optional_args]": [
         {
-            "checksum": "8b58007c340fe34ffa65b0358aa40db4",
-            "size": 2161,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-convert_to_lambda_optional_args_/sql.yql"
+            "checksum": "cdd9da80f98d7fd6d55e5ecc4e44a267",
+            "size": 2193,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-convert_to_lambda_optional_args_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-current_tz]": [
@@ -5993,23 +5993,23 @@
     ],
     "test_sql2yql.test[expr-dict_builtins]": [
         {
-            "checksum": "83e947b5afa171ce301cd8fbc1659bd8",
-            "size": 3038,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-dict_builtins_/sql.yql"
+            "checksum": "fe09eeba3ff8755f62946a0bc54119d1",
+            "size": 2684,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-dict_builtins_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-dict_builtins_null_lookup]": [
         {
-            "checksum": "5c12f6d9791d01bc74ac075c7de22692",
-            "size": 4404,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-dict_builtins_null_lookup_/sql.yql"
+            "checksum": "48327a059d882735d6ff8cc9471bf952",
+            "size": 4106,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-dict_builtins_null_lookup_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-dict_common_type]": [
         {
-            "checksum": "5f8f097e8b0b59abc2cc0062a4878178",
-            "size": 2316,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-dict_common_type_/sql.yql"
+            "checksum": "276282dff57ddcd3cc8c44c1ec010be0",
+            "size": 2532,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-dict_common_type_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-dict_comp]": [
@@ -6028,9 +6028,9 @@
     ],
     "test_sql2yql.test[expr-distinct_from_containers]": [
         {
-            "checksum": "128ad8cf3d4613d8f470cf2ec09d309c",
-            "size": 2866,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-distinct_from_containers_/sql.yql"
+            "checksum": "25886660c09ac47abd95f3fc21db3444",
+            "size": 3010,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-distinct_from_containers_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-distinct_from_opt]": [
@@ -6056,16 +6056,16 @@
     ],
     "test_sql2yql.test[expr-empty_iterator2]": [
         {
-            "checksum": "a46e0a7c4eb660eb9d71883022222ea7",
-            "size": 2629,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-empty_iterator2_/sql.yql"
+            "checksum": "b1a4268a704ca25e64416366c36efde2",
+            "size": 2635,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-empty_iterator2_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-empty_iterator]": [
         {
-            "checksum": "202d43e11724dcb8a1b4adebf2fda439",
-            "size": 2535,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-empty_iterator_/sql.yql"
+            "checksum": "5b23b4562143703a4f96932de765e576",
+            "size": 2541,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-empty_iterator_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-empty_list_ops1]": [
@@ -6084,9 +6084,9 @@
     ],
     "test_sql2yql.test[expr-empty_list_ops3]": [
         {
-            "checksum": "fbfd724293a3f8e5aab9469692111e1f",
-            "size": 8148,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-empty_list_ops3_/sql.yql"
+            "checksum": "abcb6b5b517d2f956a88d944d5ac075f",
+            "size": 7674,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-empty_list_ops3_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-empty_struct_tuple_types]": [
@@ -6126,9 +6126,9 @@
     ],
     "test_sql2yql.test[expr-exapnd_with_singular_types]": [
         {
-            "checksum": "2cf02d9ea7d51e8728c9452b5b6a8ecd",
-            "size": 1929,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-exapnd_with_singular_types_/sql.yql"
+            "checksum": "88e5df1cc45a8c02a3fcdf5a57d345df",
+            "size": 1561,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-exapnd_with_singular_types_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-expr_add_literal_nulls]": [
@@ -6147,23 +6147,23 @@
     ],
     "test_sql2yql.test[expr-expr_named_yql_lambda]": [
         {
-            "checksum": "765f42467cbf4c4853c20bb2b3b1161c",
-            "size": 1032,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-expr_named_yql_lambda_/sql.yql"
+            "checksum": "7a1cace15ad481b6c4c2c9c09a992c8c",
+            "size": 1061,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-expr_named_yql_lambda_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-expr_named_yql_lambda_multiline_atoms]": [
         {
-            "checksum": "9e8bf20a23f45d139b64827e5fa7ee24",
-            "size": 1058,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-expr_named_yql_lambda_multiline_atoms_/sql.yql"
+            "checksum": "adc31a6d2cb2b80dac6a3324a0627bc6",
+            "size": 1087,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-expr_named_yql_lambda_multiline_atoms_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-expr_named_yql_lambda_quotes]": [
         {
-            "checksum": "64cfc1e85bf9fabe41f00a46ec8a62f9",
-            "size": 1267,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-expr_named_yql_lambda_quotes_/sql.yql"
+            "checksum": "290f44e91a674f2cc78fe490ccfa17fd",
+            "size": 1325,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-expr_named_yql_lambda_quotes_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-expr_null]": [
@@ -6182,9 +6182,9 @@
     ],
     "test_sql2yql.test[expr-expr_trivial_named]": [
         {
-            "checksum": "d098ffece30ab7044a43f22fc5f0a28d",
-            "size": 998,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-expr_trivial_named_/sql.yql"
+            "checksum": "4503569f5d21ba58048f18db308f61cf",
+            "size": 1034,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-expr_trivial_named_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-expr_yql_data]": [
@@ -6210,30 +6210,30 @@
     ],
     "test_sql2yql.test[expr-extra_opt_try_member]": [
         {
-            "checksum": "977f5dc695b09feadad3998456aeff21",
-            "size": 2825,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-extra_opt_try_member_/sql.yql"
+            "checksum": "31538441de349ec7c490439265f96531",
+            "size": 2449,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-extra_opt_try_member_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-fallback_filternullelements]": [
         {
-            "checksum": "bff7d62244f472c4c10edcf9353c5b07",
-            "size": 1802,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-fallback_filternullelements_/sql.yql"
+            "checksum": "09b44cf52176a1186cb0c7a81b4bbb99",
+            "size": 1585,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-fallback_filternullelements_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-fallback_filternullmembers]": [
         {
-            "checksum": "6f5988fdc818a746c5e2cff0992b8a89",
-            "size": 1878,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-fallback_filternullmembers_/sql.yql"
+            "checksum": "83d57651d4b3e8abceaac3a14eb3f904",
+            "size": 1622,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-fallback_filternullmembers_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-flatmap_by_map_lazy_list]": [
         {
-            "checksum": "b597959365e3cf103c90ee68fe161411",
-            "size": 2236,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-flatmap_by_map_lazy_list_/sql.yql"
+            "checksum": "32e50ac3e7d89c8a18bc35454844288c",
+            "size": 2246,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-flatmap_by_map_lazy_list_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-formattypediff]": [
@@ -6266,9 +6266,9 @@
     ],
     "test_sql2yql.test[expr-inline_call]": [
         {
-            "checksum": "ca604d7c819f9b850e62ffe8b7a46d91",
-            "size": 6557,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-inline_call_/sql.yql"
+            "checksum": "c172387d26aafb13837e8855dcf0377e",
+            "size": 6677,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-inline_call_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-int_literals]": [
@@ -6301,16 +6301,16 @@
     ],
     "test_sql2yql.test[expr-iterable]": [
         {
-            "checksum": "72ec0d9d54d295d878b9bfd84ba8ee93",
-            "size": 5886,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-iterable_/sql.yql"
+            "checksum": "9c01a4e762394f4e7404fa1f5a319bab",
+            "size": 4995,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-iterable_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-lambda_as_optional_callable]": [
         {
-            "checksum": "3e7d1a9b69dd2e55ca36433bc4af4d32",
-            "size": 2040,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-lambda_as_optional_callable_/sql.yql"
+            "checksum": "1e21380a0db9d34b64e9135661bcdb64",
+            "size": 1717,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-lambda_as_optional_callable_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-lds_empty_cast]": [
@@ -6357,16 +6357,16 @@
     ],
     "test_sql2yql.test[expr-list_builtins]": [
         {
-            "checksum": "cd0e765cb93612a1da8fe3084644ef9a",
-            "size": 14530,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-list_builtins_/sql.yql"
+            "checksum": "fab3180eae2f82a800126af6bb3c2564",
+            "size": 10876,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-list_builtins_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-list_builtins_opt]": [
         {
-            "checksum": "93f9bbc21c5dac5901ecc2663cb9e648",
-            "size": 3186,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-list_builtins_opt_/sql.yql"
+            "checksum": "7375cd35dad7b831847263205ff7630e",
+            "size": 3584,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-list_builtins_opt_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-list_comp]": [
@@ -6378,9 +6378,9 @@
     ],
     "test_sql2yql.test[expr-list_concat]": [
         {
-            "checksum": "26a0730b6723e7d38cb4230d10330e2d",
-            "size": 2592,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-list_concat_/sql.yql"
+            "checksum": "a017c7ea1762d1d5cf5c2412fae51cbc",
+            "size": 2288,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-list_concat_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-list_extend]": [
@@ -6420,16 +6420,16 @@
     ],
     "test_sql2yql.test[expr-list_from_range_overflow]": [
         {
-            "checksum": "2c7b2c842cd31037ed7a7ca0c26e9fc2",
-            "size": 1715,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-list_from_range_overflow_/sql.yql"
+            "checksum": "88b2d205bcd0bd76632838f3eb0936f0",
+            "size": 1701,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-list_from_range_overflow_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-list_indexof]": [
         {
-            "checksum": "195e1053a31d4c3c7fc8c04f4446ae1a",
-            "size": 2524,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-list_indexof_/sql.yql"
+            "checksum": "33742afa760450d9f55a265270dc585a",
+            "size": 2509,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-list_indexof_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-list_not_null]": [
@@ -6455,37 +6455,37 @@
     ],
     "test_sql2yql.test[expr-list_sample]": [
         {
-            "checksum": "922f4c9c5a2fe848f40272dd15cfde42",
-            "size": 10843,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-list_sample_/sql.yql"
+            "checksum": "48a2bdfa9b1928fc44f9425aaa0cc17c",
+            "size": 5310,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-list_sample_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-list_sample_n]": [
         {
-            "checksum": "5ce08b8b61ef8b2863f931bc1b986679",
-            "size": 7573,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-list_sample_n_/sql.yql"
+            "checksum": "a87732e5040e3bb8187500b5fe98f918",
+            "size": 4539,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-list_sample_n_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-list_shuffle]": [
         {
-            "checksum": "3cd4f632706daf9ac8962369e7d0eac3",
-            "size": 4413,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-list_shuffle_/sql.yql"
+            "checksum": "11ed5760eb627e2c0455be77ea4db569",
+            "size": 3093,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-list_shuffle_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-list_takeskipwhile]": [
         {
-            "checksum": "827d6c45ccb33ccc641531600fa839ce",
-            "size": 2898,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-list_takeskipwhile_/sql.yql"
+            "checksum": "9bbabbe45da0e7e6690cf70fee24f4ed",
+            "size": 2697,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-list_takeskipwhile_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-list_takeskipwhileinclusive]": [
         {
-            "checksum": "42b17229d4d13acbd645411fcd69b59f",
-            "size": 2952,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-list_takeskipwhileinclusive_/sql.yql"
+            "checksum": "33bd59760790ced81b9170089bb91703",
+            "size": 2751,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-list_takeskipwhileinclusive_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-list_to_from_tuple]": [
@@ -6497,9 +6497,9 @@
     ],
     "test_sql2yql.test[expr-list_top_sort]": [
         {
-            "checksum": "b2acc119076239ea4f4ada66e164330b",
-            "size": 15716,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-list_top_sort_/sql.yql"
+            "checksum": "eefcfcc239adf295337cf23a1b45e992",
+            "size": 13756,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-list_top_sort_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-list_uniq]": [
@@ -6511,9 +6511,9 @@
     ],
     "test_sql2yql.test[expr-literal_list_element]": [
         {
-            "checksum": "8896a6ecf834dd1227d859c0378e0fcd",
-            "size": 1075,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-literal_list_element_/sql.yql"
+            "checksum": "3949ac8b4411233c530a639d7e56bcaf",
+            "size": 1111,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-literal_list_element_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-literal_strings]": [
@@ -6532,9 +6532,9 @@
     ],
     "test_sql2yql.test[expr-literal_struct_member]": [
         {
-            "checksum": "d48a065a5a51ca6896fcd2aa0e1e301f",
-            "size": 1089,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-literal_struct_member_/sql.yql"
+            "checksum": "b14991b922c4b0ab6177dbeafad9bb0c",
+            "size": 1125,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-literal_struct_member_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-literal_true]": [
@@ -6546,9 +6546,9 @@
     ],
     "test_sql2yql.test[expr-longint_builtins]": [
         {
-            "checksum": "4ec19528fad4905c4015e4100a356a3e",
-            "size": 3663,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-longint_builtins_/sql.yql"
+            "checksum": "bf242b87a9f0aa68fe9402143d7504c8",
+            "size": 3395,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-longint_builtins_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-many_opt_comp]": [
@@ -6609,9 +6609,9 @@
     ],
     "test_sql2yql.test[expr-opt_list_map]": [
         {
-            "checksum": "431a53d72b19edda2357ed81d5f7db32",
-            "size": 14432,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-opt_list_map_/sql.yql"
+            "checksum": "ed5a455970883abdd5df746e0f2aa0ba",
+            "size": 11012,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-opt_list_map_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-opt_try_member]": [
@@ -6630,51 +6630,51 @@
     ],
     "test_sql2yql.test[expr-pg_try_member]": [
         {
-            "checksum": "fefe0284ba87e66037460220848d2d8e",
-            "size": 3602,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-pg_try_member_/sql.yql"
+            "checksum": "5bb52a102b8a01a30973de2dfdf47f59",
+            "size": 3436,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-pg_try_member_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-pickle]": [
         {
-            "checksum": "de9e41e47a51da5a8f2772c0e71cf52f",
-            "size": 6661,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-pickle_/sql.yql"
+            "checksum": "19a17a43bc28dbc67c62aaf1f1aff67b",
+            "size": 3991,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-pickle_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-replace_member]": [
         {
-            "checksum": "c04bc27e6501ec7ed04b5e7a33e80f53",
-            "size": 2427,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-replace_member_/sql.yql"
+            "checksum": "fbfcbe1be110dbcfe211633dce17ea20",
+            "size": 2144,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-replace_member_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-sets]": [
         {
-            "checksum": "d239d43d3715c3557e4f4c25a5328e78",
-            "size": 18321,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-sets_/sql.yql"
+            "checksum": "57e618d8e552b07e1882c6dddafb6e4b",
+            "size": 17085,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-sets_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-static_fold]": [
         {
-            "checksum": "098a36595b1ab85004123ea8d89a48cc",
-            "size": 4520,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-static_fold_/sql.yql"
+            "checksum": "90e676aca21d7b7a84997aa261cba619",
+            "size": 3647,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-static_fold_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-static_zip]": [
         {
-            "checksum": "11b6f9c8ec99515fce83b9aeceef0f4b",
-            "size": 2576,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-static_zip_/sql.yql"
+            "checksum": "bef2d86db4fe911b81a33cc36ec2fe7b",
+            "size": 2630,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-static_zip_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-struct_builtins]": [
         {
-            "checksum": "bf1539673c03fcce8d9fe6b218b55149",
-            "size": 2904,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-struct_builtins_/sql.yql"
+            "checksum": "591498986d4d22d0fc2fb4789cc277e0",
+            "size": 2648,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-struct_builtins_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-struct_gather_spread]": [
@@ -6693,30 +6693,30 @@
     ],
     "test_sql2yql.test[expr-struct_literal_bind]": [
         {
-            "checksum": "379a6d959c0e5ba2272e9d212371d61d",
-            "size": 1043,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-struct_literal_bind_/sql.yql"
+            "checksum": "9c7614f8a61ac16e9595b454bdb43ce7",
+            "size": 1079,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-struct_literal_bind_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-struct_literal_members]": [
         {
-            "checksum": "f475f7d08154c580828b45887cab373a",
-            "size": 1385,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-struct_literal_members_/sql.yql"
+            "checksum": "de7e781159e12a370b16e4160b29d1a1",
+            "size": 1355,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-struct_literal_members_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-struct_merge]": [
         {
-            "checksum": "e3781bd00212a17b07691294caa0c1b0",
-            "size": 3095,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-struct_merge_/sql.yql"
+            "checksum": "22159ccc2f3d98b444350ab878cabeab",
+            "size": 2372,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-struct_merge_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-struct_slice]": [
         {
-            "checksum": "4d0f79865e785d3f3b0e9e0110bb1f86",
-            "size": 2040,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-struct_slice_/sql.yql"
+            "checksum": "18943301e6343498e27030c5f320abff",
+            "size": 1994,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-struct_slice_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-tagged_runtime]": [
@@ -6735,121 +6735,121 @@
     ],
     "test_sql2yql.test[expr-to_hashed_dict_dict_key]": [
         {
-            "checksum": "a04cf915c55575e347cab2faee4a382f",
-            "size": 26976,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-to_hashed_dict_dict_key_/sql.yql"
+            "checksum": "bbd408228dcac8bfb1c6bb00f73762d6",
+            "size": 15256,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-to_hashed_dict_dict_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-to_hashed_dict_list_key]": [
         {
-            "checksum": "56350f81a2f58e7f7e51bb13976b6452",
-            "size": 23502,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-to_hashed_dict_list_key_/sql.yql"
+            "checksum": "93c324e12a6cd50e7aa1278e7421cd26",
+            "size": 13789,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-to_hashed_dict_list_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-to_hashed_dict_tuple_key]": [
         {
-            "checksum": "d2a45d27174d6082f7f750166e6618b8",
-            "size": 57854,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-to_hashed_dict_tuple_key_/sql.yql"
+            "checksum": "5681ea29f382e5ea99403d038599f5fc",
+            "size": 37590,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-to_hashed_dict_tuple_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-to_hashed_dict_varstruct_key]": [
         {
-            "checksum": "1b12c03fbb0418eafceda0205ccd2568",
-            "size": 29794,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-to_hashed_dict_varstruct_key_/sql.yql"
+            "checksum": "f1a6cae369331b92035b9997d8a89f8e",
+            "size": 13565,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-to_hashed_dict_varstruct_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-to_hashed_dict_vartuple_key]": [
         {
-            "checksum": "dc076aa81fa40bbfaf1955db8964927f",
-            "size": 28094,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-to_hashed_dict_vartuple_key_/sql.yql"
+            "checksum": "fb76731151a6b380de4cb09bec5f37b1",
+            "size": 13548,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-to_hashed_dict_vartuple_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-to_hashed_set_dict_key]": [
         {
-            "checksum": "75ec09a29c1b759aed44bc87fd815fa9",
-            "size": 13873,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-to_hashed_set_dict_key_/sql.yql"
+            "checksum": "eb9fa6411b23475c719617fff76ef482",
+            "size": 8076,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-to_hashed_set_dict_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-to_hashed_set_list_key]": [
         {
-            "checksum": "b708b3ad623033def4ff2f9fe89b5fe4",
-            "size": 11483,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-to_hashed_set_list_key_/sql.yql"
+            "checksum": "62dc1a734e32624008db146242e4bdbf",
+            "size": 7223,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-to_hashed_set_list_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-to_hashed_set_tuple_key]": [
         {
-            "checksum": "39591507d50634c60ad23c87c0a703d2",
-            "size": 29583,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-to_hashed_set_tuple_key_/sql.yql"
+            "checksum": "f4a1a46350cc142415ec0f97070569c0",
+            "size": 20731,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-to_hashed_set_tuple_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-to_hashed_set_varstruct_key]": [
         {
-            "checksum": "3d4cfbeef5eaf1b8f14faa065010affa",
-            "size": 15157,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-to_hashed_set_varstruct_key_/sql.yql"
+            "checksum": "f7d5661fc303102c6b1744e600601ceb",
+            "size": 7735,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-to_hashed_set_varstruct_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-to_hashed_set_vartuple_key]": [
         {
-            "checksum": "b562fc6ca8422c4388110d67f4ac7689",
-            "size": 14307,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-to_hashed_set_vartuple_key_/sql.yql"
+            "checksum": "d877c912efb22fab72e40c7ddde4876a",
+            "size": 7718,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-to_hashed_set_vartuple_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-to_sorted_dict_list_key]": [
         {
-            "checksum": "57f5bf1458cb18e951c4f270df16d483",
-            "size": 10651,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-to_sorted_dict_list_key_/sql.yql"
+            "checksum": "0f73527a0f8795d5f07aca01d5fbd9b7",
+            "size": 7196,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-to_sorted_dict_list_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-to_sorted_dict_tuple_key]": [
         {
-            "checksum": "2ed37f299cb087bc3c57a211cb7c73fd",
-            "size": 26847,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-to_sorted_dict_tuple_key_/sql.yql"
+            "checksum": "1f2b8aeeaf4744048ee26d64d21fe2a8",
+            "size": 20606,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-to_sorted_dict_tuple_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-to_sorted_dict_vartuple_key]": [
         {
-            "checksum": "169243272cceab72acf11c8a5b6ca04f",
-            "size": 11745,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-to_sorted_dict_vartuple_key_/sql.yql"
+            "checksum": "b8e1831b2364e562127391057c40a0bc",
+            "size": 7481,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-to_sorted_dict_vartuple_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-to_sorted_set_list_key]": [
         {
-            "checksum": "d566d03f08c016d4d12e451789a5b9c3",
-            "size": 5426,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-to_sorted_set_list_key_/sql.yql"
+            "checksum": "5d19213762b9c6da7b676524df8bfb3e",
+            "size": 3980,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-to_sorted_set_list_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-to_sorted_set_tuple_key]": [
         {
-            "checksum": "147bb2d90d39a14aff0bd2f61a7d82de",
-            "size": 13018,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-to_sorted_set_tuple_key_/sql.yql"
+            "checksum": "6bdfaa96beae65ba8953bd33b48bbca0",
+            "size": 10552,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-to_sorted_set_tuple_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-to_sorted_set_vartuple_key]": [
         {
-            "checksum": "7676ce53856e9c323a15b83b3c97442d",
-            "size": 5860,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-to_sorted_set_vartuple_key_/sql.yql"
+            "checksum": "f435ed7bf67e7e420ab63b4464706245",
+            "size": 4030,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-to_sorted_set_vartuple_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-try_member]": [
         {
-            "checksum": "11bd9037e4c2efde4307441e96c6d3a2",
-            "size": 9904,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-try_member_/sql.yql"
+            "checksum": "69090c62c0afd0913b8089fe870b85d9",
+            "size": 7167,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-try_member_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-type_as_key]": [
@@ -6861,23 +6861,23 @@
     ],
     "test_sql2yql.test[expr-tzdate_result]": [
         {
-            "checksum": "a08597ad4ca67d5e6f140b9f28b6edcf",
-            "size": 4446,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-tzdate_result_/sql.yql"
+            "checksum": "e8b47c5e8ab3d25a42662f59261704ff",
+            "size": 4334,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-tzdate_result_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-udaf_with_list_zip]": [
         {
-            "checksum": "47d64d67fa3efed128b6cf1d52128b59",
-            "size": 3353,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-udaf_with_list_zip_/sql.yql"
+            "checksum": "d40b41ec4637323bedb903e0b019ed69",
+            "size": 2791,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-udaf_with_list_zip_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-unicode_literals]": [
         {
-            "checksum": "b0cb2ae9c703460b2e2eaac9823ef75b",
-            "size": 1940,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-unicode_literals_/sql.yql"
+            "checksum": "06445e42cb33061151fa3356dc57ad1d",
+            "size": 1972,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-unicode_literals_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-untag]": [
@@ -6910,30 +6910,30 @@
     ],
     "test_sql2yql.test[expr-variant_list_sort]": [
         {
-            "checksum": "39b9095be25d8153ac515e9e72e1f620",
-            "size": 1589,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-variant_list_sort_/sql.yql"
+            "checksum": "abd93bfb65a1cb17235be843d4cbd2c3",
+            "size": 1481,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-variant_list_sort_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-variant_struct_comp]": [
         {
-            "checksum": "0b2a7bd63b80ef1ce214007aaa17ec47",
-            "size": 21576,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-variant_struct_comp_/sql.yql"
+            "checksum": "3f85119441280a8729ef912910ac7745",
+            "size": 9664,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-variant_struct_comp_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-variant_tuple_comp]": [
         {
-            "checksum": "88bf1a9d5bca808030bd95ffc1b804b7",
-            "size": 18680,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-variant_tuple_comp_/sql.yql"
+            "checksum": "62f3d0d5c99c037db94a4f8f3c3c9d1d",
+            "size": 10172,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-variant_tuple_comp_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-with_optional_args]": [
         {
-            "checksum": "c3680ca837976fb10b5252eae8c47a1b",
-            "size": 3460,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-with_optional_args_/sql.yql"
+            "checksum": "cae5503b92db58827c32ae29af3eff66",
+            "size": 2462,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-with_optional_args_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-xor]": [
@@ -6945,16 +6945,16 @@
     ],
     "test_sql2yql.test[expr-yql-10180]": [
         {
-            "checksum": "38fda81c9e5fd439eb1284aeec8ba654",
-            "size": 6751,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-yql-10180_/sql.yql"
+            "checksum": "318963129118df9ff0dc9dfab5e256f7",
+            "size": 4601,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-yql-10180_/sql.yql"
         }
     ],
     "test_sql2yql.test[expr-yql-15485]": [
         {
-            "checksum": "3f7e94a1bc650ee4cb384c686b14cce9",
-            "size": 8630,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_expr-yql-15485_/sql.yql"
+            "checksum": "5180f5d143bdb2124eeab9e7bc053325",
+            "size": 8636,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_expr-yql-15485_/sql.yql"
         }
     ],
     "test_sql2yql.test[file-file_constness]": [
@@ -6980,9 +6980,9 @@
     ],
     "test_sql2yql.test[file-file_skip_take]": [
         {
-            "checksum": "ee6b644cae6b0e6ea2240d38c0be1ac4",
-            "size": 1172,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_file-file_skip_take_/sql.yql"
+            "checksum": "189daf8eb9b16aa659146f4d24784273",
+            "size": 1280,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_file-file_skip_take_/sql.yql"
         }
     ],
     "test_sql2yql.test[file-parse_file_bad_type_fail]": [
@@ -7015,9 +7015,9 @@
     ],
     "test_sql2yql.test[file-second_pass_parse_file_fail]": [
         {
-            "checksum": "681df7487acf69107aad8dfb16e649fe",
-            "size": 1449,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_file-second_pass_parse_file_fail_/sql.yql"
+            "checksum": "ad95ae26d097fdceb211742b62ad5c0b",
+            "size": 1374,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_file-second_pass_parse_file_fail_/sql.yql"
         }
     ],
     "test_sql2yql.test[file-where_key_in_file_content]": [
@@ -7057,9 +7057,9 @@
     ],
     "test_sql2yql.test[flatten_by-flatten_by_group_by_alias_collision]": [
         {
-            "checksum": "d203c2b79d73ffaddfeb23dd020e28de",
-            "size": 2025,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_flatten_by-flatten_by_group_by_alias_collision_/sql.yql"
+            "checksum": "46b9aeee0985ebf120ac6cb9022ef98f",
+            "size": 2061,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_flatten_by-flatten_by_group_by_alias_collision_/sql.yql"
         }
     ],
     "test_sql2yql.test[flatten_by-flatten_by_opt_dict]": [
@@ -7190,9 +7190,9 @@
     ],
     "test_sql2yql.test[flatten_by-flatten_mode]": [
         {
-            "checksum": "1ff2d223c6e1273545ce481d6b7629f0",
-            "size": 10589,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_flatten_by-flatten_mode_/sql.yql"
+            "checksum": "0120d0d4e3976eef7aa55e9ea1be2497",
+            "size": 10387,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_flatten_by-flatten_mode_/sql.yql"
         }
     ],
     "test_sql2yql.test[flatten_by-flatten_one_field]": [
@@ -7239,16 +7239,16 @@
     ],
     "test_sql2yql.test[flatten_by-flatten_with_resource]": [
         {
-            "checksum": "c064bbac1e752e6bb6ba039113590ac3",
-            "size": 2815,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_flatten_by-flatten_with_resource_/sql.yql"
+            "checksum": "4ce812c8ed923bda6f920f9c9a1d7587",
+            "size": 2608,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_flatten_by-flatten_with_resource_/sql.yql"
         }
     ],
     "test_sql2yql.test[flatten_by-flatten_with_subquery]": [
         {
-            "checksum": "84a976c9e073892308fd026fbff508ac",
-            "size": 3804,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_flatten_by-flatten_with_subquery_/sql.yql"
+            "checksum": "ddbbe929977f9d205cd28a363bc2838e",
+            "size": 3013,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_flatten_by-flatten_with_subquery_/sql.yql"
         }
     ],
     "test_sql2yql.test[flatten_by-struct_without_correlation]": [
@@ -7260,16 +7260,16 @@
     ],
     "test_sql2yql.test[flexible_types-basic]": [
         {
-            "checksum": "77a2b5b72a9ec667fd8ed44e8bb2d032",
-            "size": 2208,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_flexible_types-basic_/sql.yql"
+            "checksum": "0ddf224a5d9cb2641ec328f641e1c404",
+            "size": 2160,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_flexible_types-basic_/sql.yql"
         }
     ],
     "test_sql2yql.test[flexible_types-evaluate_expr]": [
         {
-            "checksum": "a99f0931ef3c6645e33b3c9bb2dfd23b",
-            "size": 2033,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_flexible_types-evaluate_expr_/sql.yql"
+            "checksum": "94fe3bf2bff8b4056f1c6ae267975ce9",
+            "size": 1979,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_flexible_types-evaluate_expr_/sql.yql"
         }
     ],
     "test_sql2yql.test[flexible_types-flatten_by]": [
@@ -7281,16 +7281,16 @@
     ],
     "test_sql2yql.test[flexible_types-functions]": [
         {
-            "checksum": "57b9d0a22b35a9f4c527c038eaba6019",
-            "size": 6175,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_flexible_types-functions_/sql.yql"
+            "checksum": "ab9f8ea284c2ef7b5ef01f03073d70f7",
+            "size": 6251,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_flexible_types-functions_/sql.yql"
         }
     ],
     "test_sql2yql.test[flexible_types-group_by2]": [
         {
-            "checksum": "02e6071c050374b9b44ddb56119fd360",
-            "size": 2504,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_flexible_types-group_by2_/sql.yql"
+            "checksum": "64ac7e7555d98b42777d0f464fa3aa38",
+            "size": 2520,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_flexible_types-group_by2_/sql.yql"
         }
     ],
     "test_sql2yql.test[flexible_types-group_by]": [
@@ -7302,9 +7302,9 @@
     ],
     "test_sql2yql.test[flexible_types-inside_evaluate]": [
         {
-            "checksum": "b237fbeaefa0a91eb87b1e611c69562f",
-            "size": 1480,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_flexible_types-inside_evaluate_/sql.yql"
+            "checksum": "1929ec057445285750e84e9b39f92c9b",
+            "size": 1460,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_flexible_types-inside_evaluate_/sql.yql"
         }
     ],
     "test_sql2yql.test[flexible_types-struct_literals_vs_columns]": [
@@ -7323,9 +7323,9 @@
     ],
     "test_sql2yql.test[flexible_types-unused_types]": [
         {
-            "checksum": "f6ffd93103f59dbe972cab32b2f5d2e0",
-            "size": 2016,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_flexible_types-unused_types_/sql.yql"
+            "checksum": "5e87545713e65e2ce29604040d77e740",
+            "size": 2032,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_flexible_types-unused_types_/sql.yql"
         }
     ],
     "test_sql2yql.test[flexible_types-with_typeof]": [
@@ -7358,16 +7358,16 @@
     ],
     "test_sql2yql.test[hor_join-fuse_multi_outs1]": [
         {
-            "checksum": "f81834a31ce3bccf54700787657f07d0",
-            "size": 4730,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_hor_join-fuse_multi_outs1_/sql.yql"
+            "checksum": "0be046f9650d9fb2e9c5c10707018598",
+            "size": 4736,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_hor_join-fuse_multi_outs1_/sql.yql"
         }
     ],
     "test_sql2yql.test[hor_join-fuse_multi_outs2]": [
         {
-            "checksum": "ad43280d036e717d74696a01d1de595e",
-            "size": 3917,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_hor_join-fuse_multi_outs2_/sql.yql"
+            "checksum": "f5bf43c7443a9625239d7b905642b984",
+            "size": 3923,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_hor_join-fuse_multi_outs2_/sql.yql"
         }
     ],
     "test_sql2yql.test[hor_join-fuse_multi_usage]": [
@@ -7400,9 +7400,9 @@
     ],
     "test_sql2yql.test[hor_join-less_outs]": [
         {
-            "checksum": "16c3a85ac35694e24dae8dccea821a20",
-            "size": 5148,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_hor_join-less_outs_/sql.yql"
+            "checksum": "0b595fd57dec3817db0eaf8e0937bb23",
+            "size": 5168,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_hor_join-less_outs_/sql.yql"
         }
     ],
     "test_sql2yql.test[hor_join-max_in_tables]": [
@@ -7414,30 +7414,30 @@
     ],
     "test_sql2yql.test[hor_join-max_outtables]": [
         {
-            "checksum": "02af783bc1b9e87d8e2b856fca9db537",
-            "size": 5630,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_hor_join-max_outtables_/sql.yql"
+            "checksum": "c045cd472998880fb822a346bdd79bf2",
+            "size": 5650,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_hor_join-max_outtables_/sql.yql"
         }
     ],
     "test_sql2yql.test[hor_join-merge_multiouts_all]": [
         {
-            "checksum": "733be6f194aabb5f938d9894e693637e",
-            "size": 7908,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_hor_join-merge_multiouts_all_/sql.yql"
+            "checksum": "c104eea5186f7f1d2ff9a9ee9e05ea3f",
+            "size": 7680,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_hor_join-merge_multiouts_all_/sql.yql"
         }
     ],
     "test_sql2yql.test[hor_join-merge_multiouts_part]": [
         {
-            "checksum": "1dfcb570e65636906c0a80a825c42fc6",
-            "size": 6854,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_hor_join-merge_multiouts_part_/sql.yql"
+            "checksum": "3e10eb24f5477b3b27fbb42f9a048a18",
+            "size": 6626,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_hor_join-merge_multiouts_part_/sql.yql"
         }
     ],
     "test_sql2yql.test[hor_join-merge_multiouts_reuse]": [
         {
-            "checksum": "6f9f37810f201b7a7a72c90c2262f0b5",
-            "size": 7908,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_hor_join-merge_multiouts_reuse_/sql.yql"
+            "checksum": "778da1a5c10a641ead8eaa1b72b65d7c",
+            "size": 7680,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_hor_join-merge_multiouts_reuse_/sql.yql"
         }
     ],
     "test_sql2yql.test[hor_join-out_hor_join]": [
@@ -7519,9 +7519,9 @@
     ],
     "test_sql2yql.test[hor_join-sorted_out_mix]": [
         {
-            "checksum": "6382e74ae7d0eba74a49e76af1fe4e6a",
-            "size": 4698,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_hor_join-sorted_out_mix_/sql.yql"
+            "checksum": "7ddd8c963fb1e7f811f52c11b2caeac9",
+            "size": 4638,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_hor_join-sorted_out_mix_/sql.yql"
         }
     ],
     "test_sql2yql.test[hor_join-table_record]": [
@@ -7533,16 +7533,16 @@
     ],
     "test_sql2yql.test[hor_join-yield_off]": [
         {
-            "checksum": "c48b8e343f515d919f6a22299868c4bc",
-            "size": 2931,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_hor_join-yield_off_/sql.yql"
+            "checksum": "3c89e71be08c7fe6445a5f4d0b60787a",
+            "size": 2569,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_hor_join-yield_off_/sql.yql"
         }
     ],
     "test_sql2yql.test[hor_join-yield_on]": [
         {
-            "checksum": "ede36401df3d22c37adefd62fb45f4b9",
-            "size": 2906,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_hor_join-yield_on_/sql.yql"
+            "checksum": "a82d561253831d25ac90ea1f9434c7a8",
+            "size": 2556,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_hor_join-yield_on_/sql.yql"
         }
     ],
     "test_sql2yql.test[hor_join-yql-12610_old_table_props]": [
@@ -7554,9 +7554,9 @@
     ],
     "test_sql2yql.test[hor_join-yql-6477_table_path]": [
         {
-            "checksum": "ab893ae2eaa9953a1a33d2f1a1b1c78a",
-            "size": 2102,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_hor_join-yql-6477_table_path_/sql.yql"
+            "checksum": "915818090a7bb6a7d854b4063585f994",
+            "size": 2146,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_hor_join-yql-6477_table_path_/sql.yql"
         }
     ],
     "test_sql2yql.test[in-basic_in]": [
@@ -7792,9 +7792,9 @@
     ],
     "test_sql2yql.test[in-in_with_list_dict]": [
         {
-            "checksum": "d53e40714677dde769cf2102719c0819",
-            "size": 1749,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_in-in_with_list_dict_/sql.yql"
+            "checksum": "784d8fc575d26a1bbf7daf28712f9f38",
+            "size": 1821,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_in-in_with_list_dict_/sql.yql"
         }
     ],
     "test_sql2yql.test[in-in_with_literal_list_of_structs]": [
@@ -7813,9 +7813,9 @@
     ],
     "test_sql2yql.test[in-in_with_nulls_and_optionals]": [
         {
-            "checksum": "f412e4814e6444a653044b17b4d8efd4",
-            "size": 5595,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_in-in_with_nulls_and_optionals_/sql.yql"
+            "checksum": "0dc9f7fbf6f679e0367398786bddae56",
+            "size": 5120,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_in-in_with_nulls_and_optionals_/sql.yql"
         }
     ],
     "test_sql2yql.test[in-in_with_nulls_and_optionals_extra]": [
@@ -7841,9 +7841,9 @@
     ],
     "test_sql2yql.test[in-in_with_table_of_tuples]": [
         {
-            "checksum": "9fdd04bda10e5963c92c6bdeafb30f9c",
-            "size": 3004,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_in-in_with_table_of_tuples_/sql.yql"
+            "checksum": "d4dcd6c3e5ffc3a4577f54e4a87a23c4",
+            "size": 3040,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_in-in_with_table_of_tuples_/sql.yql"
         }
     ],
     "test_sql2yql.test[in-in_with_tuple]": [
@@ -7862,16 +7862,16 @@
     ],
     "test_sql2yql.test[in-large_in_YQL-19183]": [
         {
-            "checksum": "1cd9f4cf26e7c5d827049443279a962a",
-            "size": 1235,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_in-large_in_YQL-19183_/sql.yql"
+            "checksum": "9d06fbebe8bf122d632e2af80a692a14",
+            "size": 1485,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_in-large_in_YQL-19183_/sql.yql"
         }
     ],
     "test_sql2yql.test[in-small_in_YQL-19183]": [
         {
-            "checksum": "6e299275dd6fa3e68a43e108e0c6faad",
-            "size": 1074,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_in-small_in_YQL-19183_/sql.yql"
+            "checksum": "1804eaa88f660be43888649c48ad2b4b",
+            "size": 1144,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_in-small_in_YQL-19183_/sql.yql"
         }
     ],
     "test_sql2yql.test[in-yql-10038]": [
@@ -8436,16 +8436,16 @@
     ],
     "test_sql2yql.test[join-convert_check_key_mem2]": [
         {
-            "checksum": "8274e24ae6aeca074ea8e055f98eebbb",
-            "size": 1814,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_join-convert_check_key_mem2_/sql.yql"
+            "checksum": "18c5fb7a52441432c6c75827b0e44f22",
+            "size": 1886,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_join-convert_check_key_mem2_/sql.yql"
         }
     ],
     "test_sql2yql.test[join-convert_check_key_mem]": [
         {
-            "checksum": "2bb677baa975580457cffaa716a1cf59",
-            "size": 7018,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_join-convert_check_key_mem_/sql.yql"
+            "checksum": "198b94d86fd0252412502b5c58c3347b",
+            "size": 6174,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_join-convert_check_key_mem_/sql.yql"
         }
     ],
     "test_sql2yql.test[join-convert_key]": [
@@ -8464,9 +8464,9 @@
     ],
     "test_sql2yql.test[join-cross_join_with_lazy_list]": [
         {
-            "checksum": "d7bafc1351a4b13942b311a0107148c3",
-            "size": 2530,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_join-cross_join_with_lazy_list_/sql.yql"
+            "checksum": "11839022f2417f8c80ee7a4c1ed6d22d",
+            "size": 2405,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_join-cross_join_with_lazy_list_/sql.yql"
         }
     ],
     "test_sql2yql.test[join-do_not_suppres_equijoin_input_sorts]": [
@@ -8611,16 +8611,16 @@
     ],
     "test_sql2yql.test[join-inmem_by_uncomparable_structs]": [
         {
-            "checksum": "8fcbc90571cb94cda4999577d08a613b",
-            "size": 14185,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_join-inmem_by_uncomparable_structs_/sql.yql"
+            "checksum": "6632db82eb7031a6baa68b130f0c4dcf",
+            "size": 9825,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_join-inmem_by_uncomparable_structs_/sql.yql"
         }
     ],
     "test_sql2yql.test[join-inmem_by_uncomparable_tuples]": [
         {
-            "checksum": "a77e22fe041aaad5198a189340883360",
-            "size": 12547,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_join-inmem_by_uncomparable_tuples_/sql.yql"
+            "checksum": "f6257f200c631aecb7828fa2e293c944",
+            "size": 9643,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_join-inmem_by_uncomparable_tuples_/sql.yql"
         }
     ],
     "test_sql2yql.test[join-inmem_with_null_key]": [
@@ -8632,16 +8632,16 @@
     ],
     "test_sql2yql.test[join-inmem_with_set_key]": [
         {
-            "checksum": "356483957a90979c5f12afd429ce6dd0",
-            "size": 4505,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_join-inmem_with_set_key_/sql.yql"
+            "checksum": "0f0d4dc22e4af72e60f1c01e0cc09e19",
+            "size": 4649,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_join-inmem_with_set_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[join-inmem_with_set_key_any]": [
         {
-            "checksum": "74d8117ccac1ce8348846cda0fdf54f6",
-            "size": 4561,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_join-inmem_with_set_key_any_/sql.yql"
+            "checksum": "7b9a01f95113e1487c2ed53d3dd15394",
+            "size": 4705,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_join-inmem_with_set_key_any_/sql.yql"
         }
     ],
     "test_sql2yql.test[join-inner_all]": [
@@ -8842,9 +8842,9 @@
     ],
     "test_sql2yql.test[join-left_join_null_column]": [
         {
-            "checksum": "c4c01790686a2003fafaf1175b81edbf",
-            "size": 1611,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_join-left_join_null_column_/sql.yql"
+            "checksum": "fdce02fe402c13cbf015dec80e9e1611",
+            "size": 1647,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_join-left_join_null_column_/sql.yql"
         }
     ],
     "test_sql2yql.test[join-left_join_right_pushdown_nested_left]": [
@@ -8884,16 +8884,16 @@
     ],
     "test_sql2yql.test[join-left_join_with_self_aggr]": [
         {
-            "checksum": "e0818e4300c6a61a98e5ff03bccf705a",
-            "size": 4401,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_join-left_join_with_self_aggr_/sql.yql"
+            "checksum": "24a677754eac1fa046e237d9e0da06d2",
+            "size": 4437,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_join-left_join_with_self_aggr_/sql.yql"
         }
     ],
     "test_sql2yql.test[join-left_null_literal]": [
         {
-            "checksum": "42bdd1c141f286ec37447a13830096a8",
-            "size": 1425,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_join-left_null_literal_/sql.yql"
+            "checksum": "c07bdbd6e1cc90886108f5da9af2dc64",
+            "size": 1497,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_join-left_null_literal_/sql.yql"
         }
     ],
     "test_sql2yql.test[join-left_only_semi_and_other]": [
@@ -8926,16 +8926,16 @@
     ],
     "test_sql2yql.test[join-lookupjoin_bug7646_csee]": [
         {
-            "checksum": "4ea61f39ad900d5b3ac439f89c105fe1",
-            "size": 4719,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_join-lookupjoin_bug7646_csee_/sql.yql"
+            "checksum": "f1249159f6f381e935df85e439c3adff",
+            "size": 4827,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_join-lookupjoin_bug7646_csee_/sql.yql"
         }
     ],
     "test_sql2yql.test[join-lookupjoin_bug7646_subst]": [
         {
-            "checksum": "dbc7bf22f96df024adf2b8d9ff4944f0",
-            "size": 4608,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_join-lookupjoin_bug7646_subst_/sql.yql"
+            "checksum": "13f551b32e2077eb67b29640fe25fc5c",
+            "size": 4716,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_join-lookupjoin_bug7646_subst_/sql.yql"
         }
     ],
     "test_sql2yql.test[join-lookupjoin_bug8533]": [
@@ -9080,37 +9080,37 @@
     ],
     "test_sql2yql.test[join-mapjoin_left_null_column]": [
         {
-            "checksum": "c89d66b775b4f791c338d3c7447cda84",
-            "size": 1699,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_join-mapjoin_left_null_column_/sql.yql"
+            "checksum": "f12677b2bbf85de7c2da2fec541691f3",
+            "size": 1735,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_join-mapjoin_left_null_column_/sql.yql"
         }
     ],
     "test_sql2yql.test[join-mapjoin_on_complex_type_non_optional_left_only_single]": [
         {
-            "checksum": "82b43a2aec72ba8aadd955b4f323c699",
-            "size": 2498,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_join-mapjoin_on_complex_type_non_optional_left_only_single_/sql.yql"
+            "checksum": "b8ef8e3fb5dc73bc21daebe0305641ad",
+            "size": 2534,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_join-mapjoin_on_complex_type_non_optional_left_only_single_/sql.yql"
         }
     ],
     "test_sql2yql.test[join-mapjoin_on_complex_type_optional_left_only_single]": [
         {
-            "checksum": "e4598373b99e87103b1c0e21a49eb1bd",
-            "size": 2401,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_join-mapjoin_on_complex_type_optional_left_only_single_/sql.yql"
+            "checksum": "e377b4a05d07629544ed4248e1fe1d31",
+            "size": 2437,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_join-mapjoin_on_complex_type_optional_left_only_single_/sql.yql"
         }
     ],
     "test_sql2yql.test[join-mapjoin_on_complex_type_optional_left_semi_many]": [
         {
-            "checksum": "51ad59f5bd9e509aac5c6da9d06a909f",
-            "size": 3072,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_join-mapjoin_on_complex_type_optional_left_semi_many_/sql.yql"
+            "checksum": "b5704d147afe34b14cd40c62ee9f1a1b",
+            "size": 3108,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_join-mapjoin_on_complex_type_optional_left_semi_many_/sql.yql"
         }
     ],
     "test_sql2yql.test[join-mapjoin_on_complex_type_optional_left_semi_single]": [
         {
-            "checksum": "82633006d8e59122ee798f231648bdb5",
-            "size": 2401,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_join-mapjoin_on_complex_type_optional_left_semi_single_/sql.yql"
+            "checksum": "5edc9be6e87c3f1992cdb7af1570dbec",
+            "size": 2437,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_join-mapjoin_on_complex_type_optional_left_semi_single_/sql.yql"
         }
     ],
     "test_sql2yql.test[join-mapjoin_on_tablerecord]": [
@@ -9122,16 +9122,16 @@
     ],
     "test_sql2yql.test[join-mapjoin_on_very_complex_type]": [
         {
-            "checksum": "0784be1edeaa4750af97d31ba8be9cd0",
-            "size": 2664,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_join-mapjoin_on_very_complex_type_/sql.yql"
+            "checksum": "690bdd2e8142aa0ecd83f383a7bef875",
+            "size": 2700,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_join-mapjoin_on_very_complex_type_/sql.yql"
         }
     ],
     "test_sql2yql.test[join-mapjoin_opt_vs_2xopt]": [
         {
-            "checksum": "ed9c6b26f3cdfedb8cfb1cf7eee42480",
-            "size": 3536,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_join-mapjoin_opt_vs_2xopt_/sql.yql"
+            "checksum": "6bf3a401262a2156a4bc4b1a55b42f56",
+            "size": 3608,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_join-mapjoin_opt_vs_2xopt_/sql.yql"
         }
     ],
     "test_sql2yql.test[join-mapjoin_partial_uniq_keys]": [
@@ -9164,9 +9164,9 @@
     ],
     "test_sql2yql.test[join-mapjoin_with_empty_read]": [
         {
-            "checksum": "00e4aee0192f523875e81fb7d4ea768b",
-            "size": 5403,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_join-mapjoin_with_empty_read_/sql.yql"
+            "checksum": "dadc9fd3ed0dd002f3cec471543067ad",
+            "size": 5475,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_join-mapjoin_with_empty_read_/sql.yql"
         }
     ],
     "test_sql2yql.test[join-mapjoin_with_empty_struct]": [
@@ -9255,9 +9255,9 @@
     ],
     "test_sql2yql.test[join-mergejoin_left_null_column]": [
         {
-            "checksum": "5da4f194dc060db5c2adb817a902bf94",
-            "size": 1905,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_join-mergejoin_left_null_column_/sql.yql"
+            "checksum": "8a7f95e32d12c71a550d4beefa0310c6",
+            "size": 1941,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_join-mergejoin_left_null_column_/sql.yql"
         }
     ],
     "test_sql2yql.test[join-mergejoin_narrows_output_sort]": [
@@ -9780,9 +9780,9 @@
     ],
     "test_sql2yql.test[join-strict_keys]": [
         {
-            "checksum": "4818dbe4304bb09c0e515785a7e35121",
-            "size": 3689,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_join-strict_keys_/sql.yql"
+            "checksum": "4b819794e90243ea5fb3410083d7f0af",
+            "size": 3583,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_join-strict_keys_/sql.yql"
         }
     ],
     "test_sql2yql.test[join-three_equalities]": [
@@ -9822,9 +9822,9 @@
     ],
     "test_sql2yql.test[join-yql-12022]": [
         {
-            "checksum": "9729e2bd6f91540bd28caef7eca7666d",
-            "size": 2397,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_join-yql-12022_/sql.yql"
+            "checksum": "243fc2c9e1b1813b557d6bf8149b760b",
+            "size": 2303,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_join-yql-12022_/sql.yql"
         }
     ],
     "test_sql2yql.test[join-yql-14829_left]": [
@@ -9913,23 +9913,23 @@
     ],
     "test_sql2yql.test[json-combination/nested]": [
         {
-            "checksum": "4d2cd5b048617d1cd79909ca2be27e3d",
-            "size": 3722,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_json-combination_nested_/sql.yql"
+            "checksum": "2741dede0aec80baee4dfd819a72f021",
+            "size": 3478,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_json-combination_nested_/sql.yql"
         }
     ],
     "test_sql2yql.test[json-combination/unwrapped]": [
         {
-            "checksum": "ae7c9e25a10dc0de022279f1c6d92ca1",
-            "size": 1675,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_json-combination_unwrapped_/sql.yql"
+            "checksum": "8a16d935fab222cbf8a6d84d3ae8f1d6",
+            "size": 1621,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_json-combination_unwrapped_/sql.yql"
         }
     ],
     "test_sql2yql.test[json-json_exists/common_syntax]": [
         {
-            "checksum": "ce2533ca497b406fd81c6b8eefdf622b",
-            "size": 2232,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_json-json_exists_common_syntax_/sql.yql"
+            "checksum": "8095eff727c43d90acbdd6b526f169a1",
+            "size": 2268,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_json-json_exists_common_syntax_/sql.yql"
         }
     ],
     "test_sql2yql.test[json-json_exists/example]": [
@@ -9941,100 +9941,100 @@
     ],
     "test_sql2yql.test[json-json_exists/on_error]": [
         {
-            "checksum": "67cbd85043dcd7772796f2e70aef443b",
-            "size": 1896,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_json-json_exists_on_error_/sql.yql"
+            "checksum": "4a6ef9fdffa20032999b5d5daf74a5e9",
+            "size": 1848,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_json-json_exists_on_error_/sql.yql"
         }
     ],
     "test_sql2yql.test[json-json_exists/on_error_exception]": [
         {
-            "checksum": "9bb233a1941bee5f00b9247dd74a4c5c",
-            "size": 1075,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_json-json_exists_on_error_exception_/sql.yql"
+            "checksum": "b0b91f70e1b835274a8ad7c917af7e59",
+            "size": 1111,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_json-json_exists_on_error_exception_/sql.yql"
         }
     ],
     "test_sql2yql.test[json-json_exists/passing]": [
         {
-            "checksum": "c00e43c81ba870b3f99c28a2512f0569",
-            "size": 6203,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_json-json_exists_passing_/sql.yql"
+            "checksum": "32dfd72abb6f84ba5161227490eb2c98",
+            "size": 5641,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_json-json_exists_passing_/sql.yql"
         }
     ],
     "test_sql2yql.test[json-json_exists/passing_exception]": [
         {
-            "checksum": "d38b487e124d8d44784e9e1fd6e7b1a9",
-            "size": 1154,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_json-json_exists_passing_exception_/sql.yql"
+            "checksum": "f6301cd14c2f85e24b963f606ffaaff4",
+            "size": 1190,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_json-json_exists_passing_exception_/sql.yql"
         }
     ],
     "test_sql2yql.test[json-json_query/common_syntax]": [
         {
-            "checksum": "c1fcc5d26a9f4335ef3a996f848aa967",
-            "size": 2226,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_json-json_query_common_syntax_/sql.yql"
+            "checksum": "1d4559830f0f7b7874b595a5f663f7a4",
+            "size": 2262,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_json-json_query_common_syntax_/sql.yql"
         }
     ],
     "test_sql2yql.test[json-json_query/example]": [
         {
-            "checksum": "92906b74db5211712a99b348a566167e",
-            "size": 11125,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_json-json_query_example_/sql.yql"
+            "checksum": "16cabece54e1a0c7a603b41511d50a3d",
+            "size": 10435,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_json-json_query_example_/sql.yql"
         }
     ],
     "test_sql2yql.test[json-json_query/on_empty]": [
         {
-            "checksum": "05336aa457121592365cefbf883ab432",
-            "size": 1863,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_json-json_query_on_empty_/sql.yql"
+            "checksum": "1eba361b028f7a44e6e7c265eac450fc",
+            "size": 1815,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_json-json_query_on_empty_/sql.yql"
         }
     ],
     "test_sql2yql.test[json-json_query/on_empty_exception]": [
         {
-            "checksum": "d63afd278c5eff2a0234eae7e77f936a",
-            "size": 1092,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_json-json_query_on_empty_exception_/sql.yql"
+            "checksum": "e201f80c26de9a3e111f3c70bdc0a270",
+            "size": 1128,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_json-json_query_on_empty_exception_/sql.yql"
         }
     ],
     "test_sql2yql.test[json-json_query/on_error]": [
         {
-            "checksum": "f7f2966f0792484fd103b49afaeefb80",
-            "size": 1875,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_json-json_query_on_error_/sql.yql"
+            "checksum": "30cb3e8eb90da43b7b2d9a857716b392",
+            "size": 1827,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_json-json_query_on_error_/sql.yql"
         }
     ],
     "test_sql2yql.test[json-json_query/on_error_exception]": [
         {
-            "checksum": "2b2ac2505739a04e2fb2896f1a39e4fa",
-            "size": 1095,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_json-json_query_on_error_exception_/sql.yql"
+            "checksum": "0a9103aa412ef2e338dfde52dca0716d",
+            "size": 1131,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_json-json_query_on_error_exception_/sql.yql"
         }
     ],
     "test_sql2yql.test[json-json_query/passing]": [
         {
-            "checksum": "bdceada9b49ae440353e07cc6d6318b9",
-            "size": 6127,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_json-json_query_passing_/sql.yql"
+            "checksum": "696fbb65a592550bbfdd5219d3d5d343",
+            "size": 5565,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_json-json_query_passing_/sql.yql"
         }
     ],
     "test_sql2yql.test[json-json_query/passing_exception]": [
         {
-            "checksum": "c3e360a4ff8941ec39e542071eb4caa3",
-            "size": 1148,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_json-json_query_passing_exception_/sql.yql"
+            "checksum": "42346bcd79c3771e9e2736075b490b62",
+            "size": 1184,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_json-json_query_passing_exception_/sql.yql"
         }
     ],
     "test_sql2yql.test[json-json_query/wrapper]": [
         {
-            "checksum": "c981292355daf386dae44de92a448756",
-            "size": 17717,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_json-json_query_wrapper_/sql.yql"
+            "checksum": "32d14d6cfcd4154c116791142080f12a",
+            "size": 10753,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_json-json_query_wrapper_/sql.yql"
         }
     ],
     "test_sql2yql.test[json-json_value/common_syntax]": [
         {
-            "checksum": "737758c0d781f6305930933246e4a046",
-            "size": 2286,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_json-json_value_common_syntax_/sql.yql"
+            "checksum": "1001fb28b312b7dd17a30368042ebfb7",
+            "size": 2322,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_json-json_value_common_syntax_/sql.yql"
         }
     ],
     "test_sql2yql.test[json-json_value/example]": [
@@ -10046,79 +10046,79 @@
     ],
     "test_sql2yql.test[json-json_value/on_empty]": [
         {
-            "checksum": "925325d41af95a43c113f30d7367723b",
-            "size": 4707,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_json-json_value_on_empty_/sql.yql"
+            "checksum": "c6bfe246d5f64077271227021d50416e",
+            "size": 4575,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_json-json_value_on_empty_/sql.yql"
         }
     ],
     "test_sql2yql.test[json-json_value/on_empty_cast_default_exception]": [
         {
-            "checksum": "0910c826579c86590a84bd4a44dc0c11",
-            "size": 1132,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_json-json_value_on_empty_cast_default_exception_/sql.yql"
+            "checksum": "68b1e04f129d2a77674a981cc0e09387",
+            "size": 1168,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_json-json_value_on_empty_cast_default_exception_/sql.yql"
         }
     ],
     "test_sql2yql.test[json-json_value/on_empty_exception]": [
         {
-            "checksum": "fb8e85fab34bc525337d40a0464d4e0f",
-            "size": 1106,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_json-json_value_on_empty_exception_/sql.yql"
+            "checksum": "eab6b5d88e6cf6808fc602b0bf8647fb",
+            "size": 1142,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_json-json_value_on_empty_exception_/sql.yql"
         }
     ],
     "test_sql2yql.test[json-json_value/on_error]": [
         {
-            "checksum": "683525acdfaaa827056ccd9089591346",
-            "size": 5127,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_json-json_value_on_error_/sql.yql"
+            "checksum": "bd430557fd5d275789b1f712fa20fd7b",
+            "size": 4983,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_json-json_value_on_error_/sql.yql"
         }
     ],
     "test_sql2yql.test[json-json_value/on_error_cast_default_exception]": [
         {
-            "checksum": "a0109c8f529f0fca76940eaed9e67829",
-            "size": 1144,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_json-json_value_on_error_cast_default_exception_/sql.yql"
+            "checksum": "50b29d565c324d462596e6ac90a8f553",
+            "size": 1180,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_json-json_value_on_error_cast_default_exception_/sql.yql"
         }
     ],
     "test_sql2yql.test[json-json_value/on_error_cast_udf_exception]": [
         {
-            "checksum": "cb05748c1235feae0f84816d4268919e",
-            "size": 1151,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_json-json_value_on_error_cast_udf_exception_/sql.yql"
+            "checksum": "1935878843d3fe29e043ab5173035cb9",
+            "size": 1187,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_json-json_value_on_error_cast_udf_exception_/sql.yql"
         }
     ],
     "test_sql2yql.test[json-json_value/on_error_cast_value_exception]": [
         {
-            "checksum": "bc7a6f474862d11be99dde7b9869ffbb",
-            "size": 1147,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_json-json_value_on_error_cast_value_exception_/sql.yql"
+            "checksum": "7ff27edb76ba2e5c8aee9e31c2deb8b9",
+            "size": 1183,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_json-json_value_on_error_cast_value_exception_/sql.yql"
         }
     ],
     "test_sql2yql.test[json-json_value/on_error_jsonpath_exception]": [
         {
-            "checksum": "241c37253ea2e8e7a72e579346c8948f",
-            "size": 1109,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_json-json_value_on_error_jsonpath_exception_/sql.yql"
+            "checksum": "723c13ff4b50edee9e048e1f383d0134",
+            "size": 1145,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_json-json_value_on_error_jsonpath_exception_/sql.yql"
         }
     ],
     "test_sql2yql.test[json-json_value/passing]": [
         {
-            "checksum": "6227033c03a05c4ed54e2f2bce31064a",
-            "size": 6441,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_json-json_value_passing_/sql.yql"
+            "checksum": "affd5d3e1fd3fde0a37ee9d7fbb4fadd",
+            "size": 5879,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_json-json_value_passing_/sql.yql"
         }
     ],
     "test_sql2yql.test[json-json_value/passing_exception]": [
         {
-            "checksum": "db26670f8e54a97652703d6a3d2dc40d",
-            "size": 1172,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_json-json_value_passing_exception_/sql.yql"
+            "checksum": "3570a985198ed849ecf1fce9c0d08c0d",
+            "size": 1208,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_json-json_value_passing_exception_/sql.yql"
         }
     ],
     "test_sql2yql.test[json-json_value/returning]": [
         {
-            "checksum": "ee9bd74f42f8d1eef5519302519af372",
-            "size": 15004,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_json-json_value_returning_/sql.yql"
+            "checksum": "61c492e659acc3fa33525805a716e2a8",
+            "size": 13975,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_json-json_value_returning_/sql.yql"
         }
     ],
     "test_sql2yql.test[json-jsondocument/insert]": [
@@ -10130,23 +10130,23 @@
     ],
     "test_sql2yql.test[json-jsondocument/json_exists]": [
         {
-            "checksum": "8fc6166f3c0e31424d30ed0ce159ef0c",
-            "size": 1857,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_json-jsondocument_json_exists_/sql.yql"
+            "checksum": "6cf6d823d31932798ad932168c25c915",
+            "size": 1827,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_json-jsondocument_json_exists_/sql.yql"
         }
     ],
     "test_sql2yql.test[json-jsondocument/json_query]": [
         {
-            "checksum": "3a32f59639719c9ac637d271161da78f",
-            "size": 1841,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_json-jsondocument_json_query_/sql.yql"
+            "checksum": "8b2a053800e131885eaf304aa5ae536b",
+            "size": 1811,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_json-jsondocument_json_query_/sql.yql"
         }
     ],
     "test_sql2yql.test[json-jsondocument/json_value]": [
         {
-            "checksum": "a699e6c35816cf8fb8734545e05a8a37",
-            "size": 1929,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_json-jsondocument_json_value_/sql.yql"
+            "checksum": "8708f46b578c80ea33bd4d95e9227b55",
+            "size": 1899,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_json-jsondocument_json_value_/sql.yql"
         }
     ],
     "test_sql2yql.test[json-jsondocument/select]": [
@@ -10158,9 +10158,9 @@
     ],
     "test_sql2yql.test[json-jsonpath/unicode]": [
         {
-            "checksum": "46b12a6d2e84170f718e21f74b5879e4",
-            "size": 2362,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_json-jsonpath_unicode_/sql.yql"
+            "checksum": "331e7b527e9ee5dc947db0a1add582d8",
+            "size": 2379,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_json-jsonpath_unicode_/sql.yql"
         }
     ],
     "test_sql2yql.test[key_filter-between_with_key_filter]": [
@@ -10172,9 +10172,9 @@
     ],
     "test_sql2yql.test[key_filter-calc_dependent]": [
         {
-            "checksum": "e15b8535531f65614f4f341248ff7406",
-            "size": 1381,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_key_filter-calc_dependent_/sql.yql"
+            "checksum": "a568d4dadc685192d6afc618342d5952",
+            "size": 1430,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_key_filter-calc_dependent_/sql.yql"
         }
     ],
     "test_sql2yql.test[key_filter-calc_dependent_with_tmp]": [
@@ -10235,9 +10235,9 @@
     ],
     "test_sql2yql.test[key_filter-decimal]": [
         {
-            "checksum": "3d4ef07539b91023ae6a748b8969d706",
-            "size": 11001,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_key_filter-decimal_/sql.yql"
+            "checksum": "8da231691cf7514ab76b038837a350c9",
+            "size": 10858,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_key_filter-decimal_/sql.yql"
         }
     ],
     "test_sql2yql.test[key_filter-dependent_value]": [
@@ -10326,9 +10326,9 @@
     ],
     "test_sql2yql.test[key_filter-mixed_opt_bounds]": [
         {
-            "checksum": "f249b88bc13130f3f3257f346bb8a943",
-            "size": 2931,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_key_filter-mixed_opt_bounds_/sql.yql"
+            "checksum": "08c3aacf2b9dde7bca04cad2d21fb7ef",
+            "size": 2690,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_key_filter-mixed_opt_bounds_/sql.yql"
         }
     ],
     "test_sql2yql.test[key_filter-mixed_sort]": [
@@ -10438,9 +10438,9 @@
     ],
     "test_sql2yql.test[key_filter-tzdate]": [
         {
-            "checksum": "d3c88543a4b05c1a1fc8120361bcea7b",
-            "size": 10270,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_key_filter-tzdate_/sql.yql"
+            "checksum": "2d271e6e0e2962d111632beb9c3e3ca3",
+            "size": 10127,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_key_filter-tzdate_/sql.yql"
         }
     ],
     "test_sql2yql.test[key_filter-utf8_with_legacy]": [
@@ -10452,9 +10452,9 @@
     ],
     "test_sql2yql.test[key_filter-uuid]": [
         {
-            "checksum": "687383e4066f2b8af2c7f487de82e49b",
-            "size": 13527,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_key_filter-uuid_/sql.yql"
+            "checksum": "4b03be1144b1263182085e3911bfeb91",
+            "size": 13384,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_key_filter-uuid_/sql.yql"
         }
     ],
     "test_sql2yql.test[key_filter-yql-14157]": [
@@ -10494,65 +10494,65 @@
     ],
     "test_sql2yql.test[lambda-lambda_no_arg]": [
         {
-            "checksum": "48c380a690656c54889ff5c78cca22a8",
-            "size": 1322,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_lambda-lambda_no_arg_/sql.yql"
+            "checksum": "d8a6c057114de0639ce8746db5b606ba",
+            "size": 1350,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_lambda-lambda_no_arg_/sql.yql"
         }
     ],
     "test_sql2yql.test[lambda-lambda_opt_args]": [
         {
-            "checksum": "baae95c831eccce84675eeb47408de3f",
-            "size": 1447,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_lambda-lambda_opt_args_/sql.yql"
+            "checksum": "c39b54353ae6fa237b306612b0a75b94",
+            "size": 1343,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_lambda-lambda_opt_args_/sql.yql"
         }
     ],
     "test_sql2yql.test[lambda-lambda_simple]": [
         {
-            "checksum": "6c15a559be581595bb86e85cb2608a6d",
-            "size": 1752,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_lambda-lambda_simple_/sql.yql"
+            "checksum": "b6d27fd027260e275ca013903ded1892",
+            "size": 1764,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_lambda-lambda_simple_/sql.yql"
         }
     ],
     "test_sql2yql.test[lambda-lambda_udf]": [
         {
-            "checksum": "91ef90a391f494208e0f908654b379f1",
-            "size": 1772,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_lambda-lambda_udf_/sql.yql"
+            "checksum": "3992a57634dc152f3132daf0a62de98e",
+            "size": 1774,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_lambda-lambda_udf_/sql.yql"
         }
     ],
     "test_sql2yql.test[lambda-lambda_use_labmda_as_arg]": [
         {
-            "checksum": "e3e970d824792cfdc65a4279a334532a",
-            "size": 1931,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_lambda-lambda_use_labmda_as_arg_/sql.yql"
+            "checksum": "00f43de5343f6aa8a3f4866484f84d9d",
+            "size": 1923,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_lambda-lambda_use_labmda_as_arg_/sql.yql"
         }
     ],
     "test_sql2yql.test[lambda-lambda_with_tie]": [
         {
-            "checksum": "8135493266a4678adfb570cc18647ed0",
-            "size": 1379,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_lambda-lambda_with_tie_/sql.yql"
+            "checksum": "4c533d28419c1fde8fe59db9e7c33dec",
+            "size": 1365,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_lambda-lambda_with_tie_/sql.yql"
         }
     ],
     "test_sql2yql.test[lambda-lambda_with_tie_bad_count_fail]": [
         {
-            "checksum": "4794d8e1ffef08cbe4ea6bd1707961f1",
-            "size": 1384,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_lambda-lambda_with_tie_bad_count_fail_/sql.yql"
+            "checksum": "5ac4c036e7764af1fc742a5a2915d6e1",
+            "size": 1370,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_lambda-lambda_with_tie_bad_count_fail_/sql.yql"
         }
     ],
     "test_sql2yql.test[lambda-list_aggregate]": [
         {
-            "checksum": "8c9f13fa78e8c9e979107526e7644a65",
-            "size": 2870,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_lambda-list_aggregate_/sql.yql"
+            "checksum": "0f3ba4c50a635f319ee575745745edc5",
+            "size": 2882,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_lambda-list_aggregate_/sql.yql"
         }
     ],
     "test_sql2yql.test[lambda-list_aggregate_flatmap]": [
         {
-            "checksum": "cd2d02ab0adea3c88f428908829f4f64",
-            "size": 2874,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_lambda-list_aggregate_flatmap_/sql.yql"
+            "checksum": "a8f4ed933a5bae8097c565a55f6f38ed",
+            "size": 2886,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_lambda-list_aggregate_flatmap_/sql.yql"
         }
     ],
     "test_sql2yql.test[library-forward_import]": [
@@ -10669,9 +10669,9 @@
     ],
     "test_sql2yql.test[limit-dynamic_sort_limit]": [
         {
-            "checksum": "1f8624cc8eda8b1ad44fd27e8dc730aa",
-            "size": 1783,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_limit-dynamic_sort_limit_/sql.yql"
+            "checksum": "47296c9f272d8c59adbb76ced6a65379",
+            "size": 1863,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_limit-dynamic_sort_limit_/sql.yql"
         }
     ],
     "test_sql2yql.test[limit-empty_input_after_limit]": [
@@ -10760,9 +10760,9 @@
     ],
     "test_sql2yql.test[limit-yql-7900_empty_sorted_without_keys]": [
         {
-            "checksum": "9178443752009b31379c674ac78832ea",
-            "size": 3792,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_limit-yql-7900_empty_sorted_without_keys_/sql.yql"
+            "checksum": "7fba4f56007ca9ac3c4f9a713d4d826a",
+            "size": 3828,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_limit-yql-7900_empty_sorted_without_keys_/sql.yql"
         }
     ],
     "test_sql2yql.test[limit-yql-8046_empty_sorted_desc]": [
@@ -10774,9 +10774,9 @@
     ],
     "test_sql2yql.test[limit-yql-8611_calc_peephole]": [
         {
-            "checksum": "620b7bcab7831a76ba37d766eec55afa",
-            "size": 3282,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_limit-yql-8611_calc_peephole_/sql.yql"
+            "checksum": "8b89e69e62a83471f3250a98dd813f35",
+            "size": 3265,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_limit-yql-8611_calc_peephole_/sql.yql"
         }
     ],
     "test_sql2yql.test[limit-yql-9617_empty_lambda]": [
@@ -10893,37 +10893,37 @@
     ],
     "test_sql2yql.test[lineage-nested_lambda_fields]": [
         {
-            "checksum": "7a7b3ae28983391789cb04631ff9478f",
-            "size": 1545,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_lineage-nested_lambda_fields_/sql.yql"
+            "checksum": "19f8a70b05780d4c65cc9506b768d189",
+            "size": 1557,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_lineage-nested_lambda_fields_/sql.yql"
         }
     ],
     "test_sql2yql.test[lineage-process]": [
         {
-            "checksum": "b987b74694fd6165b0c3eaa827d9ec06",
-            "size": 952,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_lineage-process_/sql.yql"
+            "checksum": "88ecc8f0f5594a02fe8b15f045b04c80",
+            "size": 976,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_lineage-process_/sql.yql"
         }
     ],
     "test_sql2yql.test[lineage-reduce]": [
         {
-            "checksum": "7e1a4df092f231a8b7706e9bf212db8b",
-            "size": 1183,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_lineage-reduce_/sql.yql"
+            "checksum": "8ad01391e480072af477d0550e0f5e59",
+            "size": 1207,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_lineage-reduce_/sql.yql"
         }
     ],
     "test_sql2yql.test[lineage-reduce_all]": [
         {
-            "checksum": "54cac061bd2ed55e0cf4779cdfc5b8dd",
-            "size": 1130,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_lineage-reduce_all_/sql.yql"
+            "checksum": "cc91f636a0535bf169b61b5f73090908",
+            "size": 1154,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_lineage-reduce_all_/sql.yql"
         }
     ],
     "test_sql2yql.test[lineage-reduce_all_row]": [
         {
-            "checksum": "34fdbe53548fab3e06a8b6d33732baef",
-            "size": 1321,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_lineage-reduce_all_row_/sql.yql"
+            "checksum": "7b6715ac04e6a49d29e90196cda00eeb",
+            "size": 1333,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_lineage-reduce_all_row_/sql.yql"
         }
     ],
     "test_sql2yql.test[lineage-scalar_context]": [
@@ -11054,9 +11054,9 @@
     ],
     "test_sql2yql.test[lineage-unordered_subquery]": [
         {
-            "checksum": "45c9a42e3a9c045cd3921818fcfc7eff",
-            "size": 1873,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_lineage-unordered_subquery_/sql.yql"
+            "checksum": "a743200afe8fa876aef1e24e07c0f88b",
+            "size": 1779,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_lineage-unordered_subquery_/sql.yql"
         }
     ],
     "test_sql2yql.test[lineage-window_asstruct]": [
@@ -11117,65 +11117,65 @@
     ],
     "test_sql2yql.test[match_recognize-alerts-streaming]": [
         {
-            "checksum": "608ebe5a00413e80b8e74157944f0b65",
-            "size": 8897,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_match_recognize-alerts-streaming_/sql.yql"
+            "checksum": "b1e24d20f8ef58a389b70cf8deb7ca73",
+            "size": 8933,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_match_recognize-alerts-streaming_/sql.yql"
         }
     ],
     "test_sql2yql.test[match_recognize-alerts]": [
         {
-            "checksum": "cdb46b31b6421829da9d236dcd55bbdd",
-            "size": 8899,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_match_recognize-alerts_/sql.yql"
+            "checksum": "329715fbdbe2734d1bffd81abf772b30",
+            "size": 8935,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_match_recognize-alerts_/sql.yql"
         }
     ],
     "test_sql2yql.test[match_recognize-alerts_without_order]": [
         {
-            "checksum": "4a7d1c9ca704a076217e529b5489ad87",
-            "size": 8780,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_match_recognize-alerts_without_order_/sql.yql"
+            "checksum": "8d8b26b500e55135967567ddc12c88a5",
+            "size": 8816,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_match_recognize-alerts_without_order_/sql.yql"
         }
     ],
     "test_sql2yql.test[match_recognize-permute]": [
         {
-            "checksum": "05c45a70d86bca34be996277afae8bf9",
-            "size": 8370,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_match_recognize-permute_/sql.yql"
+            "checksum": "6a8054e8c0449847c5a4e4066ab7c0fb",
+            "size": 8406,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_match_recognize-permute_/sql.yql"
         }
     ],
     "test_sql2yql.test[match_recognize-simple_paritioning-streaming]": [
         {
-            "checksum": "46f8074bb1a64ddd158f99407652c0ac",
-            "size": 5028,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_match_recognize-simple_paritioning-streaming_/sql.yql"
+            "checksum": "19617f8245915407eb61ee5d53d33f23",
+            "size": 5064,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_match_recognize-simple_paritioning-streaming_/sql.yql"
         }
     ],
     "test_sql2yql.test[match_recognize-simple_paritioning]": [
         {
-            "checksum": "05cf7b3874d2a89f56fc9a06ff9bf853",
-            "size": 4997,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_match_recognize-simple_paritioning_/sql.yql"
+            "checksum": "7a86cc4b3abc187a029311da20ced001",
+            "size": 5033,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_match_recognize-simple_paritioning_/sql.yql"
         }
     ],
     "test_sql2yql.test[match_recognize-test_type-streaming]": [
         {
-            "checksum": "dcb70a47c4422d81c6548150dab5b76d",
-            "size": 10244,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_match_recognize-test_type-streaming_/sql.yql"
+            "checksum": "0a77762387fab60e05cdeeb4be2ac755",
+            "size": 9896,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_match_recognize-test_type-streaming_/sql.yql"
         }
     ],
     "test_sql2yql.test[match_recognize-test_type]": [
         {
-            "checksum": "0a5812e84f194b487eae4084027bd170",
-            "size": 10249,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_match_recognize-test_type_/sql.yql"
+            "checksum": "42e41c40786c84b128f179950dd95dd4",
+            "size": 9901,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_match_recognize-test_type_/sql.yql"
         }
     ],
     "test_sql2yql.test[match_recognize-test_type_predicate]": [
         {
-            "checksum": "0a61853b05181028e48e1cb2863198cf",
-            "size": 3268,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_match_recognize-test_type_predicate_/sql.yql"
+            "checksum": "0fe3d301231ecba8d9f8fea6b545a7c9",
+            "size": 3304,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_match_recognize-test_type_predicate_/sql.yql"
         }
     ],
     "test_sql2yql.test[optimizers-aggregate_over_aggregate]": [
@@ -11187,16 +11187,16 @@
     ],
     "test_sql2yql.test[optimizers-and_absorption]": [
         {
-            "checksum": "773f469a34ff201d73b86a8250ee9c94",
-            "size": 2282,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_optimizers-and_absorption_/sql.yql"
+            "checksum": "cfc4c9972863544848bd5233a2e13f27",
+            "size": 2290,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_optimizers-and_absorption_/sql.yql"
         }
     ],
     "test_sql2yql.test[optimizers-coalesce_propagate]": [
         {
-            "checksum": "cfe96bb25f42b04dd922e6ba78a5526c",
-            "size": 1705,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_optimizers-coalesce_propagate_/sql.yql"
+            "checksum": "1411c09c14de6a2e2323447796de52f7",
+            "size": 1741,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_optimizers-coalesce_propagate_/sql.yql"
         }
     ],
     "test_sql2yql.test[optimizers-combinebykey_fields_subset]": [
@@ -11236,9 +11236,9 @@
     ],
     "test_sql2yql.test[optimizers-flatmap_with_non_struct_out]": [
         {
-            "checksum": "88bc195de78e39a7631e8950b4ecb4b1",
-            "size": 1630,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_optimizers-flatmap_with_non_struct_out_/sql.yql"
+            "checksum": "c927e8284a168828079028bf9a3f7425",
+            "size": 1646,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_optimizers-flatmap_with_non_struct_out_/sql.yql"
         }
     ],
     "test_sql2yql.test[optimizers-group_visit_lambdas]": [
@@ -11285,16 +11285,16 @@
     ],
     "test_sql2yql.test[optimizers-or_absorption]": [
         {
-            "checksum": "702997764c6e5545d61df72df846250c",
-            "size": 2242,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_optimizers-or_absorption_/sql.yql"
+            "checksum": "f21653bf7c90323befbb7b61cd597730",
+            "size": 2214,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_optimizers-or_absorption_/sql.yql"
         }
     ],
     "test_sql2yql.test[optimizers-or_distributive]": [
         {
-            "checksum": "dd47f3bb3f6cd97d786bde20eef1d532",
-            "size": 2626,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_optimizers-or_distributive_/sql.yql"
+            "checksum": "d90ab3cff9bae127e55b06adf23d65ce",
+            "size": 2583,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_optimizers-or_distributive_/sql.yql"
         }
     ],
     "test_sql2yql.test[optimizers-passthrough_sortness_over_map]": [
@@ -11369,9 +11369,9 @@
     ],
     "test_sql2yql.test[optimizers-test_lmap_opts]": [
         {
-            "checksum": "d5b6c6796d3269c4828fe90929b110cd",
-            "size": 4943,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_optimizers-test_lmap_opts_/sql.yql"
+            "checksum": "b3bbb77a825f460b835cadbd638199d8",
+            "size": 5023,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_optimizers-test_lmap_opts_/sql.yql"
         }
     ],
     "test_sql2yql.test[optimizers-test_no_aggregate_split]": [
@@ -11383,9 +11383,9 @@
     ],
     "test_sql2yql.test[optimizers-total_order]": [
         {
-            "checksum": "719cae7cb1103ed9044df61b061d3dff",
-            "size": 17172,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_optimizers-total_order_/sql.yql"
+            "checksum": "229ac4b597b78d80fd5c728b669a41d4",
+            "size": 16173,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_optimizers-total_order_/sql.yql"
         }
     ],
     "test_sql2yql.test[optimizers-unused_columns_group]": [
@@ -11432,9 +11432,9 @@
     ],
     "test_sql2yql.test[optimizers-yql-10042_disable_fuse_depends_on]": [
         {
-            "checksum": "ea9a6b797ed06ddfab26bfee3e523069",
-            "size": 1279,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_optimizers-yql-10042_disable_fuse_depends_on_/sql.yql"
+            "checksum": "f6a3be82b535c65eb0ba0276101afcf8",
+            "size": 1315,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_optimizers-yql-10042_disable_fuse_depends_on_/sql.yql"
         }
     ],
     "test_sql2yql.test[optimizers-yql-10070_extract_members_over_calcoverwindow]": [
@@ -11481,9 +11481,9 @@
     ],
     "test_sql2yql.test[optimizers-yql-14581_fuseflatmaps_with_external_lambda]": [
         {
-            "checksum": "c6207a110de506d04489b14edcd4ab0a",
-            "size": 1941,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_optimizers-yql-14581_fuseflatmaps_with_external_lambda_/sql.yql"
+            "checksum": "993fcc033867421705141e9f5c560017",
+            "size": 1806,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_optimizers-yql-14581_fuseflatmaps_with_external_lambda_/sql.yql"
         }
     ],
     "test_sql2yql.test[optimizers-yql-15210_sqlin]": [
@@ -11509,9 +11509,9 @@
     ],
     "test_sql2yql.test[optimizers-yql-17715_concat_sort_desc]": [
         {
-            "checksum": "5f6235d7fe0cec7904445ce791d3d3f3",
-            "size": 9286,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_optimizers-yql-17715_concat_sort_desc_/sql.yql"
+            "checksum": "28c6ebd7f89ff47df3622d3aa42d3b00",
+            "size": 9322,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_optimizers-yql-17715_concat_sort_desc_/sql.yql"
         }
     ],
     "test_sql2yql.test[optimizers-yql-18300-flatmap-over-extend]": [
@@ -11600,16 +11600,16 @@
     ],
     "test_sql2yql.test[optimizers-yql-6133_skip_deps]": [
         {
-            "checksum": "e1f130c466b66c9574b7adef177c1f4c",
-            "size": 2917,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_optimizers-yql-6133_skip_deps_/sql.yql"
+            "checksum": "d83d4c85803c34644ba595576a9c6298",
+            "size": 2953,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_optimizers-yql-6133_skip_deps_/sql.yql"
         }
     ],
     "test_sql2yql.test[optimizers-yql-7324_duplicate_arg]": [
         {
-            "checksum": "da2a150c066cbfaf2c1fb78890aa2faf",
-            "size": 2788,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_optimizers-yql-7324_duplicate_arg_/sql.yql"
+            "checksum": "7fc841621e01eb92fb656187ed4daefe",
+            "size": 2586,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_optimizers-yql-7324_duplicate_arg_/sql.yql"
         }
     ],
     "test_sql2yql.test[optimizers-yql-7532_wrong_field_subset_for_calcoverwindow]": [
@@ -11670,9 +11670,9 @@
     ],
     "test_sql2yql.test[optimizers-yson_dup_serialize]": [
         {
-            "checksum": "c880ca60e909a0a06684cb3254491b9a",
-            "size": 3430,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_optimizers-yson_dup_serialize_/sql.yql"
+            "checksum": "54521f419a2c9fca0e214fff94393504",
+            "size": 2907,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_optimizers-yson_dup_serialize_/sql.yql"
         }
     ],
     "test_sql2yql.test[optimizers-yt_shuffle_by_keys]": [
@@ -11775,9 +11775,9 @@
     ],
     "test_sql2yql.test[order_by-literal_complex]": [
         {
-            "checksum": "4f54ad7cba5c381abd04918aaf2e13d9",
-            "size": 1323,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_order_by-literal_complex_/sql.yql"
+            "checksum": "d1fc9343a97064b311a16849884ceba2",
+            "size": 1359,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_order_by-literal_complex_/sql.yql"
         }
     ],
     "test_sql2yql.test[order_by-literal_desc]": [
@@ -11789,30 +11789,30 @@
     ],
     "test_sql2yql.test[order_by-literal_empty_list_sort]": [
         {
-            "checksum": "2323ce58fdb212d964d15ae040fef925",
-            "size": 1156,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_order_by-literal_empty_list_sort_/sql.yql"
+            "checksum": "358f85100ad0c457568a5dce9c202f3c",
+            "size": 1192,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_order_by-literal_empty_list_sort_/sql.yql"
         }
     ],
     "test_sql2yql.test[order_by-literal_single_item_sort]": [
         {
-            "checksum": "666132c2c3bc3326476746f57d28dfb1",
-            "size": 1119,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_order_by-literal_single_item_sort_/sql.yql"
+            "checksum": "565dff12115ae8fe32473c9111280567",
+            "size": 1155,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_order_by-literal_single_item_sort_/sql.yql"
         }
     ],
     "test_sql2yql.test[order_by-literal_take_zero_sort]": [
         {
-            "checksum": "1381df5de137191c033fa8d2ae2fc259",
-            "size": 1483,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_order_by-literal_take_zero_sort_/sql.yql"
+            "checksum": "427023f5dd17b5482efb3acfb10dce78",
+            "size": 1519,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_order_by-literal_take_zero_sort_/sql.yql"
         }
     ],
     "test_sql2yql.test[order_by-literal_with_assume]": [
         {
-            "checksum": "b27fbb96b3ac761e8145844db6725a61",
-            "size": 1405,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_order_by-literal_with_assume_/sql.yql"
+            "checksum": "b66c939617efe8f0c4d4096cca7540d6",
+            "size": 1441,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_order_by-literal_with_assume_/sql.yql"
         }
     ],
     "test_sql2yql.test[order_by-literal_with_assume_desc]": [
@@ -11929,37 +11929,37 @@
     ],
     "test_sql2yql.test[order_by-order_by_missing_project_column_as_table]": [
         {
-            "checksum": "482a0162b6499b47cd62b6d5d19d14fc",
-            "size": 4529,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_order_by-order_by_missing_project_column_as_table_/sql.yql"
+            "checksum": "8b90b011a69bd620f23286f6a912a423",
+            "size": 3875,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_order_by-order_by_missing_project_column_as_table_/sql.yql"
         }
     ],
     "test_sql2yql.test[order_by-order_by_missing_project_column_ignored]": [
         {
-            "checksum": "f844bc6856fa7358172cb5bf2442f9e6",
-            "size": 6492,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_order_by-order_by_missing_project_column_ignored_/sql.yql"
+            "checksum": "9fa29e129c988e4ebc015d4663dae947",
+            "size": 6150,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_order_by-order_by_missing_project_column_ignored_/sql.yql"
         }
     ],
     "test_sql2yql.test[order_by-order_by_missing_project_column_join2]": [
         {
-            "checksum": "98039874784e044ceb5ba77e2e8158b8",
-            "size": 3496,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_order_by-order_by_missing_project_column_join2_/sql.yql"
+            "checksum": "b9ed1989e273bb1590095cd33f7c3b99",
+            "size": 3568,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_order_by-order_by_missing_project_column_join2_/sql.yql"
         }
     ],
     "test_sql2yql.test[order_by-order_by_missing_project_column_join]": [
         {
-            "checksum": "74c9e8c341785c084195974f3649ccc6",
-            "size": 20470,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_order_by-order_by_missing_project_column_join_/sql.yql"
+            "checksum": "1e73509cf0dc7650840537251bccf5ff",
+            "size": 20542,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_order_by-order_by_missing_project_column_join_/sql.yql"
         }
     ],
     "test_sql2yql.test[order_by-order_by_missing_project_column_join_types]": [
         {
-            "checksum": "9ea8f0a0e4052e5ab683483361fd7533",
-            "size": 20772,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_order_by-order_by_missing_project_column_join_types_/sql.yql"
+            "checksum": "3e272b5f58ddb236f72e1ffd3df1bd21",
+            "size": 20844,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_order_by-order_by_missing_project_column_join_types_/sql.yql"
         }
     ],
     "test_sql2yql.test[order_by-order_by_mul_columns]": [
@@ -12020,9 +12020,9 @@
     ],
     "test_sql2yql.test[order_by-order_by_tuple_expr]": [
         {
-            "checksum": "b52cd2f6dfcb81314beaa2e51c4d31f4",
-            "size": 1252,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_order_by-order_by_tuple_expr_/sql.yql"
+            "checksum": "46f0e82c2d6ebd7ee859c28a666ad45d",
+            "size": 1280,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_order_by-order_by_tuple_expr_/sql.yql"
         }
     ],
     "test_sql2yql.test[order_by-order_by_udf]": [
@@ -12069,9 +12069,9 @@
     ],
     "test_sql2yql.test[order_by-presort_order_by_table]": [
         {
-            "checksum": "c3630e6a1172a91e5be580a569aff066",
-            "size": 2628,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_order_by-presort_order_by_table_/sql.yql"
+            "checksum": "b080a8c1bdd4cc4a08e398ea9e8be040",
+            "size": 2664,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_order_by-presort_order_by_table_/sql.yql"
         }
     ],
     "test_sql2yql.test[order_by-single_item_tuple]": [
@@ -12132,9 +12132,9 @@
     ],
     "test_sql2yql.test[order_by-union_all]": [
         {
-            "checksum": "171bb0bde62a69346d4a0d1a74b4bccb",
-            "size": 2444,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_order_by-union_all_/sql.yql"
+            "checksum": "31fddc5ddaabab4cc0626b608b31ecdb",
+            "size": 2456,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_order_by-union_all_/sql.yql"
         }
     ],
     "test_sql2yql.test[order_by-warn_offset_wo_sort]": [
@@ -12223,9 +12223,9 @@
     ],
     "test_sql2yql.test[params-tuple]": [
         {
-            "checksum": "8570863a63e6b0040fca4ebbeb4efa3f",
-            "size": 1762,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_params-tuple_/sql.yql"
+            "checksum": "1ee24970545d00ab38237f1f3d1a529a",
+            "size": 1786,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_params-tuple_/sql.yql"
         }
     ],
     "test_sql2yql.test[params-variant]": [
@@ -12237,9 +12237,9 @@
     ],
     "test_sql2yql.test[pg-aggr_compare]": [
         {
-            "checksum": "54e49ec5124e9b170c31262135ecc1ed",
-            "size": 3790,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_pg-aggr_compare_/sql.yql"
+            "checksum": "edbc20475426de93400bff247f7d8c47",
+            "size": 3137,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_pg-aggr_compare_/sql.yql"
         }
     ],
     "test_sql2yql.test[pg-aggregate_combine]": [
@@ -12279,9 +12279,9 @@
     ],
     "test_sql2yql.test[pg-aggregate_factory]": [
         {
-            "checksum": "a4c5bf80700a6964f93e7a58f518c28b",
-            "size": 8397,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_pg-aggregate_factory_/sql.yql"
+            "checksum": "6ca8c27d5ab21e94d67b76798febdaa4",
+            "size": 8192,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_pg-aggregate_factory_/sql.yql"
         }
     ],
     "test_sql2yql.test[pg-aggregate_minus_zero]": [
@@ -12930,9 +12930,9 @@
     ],
     "test_sql2yql.test[pg-pg_iterate]": [
         {
-            "checksum": "776ef60a2ba5385372197ec39e44eb82",
-            "size": 4118,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_pg-pg_iterate_/sql.yql"
+            "checksum": "3ff35eee4cd1517c26eac5b4fc135d9f",
+            "size": 4238,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_pg-pg_iterate_/sql.yql"
         }
     ],
     "test_sql2yql.test[pg-pg_like]": [
@@ -14120,9 +14120,9 @@
     ],
     "test_sql2yql.test[pg-struct_tuple_cast]": [
         {
-            "checksum": "ecc9991a5650f456e39aca3a4e57e455",
-            "size": 1998,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_pg-struct_tuple_cast_/sql.yql"
+            "checksum": "89c565d8ec73f494ece298de54eae949",
+            "size": 2070,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_pg-struct_tuple_cast_/sql.yql"
         }
     ],
     "test_sql2yql.test[pg-sublink_columns_in_test_expr_columns]": [
@@ -15625,9 +15625,9 @@
     ],
     "test_sql2yql.test[pragma-classic_division]": [
         {
-            "checksum": "e5336d8701405a97dc8c154b7f868c33",
-            "size": 4361,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_pragma-classic_division_/sql.yql"
+            "checksum": "19bf0974136381af88ee85905167fe52",
+            "size": 4401,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_pragma-classic_division_/sql.yql"
         }
     ],
     "test_sql2yql.test[pragma-config_exec]": [
@@ -15646,30 +15646,30 @@
     ],
     "test_sql2yql.test[pragma-release_temp_data_chain_pull]": [
         {
-            "checksum": "7778a03c6561a12f20222fc0fe8f6348",
-            "size": 8335,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_pragma-release_temp_data_chain_pull_/sql.yql"
+            "checksum": "8a6545b57740f96e8895147716109130",
+            "size": 8324,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_pragma-release_temp_data_chain_pull_/sql.yql"
         }
     ],
     "test_sql2yql.test[pragma-release_temp_data_chain_pull_fail]": [
         {
-            "checksum": "15548ce5f880d1e7cbe40c8fd3d13ed1",
-            "size": 8332,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_pragma-release_temp_data_chain_pull_fail_/sql.yql"
+            "checksum": "4e3f0296b0d7145cf130cd357198842d",
+            "size": 8321,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_pragma-release_temp_data_chain_pull_fail_/sql.yql"
         }
     ],
     "test_sql2yql.test[pragma-release_temp_data_chain_pull_single_thread]": [
         {
-            "checksum": "83f244080d87bb1ae46998b296fd44d8",
-            "size": 8335,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_pragma-release_temp_data_chain_pull_single_thread_/sql.yql"
+            "checksum": "f7d515ce45d7992b8a85aaed9f8a55a4",
+            "size": 8324,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_pragma-release_temp_data_chain_pull_single_thread_/sql.yql"
         }
     ],
     "test_sql2yql.test[pragma-release_temp_data_chain_pull_single_thread_fail]": [
         {
-            "checksum": "eab3954c00ebeffeb48c4bb06a8937d5",
-            "size": 8335,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_pragma-release_temp_data_chain_pull_single_thread_fail_/sql.yql"
+            "checksum": "242620200bb8cb1cd099c8b67f5f3fc5",
+            "size": 8324,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_pragma-release_temp_data_chain_pull_single_thread_fail_/sql.yql"
         }
     ],
     "test_sql2yql.test[pragma-yson_auto_convert]": [
@@ -15688,30 +15688,30 @@
     ],
     "test_sql2yql.test[produce-discard_process_with_lambda]": [
         {
-            "checksum": "f2fefae1d2373e49fcca2607329a0e8b",
-            "size": 978,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-discard_process_with_lambda_/sql.yql"
+            "checksum": "548e2da00a314dddf5c71aa8e9a18351",
+            "size": 1014,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-discard_process_with_lambda_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-discard_reduce_lambda]": [
         {
-            "checksum": "3018a4021877e20dffa3f960e4361ea2",
-            "size": 1370,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-discard_reduce_lambda_/sql.yql"
+            "checksum": "d3b9ed33ebdb1b4371e6c7392cc45f7f",
+            "size": 1406,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-discard_reduce_lambda_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-fuse_reduces_with_presort]": [
         {
-            "checksum": "e379da7ed6a051092b9b7125ec129f09",
-            "size": 11861,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-fuse_reduces_with_presort_/sql.yql"
+            "checksum": "5975f2c4346c0a1e40c47091c8341388",
+            "size": 9974,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-fuse_reduces_with_presort_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-native_desc_reduce_with_presort]": [
         {
-            "checksum": "78eedc889a54e4499e62fb3752015a4a",
-            "size": 7752,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-native_desc_reduce_with_presort_/sql.yql"
+            "checksum": "26b8404de91594ddeef6c3b646d72d42",
+            "size": 7185,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-native_desc_reduce_with_presort_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-process_and_filter]": [
@@ -15723,93 +15723,93 @@
     ],
     "test_sql2yql.test[produce-process_lambda_opt_args]": [
         {
-            "checksum": "4b75cc3c37fedf0e63bdd5e43ea06d68",
-            "size": 3814,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-process_lambda_opt_args_/sql.yql"
+            "checksum": "46541e3bc7ef65ecd30a9b6417fdd219",
+            "size": 3380,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-process_lambda_opt_args_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-process_multi_in]": [
         {
-            "checksum": "781a42dd763a6735bc4078a7a36e144f",
-            "size": 6448,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-process_multi_in_/sql.yql"
+            "checksum": "9cdd0fa979b02544bb3c41f4e666ec90",
+            "size": 6110,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-process_multi_in_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-process_multi_in_single_out]": [
         {
-            "checksum": "b29789d941b4c85e0435570dd2b20f3a",
-            "size": 2202,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-process_multi_in_single_out_/sql.yql"
+            "checksum": "121a0b32b0cd6fb5569d757eed9c5931",
+            "size": 2238,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-process_multi_in_single_out_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-process_multi_in_trivial_lambda]": [
         {
-            "checksum": "87b29475e56a51fef59f1ca46b0b5233",
-            "size": 2037,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-process_multi_in_trivial_lambda_/sql.yql"
+            "checksum": "4fa007f4c48dd8f5226a2971f7e74e3e",
+            "size": 2057,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-process_multi_in_trivial_lambda_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-process_multi_out]": [
         {
-            "checksum": "7f3af92d062c2462ff246dcc0a4adfd8",
-            "size": 3492,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-process_multi_out_/sql.yql"
+            "checksum": "b5264d6f3e97e2ff8cecb2b158e61890",
+            "size": 3418,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-process_multi_out_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-process_multi_out_bad_count_fail]": [
         {
-            "checksum": "7694edfadffe8ce7830aca27c0c20c73",
-            "size": 4255,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-process_multi_out_bad_count_fail_/sql.yql"
+            "checksum": "84e3bf4511dbb572fd84a497a689d199",
+            "size": 4181,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-process_multi_out_bad_count_fail_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-process_pure_with_sort]": [
         {
-            "checksum": "d5a15cfe7d8ff41c531dd06547b78251",
-            "size": 4487,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-process_pure_with_sort_/sql.yql"
+            "checksum": "66b25cfe2f8998f2ab049246d592c28b",
+            "size": 2493,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-process_pure_with_sort_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-process_row_and_columns]": [
         {
-            "checksum": "60ff9768453251c32825c49782c05467",
-            "size": 2277,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-process_row_and_columns_/sql.yql"
+            "checksum": "527483c946d7b6b22f18cd80227299e7",
+            "size": 2357,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-process_row_and_columns_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-process_rows_and_filter]": [
         {
-            "checksum": "3014bf3d9d3a76492f9ade9215ade42d",
-            "size": 2247,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-process_rows_and_filter_/sql.yql"
+            "checksum": "32144780a3cdbfd3d514092f01ea8ec6",
+            "size": 2327,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-process_rows_and_filter_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-process_rows_sorted_desc_multi_out]": [
         {
-            "checksum": "e2b2eeba8f2af1ca49a6040cad3f9436",
-            "size": 5817,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-process_rows_sorted_desc_multi_out_/sql.yql"
+            "checksum": "c676be9a4802eb4a1812761f665fa839",
+            "size": 5841,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-process_rows_sorted_desc_multi_out_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-process_rows_sorted_multi_out]": [
         {
-            "checksum": "c4ea929094bf644a87eb852ecd3ab134",
-            "size": 5814,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-process_rows_sorted_multi_out_/sql.yql"
+            "checksum": "14eda3d41ee357607c7d1976a022dc0d",
+            "size": 5838,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-process_rows_sorted_multi_out_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-process_sorted_desc_multi_out]": [
         {
-            "checksum": "c19b3dbe190c92d8e1493a9fb4c7e345",
-            "size": 5808,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-process_sorted_desc_multi_out_/sql.yql"
+            "checksum": "b95ca0a22f1fff0f3ae0df2d1122c2b6",
+            "size": 5836,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-process_sorted_desc_multi_out_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-process_sorted_multi_out]": [
         {
-            "checksum": "cf3ddf89c61087570b3b42c536baf224",
-            "size": 5805,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-process_sorted_multi_out_/sql.yql"
+            "checksum": "0d9d1b57a555b14b10f7c99836e7f1ec",
+            "size": 5833,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-process_sorted_multi_out_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-process_streaming]": [
@@ -15828,9 +15828,9 @@
     ],
     "test_sql2yql.test[produce-process_streaming_inline_bash]": [
         {
-            "checksum": "c48a1304dd1a092e74981172f4ff9636",
-            "size": 1946,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-process_streaming_inline_bash_/sql.yql"
+            "checksum": "3654f5e3f9866590524a5ad776306113",
+            "size": 1928,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-process_streaming_inline_bash_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-process_trivial_as_struct]": [
@@ -15842,44 +15842,44 @@
     ],
     "test_sql2yql.test[produce-process_with_assume]": [
         {
-            "checksum": "7fa6c6c7b2cf1a6e233449f078223c56",
-            "size": 1128,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-process_with_assume_/sql.yql"
+            "checksum": "4eaa5ce8d21e60645eec30ee204618d8",
+            "size": 1164,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-process_with_assume_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-process_with_lambda]": [
         {
-            "checksum": "9d8c5e3ecddf08ffa8d35ce388b6f6e9",
-            "size": 966,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-process_with_lambda_/sql.yql"
+            "checksum": "faa05bdcf78373d1c64fe4fda5e7f92d",
+            "size": 1002,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-process_with_lambda_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-process_with_lambda_outstream]": [
         {
-            "checksum": "521db80f4cd328a9ae5706c015a1e839",
-            "size": 3586,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-process_with_lambda_outstream_/sql.yql"
+            "checksum": "4a7290c225b6943d0e98227b396a0398",
+            "size": 3666,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-process_with_lambda_outstream_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-process_with_python]": [
         {
-            "checksum": "92202f2cac2415b9d976e9652a2c1dd8",
-            "size": 1211,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-process_with_python_/sql.yql"
+            "checksum": "38992b04bbc0f883077e89a71629d07c",
+            "size": 1255,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-process_with_python_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-process_with_python_as_struct]": [
         {
-            "checksum": "1e9afd191168b2e77d024960c600c030",
-            "size": 1236,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-process_with_python_as_struct_/sql.yql"
+            "checksum": "34d22c06e10c9b21a5bfcbf41aa7078c",
+            "size": 1280,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-process_with_python_as_struct_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-process_with_python_stream]": [
         {
-            "checksum": "94c931fe180752fb90bce352ac64954e",
-            "size": 1462,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-process_with_python_stream_/sql.yql"
+            "checksum": "dcd86a963d38504c55756867f0af8db2",
+            "size": 1506,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-process_with_python_stream_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-process_with_udf]": [
@@ -15891,9 +15891,9 @@
     ],
     "test_sql2yql.test[produce-process_with_udf_rows]": [
         {
-            "checksum": "22678426c759a9c12f18d104953ad3c4",
-            "size": 1902,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-process_with_udf_rows_/sql.yql"
+            "checksum": "0e5061fd9cdbd8722b6e2234c4c193de",
+            "size": 1910,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-process_with_udf_rows_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-process_with_udf_validate]": [
@@ -15912,170 +15912,170 @@
     ],
     "test_sql2yql.test[produce-reduce_all]": [
         {
-            "checksum": "40e23b1a4a066f1fceccd1a1ff9b0eb5",
-            "size": 1660,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_all_/sql.yql"
+            "checksum": "6f234fc676bc54bd138e45246caee073",
+            "size": 1704,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_all_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_all_expr]": [
         {
-            "checksum": "bb9c99393e7b92770c33978ff40e69f8",
-            "size": 1613,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_all_expr_/sql.yql"
+            "checksum": "fb045c612f56afe15a88b4bf225baa8a",
+            "size": 1657,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_all_expr_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_all_list]": [
         {
-            "checksum": "f171f1b89d63e604cfe24df7877d0848",
-            "size": 1674,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_all_list_/sql.yql"
+            "checksum": "51cb9823112d222e210941425931f6bf",
+            "size": 1718,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_all_list_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_all_list_stream]": [
         {
-            "checksum": "33389459def72374008fef3b0b3f7fdf",
-            "size": 1896,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_all_list_stream_/sql.yql"
+            "checksum": "9426b85d2b238b681d90c4c460ada9c8",
+            "size": 1940,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_all_list_stream_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_all_multi_in]": [
         {
-            "checksum": "5d1a6362b000374ea050479bf6575a0c",
-            "size": 2126,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_all_multi_in_/sql.yql"
+            "checksum": "7e74984aa65550f943a06982ceb5f221",
+            "size": 2170,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_all_multi_in_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_all_opt]": [
         {
-            "checksum": "0a8b7474105e777586813bc5ad2cb622",
-            "size": 1675,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_all_opt_/sql.yql"
+            "checksum": "8b6c6d54f814a9099f1f3a2104b27f8b",
+            "size": 1719,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_all_opt_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_by_struct]": [
         {
-            "checksum": "b17fa5fb8c89bc4324c5427957dacd4a",
-            "size": 2244,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_by_struct_/sql.yql"
+            "checksum": "b3aafefb5ebb7de3fac6828adbf06c3e",
+            "size": 2268,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_by_struct_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_lambda]": [
         {
-            "checksum": "906fe293081c9373b7d3b455f257dd6d",
-            "size": 1993,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_lambda_/sql.yql"
+            "checksum": "e666e831c8d8f4192a3f6436fb9312a5",
+            "size": 2029,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_lambda_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_lambda_list_mem]": [
         {
-            "checksum": "eaf986f4341006045d512db1fcc88fef",
-            "size": 2497,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_lambda_list_mem_/sql.yql"
+            "checksum": "5814c54fd25ca669c3aa3ea35790dafe",
+            "size": 2533,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_lambda_list_mem_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_lambda_list_table]": [
         {
-            "checksum": "7ada0366b3088e51dc84859aad723331",
-            "size": 2634,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_lambda_list_table_/sql.yql"
+            "checksum": "c406f2d4c74004150152072b2bd3bb26",
+            "size": 2670,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_lambda_list_table_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_lambda_presort_twin]": [
         {
-            "checksum": "e8ee19bc4c970514ec13eaee06c51604",
-            "size": 2209,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_lambda_presort_twin_/sql.yql"
+            "checksum": "08ac6de0b0b4c60e44e695d55943fdd2",
+            "size": 2245,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_lambda_presort_twin_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_lambda_presort_twin_list]": [
         {
-            "checksum": "70e08b5baf477e08446f3efe9d79e8d2",
-            "size": 2225,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_lambda_presort_twin_list_/sql.yql"
+            "checksum": "12702bdebb35c87b1ab8427f1ce9df94",
+            "size": 2261,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_lambda_presort_twin_list_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_multi_in]": [
         {
-            "checksum": "89502ae061f87fb094f6cfb47c2e8209",
-            "size": 2739,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_multi_in_/sql.yql"
+            "checksum": "d6df2d887456e89498bb0793791b72f5",
+            "size": 2775,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_multi_in_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_multi_in_difftype]": [
         {
-            "checksum": "74dbd617d98075951494bbcba58d91a5",
-            "size": 2751,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_multi_in_difftype_/sql.yql"
+            "checksum": "8e8bb1b73f227070b6d7f0a26d910cb4",
+            "size": 2787,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_multi_in_difftype_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_multi_in_difftype_assume]": [
         {
-            "checksum": "f9f385dd8126952e74be2e740ac9facb",
-            "size": 6005,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_multi_in_difftype_assume_/sql.yql"
+            "checksum": "6d94b7558af79c4c36a60c002b9f7d05",
+            "size": 5983,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_multi_in_difftype_assume_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_multi_in_difftype_assume_keytuple]": [
         {
-            "checksum": "793328b686d3c0e66002163d828eeeaa",
-            "size": 6665,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_multi_in_difftype_assume_keytuple_/sql.yql"
+            "checksum": "2272c058539eddd436d8128de59c563b",
+            "size": 6643,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_multi_in_difftype_assume_keytuple_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_multi_in_keytuple]": [
         {
-            "checksum": "24afe71cf1b6c48bb6364efd1e9734f6",
-            "size": 2800,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_multi_in_keytuple_/sql.yql"
+            "checksum": "ec4985f0b0616d40faabd93b9b597d09",
+            "size": 2836,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_multi_in_keytuple_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_multi_in_keytuple_difftype]": [
         {
-            "checksum": "3ec8fef592c7cfd720e13b56d5804816",
-            "size": 2812,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_multi_in_keytuple_difftype_/sql.yql"
+            "checksum": "d357a207e298f403ad5ec11c2ca4def2",
+            "size": 2848,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_multi_in_keytuple_difftype_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_multi_in_presort]": [
         {
-            "checksum": "2a3df7b35e924b1043bc293271455a27",
-            "size": 2919,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_multi_in_presort_/sql.yql"
+            "checksum": "065f91b1059ee2b2680a0801dab012d1",
+            "size": 2955,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_multi_in_presort_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_multi_in_ref]": [
         {
-            "checksum": "4734e154c77f00605ca65120a2f25656",
-            "size": 4326,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_multi_in_ref_/sql.yql"
+            "checksum": "27d22f743d501317773d2925a1112277",
+            "size": 4362,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_multi_in_ref_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_multi_in_sampling]": [
         {
-            "checksum": "20676d5550acd93b1239bc405fc77d83",
-            "size": 3597,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_multi_in_sampling_/sql.yql"
+            "checksum": "1acb05411f3ef542851b7bc7e2d01cc4",
+            "size": 3633,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_multi_in_sampling_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_multi_in_stage_and_flatmap]": [
         {
-            "checksum": "6be2df429a0ea06c9282183226a99a21",
-            "size": 2880,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_multi_in_stage_and_flatmap_/sql.yql"
+            "checksum": "ba63f94040778f241d0dc60bb4dd01e7",
+            "size": 2916,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_multi_in_stage_and_flatmap_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_multi_out]": [
         {
-            "checksum": "5a8bc95f879f7b1a9b8a90a42a3ab9e7",
-            "size": 3151,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_multi_out_/sql.yql"
+            "checksum": "fc89b141a5c98fead4dd9eadb0a1a90b",
+            "size": 3195,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_multi_out_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_subfields]": [
         {
-            "checksum": "b8de23830267f7c2626e3c4038dec8a2",
-            "size": 1584,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_subfields_/sql.yql"
+            "checksum": "f2488dbf4249cbc9031871f1f4b61540",
+            "size": 1628,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_subfields_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_typeinfo]": [
@@ -16087,107 +16087,107 @@
     ],
     "test_sql2yql.test[produce-reduce_with_assume]": [
         {
-            "checksum": "1bad33f544c8bf95ff7bdf6b41f9c09d",
-            "size": 1411,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_with_assume_/sql.yql"
+            "checksum": "20a4a468b7ce168e35b263b2b0631652",
+            "size": 1447,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_with_assume_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_with_assume_in_subquery]": [
         {
-            "checksum": "1312f126c69f9c3ec3a158a83ce8a9bf",
-            "size": 2733,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_with_assume_in_subquery_/sql.yql"
+            "checksum": "5aff1abe1ae22f78f49edc293c8b83be",
+            "size": 2769,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_with_assume_in_subquery_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_with_flat_lambda]": [
         {
-            "checksum": "afe395f03450e3713edc2255b8462523",
-            "size": 1794,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_with_flat_lambda_/sql.yql"
+            "checksum": "b470a7aebc118eb08a489332d6abac83",
+            "size": 1818,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_with_flat_lambda_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_with_flat_python_stream]": [
         {
-            "checksum": "37dd7dc1db0fadbec8cfc1465958b9c4",
-            "size": 2488,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_with_flat_python_stream_/sql.yql"
+            "checksum": "aba7c20e313c54d1c6c9f1354f1a3768",
+            "size": 2532,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_with_flat_python_stream_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_with_presort_diff_order]": [
         {
-            "checksum": "6bb71b50321efbdaf2769ffe56dc05cf",
-            "size": 12411,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_with_presort_diff_order_/sql.yql"
+            "checksum": "6a41ba15080a7fc9bcc37c14f36950e0",
+            "size": 11844,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_with_presort_diff_order_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_with_python]": [
         {
-            "checksum": "5711e115e84ebcf9230424d7dde4f096",
-            "size": 2073,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_with_python_/sql.yql"
+            "checksum": "fcc67637b06db0c48b684606ce2c110d",
+            "size": 2117,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_with_python_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_with_python_few_keys]": [
         {
-            "checksum": "da05c419762dda12ac4c0408bfaf28a2",
-            "size": 3142,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_with_python_few_keys_/sql.yql"
+            "checksum": "d6814bdf00c830d618bd7eb4cedea6dc",
+            "size": 3186,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_with_python_few_keys_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_with_python_few_keys_stream]": [
         {
-            "checksum": "2f0be0869bbeac5d43f005f348ebaecd",
-            "size": 3131,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_with_python_few_keys_stream_/sql.yql"
+            "checksum": "bef225e8129eb897ad8f37962f9c724d",
+            "size": 3175,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_with_python_few_keys_stream_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_with_python_filter_and_having]": [
         {
-            "checksum": "ba786bbf51d33370beab1579ba298790",
-            "size": 1698,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_with_python_filter_and_having_/sql.yql"
+            "checksum": "7ec0ac8f01e9f0f61dc4dc476ca97578",
+            "size": 1742,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_with_python_filter_and_having_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_with_python_having]": [
         {
-            "checksum": "21101262f17e6bcd60369bbc819d844e",
-            "size": 1549,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_with_python_having_/sql.yql"
+            "checksum": "d3c7645543d761821cef7bd83a10357c",
+            "size": 1593,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_with_python_having_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_with_python_presort]": [
         {
-            "checksum": "f85aa345f661df30ce6010400bfa76e7",
-            "size": 2194,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_with_python_presort_/sql.yql"
+            "checksum": "99f3815f915adb3aaa01dcfdd10d768e",
+            "size": 2238,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_with_python_presort_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_with_python_presort_stream]": [
         {
-            "checksum": "ea2713efde189f77ad5247f202098397",
-            "size": 2181,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_with_python_presort_stream_/sql.yql"
+            "checksum": "42e0c612792dada79ee16f68d3216d56",
+            "size": 2225,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_with_python_presort_stream_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_with_python_row]": [
         {
-            "checksum": "cc37fda03256729649044142c65456bd",
-            "size": 2185,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_with_python_row_/sql.yql"
+            "checksum": "14f3b19d2aa184175d22e035f501b671",
+            "size": 2229,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_with_python_row_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-reduce_with_python_row_repack]": [
         {
-            "checksum": "fa5a17558a2861f08ec84c3a241d1419",
-            "size": 2380,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-reduce_with_python_row_repack_/sql.yql"
+            "checksum": "f03ba3e305e451d08f57011403e87b63",
+            "size": 2424,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-reduce_with_python_row_repack_/sql.yql"
         }
     ],
     "test_sql2yql.test[produce-yql-10297]": [
         {
-            "checksum": "1a13a5f3ed02ecf1ad9f644760f5a33c",
-            "size": 3937,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_produce-yql-10297_/sql.yql"
+            "checksum": "0efb35a2c6333d72f2edddd180c70a00",
+            "size": 3863,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_produce-yql-10297_/sql.yql"
         }
     ],
     "test_sql2yql.test[sampling-bind_default]": [
@@ -16206,16 +16206,16 @@
     ],
     "test_sql2yql.test[sampling-bind_expr_subquery]": [
         {
-            "checksum": "73c9a558d96888080f9fa8ce4c375b23",
-            "size": 2597,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_sampling-bind_expr_subquery_/sql.yql"
+            "checksum": "04fcdd48c61273c4e7bc57fa7e88c35e",
+            "size": 2633,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_sampling-bind_expr_subquery_/sql.yql"
         }
     ],
     "test_sql2yql.test[sampling-bind_expr_udf]": [
         {
-            "checksum": "de801db2cf674d91f69a4bd88464d366",
-            "size": 1699,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_sampling-bind_expr_udf_/sql.yql"
+            "checksum": "1ecaf0b0c64f592cf9e0130e44747614",
+            "size": 1735,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_sampling-bind_expr_udf_/sql.yql"
         }
     ],
     "test_sql2yql.test[sampling-bind_join_left]": [
@@ -16325,16 +16325,16 @@
     ],
     "test_sql2yql.test[sampling-reduce]": [
         {
-            "checksum": "38642df155ccd70e9cf68057c8dd8809",
-            "size": 2403,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_sampling-reduce_/sql.yql"
+            "checksum": "22c28df2dce019a10cc66192869cf94c",
+            "size": 2439,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_sampling-reduce_/sql.yql"
         }
     ],
     "test_sql2yql.test[sampling-reduce_with_presort]": [
         {
-            "checksum": "4eeeb83e3f94f8fdd0d1991b6d5b9834",
-            "size": 2524,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_sampling-reduce_with_presort_/sql.yql"
+            "checksum": "3ea6197083a63d236887183da1395241",
+            "size": 2560,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_sampling-reduce_with_presort_/sql.yql"
         }
     ],
     "test_sql2yql.test[sampling-sample]": [
@@ -16710,9 +16710,9 @@
     ],
     "test_sql2yql.test[schema-user_schema_bind]": [
         {
-            "checksum": "e5977417baa014cfd97925ce4b637376",
-            "size": 1240,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_schema-user_schema_bind_/sql.yql"
+            "checksum": "8c7a12d75111581733a6d382dc872d40",
+            "size": 1276,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_schema-user_schema_bind_/sql.yql"
         }
     ],
     "test_sql2yql.test[schema-user_schema_directread]": [
@@ -16962,16 +16962,16 @@
     ],
     "test_sql2yql.test[select-dict_lookup_by_key]": [
         {
-            "checksum": "0ce837c2b5608600a0379dc588bb2f02",
-            "size": 1558,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_select-dict_lookup_by_key_/sql.yql"
+            "checksum": "df4f6f8774562f20e8f7be940d35f5a0",
+            "size": 1594,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_select-dict_lookup_by_key_/sql.yql"
         }
     ],
     "test_sql2yql.test[select-dict_lookup_by_key_with_def]": [
         {
-            "checksum": "de92c9c314d885e8cf22b738e1a6c807",
-            "size": 1589,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_select-dict_lookup_by_key_with_def_/sql.yql"
+            "checksum": "2608c63c838bf1fa79cd0878d2c9233a",
+            "size": 1625,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_select-dict_lookup_by_key_with_def_/sql.yql"
         }
     ],
     "test_sql2yql.test[select-dict_lookup_column_names]": [
@@ -17235,9 +17235,9 @@
     ],
     "test_sql2yql.test[select-reuse_named_node]": [
         {
-            "checksum": "57c62ea35c17960eaccf7aa150b00917",
-            "size": 2222,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_select-reuse_named_node_/sql.yql"
+            "checksum": "a2b4664e735f82e99ccbce91e0b5a529",
+            "size": 2159,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_select-reuse_named_node_/sql.yql"
         }
     ],
     "test_sql2yql.test[select-sampleselect]": [
@@ -17284,9 +17284,9 @@
     ],
     "test_sql2yql.test[select-select_all_from_concat_anon]": [
         {
-            "checksum": "566c83792d845e4370e3926266ad59a4",
-            "size": 1950,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_select-select_all_from_concat_anon_/sql.yql"
+            "checksum": "eda324b348536c36fa2867e866e8bed2",
+            "size": 1986,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_select-select_all_from_concat_anon_/sql.yql"
         }
     ],
     "test_sql2yql.test[select-select_all_group_by_column]": [
@@ -17403,9 +17403,9 @@
     ],
     "test_sql2yql.test[select-tablepathprefix]": [
         {
-            "checksum": "d914bd4153ddb4078ad96c5ea839a80b",
-            "size": 2222,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_select-tablepathprefix_/sql.yql"
+            "checksum": "58988fa11d3cb9c417c25c22509ef9e8",
+            "size": 2258,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_select-tablepathprefix_/sql.yql"
         }
     ],
     "test_sql2yql.test[select-to_dict]": [
@@ -17536,16 +17536,16 @@
     ],
     "test_sql2yql.test[select-where_with_lambda]": [
         {
-            "checksum": "e10759377334cbdcff25390d42996702",
-            "size": 1310,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_select-where_with_lambda_/sql.yql"
+            "checksum": "8bf3c9f7e2ba3fbc1dd07c13b9858e21",
+            "size": 1370,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_select-where_with_lambda_/sql.yql"
         }
     ],
     "test_sql2yql.test[seq_mode-action_shared_subquery_expr_after_commit]": [
         {
-            "checksum": "8d46a0d01061a3bc2ce149d260b14607",
-            "size": 4521,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_seq_mode-action_shared_subquery_expr_after_commit_/sql.yql"
+            "checksum": "1bb5d0be36c50199693f92ca6eb89a8a",
+            "size": 4325,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_seq_mode-action_shared_subquery_expr_after_commit_/sql.yql"
         }
     ],
     "test_sql2yql.test[seq_mode-shared_named_expr]": [
@@ -17585,9 +17585,9 @@
     ],
     "test_sql2yql.test[seq_mode-subquery_shared_subquery]": [
         {
-            "checksum": "db3b15f3a9ead0fc6bae20740dc74e21",
-            "size": 2630,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_seq_mode-subquery_shared_subquery_/sql.yql"
+            "checksum": "f15f6f62b484b362882c30696497b3f3",
+            "size": 2374,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_seq_mode-subquery_shared_subquery_/sql.yql"
         }
     ],
     "test_sql2yql.test[simple_columns-no_simple_columns_tablerow]": [
@@ -17858,16 +17858,16 @@
     ],
     "test_sql2yql.test[table_range-range_over_filter]": [
         {
-            "checksum": "f57e43f6b05e90aac2cd553392c853c2",
-            "size": 2675,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_table_range-range_over_filter_/sql.yql"
+            "checksum": "0fe575f7dd8933e06051179457998786",
+            "size": 2719,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_table_range-range_over_filter_/sql.yql"
         }
     ],
     "test_sql2yql.test[table_range-range_over_filter_udf]": [
         {
-            "checksum": "87c2a4f73515a2ab3a18a322ca301b06",
-            "size": 1681,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_table_range-range_over_filter_udf_/sql.yql"
+            "checksum": "c3c7df44500bca2aa33043898d979fc7",
+            "size": 1761,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_table_range-range_over_filter_udf_/sql.yql"
         }
     ],
     "test_sql2yql.test[table_range-range_over_like]": [
@@ -17921,9 +17921,9 @@
     ],
     "test_sql2yql.test[tpch-q10]": [
         {
-            "checksum": "e76748ea9ea962e72ee45cececfc2519",
-            "size": 9685,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_tpch-q10_/sql.yql"
+            "checksum": "440ce7adf8081119b406242df44d7c75",
+            "size": 9721,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_tpch-q10_/sql.yql"
         }
     ],
     "test_sql2yql.test[tpch-q11]": [
@@ -17935,9 +17935,9 @@
     ],
     "test_sql2yql.test[tpch-q12]": [
         {
-            "checksum": "58128e9c76915f7b60714b3c6843c875",
-            "size": 4239,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_tpch-q12_/sql.yql"
+            "checksum": "12f35d6abf43881aaf90c2fda67267a7",
+            "size": 4275,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_tpch-q12_/sql.yql"
         }
     ],
     "test_sql2yql.test[tpch-q13]": [
@@ -17949,16 +17949,16 @@
     ],
     "test_sql2yql.test[tpch-q14]": [
         {
-            "checksum": "410aa83c8fbb96f9a5269df0b6a052a9",
-            "size": 2366,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_tpch-q14_/sql.yql"
+            "checksum": "82c8121f4357e13503570e2473155ff1",
+            "size": 2402,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_tpch-q14_/sql.yql"
         }
     ],
     "test_sql2yql.test[tpch-q15]": [
         {
-            "checksum": "1c1c6676ce58506a6b4d99b151c45229",
-            "size": 6138,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_tpch-q15_/sql.yql"
+            "checksum": "6ab5b43ee5dc4d36c5a7797f247b90a0",
+            "size": 6174,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_tpch-q15_/sql.yql"
         }
     ],
     "test_sql2yql.test[tpch-q16]": [
@@ -17998,9 +17998,9 @@
     ],
     "test_sql2yql.test[tpch-q20]": [
         {
-            "checksum": "08a27adb59aebdbe293d48012b8d4f83",
-            "size": 7606,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_tpch-q20_/sql.yql"
+            "checksum": "1b457806cc14c19352816a180c35805e",
+            "size": 7642,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_tpch-q20_/sql.yql"
         }
     ],
     "test_sql2yql.test[tpch-q21]": [
@@ -18033,23 +18033,23 @@
     ],
     "test_sql2yql.test[tpch-q4]": [
         {
-            "checksum": "d2ed660615c36dc1a64887388d70f1d5",
-            "size": 3409,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_tpch-q4_/sql.yql"
+            "checksum": "3e1e7a64db1037a7e5877d8651e2a837",
+            "size": 3445,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_tpch-q4_/sql.yql"
         }
     ],
     "test_sql2yql.test[tpch-q5]": [
         {
-            "checksum": "fd35b290f96d85611adf02351dfbb903",
-            "size": 11204,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_tpch-q5_/sql.yql"
+            "checksum": "eaec85c54d592600d50b9ee559672343",
+            "size": 11240,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_tpch-q5_/sql.yql"
         }
     ],
     "test_sql2yql.test[tpch-q6]": [
         {
-            "checksum": "2acd9e3088bac182b665285a546d7f9d",
-            "size": 1867,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_tpch-q6_/sql.yql"
+            "checksum": "430f0eb8fa655eeef52ec3e0961c6583",
+            "size": 1903,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_tpch-q6_/sql.yql"
         }
     ],
     "test_sql2yql.test[tpch-q7]": [
@@ -18089,9 +18089,9 @@
     ],
     "test_sql2yql.test[type_literal-evaluate]": [
         {
-            "checksum": "1be6347b2f7f5c1036e8620a27896993",
-            "size": 1331,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_type_literal-evaluate_/sql.yql"
+            "checksum": "24b3c33e3aef7d81dab14f4ba5c86a00",
+            "size": 1439,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_type_literal-evaluate_/sql.yql"
         }
     ],
     "test_sql2yql.test[type_v3-append_diff_flags]": [
@@ -18103,16 +18103,16 @@
     ],
     "test_sql2yql.test[type_v3-append_diff_layout1]": [
         {
-            "checksum": "c9ab592bd607d3f1d97fd9b6c0a8c157",
-            "size": 3954,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_type_v3-append_diff_layout1_/sql.yql"
+            "checksum": "520ae539a5b17affcb94bf6840aa688a",
+            "size": 3960,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_type_v3-append_diff_layout1_/sql.yql"
         }
     ],
     "test_sql2yql.test[type_v3-append_diff_layout2]": [
         {
-            "checksum": "4f6b78a6dc823ad27a880b0c2bd92c02",
-            "size": 4636,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_type_v3-append_diff_layout2_/sql.yql"
+            "checksum": "90119b8c862c8db6c5b125a227346f1f",
+            "size": 4642,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_type_v3-append_diff_layout2_/sql.yql"
         }
     ],
     "test_sql2yql.test[type_v3-append_struct]": [
@@ -18208,9 +18208,9 @@
     ],
     "test_sql2yql.test[type_v3-replace_diff_layout]": [
         {
-            "checksum": "260a0ffeef0760fab7261c719c5f6dd7",
-            "size": 3932,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_type_v3-replace_diff_layout_/sql.yql"
+            "checksum": "81f91d1839bbc57d19f3996539e79a03",
+            "size": 3938,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_type_v3-replace_diff_layout_/sql.yql"
         }
     ],
     "test_sql2yql.test[type_v3-singulars]": [
@@ -18271,72 +18271,72 @@
     ],
     "test_sql2yql.test[udf-named_args_for_script]": [
         {
-            "checksum": "6f82fa5dd316f487a706c4802aa0f243",
-            "size": 2568,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_udf-named_args_for_script_/sql.yql"
+            "checksum": "51d94be791820841c840b9b6bb58c106",
+            "size": 2612,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_udf-named_args_for_script_/sql.yql"
         }
     ],
     "test_sql2yql.test[udf-named_args_for_script_with_posargs2]": [
         {
-            "checksum": "75d4b2d52c1110720b476425ddb61528",
-            "size": 2567,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_udf-named_args_for_script_with_posargs2_/sql.yql"
+            "checksum": "e97be064e7a413ee267e253fa22f1cb5",
+            "size": 2611,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_udf-named_args_for_script_with_posargs2_/sql.yql"
         }
     ],
     "test_sql2yql.test[udf-named_args_for_script_with_posargs]": [
         {
-            "checksum": "1f630e07c06d8e5435a900751ba8f1a3",
-            "size": 2586,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_udf-named_args_for_script_with_posargs_/sql.yql"
+            "checksum": "41ee3e7ce2498094bd7030cd3595ba39",
+            "size": 2630,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_udf-named_args_for_script_with_posargs_/sql.yql"
         }
     ],
     "test_sql2yql.test[udf-named_args_for_script_with_posargs_reuse_args_fail]": [
         {
-            "checksum": "4469c2a1f87dbf7ab2c2a80358eff114",
-            "size": 2561,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_udf-named_args_for_script_with_posargs_reuse_args_fail_/sql.yql"
+            "checksum": "4bfdc6a12e1f0fe27469b26ec2d2fb69",
+            "size": 2605,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_udf-named_args_for_script_with_posargs_reuse_args_fail_/sql.yql"
         }
     ],
     "test_sql2yql.test[udf-python_script]": [
         {
-            "checksum": "78b5d2911a18dede3eecf7c1ab43ac26",
-            "size": 1423,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_udf-python_script_/sql.yql"
+            "checksum": "c9960e9019c684d400165d6a9deb5fe4",
+            "size": 1467,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_udf-python_script_/sql.yql"
         }
     ],
     "test_sql2yql.test[udf-python_script_from_file]": [
         {
-            "checksum": "17e5508e0ec2d63548ecc5be5b75b2d1",
-            "size": 1348,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_udf-python_script_from_file_/sql.yql"
+            "checksum": "4409f6d2c6fb50f8fe59145bb93db69a",
+            "size": 1420,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_udf-python_script_from_file_/sql.yql"
         }
     ],
     "test_sql2yql.test[udf-python_struct]": [
         {
-            "checksum": "57e3e2517d06b55bd71527572777a037",
-            "size": 2230,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_udf-python_struct_/sql.yql"
+            "checksum": "5d2902e97d314b23fe393bcea2e8cd07",
+            "size": 2259,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_udf-python_struct_/sql.yql"
         }
     ],
     "test_sql2yql.test[udf-regexp_udf]": [
         {
-            "checksum": "f9815d9ac466d7f2d1e9b15161c3313d",
-            "size": 1269,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_udf-regexp_udf_/sql.yql"
+            "checksum": "8c475e678a835d1bde5ac7fb560b18fb",
+            "size": 1305,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_udf-regexp_udf_/sql.yql"
         }
     ],
     "test_sql2yql.test[udf-same_udf_modules]": [
         {
-            "checksum": "52957d2d2831adfb08fbcbaa83be38d9",
-            "size": 2297,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_udf-same_udf_modules_/sql.yql"
+            "checksum": "a48871e3659552a49caa7b6a8da3db36",
+            "size": 2392,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_udf-same_udf_modules_/sql.yql"
         }
     ],
     "test_sql2yql.test[udf-sqlproject_grounds]": [
         {
-            "checksum": "52f805f63d8e551d1f2a89431e7b006d",
-            "size": 1437,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_udf-sqlproject_grounds_/sql.yql"
+            "checksum": "dc35998042c750be5cec20a0603507f0",
+            "size": 1394,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_udf-sqlproject_grounds_/sql.yql"
         }
     ],
     "test_sql2yql.test[udf-trivial_udf]": [
@@ -18348,44 +18348,44 @@
     ],
     "test_sql2yql.test[udf-two_regexps]": [
         {
-            "checksum": "0b05343df432ddda72a310ed2cb9baf3",
-            "size": 1358,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_udf-two_regexps_/sql.yql"
+            "checksum": "13c9e2b8030a2088c5435249f0e8a34b",
+            "size": 1423,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_udf-two_regexps_/sql.yql"
         }
     ],
     "test_sql2yql.test[udf-udaf]": [
         {
-            "checksum": "8fedd6fdd8e7796ceb3ee578eb8dcd9c",
-            "size": 6328,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_udf-udaf_/sql.yql"
+            "checksum": "b7e7a914a40a1309f285eb05a578924e",
+            "size": 3331,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_udf-udaf_/sql.yql"
         }
     ],
     "test_sql2yql.test[udf-udaf_default]": [
         {
-            "checksum": "f27ef12b10a0b809ca19f5b4c0d01851",
-            "size": 4294,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_udf-udaf_default_/sql.yql"
+            "checksum": "48ef7e11d67b723bffbd32d223c8e24d",
+            "size": 3162,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_udf-udaf_default_/sql.yql"
         }
     ],
     "test_sql2yql.test[udf-udaf_distinct]": [
         {
-            "checksum": "66b39945b97483c4a1a86741471179e1",
-            "size": 6849,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_udf-udaf_distinct_/sql.yql"
+            "checksum": "85076883b6258621d9cdb324ac3f1ad0",
+            "size": 3852,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_udf-udaf_distinct_/sql.yql"
         }
     ],
     "test_sql2yql.test[udf-udaf_lambda]": [
         {
-            "checksum": "47cbbbecfe108ba20532e19bf77bbdc9",
-            "size": 2263,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_udf-udaf_lambda_/sql.yql"
+            "checksum": "7187e90d75a630230b1a3962bb84fc04",
+            "size": 2321,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_udf-udaf_lambda_/sql.yql"
         }
     ],
     "test_sql2yql.test[udf-udaf_short]": [
         {
-            "checksum": "537d26f981855e27d2db739694a3891f",
-            "size": 3160,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_udf-udaf_short_/sql.yql"
+            "checksum": "28b1e0f104459fc3d4330f16ec06e334",
+            "size": 2822,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_udf-udaf_short_/sql.yql"
         }
     ],
     "test_sql2yql.test[udf-udf]": [
@@ -18411,9 +18411,9 @@
     ],
     "test_sql2yql.test[udf-udf_result_member]": [
         {
-            "checksum": "6979f7b57791d76db22bea179f57f99a",
-            "size": 1406,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_udf-udf_result_member_/sql.yql"
+            "checksum": "c119b440906906af9cf595fbcf35e471",
+            "size": 1362,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_udf-udf_result_member_/sql.yql"
         }
     ],
     "test_sql2yql.test[udf-wrong_args_fail]": [
@@ -18635,9 +18635,9 @@
     ],
     "test_sql2yql.test[view-init_view_after_eval]": [
         {
-            "checksum": "43965082305e502575a81481a6e47111",
-            "size": 2492,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_view-init_view_after_eval_/sql.yql"
+            "checksum": "2eaa7d94953a161ebad1491bfadef715",
+            "size": 2524,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_view-init_view_after_eval_/sql.yql"
         }
     ],
     "test_sql2yql.test[view-secure]": [
@@ -18663,9 +18663,9 @@
     ],
     "test_sql2yql.test[view-standalone_view_lambda]": [
         {
-            "checksum": "5f9e90e3741bb8a38e342fe5dafb8d6b",
-            "size": 1488,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_view-standalone_view_lambda_/sql.yql"
+            "checksum": "490bfc58f34a12802b68ede1c681c8c4",
+            "size": 1544,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_view-standalone_view_lambda_/sql.yql"
         }
     ],
     "test_sql2yql.test[view-system_udf]": [
@@ -18894,16 +18894,16 @@
     ],
     "test_sql2yql.test[weak_field-weak_member_string_copy]": [
         {
-            "checksum": "fca901328bbc09d56d61a2a0db231d47",
-            "size": 1389,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_weak_field-weak_member_string_copy_/sql.yql"
+            "checksum": "cb4268d861ecfaf809741771e1c31b26",
+            "size": 1425,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_weak_field-weak_member_string_copy_/sql.yql"
         }
     ],
     "test_sql2yql.test[weak_field-yql-7888_mapfieldsubset]": [
         {
-            "checksum": "cfcbcbc62acef9930c86d964ec1b9c62",
-            "size": 8828,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_weak_field-yql-7888_mapfieldsubset_/sql.yql"
+            "checksum": "12689bf022d24d30d7209b82120e3b5e",
+            "size": 5384,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_weak_field-yql-7888_mapfieldsubset_/sql.yql"
         }
     ],
     "test_sql2yql.test[window-all_columns_hide_window_special_ones]": [
@@ -18964,9 +18964,9 @@
     ],
     "test_sql2yql.test[window-current/session_extended]": [
         {
-            "checksum": "c0e0a04f51192343b601925e3572dd32",
-            "size": 4071,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_window-current_session_extended_/sql.yql"
+            "checksum": "afc60a5ff11eb207967c778834f5b42b",
+            "size": 4131,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_window-current_session_extended_/sql.yql"
         }
     ],
     "test_sql2yql.test[window-current/session_incompat_sort]": [
@@ -18992,9 +18992,9 @@
     ],
     "test_sql2yql.test[window-distinct_over_window_struct]": [
         {
-            "checksum": "7d1655b7d3bf896c96f8a6ec73a76316",
-            "size": 7089,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_window-distinct_over_window_struct_/sql.yql"
+            "checksum": "be70f2f65ca37748eea1a416eb950b2c",
+            "size": 5639,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_window-distinct_over_window_struct_/sql.yql"
         }
     ],
     "test_sql2yql.test[window-empty/aggregations]": [
@@ -19209,9 +19209,9 @@
     ],
     "test_sql2yql.test[window-presort_window_order_by_table]": [
         {
-            "checksum": "290052d3b7ef9ed21497429aee33d60f",
-            "size": 2949,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_window-presort_window_order_by_table_/sql.yql"
+            "checksum": "24725ef49707073c90c843623f2c3452",
+            "size": 2985,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_window-presort_window_order_by_table_/sql.yql"
         }
     ],
     "test_sql2yql.test[window-presort_window_partition_by_mem]": [
@@ -19300,23 +19300,23 @@
     ],
     "test_sql2yql.test[window-udaf_no_merge]": [
         {
-            "checksum": "4866c663febca80b9109bd8f628e3c2c",
-            "size": 2291,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_window-udaf_no_merge_/sql.yql"
+            "checksum": "0dc37b79b4b873c514b21301191e8400",
+            "size": 2279,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_window-udaf_no_merge_/sql.yql"
         }
     ],
     "test_sql2yql.test[window-udaf_window]": [
         {
-            "checksum": "3b5ecbf9a35b5208635dc01be96c2947",
-            "size": 6449,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_window-udaf_window_/sql.yql"
+            "checksum": "9ff90112eed62104fa6855ff0e3dafdb",
+            "size": 3452,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_window-udaf_window_/sql.yql"
         }
     ],
     "test_sql2yql.test[window-udaf_with_def_value]": [
         {
-            "checksum": "ceb69ec59ae2312fb4323ab3c5f17604",
-            "size": 15889,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_window-udaf_with_def_value_/sql.yql"
+            "checksum": "ba4e83e3c28e7744ca8da513ebab0fa7",
+            "size": 10408,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_window-udaf_with_def_value_/sql.yql"
         }
     ],
     "test_sql2yql.test[window-win_by_all_aggregate]": [
@@ -19335,9 +19335,9 @@
     ],
     "test_sql2yql.test[window-win_by_all_percentile_interval]": [
         {
-            "checksum": "05c99b91aebbfc7a493e2847fa9b69ae",
-            "size": 4820,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_window-win_by_all_percentile_interval_/sql.yql"
+            "checksum": "e434533b3fbf05a562623bad89b6a941",
+            "size": 4856,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_window-win_by_all_percentile_interval_/sql.yql"
         }
     ],
     "test_sql2yql.test[window-win_by_simple]": [
@@ -19790,9 +19790,9 @@
     ],
     "test_sql2yql.test[window-yql-14277]": [
         {
-            "checksum": "b888e54717f5827726b53f9a422d4062",
-            "size": 2964,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_window-yql-14277_/sql.yql"
+            "checksum": "cd7f0f26b2539046c20ee132f88de952",
+            "size": 3000,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_window-yql-14277_/sql.yql"
         }
     ],
     "test_sql2yql.test[window-yql-14479]": [
@@ -19818,9 +19818,9 @@
     ],
     "test_sql2yql.test[window-yql-18879]": [
         {
-            "checksum": "acd0d2f0152d3728ef363717eb7ed654",
-            "size": 8530,
-            "uri": "https://{canondata_backend}/1937429/434276f26b2857be3c5ad3fdbbf877d2bf775ac5/resource.tar.gz#test_sql2yql.test_window-yql-18879_/sql.yql"
+            "checksum": "d90454e8e53f5a07ff3775fb7ca68b9b",
+            "size": 6212,
+            "uri": "https://{canondata_backend}/1936273/4a1b39013e1bae40e722cff8ccef8829784964e2/resource.tar.gz#test_sql2yql.test_window-yql-18879_/sql.yql"
         }
     ],
     "test_sql2yql.test[ypath-complex]": [
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 096eaf6d0b..422ea43801 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 21c5d791ed..c29c4e6f3c 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 fa4b8696ef..3a0a31659c 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 8fa8376f94..1c36271fd7 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 99f9092eed..f92e8bd49c 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 6dc70983ef..1e41b9121d 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 31bf0edb84..af885991d8 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 1da6c09afc..84dcd3aef3 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 5b94a5ef5f..774199e7f6 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 037a14e177..e2df18f8e9 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 8f438ddc5a..5e92f404b6 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 01b0fd9536..b06a38b851 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 ef4f964c80..b96ddbaa26 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 7c12117bde..1d3df16225 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 075981ccec..a86345781d 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 af9978c62f..b112c3640a 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 6699ea396d..4558b3436a 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 a8e1634c60..f552a99527 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<String> */
+/* yt can not */
+/* custom error: Expected data or optional of data, but got: List<String> */
 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 098515d285..ec1dc67bda 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<String> */
+/* yt can not */
+/* custom error: Expected data or optional of data, but got optional of: List<String> */
 USE plato;
 DECLARE $n AS List<String>?;
 
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 4c67cdf4eb..3f6254e7b5 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 a47fc0e752..81e1d336fe 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 dbbf8a606f..f503347bde 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 ee9ede11ae..b21d3f39b3 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 089f6ffefb..c915061577 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 1f5bf9701c..8dd6d61997 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 0b8ef1bf20..133b38ab44 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 c79f632c4c..29cd0dee79 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 0df3978d65..85f0e39603 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 8812fbe250..778b9ba7d3 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 3e53daafa6..cd5415d833 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 f7ae2a30f5..8988709a9b 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 da96a6fb1c..b292df6cde 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 fe8674c176..016dea3d95 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 b166754422..f0ac90828a 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 30f7b7a0d4..6417c38e06 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 f0ff8155a3..c8416f1b58 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 d1ddf9641a..1d0e4d5c1a 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 ad46c4ac78..3939200414 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 3b5081f3e3..b1f883f82a 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 610dc0c034..9a75723624 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 97fcce6039..7ece483ab1 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 324736c06c..1f07588c8a 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 54f21f7a34..cec2c18638 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 9f3ce03a5d..ba9400b04d 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 e7b3e0d5c8..c708a7f804 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 61a003042e..5d8d5683f9 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 d949cefdc5..38794da69d 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 ab9c25dedc..16e7781479 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 b59f5462c8..0a48cee84d 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 8301e7d487..1195824b00 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 30c8bc5b05..a7ca4b2a50 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 df2385fa4a..9fc83bda55 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 350aca6ec6..1913ce4654 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 a95875b9e7..6b849ac117 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 abe2b4d319..adbc9c1f82 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<key:String,subkey:String,value:String>;
     $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 316573b43c..c37c8231ca 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 a00dcbd4f7..323c12f4c1 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<One:Int32,Two:String>");
 
 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 c565cbfe9d..2a360696c7 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 228ac3c38a..787f29d490 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 7c06f6ec54..1fe5f0a88e 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 34f2c46b0e..ab3e20f520 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 d89982ae95..9558e50ea6 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 71a27fb97a..0051e1de91 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 cf90cc8d74..dd4cb9f887 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 a4f2ec2b4b..0a22908f73 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 734134517b..500c6c305a 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 90e5fbfa80..0750a8c421 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 d9ad7be873..64a1d9b724 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 41fae1e06f..8f31e1b266 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 406698d02b..27015f31c3 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<lel: Int32>>,
     ($_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 85fbc26686..9781807bcc 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 28d1a6a7c5..f4666e89f5 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 970e341ff4..e62b4dc237 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 0cb67d7497..908cc49208 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 e2a1a36fd9..02de6525ca 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 79754c2ab4..552a62476d 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 9fa68e3209..0204a1dd96 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 212c8fcc4f..5adf49f5c1 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 0cb04a0724..b331c3f6a5 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 d0db5440e7..746b747222 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 d898abcaf3..2c6506b517 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 9483430a6d..f64c2f5b19 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 49bb8833a4..19ff7afe39 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 381f52d035..74f0d28616 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 e567db2e6c..01c57b239f 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 36cf173064..2332e774d7 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 025e6b04f5..a18791caa6 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 d225bf9e73..3a80775476 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 7b3ac5a729..30c661c9f1 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 4c12219b65..de017033e3 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 d89b6bf7df..bd6c9d4754 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 1f20d72579..5362ff7249 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 9475e73306..2fdd018f21 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 cf4bc5e4de..c4c1c2d135 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 3a09fb832d..47adf7517c 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 898addbeb3..14bf11dedb 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 5b0db96f21..5b4be2eae6 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 311eead752..8ce3c88d5a 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 0bbdac3b96..dda471d209 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 b787b7a09c..25bfd19db2 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 7380192854..ad9f33320b 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 57fc2f316c..f454a486c9 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 4d67f7cea6..54f76913fe 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 85452e3b31..fb6a96f9b1 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 05d4e10bfb..d9668b6182 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 e38d9b0a1f..583cd24e7f 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 c64e77ad92..29268b978a 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 4cccb40f77..40f8c71c77 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 0b9ccb2707..5bc93328d7 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 f8cee39d39..b6e020cfec 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 b51739e13e..3335c51db6 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 043f1dbed3..ec7535164b 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 99ae51c6e9..35505e4443 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 cbfe616e74..4e45fd009a 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 9259a03101..dd8b9e040c 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 b79937131a..1dec791d9a 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 7d3f5ac97f..4d97b2f7ad 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 f4a889dca7..3a75bc8912 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 f90796f2f3..b66e2ab0c5 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 cf57d5f844..24aac52200 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 f0800b7a77..9c7cc0bbfb 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 7664aa3b1d..4209e769d5 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 0c40fcdbb7..50529a4fcb 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 0cf490eb41..1316760a89 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 5a5a962143..0c254e2963 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 5b8f773b2f..a129cd7e1d 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 cc2ecea209..92ea13a975 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 b6127a07b1..cfa10bd73b 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 f322705c42..429ca882bb 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 74a4e9d740..95574ef487 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 29cfa34f66..d7fafe3ab2 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 bc7e4f5aec..b2a5138bde 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 eb8ffa058b..494165d349 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 5dcbe4141e..2ba806b7c0 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 660b23b87b..4d0da91b63 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 948b68d617..06d20e8902 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 cd43c264fb..d724337c64 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 0f5138d6ca..885faaa941 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 5f12cc17c4..42b5ccc402 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 cf76a96dcd..3b5dc33786 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 c0dc34cb32..34e4998017 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 9826167084..bee02faa2a 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 fdeeda8442..7941b3e75d 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 ecea4f3ca8..f42e5a5b9a 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 6eb67bff18..3ed15bd091 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 ec0f1446fe..9603779332 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 bad658c61a..9eebe1213e 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 d35c4bb181..81648fefbf 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 539b6aa816..3b32213aa7 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 7acd838924..e2136ffb76 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 5bda05e466..aa38a7f5a8 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 8e0cd32462..43f038a3ae 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 900cf5ef56..8b13589b10 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 70e1f60837..591d445c23 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 015ad6562a..6335ed449d 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 6e28598691..dc71d4c34e 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 88447f0e32..c96663add3 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 3bf7664699..b71bdfc4b2 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 144f242768..ce5a084394 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 a4b1bc4bdf..2ac28e92e7 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 30c4be1c5d..711fc80db6 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 9bf9b4edaa..1360a93083 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 5c694ed440..759153011a 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 5001f79226..3af210ee4f 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 1df035fe04..560e5fe8ed 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 7e827ebe26..5c138948e7 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 f068f22fa4..fcc6a4587a 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 384a4a4822..132ea9cb7b 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 d3d316a384..1aea3b1fd2 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 016f09b490..85fd15b5d8 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 9ddb84c04d..41d63a366a 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 9471203bd6..d388cb68f6 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 d2ad0fa6ba..396fca4cf0 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 22ca7a3b83..b9277028e9 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 edcb9bc671..0fed8a2963 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 648f50ee1e..c624e863ed 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 298c21bef4..7de1024fd3 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 7e6ce1c82c..7dceb8601b 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 ea8e41863e..a1e37a761e 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 d071eb8033..153526da2f 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 15a1ec365d..de28f11dd5 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 586809d324..b5f851670e 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 d961d1995d..8477294dad 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 d70d3a3a67..171e0f5fd9 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 5ee2f84695..96faf567b4 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 85e5cbbc1b..16b6666e7c 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 c71617dbfd..60e598da74 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 eb7d917e9f..87ff0ec95b 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 8ba0d240bf..c676f0271a 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 1f83ce75dd..59f57142ab 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 22f3f1bb2c..d719e98520 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 6f99437dba..4ce55a29a4 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 58bf23559c..c629528178 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 37ff799dc4..ae2c7930d3 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 0242298808..ed99b7b168 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 0a9e2a2eef..dad4cee099 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 ff7a39f2d3..e208c61b73 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 6758d32217..1b36354475 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 50ba547a6e..88fb8111f0 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 bf506a3200..68f3cb1296 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 7497a47006..5a8deebb26 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 45423bfdaa..1327ea2e90 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 7fd10e8b78..2fe3fc84e8 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 09c1ccfc45..5ad9b39284 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 53b2d3a302..ba738bef4f 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 75f3569e44..fc07102c0b 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 d1c247a85e..71c304569f 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 0139a91ab1..081abb3424 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 b127061e82..282f0d19ef 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 70525da241..48e71e4e9b 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 08ca5ef391..f53c5ce9db 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 8d23f997cd..5a5a25d722 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 7e297c300f..ee0d68065f 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 298bf6c1d0..639146d19c 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 4077dfe933..ffddf73b4d 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 214cfbbea1..8d3e95ad70 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 d6247097f0..5d7b4fe1f5 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 4a3c8772b1..898e08cccf 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 013032f3fb..cb584fa30d 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 0de86f9eb6..4d9273df2b 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 5ff2dc2042..4470ec22b6 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 e527c009a2..a13676612a 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 35c792e816..eb99d181c5 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 fc904ff0bc..5f066596df 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 6a9f9a620c..030834eb9c 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 c447793e67..98a12627b0 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 a32000baeb..8b7b3c1b0e 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 4edb93b970..c518bcf684 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 b362fe05ff..21f08bf857 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 1909fbf320..5a2f79a36c 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 547eb9d7cb..14b0f0b9e7 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 4261a842ac..93d0ecab9b 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 1b2e79c0ea..7cd14fb035 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 57618a642f..b74d6ece89 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 9761eccfba..4ac2c46aca 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 d4824cfefa..78c3f2a675 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 b94f67d1ce..dc1a0b851e 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 df6054e631..738f0800d8 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 e4917c9120..1c527d4551 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 d4462d3c00..994117d2ea 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 af54473295..be07029890 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 5d5ce58bdc..3deef9e1d9 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 99cbfb4143..eabaed038d 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 2b29e65412..4dd533a245 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 1099e25fda..ed999b4cae 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 ee1b94468a..4e6fb05333 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 a30597d7d4..f8cb365f0b 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 7a833f3007..ea3822b8e2 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 50360a981e..2f470b63ac 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 d8aca439b1..186c1d9c49 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 82095213f6..ccdbd7d890 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 e6ce30b36c..7b424680a6 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 b25fe6ed0e..dc056eca8b 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 9aaee955e5..aa3ab82bd2 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 44f8fedd4f..9859e806c9 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 ca892cfe13..1003c063ed 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 a34c3f4809..47b86b434d 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 089bc8f019..4330a31d0e 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 809d1d2d62..2bd1a6d96f 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 de2ee12cd2..8e58838fcf 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 89e7927db5..cf1f99754f 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 7424c533dc..1384265620 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 be9ec97baf..f5649461ca 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 6999f25718..b6ec83e724 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 da55208c7c..a0043ddbe3 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 25ca39ee30..2f04352649 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 bdbfbb081a..b1a084510c 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 ed3269742d..3979a71ba6 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 20547e1a5c..29a129f4bc 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 3dcf0ec4dc..81a3df28a3 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 ad10340e2a..734bf95f75 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 4c5ba745b0..c25b4a85d7 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 b3d115f920..96b4c68e3b 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 80e38ad6bf..bd7606b16d 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 953dac3b7f..13c0b2573a 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 6c74e0e45e..429b4e9faf 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 749d2a788a..edf161f45f 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 e11004accb..6c59104f06 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 030d54d64d..371bb211a7 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 0c9ad4b0e3..f40c06b767 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 376d4497ed..6398f4b5b1 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 080f8d3639..5cbba31a32 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 193f054153..ce33eda65c 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 8c70f377fa..5210482bbb 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 aa10402855..25beaf4ba0 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 199a6256a6..91feb1abed 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 0f0770da1a..48287a0a9c 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 221d628491..35f8e191cd 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 d148be89c0..bc347b9a8e 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 a8a18e25fb..3b69b85086 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 8124659603..7669836508 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 9e8a16dac4..944b8dd624 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 aa96c51ff5..aff88b08c2 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 77d506df90..b118834d9a 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 ff1eca29d9..9b2a77fedc 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 0325968041..bc9089527e 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 6da33af608..692a990c85 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 fbd8c6b890..e83f495ddd 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 3b3df82176..93ecb38847 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 d341d224e2..37cb7029f7 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 7ec6f97b52..e59f777aec 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 ef36d2579a..07b5afb596 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 161a469a92..7918533132 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 482fca6df3..7ddca82844 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 4c54034eb9..cb0c47f06d 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 5cabe711fa..b6568315cc 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 15798c5c20..9ed1ab4485 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 46c5de73c9..663b7e8319 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 e5e70800e9..a70e4371b0 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 ff5a395b38..c41d1c2631 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 37ba965586..0b6e52acd4 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 c55f9f0583..76f7a9b9e4 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 d3354ea407..d740a34d11 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 23affa335e..3af0d286e6 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 fc1792ed2c..74797890b7 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 c03031a658..09b60f0375 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 c48a3cb861..1870d8755c 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 e2650837fb..f7661c0329 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 e5ddabbc5d..86fa050d65 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 a1a43e55ad..5f316da55e 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 99caa25295..24c7958510 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 78b011a9ed..199e12e432 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 ead2074b04..891d83b296 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 b76bd95d98..0f160b2d8b 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 60af046b1b..6ebb49936d 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 1d2cc54ac1..9ea299c5e1 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 f791791adf..b1ab03d3f9 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 de6b2ea6ca..5f240e433f 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 de9f6549c7..a8991e4cef 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 3afd1f1f51..168aa6b856 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?>) -> 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 6727f99869..5cffbdefad 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 597c82124a..809fd06ee7 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 3e3c907fd8..179331492e 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 ae6d477355..eab31a4334 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 dffae9f5c5..6039f777b5 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 f3ccf28a75..fb23113b9f 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 93ee9c309f..60e22f878f 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 5ef211fbed..8bc5897a46 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 9b185f6f8e..9999a0c43e 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 333e1ccd2b..771aee6a7d 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 a9112ec793..43696dcbe5 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<Int32>")) 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 669ffa2f3e..335bb0874a 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 0253dfd099..e9d7b19ac4 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 111fb42bc2..f257d9ec9d 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 7fe0835337..826c02dec6 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 37b4724b38..9e45af8cca 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 3cd19e827c..287ecc0358 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 9cd9d48d53..e11c74c3f2 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 221ef104e7..dd25e69ae5 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 926bfcff08..d703c9b6ec 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 58dafb07c3..ed622812c1 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 70b74dcd14..6a1f0cb717 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 ff1896b98a..f21b94ad6d 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 82dde7478f..a7780a6966 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 605728c745..73cfa7410c 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 8b0e1a2274..6bb2bdd1c7 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 09b038ad83..d4889c422b 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 24f6f8b2bc..510c13dd14 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 40290ae732..c5351bb93e 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 f563da5d98..056fb4b214 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 4e489b1eac..4d3c9c8c95 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 5deff94ff6..31477d483b 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 f36b71a88b..da248e246e 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 045bcfafc3..c4d9e8908b 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 21b496b76d..8dd56c0b9a 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 602abe718d..f9ae6e13f5 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 f1b18fc1f8..9b5f56d6af 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 d82349bfbd..b093765c0f 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 3a2a0aa817..a484e9972d 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 f64fe39198..fad5173570 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 e8e4e8c028..59fa033186 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 5d182be1cf..f62f1382af 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 4ae2922845..abbb925a0b 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 1aeebc99e3..0183209c04 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 e2e79ff38d..576a63114b 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 4ee9ca9e73..8bbfb5271b 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 9cf143f1af..0ba2d96f06 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 301716afaa..73791a67f7 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 08f17a3e42..fc885b3ee9 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 9d9c18a091..01323eb650 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 70847d0c49..b6e73d5945 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 20886fd22e..ead9235531 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 59333d3d22..d47224c804 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 b96d98331b..43f6e859a1 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 f79a6a9cde..acb3f07f17 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: <AddMember> callable always expands to <AsStruct>. */ AddMember(val, "k", key) AS wik,
-    /* XXX: <RemoveMember> callable always expands to <AsStruct>. */ RemoveMember(val, "x") AS wox,
+
+    /* XXX: <AddMember> callable always expands to <AsStruct>. */
+    AddMember(val, "k", key) AS wik,
+
+    /* XXX: <RemoveMember> callable always expands to <AsStruct>. */
+    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 4efedaf1f0..968019ea03 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 bf2dca0835..f7a2ef08e2 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 6a5c3bd69b..33c3b18fee 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 479a5cc6f0..b9abcaf515 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 88641ef024..ad48e357a9 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 e4d30eaa93..ffda239fae 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 30225209ea..ff978e5d51 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 8fc4dd7dde..b0a27f6ff2 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 2e19113201..7fd3e1a495 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 cd1a62dbc2..e8be046a36 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 bb8f67a41a..a7757e7bd1 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 950c26f0f4..d7f53aa2e9 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 3d1edd4ff1..7c9c0eb65a 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 f756aeada2..21cc3c9f32 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 21d46e91ae..a1fd936f3e 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 3921b0800b..8465b20c54 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 1ad9315644..c8edbb44cb 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 f00185e6a4..3338437aa1 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 d9cb53fdec..912a8abea7 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 ecd985055e..8af42fd462 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 bac0f7940f..50a630ac72 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 da266fca8d..2b5dd2a168 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 5710d3b879..5bec7509cb 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 6293c34cb6..4e9d2e17fb 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 5219e5558f..5899f1fbed 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 a4664cd44a..708217f5c9 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 6f1a78f175..1d5ca3d7da 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 e8cc62d322..fccac9c8b3 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 e446820347..e806d46b67 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 785e481c3e..82bce446ea 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 36f624c99c..4ce061d6a0 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 1b2f28456b..9a4be2cb5d 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 9310c30367..df6df5a0e4 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 fe89265f59..f4c8536743 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 dc85882f78..922b561f30 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 a641c9a164..5409fdfba5 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 77ce87741e..1de6daf7dc 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 0454a4c59a..b52a46df91 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 b4b5c1eaf6..bb33c29004 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 2ac28e20ef..9d2298a1b0 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 24320a7c6e..0cae0562ae 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 2b070ff80a..8fe6b21148 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 4c31677b03..e06ce255b4 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 1913c0dca9..0b653bd6c6 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 14d1daaf9a..cb5fe9dda5 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 f7874014d4..54ef4f68c6 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 0b770abfe7..188216e49b 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<x: Decimal (15, 10)?>;
 $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 8744b09d48..cb543db889 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 358de9f9f5..c1c9ab0529 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 fec693f55d..cce6aff79f 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 0334a789c6..494e24d413 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 bfd3ff52ce..7e12cbc8f8 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 74c45c804c..21d613d939 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 4c2fffae01..760204aa5a 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 f6bcc85b38..5718fe14d4 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 d3ab624da5..a7b9cf847f 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 885f413ce0..b126133cdb 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 6cd4d46e7e..85f64a6c5e 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<x: Int32?, y: Int32?, z: String?, t: String?>;
 $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 2af61363f7..723c01afff 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 ed3c079bb3..235a0b2696 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 ab28d332ae..ac7c10e54e 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 af17cb8040..4883eb3172 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 2be73d39a4..226adcebbf 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 12bac666ca..ba8acbffaa 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<x: String, y: String, z: String>,
         ($row) -> (
-            ($row.x, $row.y, $row.z) > ("a", "b", "c") AND
-                ($row.x, $row.y, $row.z) < ("d", "e", "f") AND
-                $row.z IN AsList("t", "u", "v") AND
-                $row.y IN AsList("x", "y", "z") 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 8b5d3fcca7..81804358c2 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<x: Int32, y: UInt32, z: Uint64>,
         ($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 8af2fa735c..35ea00b034 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 24fa800e21..e889026d5b 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<x: Int32, y: Int32, z: Int32>;
 $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 356b00e77b..514003e8a7 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 e981777ff2..18c681890a 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<x: UInt32?, y: Int32?>;
 $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 31c0be0074..921ecba9d8 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 61c652eb70..598df2e6f6 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 644a3edfbb..c2e5bf0cbb 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 ff6036c793..5d51dfb54b 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 f6510d9472..0ae34ac976 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 ca2e131582..263aa65b36 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 1771f45481..de4158c0e8 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 92d3914f8d..e7431a3935 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 4f3c7d5193..aec24f7c8f 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 4ec6437ffd..f88256c9d3 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 3b8f938cd8..b60fa64b19 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 280e838186..86c487180d 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 5db055965a..c1ec1edf1e 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 ad6cf409f8..7bdd19dff5 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 38ee930583..575a205621 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 2acce5f7a9..0c102e0b5d 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 df96081183..09fb66e36f 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 c5846148ff..c75ef00517 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 6ef0aa6ec9..1f790f67eb 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 27f5942b99..2015d99224 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 e0916de0ba..733867e5d0 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 85a3ee8abd..d19c6efcd2 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 be9ff80b0c..f00fa9963a 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 a6653bf79d..d60770ef0f 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 9ea59213d0..086d4a4e0a 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 7d0c48c5ec..1a55894a8c 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 60005c06ce..23f491d5ed 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 a491355cc0..f5440c52ea 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 11a8144a1c..75d8ad14f2 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 bcc6cd5f7f..b0856f7c42 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 eaabfe3031..3a0d09e4a9 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 6ae70061e7..3a53013ea0 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 bc21ab9aad..28ec9c3629 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 59ceb8448e..c13a9ba70c 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 bc9df808fa..c2e5a3ac8a 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 4a434d7557..26982bd02a 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<Int64>);
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 bb5560139f..cb8e719c30 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 27540a3efa..57cecce842 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<Uint32>;
 
 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 8cce68c1c3..1c908eb75c 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 43bc5c962b..c509046558 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 bdeefad8fd..268c72c850 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 40445c4221..2554077019 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 4d84a0c1a6..c2db42494a 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 6bb6e6ebce..5dbf5369ab 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 9a15947b08..94922c9d9d 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<T> 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<T> for any T
+    DictLookup($d2, NULL), -- Nothing(String?), no such key
     DictLookup($d3, NULL);
 
 -- Just("baz"), null is convertible to Nothing<T> for any T
 SELECT
-    DictContains($t1, AsTuple(1, "keyy")),
-    -- false, missing key
-    DictContains($t1, AsTuple(1, "key")),
-    -- true,  match
-    DictContains($t1, Just(AsTuple(1, "key"))),
-    -- true,  match with optional
-    DictContains($t2, AsTuple(NULL, "key")),
-    -- false, no such key
-    DictContains($t3, AsTuple(NULL, "key")),
-    -- true, null is convertible to Nothing<T> for any T
-    DictLookup($t2, AsTuple(NULL, "key")),
-    -- Nothing(Tuple<Int32?, String>?), no such key
+    DictContains($t1, AsTuple(1, "keyy")), -- false, missing key
+    DictContains($t1, AsTuple(1, "key")), -- true,  match
+    DictContains($t1, Just(AsTuple(1, "key"))), -- true,  match with optional
+    DictContains($t2, AsTuple(NULL, "key")), -- false, no such key
+    DictContains($t3, AsTuple(NULL, "key")), -- true, null is convertible to Nothing<T> for any T
+    DictLookup($t2, AsTuple(NULL, "key")), -- Nothing(Tuple<Int32?, String>?), no such key
     DictLookup($t3, AsTuple(NULL, "key"));
 -- Just(AsTuple(123, "value")), null is convertible to Nothing<T> for any T
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-dict_common_type_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-dict_common_type_/formatted.sql
index 0af320556d..c3e024ec6f 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 310f67ba91..bf65de535b 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 f62bf617e1..e73f279937 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<Int32,Int32?>");
 $vt2 = ParseType("Variant<Int64,Null>");
 $svt1 = ParseType("Variant<a:Int32,b:Int32?>");
 $svt2 = ParseType("Variant<a:Int64,b:Null>");
 
 SELECT
-    (1, 2) IS NOT DISTINCT FROM (1, 2, 1 / 0),
-    --true
-    <|a: 1 / 0, b: Nothing(String?), c: 1|> IS NOT DISTINCT FROM <|c: 1u, d: 1u / 0u, e: Nothing(Utf8?)|>,
-    --true
-    [1, 2, NULL] IS NOT DISTINCT FROM [1, 2, just(1 / 0)],
-    --false
-    {1: NULL} IS DISTINCT FROM {1u: 2 / 0},
-    --false
-    VARIANT (1 / 0, "1", $vt1) IS DISTINCT FROM VARIANT (NULL, "1", $vt2),
-    --false
-    VARIANT (1 / 0, "b", $svt1) IS NOT DISTINCT FROM VARIANT (NULL, "b", $svt2),--true
+    (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 2e37cb4f1a..72b9fc2a9f 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 0c73e5d2f1..4d15166bd1 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 6c750023ed..28607c1654 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 99785f2a37..a2c9d8a7c3 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 c19b63a092..48c468ea22 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 0264b93b26..d9f9264ef5 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 1b284d4de3..46b2c8aa13 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 c63d596a48..907ba6d1ba 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 efc37b3cb3..2231823c2f 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 dd30d3bd61..e06c7e55c8 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 9a258fd314..e655fa5a72 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<a: Int32, b: Uint32?, c: Int32??>?);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-implicit_bitcast_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-implicit_bitcast_fail_/formatted.sql
index 5f6dce9012..cb56797e25 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 9d2ddb1488..abfebf6b02 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 b019b0fa93..b227fb6a2a 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 fc03939d4c..54355c8b17 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 57c604f611..416f887bdd 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 4436977ea4..ba86ab88e3 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 a7489d246d..11f1e61141 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 2735d51534..e8611aa521 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 9b1e607792..8bdcfa5cf8 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 4eab4b374c..69916337f0 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 a156e0d805..a822e19dd2 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 ea28d18529..2fc6cae3aa 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 477f72ccb0..d31cf78905 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 c80305f9a9..a8fc9191cd 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 29e846ab52..e6697edf67 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 9e21551313..a85cfa14be 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 28bffc78e0..945e9ed195 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 4ca02cac54..0f0f46a0e4 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 6a5d112f76..425c70ec21 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 5257dbafc0..bfa456ec9c 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 519dc1c9b7..eca0dd884b 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 1f67448960..9e017f986b 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 9bfc9c2924..7e89846661 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 690dde25d5..000baa623b 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<a: PgInt>?);
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 aaac9f3fff..f2c6276a50 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 2073ed819f..8545f7389c 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 3733ff585c..ffe23134a2 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 246dcf3cc1..8c173fa371 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 dcdb2a8fd9..26c64cdf40 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 a4545a9601..971253977b 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 a08269a172..69b385589b 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 4dba1b5951..a514d08ee3 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 c5225e1e74..92c16355cd 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<a: Int32, b: Uint32?, c: Int32??>?);
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 ba9b49cc35..897d044158 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 8a723af534..b50fedd24f 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 e8ff1fa099..771f3b41d1 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 0379aff425..96f31c8f7a 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 e270aedad5..b9c7f62728 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 3324cb2df3..2f87d7a87a 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 fd5df90b64..1194fdd2a0 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 73c1bd282a..83fc510ec3 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 b65f82d8f2..957f331d87 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 84c50a8190..acca8283c5 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 dfe1ac7c68..9b1adaf442 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 e2084e94a2..346146c84f 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 a73a548a86..fd547c1859 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 61dd64b346..883a0410f6 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 dfe1ac7c68..9b1adaf442 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 8382c173dc..b7645e7a73 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 05c50a95e8..1d0af91cd3 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 7c9c6bcdf2..f2fd7e3d74 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 a181c15f43..e7c3cdf182 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 568cad8338..ab595d437f 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 8ffad72338..e80a6a86c7 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 0a42fc0821..40b24169fd 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 b5b9e2b8fc..6ce9d1ed9d 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 8422c5b17b..384b7ca931 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 3cef440fea..25391942a8 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 46df7d55cb..689eeb4eff 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 4f0b3500d4..5570dbc2b0 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 9a0d8ebfcd..d9872c308d 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 42b18417bd..8de5dcddf4 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 674c544a7a..6e98277968 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 1487d1563b..5ab1b40313 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 6e94acace0..24f58c2e0c 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 4aa1974475..df6d24fd9d 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 e78b6e35e1..d1336d3d8e 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 32ce0f42ca..9d9dd9289f 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 4994bd7ebc..66f9c4289d 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 72c8bb841c..e3c5c291cf 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 5c866b394c..0f09ff6e3f 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 b075c112ee..5a4d3e6123 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 c8953dce14..21157963b2 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 afd8756e8a..53683af2e0 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 b99f03bdd7..bc32fd343e 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 ca3f152172..d24e04b2b8 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 68adef24cd..9e66236f28 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 2e722d202e..62ff32da69 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 f82160cffb..e9d2270328 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 cec54f853c..71d005b616 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 f9d44948c2..f6ba3d48ed 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 618ce6d87a..468b6fac6b 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 b203f60c2f..cbc2cd73de 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 0c6e8bc892..d23775100c 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 582e3d2d47..e7fffc5d6e 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 8004df696a..f78e010e30 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 5c43e4efe1..86a53d723f 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 a7a907f579..49f6f95aa0 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 6d11e92000..e044d76f94 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 bc07ed8ce9..0a83a16248 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 2b1521fa28..fc66908fc9 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 fea6c2126a..3ae90c9229 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 22f616e809..6574ba53e8 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 a4abafef06..c11f9e4a75 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 34163fb64e..1c6148afad 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 49f9e4354a..485b38132a 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 e9cf21d7b0..24211c44c4 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 caa09e05ae..07b2f436a6 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 1611a9a8cf..2186eb4ea7 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 c66323b8c2..c927ae3b81 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 a8996bc237..c241facf24 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 603a2afd66..203034758a 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 7aedd0e7e5..f0d05539d4 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 494fd69862..b0a6eda6bd 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 d441ec24b4..5f1c613ee0 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<Bool?>
-    NULL IN (),
-    -- false?
-    NULL IN (NULL),
-    -- Nothing<Bool?>
-    NULL IN (1),
-    -- Nothing<Bool?>
-    (1, NULL) IN ((1, 1), (2, 2)),
-    -- Nothing<Bool?>
-    (1, NULL) IN ((2, 2), (3, 3)),
-    -- false?
-    (1, 2) IN ((1, NULL), (2, 2)),
-    -- Nothing<Bool?>
-    (1, 2) IN ((NULL, 1), (2, 1)),
-    -- false?
-    (1, 2) IN ((1, NULL), (2, 1)),
-    -- Nothing<Bool?>
-    128 IN (128ut, 1t),-- true
+    1 IN (2, 3, NULL), -- Nothing<Bool?>
+    NULL IN (), -- false?
+    NULL IN (NULL), -- Nothing<Bool?>
+    NULL IN (1), -- Nothing<Bool?>
+    (1, NULL) IN ((1, 1), (2, 2)), -- Nothing<Bool?>
+    (1, NULL) IN ((2, 2), (3, 3)), -- false?
+    (1, 2) IN ((1, NULL), (2, 2)), -- Nothing<Bool?>
+    (1, 2) IN ((NULL, 1), (2, 1)), -- false?
+    (1, 2) IN ((1, NULL), (2, 1)), -- Nothing<Bool?>
+    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 7f9793272e..663e2e424f 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<Bool?>
-    2 IN {2, 3, NULL},
-    -- true?
-    (1, 2) IN {(1, NULL), (2, 1)},
-    -- Nothing<Bool?>
-    (1, 2) IN {(1, NULL), (1, 2)},-- true?
+    1 IN {2, 3, NULL}, -- Nothing<Bool?>
+    2 IN {2, 3, NULL}, -- true?
+    (1, 2) IN {(1, NULL), (2, 1)}, -- Nothing<Bool?>
+    (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 a620341d6d..f6a65c2952 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<Bool?>
-    NULL IN DictCreate(Int32, String?),
-    -- false?
-    NULL IN AsDict((NULL, "foo")),
-    -- Nothing<Bool?>
-    NULL IN AsDict((1, "bar")),
-    -- Nothing<Bool?>
-    (1, NULL) IN AsDict(((1, 1), NULL), ((2, 2), "foo")),
-    -- Nothing<Bool?>
-    (1, NULL) IN AsDict(((2, 2), "foo"), ((3, 3), "bar")),
-    -- false?
-    (1, 2) IN AsDict(((1, NULL), "foo"), ((2, 2), "bar")),
-    -- Nothing<Bool?>
-    (1, 2) IN AsDict(((NULL, 1), "foo"), ((2, 1), NULL)),
-    -- false?
-    (1, 2) IN AsDict(((1, NULL), "foo"), ((2, 1), "bar")),-- Nothing<Bool?>
+    1 IN AsDict((2, "x"), (3, "y"), (NULL, "z")), -- Nothing<Bool?>
+    NULL IN DictCreate(Int32, String?), -- false?
+    NULL IN AsDict((NULL, "foo")), -- Nothing<Bool?>
+    NULL IN AsDict((1, "bar")), -- Nothing<Bool?>
+    (1, NULL) IN AsDict(((1, 1), NULL), ((2, 2), "foo")), -- Nothing<Bool?>
+    (1, NULL) IN AsDict(((2, 2), "foo"), ((3, 3), "bar")), -- false?
+    (1, 2) IN AsDict(((1, NULL), "foo"), ((2, 2), "bar")), -- Nothing<Bool?>
+    (1, 2) IN AsDict(((NULL, 1), "foo"), ((2, 1), NULL)), -- false?
+    (1, 2) IN AsDict(((1, NULL), "foo"), ((2, 1), "bar")), -- Nothing<Bool?>
 ;
 
 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 7e7f8f15d5..92810d8027 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<Bool?>
-    NULL IN Nothing(EmptyDict?),
-    -- Nothing<Bool?>
-    NULL IN Nothing(ParseType("Tuple<>?")),-- Nothing<Bool?>
+    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<Bool?>
+    NULL IN Nothing(EmptyDict?), -- Nothing<Bool?>
+    NULL IN Nothing(ParseType("Tuple<>?")), -- Nothing<Bool?>
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_join_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_join_/formatted.sql
index 62f5e30428..cf24ad9563 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 ed0a9df979..41256d9f60 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<Bool?>
-    2 IN [2, 3, NULL],
-    -- true?
-    (1, 2) IN [(1, NULL), (2, 1)],
-    -- Nothing<Bool?>
-    (1, 2) IN [(1, NULL), (1, 2)],-- true?
+    1 IN [2, 3, NULL], -- Nothing<Bool?>
+    2 IN [2, 3, NULL], -- true?
+    (1, 2) IN [(1, NULL), (2, 1)], -- Nothing<Bool?>
+    (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 4439e59048..fc315b55c7 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<Bool?>
-    NULL IN ListCreate(Int32),
-    -- false?
-    NULL IN AsList(NULL),
-    -- Nothing<Bool?>
-    NULL IN AsList(1),
-    -- Nothing<Bool?>
-    (1, NULL) IN AsList((1, 1), (2, 2)),
-    -- Nothing<Bool?>
-    (1, NULL) IN AsList((2, 2), (3, 3)),
-    -- false?
-    (1, 2) IN AsList((1, NULL), (2, 2)),
-    -- Nothing<Bool?>
-    (1, 2) IN AsList((NULL, 1), (2, 1)),
-    -- false?
-    (1, 2) IN AsList((1, NULL), (2, 1)),-- Nothing<Bool?>
+    1 IN AsList(2, 3, NULL), -- Nothing<Bool?>
+    NULL IN ListCreate(Int32), -- false?
+    NULL IN AsList(NULL), -- Nothing<Bool?>
+    NULL IN AsList(1), -- Nothing<Bool?>
+    (1, NULL) IN AsList((1, 1), (2, 2)), -- Nothing<Bool?>
+    (1, NULL) IN AsList((2, 2), (3, 3)), -- false?
+    (1, 2) IN AsList((1, NULL), (2, 2)), -- Nothing<Bool?>
+    (1, 2) IN AsList((NULL, 1), (2, 1)), -- false?
+    (1, 2) IN AsList((1, NULL), (2, 1)), -- Nothing<Bool?>
 ;
 
 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 ee80a64584..9b73031f36 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<Bool?>
-    NULL IN SetCreate(Int32),
-    -- false?
-    NULL IN AsSet(NULL),
-    -- Nothing<Bool?>
-    NULL IN AsSet(1),
-    -- Nothing<Bool?>
-    (1, NULL) IN AsSet((1, 1), (2, 2)),
-    -- Nothing<Bool?>
-    (1, NULL) IN AsSet((2, 2), (3, 3)),
-    -- false?
-    (1, 2) IN AsSet((1, NULL), (2, 2)),
-    -- Nothing<Bool?>
-    (1, 2) IN AsSet((NULL, 1), (2, 1)),
-    -- false?
-    (1, 2) IN AsSet((1, NULL), (2, 1)),-- Nothing<Bool?>
+    1 IN AsSet(2, 3, NULL), -- Nothing<Bool?>
+    NULL IN SetCreate(Int32), -- false?
+    NULL IN AsSet(NULL), -- Nothing<Bool?>
+    NULL IN AsSet(1), -- Nothing<Bool?>
+    (1, NULL) IN AsSet((1, 1), (2, 2)), -- Nothing<Bool?>
+    (1, NULL) IN AsSet((2, 2), (3, 3)), -- false?
+    (1, 2) IN AsSet((1, NULL), (2, 2)), -- Nothing<Bool?>
+    (1, 2) IN AsSet((NULL, 1), (2, 1)), -- false?
+    (1, 2) IN AsSet((1, NULL), (2, 1)), -- Nothing<Bool?>
 ;
 
 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 8dba7f6cd0..a178c2043a 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 a6dc8a332f..2da24c624e 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 bd4e248d44..8289457a1d 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<Bool?>
-    NULL IN (NULL),
-    -- Nothing<Bool?>
-    NULL IN (1),
-    -- Nothing<Bool?>
-    (1, NULL) IN ((1, 1), (2, 2)),
-    -- Nothing<Bool?>
-    (1, NULL) IN ((2, 2), (3, 3)),
-    -- Nothing<Bool?>
-    (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<Bool?>
+    NULL IN (NULL), -- Nothing<Bool?>
+    NULL IN (1), -- Nothing<Bool?>
+    (1, NULL) IN ((1, 1), (2, 2)), -- Nothing<Bool?>
+    (1, NULL) IN ((2, 2), (3, 3)), -- Nothing<Bool?>
+    (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 eeec352b1e..f7ed9d7991 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<Bool?>
-    NULL IN EmptyDict(),
-    -- Nothing<Bool?>
-    NULL IN (),
-    -- Nothing<Bool?>
-    1 IN EmptyList(),
-    -- false
-    1 IN EmptyDict(),
-    -- false
-    1 IN (),
-    -- false
-    NULL IN Nothing(EmptyList?),
-    -- Nothing<Bool?>
-    NULL IN Nothing(EmptyDict?),
-    -- Nothing<Bool?>
-    NULL IN Nothing(ParseType("Tuple<>?")),-- Nothing<Bool?>
+    NULL IN EmptyList(), -- Nothing<Bool?>
+    NULL IN EmptyDict(), -- Nothing<Bool?>
+    NULL IN (), -- Nothing<Bool?>
+    1 IN EmptyList(), -- false
+    1 IN EmptyDict(), -- false
+    1 IN (), -- false
+    NULL IN Nothing(EmptyList?), -- Nothing<Bool?>
+    NULL IN Nothing(EmptyDict?), -- Nothing<Bool?>
+    NULL IN Nothing(ParseType("Tuple<>?")), -- Nothing<Bool?>
 ;
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 6844b30110..3517a17e2e 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 c4dfd695ac..5bf9207be1 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 fda3d047f5..33ded8fd6a 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 48785f280f..8ca3a52db3 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 c523d41099..bc1060e297 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 81574f3e97..29203b4b26 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 d0f6136369..ae9ea4ac26 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 d34d33a201..7f9b242b89 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 7b6eeee10a..1ec4193a33 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<Int32, Int32, Int32>?"));
 
 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 48c10c3de1..a5f7120d73 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<Bool?>
-    (1, 1) IN ((1, NULL)),
-    -- false
-    (1, 1) IN ((1, 1), (2, NULL)),
-    -- true
-    (1, NULL) IN ((1, 2), (1, 3)),
-    -- Nothing<Bool?>
-    (2, NULL) IN ((1, 2), (1, 3)),
-    -- Nothing<Bool?>
+    1 IN (2, 3, NULL), -- false
+    1 IN (NULL), -- false
+    (1, NULL) IN ((1, 2), (1, 3), (1, NULL)), -- Nothing<Bool?>
+    (1, 1) IN ((1, NULL)), -- false
+    (1, 1) IN ((1, 1), (2, NULL)), -- true
+    (1, NULL) IN ((1, 2), (1, 3)), -- Nothing<Bool?>
+    (2, NULL) IN ((1, 2), (1, 3)), -- Nothing<Bool?>
     (1, NULL) IN ();
 -- Nothing<Bool?>
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 d9045a29e7..11e631e124 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<Bool?>
-    1 IN (NULL),
-    -- Nothing<Bool?>
-    (1, NULL) IN ((1, 2), (1, 3), (1, NULL)),
-    -- Nothing<Bool?>
-    (1, 1) IN ((1, NULL)),
-    -- Nothing<Bool?>
-    (1, 1) IN ((1, 1), (2, NULL)),
-    -- Just(true)
-    (1, NULL) IN ((1, 2), (1, 3)),
-    -- Nothing<Bool?>
-    (2, NULL) IN ((1, 2), (1, 3)),
-    -- Just(false)
+    1 IN (2, 3, NULL), -- Nothing<Bool?>
+    1 IN (NULL), -- Nothing<Bool?>
+    (1, NULL) IN ((1, 2), (1, 3), (1, NULL)), -- Nothing<Bool?>
+    (1, 1) IN ((1, NULL)), -- Nothing<Bool?>
+    (1, 1) IN ((1, 1), (2, NULL)), -- Just(true)
+    (1, NULL) IN ((1, 2), (1, 3)), -- Nothing<Bool?>
+    (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 c628dc80bb..55ab5aba96 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 58b5b2f83f..8d83d8e26e 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 bec40b5f10..2211f34722 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 b3b9d061eb..92b8c77413 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 7e54ed90ba..6267566520 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 5630432f0f..79fa4b23b5 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 6d1f9753be..2fa03defd8 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 5630432f0f..79fa4b23b5 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 bb12595f9d..2e09b76a8e 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 e1d89579db..e60f4c7f0a 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 c191b732c2..bfd5b810c7 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 8b8905afb0..57972ff474 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 5ec982a06d..caf0d0b6d8 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 ea7a6c0832..b6dc4bcc4e 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 7dd3194fc9..132d260278 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 1c35293fb5..d08c001cd5 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 7dd3194fc9..132d260278 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 3f2496a717..959f91ad83 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 dd821eecb8..2b454ffaf6 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 b5992250a1..3f20b94ce6 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 c191b732c2..bfd5b810c7 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 3796ad5b77..26df447569 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 67918cee1e..bbd180a20b 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 42bbfaa008..3f904e4b46 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 8936cf02b2..ab0c7f6350 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 771e510d5a..e41b0630d2 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 2c68b86ea3..ce02ac334b 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 41eca9dac1..656b5b8162 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 d9993fb206..e04ae578a8 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 c279867a7c..5bcbcd6491 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 8ec1cb8660..b0654780b7 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 cd4afde4f9..1ef1f37c5c 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 b241c58f01..ad15ccd8d7 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 3f01f8ee8a..b6d9225cc5 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 309a1b400e..68d090f051 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 be0fe85c1d..6775c33f88 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 ff3cb0c9c8..a7f69b8095 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 f6a99de6f8..4b76513c97 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 a02e9fec29..05dd98ce9e 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 e26579738e..66fbbfb923 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 659996508e..14cc2cd34d 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 ac4eb87f44..61bd2bfd21 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 69512bebe7..c19845920f 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 b365a4cf51..9ace87e432 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 8e98d642c4..0018ff75bd 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 dc404d281e..8696297992 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 0901faa840..7af3810932 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 878fad6d32..8ebbf10b17 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 c64ab2a66f..011587c98d 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 8288e8f061..7e55e6c868 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 9f885b645c..43193ee243 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 45d0ab8477..b970369ade 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 d6a4c716c3..c7aa04dbb3 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 45d0ab8477..b970369ade 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 d1dbca6024..23e74a1c74 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 c93b97fef5..6b220083a1 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 da0fd5d011..2e2ea6935a 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 22511f4b96..f517b39e03 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 44e5347874..c8d5849385 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 4fb3501fdb..668c0719db 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 f4bbdbebe9..5c24518cf4 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 ce81640a27..f2f556c10f 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 b342d31d4d..3516171d8a 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 a1ccf2e814..cfe3396d63 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 19131ca340..9d8a12c68d 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 bfa6bf877b..47b8feb056 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 cf93be71ed..1c627eeea0 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 39d4b7376b..fbbc43d5c2 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 f3cc86bda6..930ff6497b 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 fdbbbb8ec0..7b8c4626e3 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 34c7d39182..1073dc7caa 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 d952caccc9..2ec7c6cb83 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 ac57053772..6fcd7595b8 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 ad9dcd15a8..cdfb1e5d9a 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 6e7bc5de52..9ad40469df 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 ee39846a0f..afeedb0612 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 c693a400c9..8a94c22426 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 6e82aa9d0a..e6abbb842a 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 4a20ad293a..f4f3821135 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 fa2d1be2a7..5a6bcac661 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 064d855c14..d7bb37f881 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 3396361bc8..76772934e6 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 7d7e0362ce..f7188f1a5f 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 d70054b773..73bd429575 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 c9d43e3849..448493ddc6 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 845689fd8e..8f4c300c9f 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 2143d9aa06..b9f9e5f328 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 9152bf4216..43817de7bb 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 3330e956d7..791755af74 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 d6a02ff949..93e939bedd 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 77e270fa85..a8a39c6d42 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 78ee05eb4e..4b4a472932 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 72e7721867..2c3474c1cf 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 167ef993c1..c625d80dbb 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 5f6aacd0c1..20174f9a8c 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 245662099f..7158925fb2 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 a0ecec7b1d..196fb8d311 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 8d7238f15a..d395c88254 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 64ec60c603..ddccbf7de7 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 5175d42c10..02973c7dc6 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 78cf07c3ad..27255c01cf 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 0598b109c7..3c1fb43751 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 0598b109c7..3c1fb43751 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 0598b109c7..3c1fb43751 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 0598b109c7..3c1fb43751 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 fe9fbeda3c..a3ccd8fa21 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 12655d5b33..725530bfab 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 cff60b5abd..7badd23ddf 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 cff60b5abd..7badd23ddf 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 cff60b5abd..7badd23ddf 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 cff60b5abd..7badd23ddf 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 cff60b5abd..7badd23ddf 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 bdadafad28..9245c1032e 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 70a7cc86d9..93f613413e 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 316701d961..25f29e4d61 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 52e0392d86..a2ee87da2d 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 e88774b00c..4bcc065373 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 4e3699b46c..735d8bb44f 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 245b589d0d..1bfb826373 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 c6858480b3..c43768bb63 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 4220510965..f8847f6c73 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 0791afd4d0..186ce8eae9 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 70d5372284..de00375c4d 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 ba5b934b33..6a0ff4c91c 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 a733fc8cb4..93326beec1 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 f47d45fd85..217264212b 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 842824f036..7c70080aa4 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 f13d5fb272..0586bbb93d 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 2f7899be20..cafcd6aebe 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 095e1183ea..91597393ac 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 237134ac01..0ed15df9ff 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 49b8a51fce..83348b5dcd 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 f15a4b30e6..7af0913177 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 cf13f4582a..f878dc5089 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 994494bd66..14eb3b2847 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 67e9508269..788df21368 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 ecc134de39..74edb8adf9 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 70fab83220..37bf3090c5 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 428cb48574..d784a3cf81 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 ba15d51a41..9d5e582347 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 8ee4c57ece..3be817f224 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 8b502bc1f3..f1e936cb74 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 5cb32faa2b..ceab66e653 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 947be55d8b..4b47a9b7b3 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 30ceba5b0a..5036f7cb5a 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 534eef096b..8d057ad6e4 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 77bba7e40f..50c904f4f3 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 22fe1af5d5..2229a0dd2c 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 7a6fb5c8e1..afdd4196ae 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 0bfeb51b79..513289018b 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 1b3dd71a6a..d61031849f 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 85c5c0798b..95887f1193 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 ac0e75f274..f59f387e18 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 a45ece18d6..d74eee8557 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 b3a25bc939..5a42789ae4 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 3229e42356..9c36a70c49 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 bc9e0d8929..c75d4bddc1 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 c5bbfabc97..aa7242f2a8 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 15a39b6638..dc0e68fce0 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 8d22616f99..298a09b22b 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 287476c209..2362048747 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 d408354f8f..cf65ff2c25 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 686785c937..ae04bb7837 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 60b92a2a90..f5091471dd 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 8ece22743c..72ab3f1d8d 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 8b9f68abe0..0ad61ce90f 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 c90e15826b..1785176206 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 b0b347de1d..f76990cb5a 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 1803ddb6b6..6df91327d3 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 1691e42d9e..ecafb6ad09 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 ad422a2a67..ea55520b4e 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 72d644ca94..f6f0542ba9 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 8b744140dd..3821f4f6f7 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 16f017e003..27f2edef6d 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 f899410a7c..764bed9926 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 7703c80765..e47ba47322 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 17afcd3261..4e7bb2eb70 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 7706ce03bb..f5e2ccd300 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 afbecd0a35..51b04b964a 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 fa986f2eeb..c7bc09914e 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 afbecd0a35..51b04b964a 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 f1fbb284dc..a324986843 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 27fb7ba30d..6785972709 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 299e58519f..454e07ed4b 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 9b2b2f1c80..edaf58aecf 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 77ea20a989..8b6c70be77 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 048bb9e02b..7dbfa03570 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 aba691e2ff..00eb58e323 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 3446c98c11..96487cd958 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 69d072f99d..c045e050ae 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 6f9e8aa8d6..a348746c6a 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 6bd5db19f8..af75d605c7 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 1085cc5ff8..33cab7715f 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 603f6e0087..83fc420b49 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 4cdc3bc362..fad5d8d486 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 0eea5b241d..1e633353f4 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 8081e288d8..c92fd53bb8 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 ebfd1c3022..5682cb61f7 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 b54f876fec..0078e86f8b 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 679d5295e8..fabe3a8d5c 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 39de782e10..4ae5096bcf 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 863ea2f45b..40e5f16e39 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 9a2816b6fa..0291493f33 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 d70dd8bee0..fdd8c31419 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 599387bb72..a8441f86a1 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 e799845b4d..a5aac6d3ca 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 310190463e..5b961c4e92 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 76ec427bd3..469eb860f8 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 cdb91a971e..362f6051ef 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 9c34f5c883..d1b12e91dc 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 8cd635fbd4..98bd9c41bb 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 3f95ca676d..84bbb7771a 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 7037729a44..d92f0c45e7 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<Int32,Int32>*/
+/* syntax version 1 */
+/* postgres can not */
+/* custom error:Expected data or optional of data, but got: Tuple<Int32,Int32>*/
 $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 253d5c9923..659d5cf91b 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 bd2bab8f5f..0abc8638a6 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 17d7146c51..e21c71b18b 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 52a33c3509..25db9077fb 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 d3c92391bd..d3ef21415e 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 68f3d53a18..18731ae430 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<Uint16>*/-- 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<Uint16>*/
+-- 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 dbed90477e..18323cd52a 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 463a954fed..f06a5ce8dd 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<Uint16>*/-- In this case call to Json2::SqlValueNumber will be successfull, but cast
+/* custom error:Failed to cast extracted JSON value to target type Optional<Uint16>*/
+-- 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 b2e2b2be90..cfcdba47ea 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 66f1405976..432aa0b8da 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<Int32,Int32>*/
+/* syntax version 1 */
+/* postgres can not */
+/* custom error:Expected data or optional of data, but got: Tuple<Int32,Int32>*/
 $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 8d5caf6571..6456244a11 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 b3b9d061eb..92b8c77413 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 7da3705e8c..2837e7bbfb 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 961d57cac3..8330957cc3 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 77bc8086a2..b894dec53d 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 912d6a2117..d433d3931d 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 6dbd21e25f..d81542c9c4 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 8d4aa6be6a..9f1a8268d9 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 ede65a5ad4..c85f87614f 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 a33db648cf..b5c87baf27 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 06d1c653d0..ce6ee62912 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 e6a5ac1b3e..93180782f7 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 14a22444a8..2fd27381d1 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 0581b91769..beefd241ab 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 867b1a7eed..4eb58ef1ca 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 cf0b7c2ec8..a35ab0307e 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 2a80780ee4..fa383de747 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 e3d4cd95d2..0ef653242b 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 2480f9eeac..f2e701e0d5 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 75bb219646..e3e2b88145 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 f70d418170..cc441e73c4 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 46cc96e01e..4a7ce346ef 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 331a572562..3332438fe2 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 bee9db10fe..db2c321251 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 f21dd99700..817a1b4985 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 9cbdae3fd4..3aafc45f6a 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 e26409f257..22429bd739 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 e7f97c7d8a..cc07ddaa96 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 fa5bd30eee..e8bc35a6c9 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 538fb5acc3..84bef6802c 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 9512103f19..30003cc139 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 4ff0a14141..beb8900b73 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 7547c65988..32cf91a579 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 80c8be60cd..898fa4ca5c 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 e9a96bebc2..eb86d53d47 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 502e0b8b92..7943f4b334 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 e9a96bebc2..eb86d53d47 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 0c1a009c54..9966e91bc6 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 85fe265137..4d3d29628e 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 55985d711b..da13aa5111 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 ec33b3a8f4..335f339c1c 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 d70c4659fd..f1693811be 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 06b88ddaa5..a608a0a22c 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 daa33d5d97..73b10fe3e7 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 bdd7bdf4f1..6e039ad907 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 b8263ec117..a9225d1d33 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 65675a57b8..ff77f73ad1 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 fde34515df..8d6481a605 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 0024855a10..f2d76f4591 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 a9829198d6..df35cead10 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 2592827739..6a106936a2 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 5e693e5047..6ccdfab960 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 f05cf0ebef..7782246ee2 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 0b4f315c8e..33a5d3f21e 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 51c2def545..cb3d37ecb9 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 617db65bf8..904398c165 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 5215767079..f54175cc92 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 50402c9405..d745bbd53f 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 cae5532420..3872fb15c0 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 578c991654..4ef3af991f 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 42d3f1989c..71a7531908 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 5a4c503b11..802e1844fc 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 4ef3bc58a3..adb51e2419 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 8827040313..4ba988553f 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 2bfa447402..1241467844 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 62e6c8d11d..3876a82dae 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 d554983014..504eee3fe3 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 5c0493f232..078cda49ef 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 f552bfb4df..571243be15 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 978579de75..ded55a88ba 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 b722ede663..6e2a9b262b 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 b40e5139b4..24e9796706 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 e180e8648f..aa718e0403 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 b5193105ce..9a9dcfb02e 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 32ec14f1f9..3d75166736 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 cd09e7cd44..8ce1004b1d 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 4abd17431b..d54624b763 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 4658a74328..fe7405bd90 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 00c0a7e8c5..90fa1b7039 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 c4d4e818bb..9d7922cef5 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 ae945a7af6..f6e0e8c251 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 aa021d985d..78d45302e4 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 41607f459a..0cb7ddeb71 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 290606a01f..075cefdc0d 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 a3fd56ed5a..dd21b1198d 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 95b0c02cbe..39765d3e6d 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 3b453c23a8..4455f826d2 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 2a54870a57..652d3f0d7b 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 0943ed92f1..82627f7370 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 a54c1a47ce..ac104dee64 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 9814153d96..79a03a5a8d 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 0954517d89..ec47aae51e 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 749fc9c77b..37b4c7e8c3 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 d1f0447101..4cd9fc530b 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 0d5e480a26..9c7c5ba757 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 a362be39e7..07dd621a87 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 9f2a42e3a3..829611e810 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 b289a4dc38..4f3191b7c6 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 abb237872d..f1e05d7f1e 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 b4c509d56c..f69465005d 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 6bfaa241cf..15455fbb8d 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 9ea4aca672..7853586f8e 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 9826f0945e..14d0a8d0c4 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 6674b5b1fc..7985721c65 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 6f700320fd..97fb94962d 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 6fef4f7772..1ab09ebfc0 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 cc06f4b4f0..0d39168d46 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<key: String, subkey: String, value: String>);
 
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 5563d71e79..29ebf961aa 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 0fcd655d02..fec3b5b7d2 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 03a4830f52..9590a75990 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 5e992189d2..28245b150e 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 7092d0b34d..48644f57a9 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 30d9c9fd0c..5e6e9ef20c 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 5376f84813..b956f71c59 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 6bfa8d4305..a43bbb754b 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 2b074c730e..004bbf12eb 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 6f4cf5f9ba..7e92a08f12 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 9b7d509ae1..437f99aba1 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 43df6f5806..592b5ac19b 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 1fc9441d19..43b767b442 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 9ebf8595d7..e6ad67a97f 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 dde78fbe4c..f5f333f0e7 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 5dcefe41ec..2f0401316f 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 86d057b1ef..0a5e1ec7d4 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 5bd73359b4..9a504703b9 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 c9d51bc5f7..40f351d91a 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 dca7acfec3..80b3a8052a 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 a6be26e466..acab9229f8 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 d8d75a9809..b75d89008a 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 c7a0e27d74..0613608d23 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<String, Int64>;
 DECLARE $x2 AS Variant<String, Int64>;
 -- 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 b33b488b67..6e0aea37b7 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 14909129b6..3d735a2551 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 f263c7035a..65f591b2ff 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 2ef36919f7..f55e6e5d96 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 872b2aa5bc..dbb3662273 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 0d55cdf024..cbab532326 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 feb3457e75..53191fa80c 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 b0490a7467..5193083555 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 84cc6ae14d..9f1e3d49b2 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 230bd3df56..cc921a4ddc 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 b88b947c79..d24cc64095 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 56cf58b9c0..6861f27bcd 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 89cc58132b..5df53de7a2 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 d479bae803..4b4dbc7cb3 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 af90aa3f9d..2553f0e830 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 5ef943df9d..a275f62a98 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 46a3abf2c9..d465922e7c 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 384c51472f..7411900312 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 eaff35daa8..dd3b81530b 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 2566eb8de6..2cf3d1d5b6 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 eddcc7311f..48f715852d 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 63a0260333..677d3f5b49 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 7e7cec3134..42040d8c78 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 bd0a6423a7..be805b67fd 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 07d4efb5a2..a786eeb851 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 0066f2d84d..d715a64b90 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 fb81e0b4d0..f8ff07ab2e 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 2a212c864b..f6c20d5695 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 aa2374b055..0e5daa6010 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 8b1d686e79..0c1c140596 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 27ac45d000..67e79c875c 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 e7e97b7efa..9ed51e3437 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 26d8552c40..3e91ed0e86 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 c6f2769fd5..9b8879f8c0 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 a3951a7264..e7d0b096f8 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 eeb7c35c77..940acf59af 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 6297dedf23..d41b1783fc 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 302c48e6e4..e453dd8415 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 4102437636..3363b01f4a 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 9d7e93bb16..91fc592977 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 190661aa55..663f8b652f 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 68a7f056cc..fadcae1a77 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 dd88374945..101830dbbe 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 d66c81a6f6..38c211305f 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 01f1c979a9..53f2d79e4c 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 dc8718a92b..5f7a18625b 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 c70a25beb2..c51ac4bb2e 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 f6f5e52f2a..9e9b5d90bc 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 91dabfd3cd..98a9931626 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 680069a90b..086e7c0b6e 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 c0b72cdfe7..c738bfcfbe 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 8d707c7ada..01a61e88ae 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 1903b99b06..df7ffcd8cd 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 5a92ebe326..810a4fe7d7 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 29479412e9..a3c4ebfe05 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 c014f3fc12..cebcb5ca5f 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 7349bfc465..7eb40b79a0 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 aced49179f..9be27f7f93 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 e96cc32135..992fb686fd 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 7589a9ce5d..ecd17ec97b 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 eb3ca3ee5a..137eb516ff 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 db7fb78b76..a687c1b664 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 0e9c447ba9..9e81532925 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 dc7981fbe1..b21d348705 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 d614319527..0e1b4743e8 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 9bfe002c73..3d890a6b63 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 05d70cef2c..72ba3205e5 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 f00e5cd36b..2309bf6f08 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 69c05b8d5d..a03bb7ca6e 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 692317b5c9..56ca884861 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 71f7525f6c..6d7953153e 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 ff9b36f3ae..b6f6b895de 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 e934c9922c..affafd94fd 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 b3979ff124..ecd8a2d0c5 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 34f490580f..cc82e62719 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 54f1a15a5c..4ed78a5f0e 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 a40f444216..02afb9be0b 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 ec122fe0d1..e927d6b2d1 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 1363ed2b8e..bbb3c81776 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 288ba1e515..c8a7b412e8 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 b5304fec54..f74feadfac 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 b5ede1572e..1025b9d95b 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 f3218b2fe5..92d0c1d5b6 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 85a1905e26..1109467c95 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 f32f634505..51ebc28e44 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 f1169564ef..e3976f08f7 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 0fa2a05312..dc124a6b0d 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 c35a0068c9..c5db5cfd03 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 bbd91591ed..43f4cd2dea 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 ff0e3a89b8..cf30f1c3bc 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 401045257a..cd165ea221 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 62300f1e04..4b2ab4b8dc 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 8b2d40a717..acb4794a53 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 f197582040..1a40abb462 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 17daffbb54..dd67c271c7 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 88798c8d7c..01acd51d9b 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 7452c90c03..c3b7e4f2d8 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 7db73e64cb..0f14e2a349 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 32369e4aeb..6222128bc5 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 3dee0f5e8d..9a8c05d7fa 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 08d67d1892..6a27e3b06f 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 ae38564042..bfc6af98b7 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 205cfdb12e..ee517f1e54 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 b124a431b5..d36ea97437 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 1ef828f1f5..c92097f539 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 baaa928260..cef4b22421 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 f023227335..71fcce3fc4 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 1f8c1cd909..86758c0119 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 c42daf0e38..7ffb9fc5d6 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 b9c11d337b..e5c142c6e3 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 d9768cddbb..39ceaf9d60 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 1c6dfa6d64..503d5b9a62 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 818c6e2249..b3e206858d 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 7a9e14988e..86555fb220 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 b03543259e..764d4c806d 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 2b848423f4..ea8cfeab6c 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 16b0d22aca..9161c53a4f 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 18a245c06f..5e6fe8f35a 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 30bf3cc672..118f0a97e7 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 a609a8ddef..860d733161 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 f2dfce6265..73c1439a50 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 d665accb0e..ee81cabede 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 a104c6d900..9913ffa2b8 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 97284cb05f..e0740878b0 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 a755edd9b8..c5fc6a2573 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 bc6d82fec9..2f07522c3e 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 28f9976066..9510cb7106 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 5d5fa61647..c7fadba62b 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 ef2887b8e8..5f9ba3b5f6 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 0fd3ee65ab..901f88bd37 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 ed11306126..5440739e12 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 d0bfeb9043..c980dfd62a 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 b8768f8d94..827880a0f9 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 8970416908..fd39ad8f85 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 8d237c9e74..46e78d08b6 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 543aa056fb..ca7a5c8955 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 466e643438..58761902b0 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 8bcec721ef..4c21ac63ac 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 516a1e7609..7f1ea916c3 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 76cbaab63e..7b25987ce2 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 e04c83a173..476b3a2788 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 b16494ad64..2f99981448 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 0270fc12dc..5801c73327 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 038cc44348..a9c061a949 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 9c08e0eba8..7eba15ca64 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 0fa129ac89..335f51ae66 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 08d59f2cd8..29c6546e4e 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 45abc65531..5e75afcceb 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 0e3dea3c8f..8e1cb0bd3c 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 9b915ba9fe..f616ca6492 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 c18b3b9f69..651921abdc 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 9515242a91..93a2a03c5e 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 9c2a9b016d..2ca3a0412c 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 63ea4542c0..000500f9b7 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 e579c60e1c..c355b428ab 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 3c18b7cd11..a69f5734d5 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 29d2fa1ac3..4533746e4f 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 4f8440d9db..bad4057237 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 4f7b95ee58..fa047dcfb7 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 29e9974bbe..8cac07ce1c 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 93a9f01194..ab9d450f08 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 2b6928d2ff..045edbcee3 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 30f26e70eb..65dafcc2e1 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 a404baef98..e43aed108c 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 fa01532490..ef5062fe12 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 2fea52b2a5..90bdc7cc1e 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 bbe047be6c..43c1eea9a8 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 d2af8f3788..1fee6df9dd 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 9c33942e03..f0df05d477 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 d35a56e84f..0f8b7286d4 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 c3027d5307..8f6becd412 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 f9bdcd9748..8654fad412 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 416927f861..803affbd1f 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 482d41d123..8c706eccd5 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 eb709437d4..591e51d4ba 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 c57ea2e29f..8a373378dc 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 080e4f2244..8137c2c877 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 7b56ce35c3..ef1cebc02d 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 854e578cae..5b530a4915 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 c9d05c1dae..b24fa179d4 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 409775f506..7955643d1a 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 f94ebe4326..1e8accad4a 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 c32ed93ae4..80846da7f5 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 4cf533ff93..1aee7dc729 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 c7973851bf..803a052fcd 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 2fae13fed8..3477c7f03b 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 7f21f82bc7..5a0822ccbc 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 4a1852a78b..918aee2b77 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 9634bcba87..f0a676b526 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 f56a5aae51..97288da9ba 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 87314d9893..30430a0905 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 e95c2f1775..e446d3e66f 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 dac6c320dc..fd6adb911c 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 b86bdd7b6e..1ed66d026c 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 6d93e0da6b..58301e5beb 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 c53437fa8b..38fcaa4b0a 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 6c4e66933e..7437c3aa63 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 b316612541..b9448995cd 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 3c7d244c5c..95cf9fcbfa 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 3b672ffdf5..e25b9f5559 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 ccf08efece..4c36491bea 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 91aa214a9e..598596dfe4 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 a96e3e3f34..f8087ebbfb 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 682e419ef0..ff7b03b980 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 49df8c0734..27592247a4 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 f1a02d7631..41b9e905e0 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 0cd853081d..fd906274d3 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 6632e812e2..370f8abe88 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 a5ec4211f7..b72f72cba3 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 ca5d44d1d3..b370963f47 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 1b0c774567..2ddb1f3760 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 43e2dbafad..6f2e6444b4 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 aabee14bd7..7c35b875bf 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 aaac30aa32..d8da6069ad 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 142c3729d4..f1c6ee3a02 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 d8a182adcb..341804787b 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 d98a1e9a00..3cde364b2f 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 1bf8938796..d7f9d0afcc 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 3ec00bf392..82d24020b2 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 76e76a79e2..5f566b3cc9 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 8c5d89f457..35e0783508 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 b1fc168ee3..daafed3dbb 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 c58fe77a29..bdcccb8548 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 6ffd38d4ca..bf7a60a510 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 dca87dfce9..a877deaeca 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 4ec3664b69..8ed79f0b47 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 6b7b731ec6..9c35d3b2ee 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 a391fd3acd..c191cc9341 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 b9feb43dd6..f5fae7cd05 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 f602a21ea4..e0fd34d942 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 58624ff3fd..06af796ffb 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 795babd14b..15540faffe 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 8e6350c1f5..83b81eb2fc 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 b9916d2d0a..9f46c8f8f5 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 b011d85ba0..443c25a358 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 8a49a5d455..735a88edab 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 a310643a5b..aa82674abf 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 2dcd046523..9bc3dadf12 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 f58f9e47c6..0ad61a4b2d 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 ddf6c4688c..ab122d487c 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 7abf6e7bed..ed1dfc10a0 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 502e379148..129e134489 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 1ad22cf12a..2c645264b3 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 e50094e42d..b448e9459e 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 06e5dffdf6..6f17e4cbb9 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 aece4fcc0e..918fd7f967 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 7bd2ef9cbd..0728a103da 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 1f961f2e92..db3b03857d 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 e6cf36b991..cbc653f632 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 b6132791d5..442b90b7ef 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 eb41832c82..a3c8b80092 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 26ae8f396d..20beddf699 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 966c859d31..6eba486d27 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 ec0d80215b..77e125846a 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 1da298b93a..9cf6ecc1d5 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 15618d0139..16eb286f99 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 101173fc07..0f0983786c 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 f0b39199d3..5441587eef 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 987bb33f7f..a5a27e02db 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 5fcabe5480..e2e2700b26 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 ac967ceb62..384d754f7e 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 ca2e8b8979..8347c1166a 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 b5f5af5e22..c88a4425ec 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 bec6f356a8..a76f8ad3b2 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 b82a39422b..b26879e853 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 d676a40337..9dbd867577 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 96bc55d0f7..f70ee198a9 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 41cc79e8b7..f6102e49b6 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 c4808b26ef..182b681ee2 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 a232e50444..faa3585150 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 a485807520..46710ca012 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 fe77d9dd16..45fa0bdda5 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 987cad75e6..a9d267517c 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 9797452a3d..79a161e164 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 7507751020..e0cfe16437 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 c4fb9011cc..f621c99c77 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 be5c637df5..6f5b7427c9 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 148ef620a7..5cc7d15f7f 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 a6c817cd58..368981590e 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 2492879a26..7334ebdb15 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 d11ddd8535..6f9ad697d4 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 3d2c5a094f..f54e80677e 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 de00bf47b6..eb7f52c2e5 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 068b33e140..9b38af2ba4 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 4fdc7d4235..de912360c9 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 c92da7d8c1..f548a836d6 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 1873d931e4..156e92b6d0 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 bc21fbbe0d..7809969a5f 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 9d2369ab76..f8ceb6c976 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 dff1534e92..8a528df496 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 2e887641bf..9db81c5b82 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 47f4f9391b..4d614f8a22 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 9ccd62a35b..b409685a2f 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 49576b82c7..b9666bb9a9 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 e5544df194..801f181acc 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 144571bd84..77473247bc 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 bcc8f6b2a0..a3eed096bb 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 9b996dfa3c..08a109001b 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 13c641636d..1123185007 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 a8892c0954..d9fff21369 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 e4d7e5e48b..f952a8c535 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 9956799116..37e1683ef3 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 3f5d5ce547..8f9fe8c8d2 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 0ee1be5eac..50b442f9d9 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 ab8329d6fe..7dd02abc0b 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 d8e93e2c2b..4771849c71 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 8ff421d059..42cc844cd3 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 20d7f03bc4..2548487b4e 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 6774304dd1..ffbc24f51f 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 b063bd37f7..ea0ee596ca 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 c9c9cb0020..0bc972ed37 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 25b0aadf20..1d2ceae660 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 399675162a..e239584980 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 5a8f446510..e5dba381aa 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 9a488e061f..d5900048c2 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 17337461eb..15a95079bd 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 1c9a5669ee..f819eb2196 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 441845b0e1..f04b1a1db6 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 ea216d29a0..6a0656a329 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 b73c883826..aed0e1e2d1 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 c99af90e5f..5624c11577 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 f50aa7410a..138e04b83f 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 db93813a87..9c96740478 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 d915371d49..e23af8700d 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 b27bfd5cd2..d6ce1e0861 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 79eae5071c..8231d89052 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 e6bcbe9b5a..34fbd88cc9 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 9eb4b1262b..fd8e500fe8 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 0492f289ea..f37aee64dd 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 b4a210eb4c..a9dfcd25e7 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 f6895d1f86..ab48e4a387 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 54f2aeedda..b13cfb8701 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 4e136cef41..5d75270c57 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 5b335782e8..ff2204d63b 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 cfaa9c87c8..efe3cadb8d 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 98dde1a98b..3399e8d83a 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 e5182cd1f0..1cbde29ab3 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;
diff --git a/yql/essentials/udfs/common/datetime2/datetime_udf.cpp b/yql/essentials/udfs/common/datetime2/datetime_udf.cpp
index 143eaefbcd..d7948c3371 100644
--- a/yql/essentials/udfs/common/datetime2/datetime_udf.cpp
+++ b/yql/essentials/udfs/common/datetime2/datetime_udf.cpp
@@ -548,18 +548,29 @@ TValue DoAddYears(const TValue& date, i64 years, const NUdf::IDateBuilder& build
         return false;
     }
 
-    inline bool ValidateDatetime(ui32 datetime) {
-        return datetime < MAX_DATETIME;
-    }
+    template<typename TType>
+    inline bool Validate(typename TDataType<TType>::TLayout arg);
 
-    inline bool ValidateTimestamp(ui64 timestamp) {
+    template<>
+    inline bool Validate<TTimestamp>(ui64 timestamp) {
         return timestamp < MAX_TIMESTAMP;
     }
 
-    inline bool ValidateInterval(i64 interval) {
+    template<>
+    inline bool Validate<TTimestamp64>(i64 timestamp) {
+        return timestamp >= MIN_TIMESTAMP64 && timestamp <= MAX_TIMESTAMP64;
+    }
+
+    template<>
+    inline bool Validate<TInterval>(i64 interval) {
         return interval > -i64(MAX_TIMESTAMP) && interval < i64(MAX_TIMESTAMP);
     }
 
+    template<>
+    inline bool Validate<TInterval64>(i64 interval) {
+        return interval >= -MAX_INTERVAL64 && interval <= MAX_INTERVAL64;
+    }
+
     // Split
 
     template<typename TUserDataType, bool Nullable>
@@ -1268,90 +1279,52 @@ TValue DoAddYears(const TValue& date, i64 years, const NUdf::IDateBuilder& build
 
     // From*
 
-    BEGIN_SIMPLE_STRICT_ARROW_UDF(TFromSeconds, TOptional<TTimestamp>(TAutoMap<ui32>)) {
-        Y_UNUSED(valueBuilder);
-        auto res = args[0].Get<ui32>();
-        if (!ValidateDatetime(res)) {
-            return TUnboxedValuePod();
-        }
-        return TUnboxedValuePod((ui64)(res * 1000000ull));
-    }
-
-    using TFromSecondsKernel = TUnaryUnsafeFixedSizeFilterKernel<ui32, ui64,
-        [] (ui32 seconds) { return std::make_pair(ui64(seconds * 1000000ull), ValidateDatetime(seconds)); }>;
-    END_SIMPLE_ARROW_UDF(TFromSeconds, TFromSecondsKernel::Do);
-
-    BEGIN_SIMPLE_STRICT_ARROW_UDF(TFromMilliseconds, TOptional<TTimestamp>(TAutoMap<ui64>)) {
-        Y_UNUSED(valueBuilder);
-        auto res = args[0].Get<ui64>();
-        if (res >= MAX_TIMESTAMP / 1000u) {
-            return TUnboxedValuePod();
-        }
-        return TUnboxedValuePod(res * 1000u);
-    }
-
-    using TFromMillisecondsKernel = TUnaryUnsafeFixedSizeFilterKernel<ui64, ui64,
-        [] (ui64 milliseconds) { return std::make_pair(ui64(milliseconds * 1000u), milliseconds < MAX_TIMESTAMP / 1000u); }>;
-    END_SIMPLE_ARROW_UDF(TFromMilliseconds, TFromMillisecondsKernel::Do);
-
-    BEGIN_SIMPLE_STRICT_ARROW_UDF(TFromMicroseconds, TOptional<TTimestamp>(TAutoMap<ui64>)) {
-        Y_UNUSED(valueBuilder);
-        auto res = args[0].Get<ui64>();
-        if (!ValidateTimestamp(res)) {
-            return TUnboxedValuePod();
-        }
-        return TUnboxedValuePod(res);
-    }
-
-    using TFromMicrosecondsKernel = TUnaryUnsafeFixedSizeFilterKernel<ui64, ui64,
-        [] (ui64 timestamp) { return std::make_pair(timestamp, ValidateTimestamp(timestamp)); }>;
-    END_SIMPLE_ARROW_UDF(TFromMicroseconds, TFromMicrosecondsKernel::Do);
-
-    template <typename TInput, i64 Multiplier>
-    using TIntervalFromKernel = TUnaryUnsafeFixedSizeFilterKernel<TInput, i64,
-        [] (TInput interval) { return std::make_pair(i64(interval * Multiplier), ValidateInterval(interval)); }>;
-
-    BEGIN_SIMPLE_STRICT_ARROW_UDF(TIntervalFromDays, TOptional<TInterval>(TAutoMap<i32>)) {
-        Y_UNUSED(valueBuilder);
-        const i64 res = i64(args[0].Get<i32>()) * UsecondsInDay;
-        return ValidateInterval(res) ? TUnboxedValuePod(res) : TUnboxedValuePod();
-    }
-    END_SIMPLE_ARROW_UDF(TIntervalFromDays, (TIntervalFromKernel<i32, UsecondsInDay>::Do));
-
-    BEGIN_SIMPLE_STRICT_ARROW_UDF(TIntervalFromHours, TOptional<TInterval>(TAutoMap<i32>)) {
-        Y_UNUSED(valueBuilder);
-        const i64 res = i64(args[0].Get<i32>()) * UsecondsInHour;
-        return ValidateInterval(res) ? TUnboxedValuePod(res) : TUnboxedValuePod();
-    }
-    END_SIMPLE_ARROW_UDF(TIntervalFromHours, (TIntervalFromKernel<i32, UsecondsInHour>::Do));
-
-    BEGIN_SIMPLE_STRICT_ARROW_UDF(TIntervalFromMinutes, TOptional<TInterval>(TAutoMap<i32>)) {
-        Y_UNUSED(valueBuilder);
-        const i64 res = i64(args[0].Get<i32>()) * UsecondsInMinute;
-        return ValidateInterval(res) ? TUnboxedValuePod(res) : TUnboxedValuePod();
-    }
-    END_SIMPLE_ARROW_UDF(TIntervalFromMinutes, (TIntervalFromKernel<i32, UsecondsInMinute>::Do));
-
-    BEGIN_SIMPLE_STRICT_ARROW_UDF(TIntervalFromSeconds, TOptional<TInterval>(TAutoMap<i32>)) {
-        Y_UNUSED(valueBuilder);
-        const i64 res = i64(args[0].Get<i32>()) * UsecondsInSecond;
-        return ValidateInterval(res) ? TUnboxedValuePod(res) : TUnboxedValuePod();
-    }
-    END_SIMPLE_ARROW_UDF(TIntervalFromSeconds, (TIntervalFromKernel<i32, UsecondsInSecond>::Do));
-
-    BEGIN_SIMPLE_STRICT_ARROW_UDF(TIntervalFromMilliseconds, TOptional<TInterval>(TAutoMap<i64>)) {
-        Y_UNUSED(valueBuilder);
-        const i64 res = i64(args[0].Get<i64>()) * UsecondsInMilliseconds;
-        return ValidateInterval(res) ? TUnboxedValuePod(res) : TUnboxedValuePod();
-    }
-    END_SIMPLE_ARROW_UDF(TIntervalFromMilliseconds, (TIntervalFromKernel<i64, UsecondsInMilliseconds>::Do));
-
-    BEGIN_SIMPLE_STRICT_ARROW_UDF(TIntervalFromMicroseconds, TOptional<TInterval>(TAutoMap<i64>)) {
-        Y_UNUSED(valueBuilder);
-        const i64 res = args[0].Get<i64>();
-        return ValidateInterval(res) ? TUnboxedValuePod(res) : TUnboxedValuePod();
-    }
-    END_SIMPLE_ARROW_UDF(TIntervalFromMicroseconds, (TIntervalFromKernel<i64, 1>::Do));
+    template<typename TInput, typename TOutput, i64 UsecMultiplier>
+    inline TUnboxedValuePod TFromConverter(TInput arg) {
+        using TLayout = TDataType<TOutput>::TLayout;
+        const TLayout usec = TLayout(arg) * UsecMultiplier;
+        return Validate<TOutput>(usec) ? TUnboxedValuePod(usec) : TUnboxedValuePod();
+    }
+
+
+    template<typename TInput, typename TOutput, i64 UsecMultiplier>
+    using TFromConverterKernel = TUnaryUnsafeFixedSizeFilterKernel<TInput,
+        typename TDataType<TOutput>::TLayout, [] (TInput arg) {
+            using TLayout = TDataType<TOutput>::TLayout;
+            const TLayout usec = TLayout(arg) * UsecMultiplier;
+            return std::make_pair(usec, Validate<TOutput>(usec));
+        }>;
+
+
+#define DATETIME_FROM_CONVERTER_UDF(name, retType, argType, usecMultiplier)              \
+    BEGIN_SIMPLE_STRICT_ARROW_UDF(T##name, TOptional<retType>(TAutoMap<argType>)) {      \
+        Y_UNUSED(valueBuilder);                                                          \
+        return TFromConverter<argType, retType, usecMultiplier>(args[0].Get<argType>()); \
+    }                                                                                    \
+                                                                                         \
+    END_SIMPLE_ARROW_UDF(T##name, (TFromConverterKernel<argType, retType, usecMultiplier>::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);
+
+    DATETIME_FROM_CONVERTER_UDF(IntervalFromDays, TInterval, i32, UsecondsInDay);
+    DATETIME_FROM_CONVERTER_UDF(IntervalFromHours, TInterval, i32, UsecondsInHour);
+    DATETIME_FROM_CONVERTER_UDF(IntervalFromMinutes, TInterval, i32, UsecondsInMinute);
+    DATETIME_FROM_CONVERTER_UDF(IntervalFromSeconds, TInterval, i32, UsecondsInSecond);
+    DATETIME_FROM_CONVERTER_UDF(IntervalFromMilliseconds, TInterval, i64, UsecondsInMilliseconds);
+    DATETIME_FROM_CONVERTER_UDF(IntervalFromMicroseconds, TInterval, i64, 1);
+
+    DATETIME_FROM_CONVERTER_UDF(Interval64FromDays, TInterval64, i32, UsecondsInDay);
+    DATETIME_FROM_CONVERTER_UDF(Interval64FromHours, TInterval64, i64, UsecondsInHour);
+    DATETIME_FROM_CONVERTER_UDF(Interval64FromMinutes, TInterval64, i64, UsecondsInMinute);
+    DATETIME_FROM_CONVERTER_UDF(Interval64FromSeconds, TInterval64, i64, UsecondsInSecond);
+    DATETIME_FROM_CONVERTER_UDF(Interval64FromMilliseconds, TInterval64, i64, UsecondsInMilliseconds);
+    DATETIME_FROM_CONVERTER_UDF(Interval64FromMicroseconds, TInterval64, i64, 1);
 
     // To*
 
@@ -1596,7 +1569,25 @@ TValue DoAddYears(const TValue& date, i64 years, const NUdf::IDateBuilder& build
         return storage;
     }
 
-    struct TStartOfBinaryKernelExec : TBinaryKernelExec<TStartOfBinaryKernelExec> {
+    TMaybe<TTMStorage> 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<bool UseEnd>
+    struct TStartEndOfBinaryKernelExec : TBinaryKernelExec<TStartEndOfBinaryKernelExec<UseEnd>> {
         template<typename TSink>
         static void Process(const IValueBuilder* valueBuilder, TBlockItem arg1, TBlockItem arg2, const TSink& sink) {
             auto& storage = Reference(arg1);
@@ -1606,7 +1597,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 +1618,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<false>::Do);
+
+    BEGIN_SIMPLE_STRICT_ARROW_UDF(TEndOf, TOptional<TResource<TMResourceName>>(TAutoMap<TResource<TMResourceName>>, TAutoMap<TInterval>)) {
+        auto result = args[0];
+        ui64 interval = std::abs(args[1].Get<i64>());
+        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<true>::Do);
 
     struct TTimeOfDayKernelExec : TUnaryKernelExec<TTimeOfDayKernelExec, TReaderTraits::TResource<false>, TFixedSizeArrayBuilder<TDataType<TInterval>::TLayout, false>> {
         template<typename TSink>
@@ -2394,6 +2399,10 @@ TValue DoAddYears(const TValue& date, i64 years, const NUdf::IDateBuilder& build
         TFromMilliseconds,
         TFromMicroseconds,
 
+        TFromSeconds64,
+        TFromMilliseconds64,
+        TFromMicroseconds64,
+
         TIntervalFromDays,
         TIntervalFromHours,
         TIntervalFromMinutes,
@@ -2401,6 +2410,13 @@ TValue DoAddYears(const TValue& date, i64 years, const NUdf::IDateBuilder& build
         TIntervalFromMilliseconds,
         TIntervalFromMicroseconds,
 
+        TInterval64FromDays,
+        TInterval64FromHours,
+        TInterval64FromMinutes,
+        TInterval64FromSeconds,
+        TInterval64FromMilliseconds,
+        TInterval64FromMicroseconds,
+
         TToDays,
         TToHours,
         TToMinutes,
diff --git a/yql/essentials/udfs/common/datetime2/test/canondata/test.test_BlockFrom_/results.txt b/yql/essentials/udfs/common/datetime2/test/canondata/test.test_BlockFrom_/results.txt
index b053c8139f..64185a531a 100644
--- a/yql/essentials/udfs/common/datetime2/test/canondata/test.test_BlockFrom_/results.txt
+++ b/yql/essentials/udfs/common/datetime2/test/canondata/test.test_BlockFrom_/results.txt
@@ -160,9 +160,7 @@
                         [
                             "-604800000000"
                         ];
-                        [
-                            "8640000000000000"
-                        ];
+                        #;
                         #
                     ];
                     [
@@ -194,9 +192,7 @@
                         [
                             "-604800000000"
                         ];
-                        [
-                            "8640000000000000"
-                        ];
+                        #;
                         #
                     ]
                 ]
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 8dafce2473..5c813a2e6b 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 ee0eb55e6a..75210b4b95 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`
diff --git a/yql/essentials/udfs/common/datetime2/test_bigdates/canondata/result.json b/yql/essentials/udfs/common/datetime2/test_bigdates/canondata/result.json
index f83bc10798..c804444f63 100644
--- a/yql/essentials/udfs/common/datetime2/test_bigdates/canondata/result.json
+++ b/yql/essentials/udfs/common/datetime2/test_bigdates/canondata/result.json
@@ -1,4 +1,14 @@
 {
+    "test.test[BlockFrom]": [
+        {
+            "uri": "file://test.test_BlockFrom_/results.txt"
+        }
+    ],
+    "test.test[From]": [
+        {
+            "uri": "file://test.test_From_/results.txt"
+        }
+    ],
     "test.test[SplitMake]": [
         {
             "uri": "file://test.test_SplitMake_/results.txt"
diff --git a/yql/essentials/udfs/common/datetime2/test_bigdates/canondata/test.test_BlockFrom_/results.txt b/yql/essentials/udfs/common/datetime2/test_bigdates/canondata/test.test_BlockFrom_/results.txt
new file mode 100644
index 0000000000..6cafc251d1
--- /dev/null
+++ b/yql/essentials/udfs/common/datetime2/test_bigdates/canondata/test.test_BlockFrom_/results.txt
@@ -0,0 +1,246 @@
+[
+    {
+        "Write" = [
+            {
+                "Type" = [
+                    "ListType";
+                    [
+                        "StructType";
+                        [
+                            [
+                                "ts64_sec";
+                                [
+                                    "OptionalType";
+                                    [
+                                        "DataType";
+                                        "Timestamp64"
+                                    ]
+                                ]
+                            ];
+                            [
+                                "ts64_msec";
+                                [
+                                    "OptionalType";
+                                    [
+                                        "DataType";
+                                        "Timestamp64"
+                                    ]
+                                ]
+                            ];
+                            [
+                                "ts64_usec";
+                                [
+                                    "OptionalType";
+                                    [
+                                        "DataType";
+                                        "Timestamp64"
+                                    ]
+                                ]
+                            ];
+                            [
+                                "interval64_days";
+                                [
+                                    "OptionalType";
+                                    [
+                                        "DataType";
+                                        "Interval64"
+                                    ]
+                                ]
+                            ];
+                            [
+                                "interval64_hours";
+                                [
+                                    "OptionalType";
+                                    [
+                                        "DataType";
+                                        "Interval64"
+                                    ]
+                                ]
+                            ];
+                            [
+                                "interval64_minutes";
+                                [
+                                    "OptionalType";
+                                    [
+                                        "DataType";
+                                        "Interval64"
+                                    ]
+                                ]
+                            ];
+                            [
+                                "interval64_seconds";
+                                [
+                                    "OptionalType";
+                                    [
+                                        "DataType";
+                                        "Interval64"
+                                    ]
+                                ]
+                            ];
+                            [
+                                "interval64_msec";
+                                [
+                                    "OptionalType";
+                                    [
+                                        "DataType";
+                                        "Interval64"
+                                    ]
+                                ]
+                            ];
+                            [
+                                "interval64_usec";
+                                [
+                                    "OptionalType";
+                                    [
+                                        "DataType";
+                                        "Interval64"
+                                    ]
+                                ]
+                            ]
+                        ]
+                    ]
+                ];
+                "Data" = [
+                    [
+                        [
+                            "3875345000000"
+                        ];
+                        [
+                            "3875345000000"
+                        ];
+                        [
+                            "3875345000000"
+                        ];
+                        [
+                            "604800000000"
+                        ];
+                        [
+                            "604800000000"
+                        ];
+                        [
+                            "604800000000"
+                        ];
+                        [
+                            "604800000000"
+                        ];
+                        [
+                            "604800000000"
+                        ];
+                        [
+                            "604800000000"
+                        ]
+                    ];
+                    [
+                        [
+                            "4291747200000000"
+                        ];
+                        [
+                            "4291747200000000"
+                        ];
+                        [
+                            "4291747200000000"
+                        ];
+                        [
+                            "4291747200000000"
+                        ];
+                        [
+                            "4291747200000000"
+                        ];
+                        [
+                            "4291747200000000"
+                        ];
+                        [
+                            "4291747200000000"
+                        ];
+                        [
+                            "4291747200000000"
+                        ];
+                        [
+                            "4291747200000000"
+                        ]
+                    ];
+                    [
+                        [
+                            "-4611669897600000000"
+                        ];
+                        [
+                            "-4611669897600000000"
+                        ];
+                        [
+                            "-4611669897600000000"
+                        ];
+                        [
+                            "-9223339622400000000"
+                        ];
+                        [
+                            "-9223339622400000000"
+                        ];
+                        [
+                            "-9223339622400000000"
+                        ];
+                        [
+                            "-9223339708799000000"
+                        ];
+                        [
+                            "-9223339708799999000"
+                        ];
+                        [
+                            "-9223339708799999999"
+                        ]
+                    ];
+                    [
+                        #;
+                        #;
+                        #;
+                        #;
+                        #;
+                        #;
+                        #;
+                        #;
+                        #
+                    ];
+                    [
+                        [
+                            "4611669811199000000"
+                        ];
+                        [
+                            "4611669811199999000"
+                        ];
+                        [
+                            "4611669811199999999"
+                        ];
+                        [
+                            "9223339622400000000"
+                        ];
+                        [
+                            "9223339622400000000"
+                        ];
+                        [
+                            "9223339622400000000"
+                        ];
+                        [
+                            "9223339708799000000"
+                        ];
+                        [
+                            "9223339708799999000"
+                        ];
+                        [
+                            "9223339708799999999"
+                        ]
+                    ];
+                    [
+                        #;
+                        #;
+                        #;
+                        #;
+                        #;
+                        #;
+                        #;
+                        #;
+                        #
+                    ]
+                ]
+            }
+        ]
+    }
+]
\ No newline at end of file
diff --git a/yql/essentials/udfs/common/datetime2/test_bigdates/canondata/test.test_From_/results.txt b/yql/essentials/udfs/common/datetime2/test_bigdates/canondata/test.test_From_/results.txt
new file mode 100644
index 0000000000..6cafc251d1
--- /dev/null
+++ b/yql/essentials/udfs/common/datetime2/test_bigdates/canondata/test.test_From_/results.txt
@@ -0,0 +1,246 @@
+[
+    {
+        "Write" = [
+            {
+                "Type" = [
+                    "ListType";
+                    [
+                        "StructType";
+                        [
+                            [
+                                "ts64_sec";
+                                [
+                                    "OptionalType";
+                                    [
+                                        "DataType";
+                                        "Timestamp64"
+                                    ]
+                                ]
+                            ];
+                            [
+                                "ts64_msec";
+                                [
+                                    "OptionalType";
+                                    [
+                                        "DataType";
+                                        "Timestamp64"
+                                    ]
+                                ]
+                            ];
+                            [
+                                "ts64_usec";
+                                [
+                                    "OptionalType";
+                                    [
+                                        "DataType";
+                                        "Timestamp64"
+                                    ]
+                                ]
+                            ];
+                            [
+                                "interval64_days";
+                                [
+                                    "OptionalType";
+                                    [
+                                        "DataType";
+                                        "Interval64"
+                                    ]
+                                ]
+                            ];
+                            [
+                                "interval64_hours";
+                                [
+                                    "OptionalType";
+                                    [
+                                        "DataType";
+                                        "Interval64"
+                                    ]
+                                ]
+                            ];
+                            [
+                                "interval64_minutes";
+                                [
+                                    "OptionalType";
+                                    [
+                                        "DataType";
+                                        "Interval64"
+                                    ]
+                                ]
+                            ];
+                            [
+                                "interval64_seconds";
+                                [
+                                    "OptionalType";
+                                    [
+                                        "DataType";
+                                        "Interval64"
+                                    ]
+                                ]
+                            ];
+                            [
+                                "interval64_msec";
+                                [
+                                    "OptionalType";
+                                    [
+                                        "DataType";
+                                        "Interval64"
+                                    ]
+                                ]
+                            ];
+                            [
+                                "interval64_usec";
+                                [
+                                    "OptionalType";
+                                    [
+                                        "DataType";
+                                        "Interval64"
+                                    ]
+                                ]
+                            ]
+                        ]
+                    ]
+                ];
+                "Data" = [
+                    [
+                        [
+                            "3875345000000"
+                        ];
+                        [
+                            "3875345000000"
+                        ];
+                        [
+                            "3875345000000"
+                        ];
+                        [
+                            "604800000000"
+                        ];
+                        [
+                            "604800000000"
+                        ];
+                        [
+                            "604800000000"
+                        ];
+                        [
+                            "604800000000"
+                        ];
+                        [
+                            "604800000000"
+                        ];
+                        [
+                            "604800000000"
+                        ]
+                    ];
+                    [
+                        [
+                            "4291747200000000"
+                        ];
+                        [
+                            "4291747200000000"
+                        ];
+                        [
+                            "4291747200000000"
+                        ];
+                        [
+                            "4291747200000000"
+                        ];
+                        [
+                            "4291747200000000"
+                        ];
+                        [
+                            "4291747200000000"
+                        ];
+                        [
+                            "4291747200000000"
+                        ];
+                        [
+                            "4291747200000000"
+                        ];
+                        [
+                            "4291747200000000"
+                        ]
+                    ];
+                    [
+                        [
+                            "-4611669897600000000"
+                        ];
+                        [
+                            "-4611669897600000000"
+                        ];
+                        [
+                            "-4611669897600000000"
+                        ];
+                        [
+                            "-9223339622400000000"
+                        ];
+                        [
+                            "-9223339622400000000"
+                        ];
+                        [
+                            "-9223339622400000000"
+                        ];
+                        [
+                            "-9223339708799000000"
+                        ];
+                        [
+                            "-9223339708799999000"
+                        ];
+                        [
+                            "-9223339708799999999"
+                        ]
+                    ];
+                    [
+                        #;
+                        #;
+                        #;
+                        #;
+                        #;
+                        #;
+                        #;
+                        #;
+                        #
+                    ];
+                    [
+                        [
+                            "4611669811199000000"
+                        ];
+                        [
+                            "4611669811199999000"
+                        ];
+                        [
+                            "4611669811199999999"
+                        ];
+                        [
+                            "9223339622400000000"
+                        ];
+                        [
+                            "9223339622400000000"
+                        ];
+                        [
+                            "9223339622400000000"
+                        ];
+                        [
+                            "9223339708799000000"
+                        ];
+                        [
+                            "9223339708799999000"
+                        ];
+                        [
+                            "9223339708799999999"
+                        ]
+                    ];
+                    [
+                        #;
+                        #;
+                        #;
+                        #;
+                        #;
+                        #;
+                        #;
+                        #;
+                        #
+                    ]
+                ]
+            }
+        ]
+    }
+]
\ No newline at end of file
diff --git a/yql/essentials/udfs/common/datetime2/test_bigdates/cases/BlockFrom.cfg b/yql/essentials/udfs/common/datetime2/test_bigdates/cases/BlockFrom.cfg
new file mode 100644
index 0000000000..018e43ffd8
--- /dev/null
+++ b/yql/essentials/udfs/common/datetime2/test_bigdates/cases/BlockFrom.cfg
@@ -0,0 +1 @@
+in plato.Input BlockFrom.in
diff --git a/yql/essentials/udfs/common/datetime2/test_bigdates/cases/BlockFrom.in b/yql/essentials/udfs/common/datetime2/test_bigdates/cases/BlockFrom.in
new file mode 100644
index 0000000000..9b8575e120
--- /dev/null
+++ b/yql/essentials/udfs/common/datetime2/test_bigdates/cases/BlockFrom.in
@@ -0,0 +1,72 @@
+{
+    "fts64_sec"    = 3875345;
+    "fts64_msec"   = 3875345000;
+    "fts64_usec"   = 3875345000000;
+
+    "fi64_days"    = 7;
+    "fi64_hours"   = 168;
+    "fi64_minutes" = 10080;
+    "fi64_seconds" = 604800;
+    "fi64_msec"    = 604800000;
+    "fi64_usec"    = 604800000000;
+};
+{
+    "fts64_sec"    = 4291747200;
+    "fts64_msec"   = 4291747200000;
+    "fts64_usec"   = 4291747200000000;
+
+    "fi64_days"    = 49673;
+    "fi64_hours"   = 1192152;
+    "fi64_minutes" = 71529120;
+    "fi64_seconds" = 4291747200;
+    "fi64_msec"    = 4291747200000;
+    "fi64_usec"    = 4291747200000000;
+};
+{
+    "fts64_sec"    = -4611669897600;
+    "fts64_msec"   = -4611669897600000;
+    "fts64_usec"   = -4611669897600000000;
+
+    "fi64_days"    = -106751616;
+    "fi64_hours"   = -2562038784;
+    "fi64_minutes" = -153722327040;
+    "fi64_seconds" = -9223339708799;
+    "fi64_msec"    = -9223339708799999;
+    "fi64_usec"    = -9223339708799999999;
+};
+{
+    "fts64_sec"    = -4611669897601;
+    "fts64_msec"   = -4611669897600001;
+    "fts64_usec"   = -4611669897600000001;
+
+    "fi64_days"    = -106751617;
+    "fi64_hours"   = -2562038808;
+    "fi64_minutes" = -153722328480;
+    "fi64_seconds" = -9223339708800;
+    "fi64_msec"    = -9223339708800000;
+    "fi64_usec"    = -9223339708800000000;
+};
+{
+    "fts64_sec"    = 4611669811199;
+    "fts64_msec"   = 4611669811199999;
+    "fts64_usec"   = 4611669811199999999;
+
+    "fi64_days"    = 106751616;
+    "fi64_hours"   = 2562038784;
+    "fi64_minutes" = 153722327040;
+    "fi64_seconds" = 9223339708799;
+    "fi64_msec"    = 9223339708799999;
+    "fi64_usec"    = 9223339708799999999;
+};
+{
+    "fts64_sec"    = 4611669811200;
+    "fts64_msec"   = 4611669811200000;
+    "fts64_usec"   = 4611669811200000000;
+
+    "fi64_days"    = 106751617;
+    "fi64_hours"   = 2562038808;
+    "fi64_minutes" = 153722328480;
+    "fi64_seconds" = 9223339708800;
+    "fi64_msec"    = 9223339708800000;
+    "fi64_usec"    = 9223339708800000000;
+};
diff --git a/yql/essentials/udfs/common/datetime2/test_bigdates/cases/BlockFrom.in.attr b/yql/essentials/udfs/common/datetime2/test_bigdates/cases/BlockFrom.in.attr
new file mode 100644
index 0000000000..fd67725a7f
--- /dev/null
+++ b/yql/essentials/udfs/common/datetime2/test_bigdates/cases/BlockFrom.in.attr
@@ -0,0 +1,72 @@
+{
+    "_yql_row_spec" = {
+        "Type" = [
+            "StructType";
+            [
+                [
+                    "fts64_sec";
+                    [
+                        "DataType";
+                        "Int64"
+                    ]
+                ];
+                [
+                    "fts64_msec";
+                    [
+                        "DataType";
+                        "Int64"
+                    ]
+                ];
+                [
+                    "fts64_usec";
+                    [
+                        "DataType";
+                        "Int64"
+                    ]
+                ];
+                [
+                    "fi64_days";
+                    [
+                        "DataType";
+                        "Int32"
+                    ]
+                ];
+                [
+                    "fi64_hours";
+                    [
+                        "DataType";
+                        "Int64"
+                    ]
+                ];
+                [
+                    "fi64_minutes";
+                    [
+                        "DataType";
+                        "Int64"
+                    ]
+                ];
+                [
+                    "fi64_seconds";
+                    [
+                        "DataType";
+                        "Int64"
+                    ]
+                ];
+                [
+                    "fi64_msec";
+                    [
+                        "DataType";
+                        "Int64"
+                    ]
+                ];
+                [
+                    "fi64_usec";
+                    [
+                        "DataType";
+                        "Int64"
+                    ]
+                ];
+            ]
+        ]
+    }
+}
diff --git a/yql/essentials/udfs/common/datetime2/test_bigdates/cases/BlockFrom.sql b/yql/essentials/udfs/common/datetime2/test_bigdates/cases/BlockFrom.sql
new file mode 100644
index 0000000000..84cff261d2
--- /dev/null
+++ b/yql/essentials/udfs/common/datetime2/test_bigdates/cases/BlockFrom.sql
@@ -0,0 +1,15 @@
+/* syntax version 1 */
+pragma UseBlocks;
+
+select
+    DateTime::FromSeconds64(fts64_sec) as ts64_sec,
+    DateTime::FromMilliseconds64(fts64_msec) as ts64_msec,
+    DateTime::FromMicroseconds64(fts64_usec) as ts64_usec,
+
+    DateTime::Interval64FromDays(fi64_days) as interval64_days,
+    DateTime::Interval64FromHours(fi64_hours) as interval64_hours,
+    DateTime::Interval64FromMinutes(fi64_minutes) as interval64_minutes,
+    DateTime::Interval64FromSeconds(fi64_seconds) as interval64_seconds,
+    DateTime::Interval64FromMilliseconds(fi64_msec) as interval64_msec,
+    DateTime::Interval64FromMicroseconds(fi64_usec) as interval64_usec
+from Input
diff --git a/yql/essentials/udfs/common/datetime2/test_bigdates/cases/From.cfg b/yql/essentials/udfs/common/datetime2/test_bigdates/cases/From.cfg
new file mode 100644
index 0000000000..8fc79a8b6b
--- /dev/null
+++ b/yql/essentials/udfs/common/datetime2/test_bigdates/cases/From.cfg
@@ -0,0 +1 @@
+in plato.Input From.in
diff --git a/yql/essentials/udfs/common/datetime2/test_bigdates/cases/From.in b/yql/essentials/udfs/common/datetime2/test_bigdates/cases/From.in
new file mode 100644
index 0000000000..9b8575e120
--- /dev/null
+++ b/yql/essentials/udfs/common/datetime2/test_bigdates/cases/From.in
@@ -0,0 +1,72 @@
+{
+    "fts64_sec"    = 3875345;
+    "fts64_msec"   = 3875345000;
+    "fts64_usec"   = 3875345000000;
+
+    "fi64_days"    = 7;
+    "fi64_hours"   = 168;
+    "fi64_minutes" = 10080;
+    "fi64_seconds" = 604800;
+    "fi64_msec"    = 604800000;
+    "fi64_usec"    = 604800000000;
+};
+{
+    "fts64_sec"    = 4291747200;
+    "fts64_msec"   = 4291747200000;
+    "fts64_usec"   = 4291747200000000;
+
+    "fi64_days"    = 49673;
+    "fi64_hours"   = 1192152;
+    "fi64_minutes" = 71529120;
+    "fi64_seconds" = 4291747200;
+    "fi64_msec"    = 4291747200000;
+    "fi64_usec"    = 4291747200000000;
+};
+{
+    "fts64_sec"    = -4611669897600;
+    "fts64_msec"   = -4611669897600000;
+    "fts64_usec"   = -4611669897600000000;
+
+    "fi64_days"    = -106751616;
+    "fi64_hours"   = -2562038784;
+    "fi64_minutes" = -153722327040;
+    "fi64_seconds" = -9223339708799;
+    "fi64_msec"    = -9223339708799999;
+    "fi64_usec"    = -9223339708799999999;
+};
+{
+    "fts64_sec"    = -4611669897601;
+    "fts64_msec"   = -4611669897600001;
+    "fts64_usec"   = -4611669897600000001;
+
+    "fi64_days"    = -106751617;
+    "fi64_hours"   = -2562038808;
+    "fi64_minutes" = -153722328480;
+    "fi64_seconds" = -9223339708800;
+    "fi64_msec"    = -9223339708800000;
+    "fi64_usec"    = -9223339708800000000;
+};
+{
+    "fts64_sec"    = 4611669811199;
+    "fts64_msec"   = 4611669811199999;
+    "fts64_usec"   = 4611669811199999999;
+
+    "fi64_days"    = 106751616;
+    "fi64_hours"   = 2562038784;
+    "fi64_minutes" = 153722327040;
+    "fi64_seconds" = 9223339708799;
+    "fi64_msec"    = 9223339708799999;
+    "fi64_usec"    = 9223339708799999999;
+};
+{
+    "fts64_sec"    = 4611669811200;
+    "fts64_msec"   = 4611669811200000;
+    "fts64_usec"   = 4611669811200000000;
+
+    "fi64_days"    = 106751617;
+    "fi64_hours"   = 2562038808;
+    "fi64_minutes" = 153722328480;
+    "fi64_seconds" = 9223339708800;
+    "fi64_msec"    = 9223339708800000;
+    "fi64_usec"    = 9223339708800000000;
+};
diff --git a/yql/essentials/udfs/common/datetime2/test_bigdates/cases/From.in.attr b/yql/essentials/udfs/common/datetime2/test_bigdates/cases/From.in.attr
new file mode 100644
index 0000000000..afe0b1f384
--- /dev/null
+++ b/yql/essentials/udfs/common/datetime2/test_bigdates/cases/From.in.attr
@@ -0,0 +1,73 @@
+{
+    "_yql_row_spec" = {
+        "Type" = [
+            "StructType";
+            [
+                [
+                    "fts64_sec";
+                    [
+                        "DataType";
+                        "Int64"
+                    ]
+                ];
+                [
+                    "fts64_msec";
+                    [
+                        "DataType";
+                        "Int64"
+                    ]
+                ];
+                [
+                    "fts64_usec";
+                    [
+                        "DataType";
+                        "Int64"
+                    ]
+                ];
+                [
+                    "fi64_days";
+                    [
+                        "DataType";
+                        "Int32"
+                    ]
+                ];
+                [
+                    "fi64_hours";
+                    [
+                        "DataType";
+                        "Int64"
+                    ]
+                ];
+                [
+                    "fi64_minutes";
+                    [
+                        "DataType";
+                        "Int64"
+                    ]
+                ];
+                [
+                    "fi64_seconds";
+                    [
+                        "DataType";
+                        "Int64"
+                    ]
+                ];
+                [
+                    "fi64_msec";
+                    [
+                        "DataType";
+                        "Int64"
+                    ]
+                ];
+                [
+                    "fi64_usec";
+                    [
+                        "DataType";
+                        "Int64"
+                    ]
+                ];
+            ]
+        ]
+    }
+}
+
diff --git a/yql/essentials/udfs/common/datetime2/test_bigdates/cases/From.sql b/yql/essentials/udfs/common/datetime2/test_bigdates/cases/From.sql
new file mode 100644
index 0000000000..10de493fae
--- /dev/null
+++ b/yql/essentials/udfs/common/datetime2/test_bigdates/cases/From.sql
@@ -0,0 +1,13 @@
+/* syntax version 1 */
+select
+    DateTime::FromSeconds64(fts64_sec) as ts64_sec,
+    DateTime::FromMilliseconds64(fts64_msec) as ts64_msec,
+    DateTime::FromMicroseconds64(fts64_usec) as ts64_usec,
+
+    DateTime::Interval64FromDays(fi64_days) as interval64_days,
+    DateTime::Interval64FromHours(fi64_hours) as interval64_hours,
+    DateTime::Interval64FromMinutes(fi64_minutes) as interval64_minutes,
+    DateTime::Interval64FromSeconds(fi64_seconds) as interval64_seconds,
+    DateTime::Interval64FromMilliseconds(fi64_msec) as interval64_msec,
+    DateTime::Interval64FromMicroseconds(fi64_usec) as interval64_usec
+from Input