YQL-19129 soft WITHOUT

commit_hash:563aebc32ae87bc18e5e3e38babc034e5e89e2c1

6 files changed, 22 insertions, 11 deletions

diff --git a/yql/essentials/sql/v1/SQLv1.g.in b/yql/essentials/sql/v1/SQLv1.g.in
index 0168dbab95d..1d7dca51854 100644
--- a/yql/essentials/sql/v1/SQLv1.g.in
+++ b/yql/essentials/sql/v1/SQLv1.g.in
@@ -397,7 +397,7 @@ reduce_core:
 opt_set_quantifier: (ALL | DISTINCT)?;
 
 select_core:
-  (FROM join_source)? SELECT STREAM? opt_set_quantifier result_column (COMMA result_column)* COMMA? (WITHOUT without_column_list)? (FROM join_source)? (WHERE expr)?
+  (FROM join_source)? SELECT STREAM? opt_set_quantifier result_column (COMMA result_column)* COMMA? (WITHOUT (IF EXISTS)? without_column_list)? (FROM join_source)? (WHERE expr)?
   group_by_clause? (HAVING expr)? window_clause? ext_order_by_clause?
 ;
 
diff --git a/yql/essentials/sql/v1/SQLv1Antlr4.g.in b/yql/essentials/sql/v1/SQLv1Antlr4.g.in
index 0edf273094b..8aff2bb89a3 100644
--- a/yql/essentials/sql/v1/SQLv1Antlr4.g.in
+++ b/yql/essentials/sql/v1/SQLv1Antlr4.g.in
@@ -396,7 +396,7 @@ reduce_core:
 opt_set_quantifier: (ALL | DISTINCT)?;
 
 select_core:
-  (FROM join_source)? SELECT STREAM? opt_set_quantifier result_column (COMMA result_column)* COMMA? (WITHOUT without_column_list)? (FROM join_source)? (WHERE expr)?
+  (FROM join_source)? SELECT STREAM? opt_set_quantifier result_column (COMMA result_column)* COMMA? (WITHOUT (IF EXISTS)? without_column_list)? (FROM join_source)? (WHERE expr)?
   group_by_clause? (HAVING expr)? window_clause? ext_order_by_clause?
 ;
 
diff --git a/yql/essentials/sql/v1/format/sql_format_ut.h b/yql/essentials/sql/v1/format/sql_format_ut.h
index d92393008f0..2747ce28714 100644
--- a/yql/essentials/sql/v1/format/sql_format_ut.h
+++ b/yql/essentials/sql/v1/format/sql_format_ut.h
@@ -858,6 +858,8 @@ Y_UNIT_TEST(Select) {
             "SELECT\n\t*\nWITHOUT\n\ta,\n\tb\n;\n"},
         {"select * without a,",
             "SELECT\n\t*\nWITHOUT\n\ta,\n;\n"},
+        {"select * without if exists a",
+            "SELECT\n\t*\nWITHOUT IF EXISTS\n\ta\n;\n"},
         {"select 1 from user",
             "SELECT\n\t1\nFROM\n\tuser\n;\n"},
         {"select 1 from plato.user",
diff --git a/yql/essentials/sql/v1/select.cpp b/yql/essentials/sql/v1/select.cpp
index f44e328ba2c..98029daa511 100644
--- a/yql/essentials/sql/v1/select.cpp
+++ b/yql/essentials/sql/v1/select.cpp
@@ -1489,6 +1489,7 @@ public:
         const TVector<TNodePtr>& terms,
         bool distinct,
         const TVector<TNodePtr>& without,
+        bool forceWithout,
         bool selectStream,
         const TWriteSettings& settings,
         TColumnsSets&& uniqueSets,
@@ -1506,6 +1507,7 @@ public:
         , WinSpecs(winSpecs)
         , Terms(terms)
         , Without(without)
+        , ForceWithout(forceWithout)
         , Distinct(distinct)
         , LegacyHoppingWindowSpec(legacyHoppingWindowSpec)
         , SelectStream(selectStream)
@@ -1924,7 +1926,7 @@ public:
                 if (Source && Source->GetJoin()) {
                     name = DotJoin(*without->GetSourceName(), name);
                 }
-                terms = L(terms, Y("let", "row", Y("RemoveMember", "row", Q(name))));
+                terms = L(terms, Y("let", "row", Y(ForceWithout ? "ForceRemoveMember" : "RemoveMember", "row", Q(name))));
             }
         }
 
@@ -1941,7 +1943,7 @@ public:
         return new TSelectCore(Pos, Source->CloneSource(), CloneContainer(GroupByExpr),
                 CloneContainer(GroupBy), CompactGroupBy, GroupBySuffix, AssumeSorted, CloneContainer(OrderBy),
                 SafeClone(Having), CloneContainer(WinSpecs), SafeClone(LegacyHoppingWindowSpec),
-                CloneContainer(Terms), Distinct, Without, SelectStream, Settings, TColumnsSets(UniqueSets), TColumnsSets(DistinctSets));
+                CloneContainer(Terms), Distinct, Without, ForceWithout, SelectStream, Settings, TColumnsSets(UniqueSets), TColumnsSets(DistinctSets));
     }
 
 private:
@@ -2301,6 +2303,7 @@ private:
     TNodePtr CompositeTerms;
     TVector<TNodePtr> Terms;
     TVector<TNodePtr> Without;
+    const bool ForceWithout;
     const bool Distinct;
     bool OrderByInit = false;
     TLegacyHoppingWindowSpecPtr LegacyHoppingWindowSpec;
@@ -2715,6 +2718,7 @@ TSourcePtr DoBuildSelectCore(
     TVector<TNodePtr>&& terms,
     bool distinct,
     TVector<TNodePtr>&& without,
+    bool forceWithout,
     bool selectStream,
     const TWriteSettings& settings,
     TColumnsSets&& uniqueSets,
@@ -2722,7 +2726,7 @@ TSourcePtr DoBuildSelectCore(
 ) {
     if (groupBy.empty() || !groupBy.front()->ContentListPtr()) {
         return new TSelectCore(pos, std::move(source), groupByExpr, groupBy, compactGroupBy, groupBySuffix, assumeSorted,
-            orderBy, having, winSpecs, legacyHoppingWindowSpec, terms, distinct, without, selectStream, settings, std::move(uniqueSets), std::move(distinctSets));
+            orderBy, having, winSpecs, legacyHoppingWindowSpec, terms, distinct, without, forceWithout, selectStream, settings, std::move(uniqueSets), std::move(distinctSets));
     }
     if (groupBy.size() == 1) {
         /// actualy no big idea to use grouping function in this case (result allways 0)
@@ -2730,7 +2734,7 @@ TSourcePtr DoBuildSelectCore(
         source = new TNestedProxySource(pos, *contentPtr, source);
         return DoBuildSelectCore(ctx, pos, originalSource, source, groupByExpr, *contentPtr, compactGroupBy, groupBySuffix,
             assumeSorted, orderBy, having, std::move(winSpecs),
-            legacyHoppingWindowSpec, std::move(terms), distinct, std::move(without), selectStream, settings, std::move(uniqueSets), std::move(distinctSets));
+            legacyHoppingWindowSpec, std::move(terms), distinct, std::move(without), forceWithout, selectStream, settings, std::move(uniqueSets), std::move(distinctSets));
     }
     /// \todo some smart merge logic, generalize common part of grouping (expr, flatten, etc)?
     TIntrusivePtr<TCompositeSelect> compositeSelect = new TCompositeSelect(pos, std::move(source), originalSource->CloneSource(), settings);
@@ -2757,7 +2761,7 @@ TSourcePtr DoBuildSelectCore(
         totalGroups += contentPtr->size();
         TSelectCore* selectCore = new TSelectCore(pos, std::move(proxySource), CloneContainer(groupByExpr),
             CloneContainer(*contentPtr), compactGroupBy, groupBySuffix, assumeSorted, orderBy, SafeClone(having), CloneContainer(winSpecs),
-            legacyHoppingWindowSpec, terms, distinct, without, selectStream, settings, TColumnsSets(uniqueSets), TColumnsSets(distinctSets));
+            legacyHoppingWindowSpec, terms, distinct, without, forceWithout, selectStream, settings, TColumnsSets(uniqueSets), TColumnsSets(distinctSets));
         subselects.emplace_back(selectCore);
     }
     if (totalGroups > ctx.PragmaGroupByLimit) {
@@ -2786,6 +2790,7 @@ TSourcePtr BuildSelectCore(
     TVector<TNodePtr>&& terms,
     bool distinct,
     TVector<TNodePtr>&& without,
+    bool forceWithout,
     bool selectStream,
     const TWriteSettings& settings,
     TColumnsSets&& uniqueSets,
@@ -2793,7 +2798,7 @@ TSourcePtr BuildSelectCore(
 )
 {
     return DoBuildSelectCore(ctx, pos, source, source, groupByExpr, groupBy, compactGroupBy, groupBySuffix, assumeSorted, orderBy,
-        having, std::move(winSpecs), legacyHoppingWindowSpec, std::move(terms), distinct, std::move(without), selectStream, settings, std::move(uniqueSets), std::move(distinctSets));
+        having, std::move(winSpecs), legacyHoppingWindowSpec, std::move(terms), distinct, std::move(without), forceWithout, selectStream, settings, std::move(uniqueSets), std::move(distinctSets));
 }
 
 class TUnion: public IRealSource {
diff --git a/yql/essentials/sql/v1/source.h b/yql/essentials/sql/v1/source.h
index f5855f50d1a..f89be5dd982 100644
--- a/yql/essentials/sql/v1/source.h
+++ b/yql/essentials/sql/v1/source.h
@@ -269,6 +269,7 @@ namespace NSQLTranslationV1 {
         TVector<TNodePtr>&& terms,
         bool distinct,
         TVector<TNodePtr>&& without,
+        bool forceWithout,
         bool selectStream,
         const TWriteSettings& settings,
         TColumnsSets&& uniqueSets,
diff --git a/yql/essentials/sql/v1/sql_select.cpp b/yql/essentials/sql/v1/sql_select.cpp
index c27aa8f126a..52dd399a990 100644
--- a/yql/essentials/sql/v1/sql_select.cpp
+++ b/yql/essentials/sql/v1/sql_select.cpp
@@ -1027,8 +1027,10 @@ TSourcePtr TSqlSelect::SelectCore(const TRule_select_core& node, const TWriteSet
 
     const bool selectStream = node.HasBlock3();
     TVector<TNodePtr> without;
+    bool forceWithout = false;
     if (node.HasBlock8()) {
-        if (!ColumnList(without, node.GetBlock8().GetRule_without_column_list2())) {
+        forceWithout = node.GetBlock8().HasBlock2();
+        if (!ColumnList(without, node.GetBlock8().GetRule_without_column_list3())) {
             return nullptr;
         }
     }
@@ -1167,7 +1169,7 @@ TSourcePtr TSqlSelect::SelectCore(const TRule_select_core& node, const TWriteSet
         return nullptr;
     }
     return BuildSelectCore(Ctx, startPos, std::move(source), groupByExpr, groupBy, compactGroupBy, groupBySuffix, assumeSorted, orderBy, having,
-        std::move(windowSpec), legacyHoppingWindowSpec, std::move(terms), distinct, std::move(without), selectStream, settings, std::move(uniqueSets), std::move(distinctSets));
+        std::move(windowSpec), legacyHoppingWindowSpec, std::move(terms), distinct, std::move(without), forceWithout, selectStream, settings, std::move(uniqueSets), std::move(distinctSets));
 }
 
 bool TSqlSelect::WindowDefinition(const TRule_window_definition& rule, TWinSpecs& winSpecs) {
@@ -1421,6 +1423,7 @@ TSourcePtr TSqlSelect::Build(const TRule& node, TPosition pos, TSelectKindResult
         TLegacyHoppingWindowSpecPtr legacyHoppingWindowSpec;
         bool distinct = false;
         TVector<TNodePtr> without;
+        bool forceWithout = false;
         bool stream = false;
 
         TVector<TNodePtr> terms;
@@ -1428,7 +1431,7 @@ TSourcePtr TSqlSelect::Build(const TRule& node, TPosition pos, TSelectKindResult
 
         result = BuildSelectCore(Ctx, unionPos, std::move(result), groupByExpr, groupBy, compactGroupBy, groupBySuffix,
             assumeOrderBy, orderBy, having, std::move(winSpecs), legacyHoppingWindowSpec, std::move(terms),
-            distinct, std::move(without), stream, outermostSettings, {}, {});
+            distinct, std::move(without), forceWithout, stream, outermostSettings, {}, {});
 
         result = BuildSelect(unionPos, std::move(result), skipTake);
     } else if (skipTake) {