deprecate DisableAnsiOrderByLimitInUnionAll pragma

18 files changed, 19 insertions, 289 deletions

diff --git a/ydb/library/yql/sql/v1/context.cpp b/ydb/library/yql/sql/v1/context.cpp
index ec053f181d0..366992aebe1 100644
--- a/ydb/library/yql/sql/v1/context.cpp
+++ b/ydb/library/yql/sql/v1/context.cpp
@@ -55,7 +55,6 @@ THashMap<TStringBuf, TPragmaField> CTX_PRAGMA_FIELDS = {
     {"FlexibleTypes", &TContext::FlexibleTypes},
     {"AnsiCurrentRow", &TContext::AnsiCurrentRow},
     {"EmitStartsWith", &TContext::EmitStartsWith},
-    {"EnforceAnsiOrderByLimitInUnionAll", &TContext::EnforceAnsiOrderByLimitInUnionAll},
     {"EmitAggApply", &TContext::EmitAggApply},
     {"AnsiLike", &TContext::AnsiLike},
     {"UseBlocks", &TContext::UseBlocks},
@@ -65,7 +64,6 @@ typedef TMaybe<bool> TContext::*TPragmaMaybeField;
 
 THashMap<TStringBuf, TPragmaMaybeField> CTX_PRAGMA_MAYBE_FIELDS = {
     {"AnsiRankForNullableKeys", &TContext::AnsiRankForNullableKeys},
-    {"AnsiOrderByLimitInUnionAll", &TContext::AnsiOrderByLimitInUnionAll},
     {"AnsiInForEmptyOrNullableItemsCollections", &TContext::AnsiInForEmptyOrNullableItemsCollections},
     {"CompactGroupBy", &TContext::CompactGroupBy},
 };
diff --git a/ydb/library/yql/sql/v1/context.h b/ydb/library/yql/sql/v1/context.h
index 8ec2a4df6a3..a1e531b587e 100644
--- a/ydb/library/yql/sql/v1/context.h
+++ b/ydb/library/yql/sql/v1/context.h
@@ -268,8 +268,6 @@ namespace NSQLTranslationV1 {
         TMaybe<bool> JsonQueryReturnsJsonDocument;
         TMaybe<bool> AnsiInForEmptyOrNullableItemsCollections;
         TMaybe<bool> AnsiRankForNullableKeys = true;
-        TMaybe<bool> AnsiOrderByLimitInUnionAll = true;
-        bool EnforceAnsiOrderByLimitInUnionAll = false;
         const bool AnsiQuotedIdentifiers;
         bool AnsiOptionalAs = true;
         bool OrderedColumns = false;
diff --git a/ydb/library/yql/sql/v1/sql_query.cpp b/ydb/library/yql/sql/v1/sql_query.cpp
index 4675cd149f0..0836d761050 100644
--- a/ydb/library/yql/sql/v1/sql_query.cpp
+++ b/ydb/library/yql/sql/v1/sql_query.cpp
@@ -1845,13 +1845,11 @@ TNodePtr TSqlQuery::PragmaStatement(const TRule_pragma_stmt& stmt, bool& success
             Ctx.AnsiRankForNullableKeys = false;
             Ctx.IncrementMonCounter("sql_pragma", "DisableAnsiRankForNullableKeys");
         } else if (normalizedPragma == "ansiorderbylimitinunionall") {
-            Ctx.AnsiOrderByLimitInUnionAll = true;
             Ctx.IncrementMonCounter("sql_pragma", "AnsiOrderByLimitInUnionAll");
-        } else if (!Ctx.EnforceAnsiOrderByLimitInUnionAll && normalizedPragma == "disableansiorderbylimitinunionall") {
-            Ctx.AnsiOrderByLimitInUnionAll = false;
-            Ctx.Warning(Ctx.Pos(), TIssuesIds::YQL_DEPRECATED_PRAGMA)
-                << "Use of deprecated DisableAnsiOrderByLimitInUnionAll pragma. It will be dropped soon";
-            Ctx.IncrementMonCounter("sql_pragma", "DisableAnsiOrderByLimitInUnionAll");
+        } else if (normalizedPragma == "disableansiorderbylimitinunionall") {
+            Error() << "DisableAnsiOrderByLimitInUnionAll pragma is deprecated and no longer supported";
+            Ctx.IncrementMonCounter("sql_errors", "DeprecatedPragma");
+            return {};
         } else if (normalizedPragma == "ansioptionalas") {
             Ctx.AnsiOptionalAs = true;
             Ctx.IncrementMonCounter("sql_pragma", "AnsiOptionalAs");
diff --git a/ydb/library/yql/sql/v1/sql_select.cpp b/ydb/library/yql/sql/v1/sql_select.cpp
index 8321d24a702..1fb347a88cb 100644
--- a/ydb/library/yql/sql/v1/sql_select.cpp
+++ b/ydb/library/yql/sql/v1/sql_select.cpp
@@ -1148,20 +1148,8 @@ bool TSqlSelect::ValidateLimitOrderByWithSelectOp(TMaybe<TSelectKindPlacement> p
         // not in select_op chain
         return true;
     }
-    if (!Ctx.AnsiOrderByLimitInUnionAll.Defined()) {
-        if (!placement->IsLastInSelectOp) {
-            Ctx.Warning(Ctx.Pos(), TIssuesIds::YQL_LIMIT_ORDER_BY_WITH_UNION)
-                << what << " will not be allowed here for ANSI compliant UNION ALL.\n"
-                << "For details please consult documentation on PRAGMA AnsiOrderByLimitInUnionAll";
-        } else {
-            Ctx.Warning(Ctx.Pos(), TIssuesIds::YQL_LIMIT_ORDER_BY_WITH_UNION)
-                << what << " will be applied to last subquery in UNION ALL, not to entire UNION ALL.\n"
-                << "For ANSI compliant behavior please use PRAGMA AnsiOrderByLimitInUnionAll";
-        }
-        return true;
-    }
 
-    if (*Ctx.AnsiOrderByLimitInUnionAll && !placement->IsLastInSelectOp) {
+    if (!placement->IsLastInSelectOp) {
         Ctx.Error() << what << " within UNION ALL is only allowed after last subquery";
         return false;
     }
@@ -1169,9 +1157,6 @@ bool TSqlSelect::ValidateLimitOrderByWithSelectOp(TMaybe<TSelectKindPlacement> p
 }
 
 bool TSqlSelect::NeedPassLimitOrderByToUnderlyingSelect(TMaybe<TSelectKindPlacement> placement) {
-    if (!Ctx.AnsiOrderByLimitInUnionAll.Defined() || !*Ctx.AnsiOrderByLimitInUnionAll) {
-        return true;
-    }
     return !placement.Defined() || !placement->IsLastInSelectOp;
 }
 
@@ -1262,24 +1247,16 @@ TSqlSelect::TSelectKindResult TSqlSelect::SelectKind(const TRule_select_kind& no
             res.Settings.Discard = settings.Discard;
         } else if (settings.Discard) {
             auto discardPos = Ctx.TokenPosition(node.GetBlock1().GetToken1());
-            if (Ctx.AnsiOrderByLimitInUnionAll.Defined() && *Ctx.AnsiOrderByLimitInUnionAll) {
-                Ctx.Error(discardPos) << "DISCARD within UNION ALL is only allowed before first subquery";
-                return {};
-            }
-            Ctx.Warning(discardPos, TIssuesIds::YQL_LIMIT_ORDER_BY_WITH_UNION)
-                << "DISCARD will be ignored here. Please use DISCARD before first subquery in UNION ALL if you want to discard entire UNION ALL result";
+            Ctx.Error(discardPos) << "DISCARD within UNION ALL is only allowed before first subquery";
+            return {};
         }
 
         if (placement->IsLastInSelectOp) {
             res.Settings.Label = settings.Label;
         } else if (!settings.Label.Empty()) {
             auto labelPos = Ctx.TokenPosition(node.GetBlock3().GetToken1());
-            if (Ctx.AnsiOrderByLimitInUnionAll.Defined() && *Ctx.AnsiOrderByLimitInUnionAll) {
-                Ctx.Error(labelPos) << "INTO RESULT within UNION ALL is only allowed after last subquery";
-                return {};
-            }
-            Ctx.Warning(labelPos, TIssuesIds::YQL_LIMIT_ORDER_BY_WITH_UNION)
-                << "INTO RESULT will be ignored here. Please use INTO RESULT after last subquery in UNION ALL if you want label entire UNION ALL result";
+            Ctx.Error(labelPos) << "INTO RESULT within UNION ALL is only allowed after last subquery";
+            return {};
         }
 
         settings = {};
diff --git a/ydb/library/yql/sql/v1/sql_ut.cpp b/ydb/library/yql/sql/v1/sql_ut.cpp
index d440d2415b0..5a865fe3528 100644
--- a/ydb/library/yql/sql/v1/sql_ut.cpp
+++ b/ydb/library/yql/sql/v1/sql_ut.cpp
@@ -1593,7 +1593,7 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) {
         UNIT_ASSERT(SqlToYql(req).IsOk());
     }
 
-    Y_UNIT_TEST(NoWarnUnionAllWithOrderByWithExplicitLegacyMode) {
+    Y_UNIT_TEST(DenyAnsiOrderByLimitLegacyMode) {
         auto req = "pragma DisableAnsiOrderByLimitInUnionAll;\n"
                    "use plato;\n"
                    "\n"
@@ -1602,38 +1602,8 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) {
                    "select * from Input order by key limit 1;";
 
         auto res = SqlToYql(req);
-        UNIT_ASSERT(res.Root);
-        UNIT_ASSERT_NO_DIFF(Err2Str(res), "<main>:1:8: Warning: Use of deprecated DisableAnsiOrderByLimitInUnionAll pragma. It will be dropped soon, code: 4518\n");
-    }
-
-    Y_UNIT_TEST(WarnUnionAllWithDiscardIntoResultWithExplicitLegacyMode) {
-        auto req = "use plato;\n"
-                   "pragma DisableAnsiOrderByLimitInUnionAll;\n"
-                   "\n"
-                   "select * from Input into result aaa\n"
-                   "union all\n"
-                   "discard select * from Input;";
-
-        auto res = SqlToYql(req);
-        UNIT_ASSERT(res.Root);
-        UNIT_ASSERT_NO_DIFF(Err2Str(res), "<main>:2:8: Warning: Use of deprecated DisableAnsiOrderByLimitInUnionAll pragma. It will be dropped soon, code: 4518\n"
-                                          "<main>:4:21: Warning: INTO RESULT will be ignored here. Please use INTO RESULT after last subquery in UNION ALL if you want label entire UNION ALL result, code: 4522\n"
-                                          "<main>:6:1: Warning: DISCARD will be ignored here. Please use DISCARD before first subquery in UNION ALL if you want to discard entire UNION ALL result, code: 4522\n");
-    }
-
-    Y_UNIT_TEST(WarnUnionAllWithIgnoredOrderByLegacyMode) {
-        auto req = "use plato;\n"
-                   "pragma DisableAnsiOrderByLimitInUnionAll;\n"
-                   "\n"
-                   "SELECT * FROM (\n"
-                   "  SELECT * FROM Input\n"
-                   "  UNION ALL\n"
-                   "  SELECT t.* FROM Input AS t ORDER BY t.key\n"
-                   ");";
-        auto res = SqlToYql(req);
-        UNIT_ASSERT(res.Root);
-        UNIT_ASSERT_NO_DIFF(Err2Str(res), "<main>:2:8: Warning: Use of deprecated DisableAnsiOrderByLimitInUnionAll pragma. It will be dropped soon, code: 4518\n"
-                                          "<main>:7:3: Warning: ORDER BY without LIMIT in subquery will be ignored, code: 4504\n");
+        UNIT_ASSERT(!res.Root);
+        UNIT_ASSERT_NO_DIFF(Err2Str(res), "<main>:1:8: Error: DisableAnsiOrderByLimitInUnionAll pragma is deprecated and no longer supported\n");
     }
 
     Y_UNIT_TEST(ReduceUsingUdfWithShortcutsWorks) {
diff --git a/ydb/library/yql/tests/sql/dq_file/part5/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part5/canondata/result.json
index 40ba37c08db..63bbe3cef69 100644
--- a/ydb/library/yql/tests/sql/dq_file/part5/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part5/canondata/result.json
@@ -5405,35 +5405,6 @@
         }
     ],
     "test.test[union_all-union_all_trivial-default.txt-Results]": [],
-    "test.test[union_all-union_all_with_discard_into_result-default.txt-Analyze]": [
-        {
-            "checksum": "b6ee64e2e7a4cf5459c64322d9148b9a",
-            "size": 4968,
-            "uri": "https://{canondata_backend}/1917492/d983c8e69867e7a5af2aad3db8b5eeebdf959284/resource.tar.gz#test.test_union_all-union_all_with_discard_into_result-default.txt-Analyze_/plan.txt"
-        },
-        {
-            "uri": "file://test.test_union_all-union_all_with_discard_into_result-default.txt-Analyze_/extracted"
-        }
-    ],
-    "test.test[union_all-union_all_with_discard_into_result-default.txt-Debug]": [
-        {
-            "checksum": "47c655780e25eb865a8e300d5dd5f158",
-            "size": 1599,
-            "uri": "https://{canondata_backend}/1917492/d983c8e69867e7a5af2aad3db8b5eeebdf959284/resource.tar.gz#test.test_union_all-union_all_with_discard_into_result-default.txt-Debug_/opt.yql_patched"
-        }
-    ],
-    "test.test[union_all-union_all_with_discard_into_result-default.txt-Plan]": [
-        {
-            "checksum": "b6ee64e2e7a4cf5459c64322d9148b9a",
-            "size": 4968,
-            "uri": "https://{canondata_backend}/1942415/b35d2514a5150e9f12a175bf916b9aef176e9b54/resource.tar.gz#test.test_union_all-union_all_with_discard_into_result-default.txt-Plan_/plan.txt"
-        }
-    ],
-    "test.test[union_all-union_all_with_discard_into_result-default.txt-Results]": [
-        {
-            "uri": "file://test.test_union_all-union_all_with_discard_into_result-default.txt-Results_/extracted"
-        }
-    ],
     "test.test[union_all-union_all_with_limits-default.txt-Analyze]": [
         {
             "checksum": "6947a846cc249a2b38e2c7a01e209a64",
diff --git a/ydb/library/yql/tests/sql/dq_file/part5/canondata/test.test_union_all-union_all_with_discard_into_result-default.txt-Analyze_/extracted b/ydb/library/yql/tests/sql/dq_file/part5/canondata/test.test_union_all-union_all_with_discard_into_result-default.txt-Analyze_/extracted
deleted file mode 100644
index 87b8a1087d7..00000000000
--- a/ydb/library/yql/tests/sql/dq_file/part5/canondata/test.test_union_all-union_all_with_discard_into_result-default.txt-Analyze_/extracted
+++ /dev/null
@@ -1,15 +0,0 @@
-<tmp_path>/program.sql:<main>: Warning: Parse Sql
-
-    <tmp_path>/program.sql:<main>:5:8: Warning: Use of deprecated DisableAnsiOrderByLimitInUnionAll pragma. It will be dropped soon
-    	pragma DisableAnsiOrderByLimitInUnionAll;
-	       ^
-<tmp_path>/program.sql:<main>: Warning: Parse Sql
-
-    <tmp_path>/program.sql:<main>:5:8: Warning: Use of deprecated DisableAnsiOrderByLimitInUnionAll pragma. It will be dropped soon
-    	pragma DisableAnsiOrderByLimitInUnionAll;
-	       ^
-<tmp_path>/program.sql:<main>: Warning: Parse Sql
-
-    <tmp_path>/program.sql:<main>:5:8: Warning: Use of deprecated DisableAnsiOrderByLimitInUnionAll pragma. It will be dropped soon
-    	pragma DisableAnsiOrderByLimitInUnionAll;
-	       ^
\ No newline at end of file
diff --git a/ydb/library/yql/tests/sql/dq_file/part5/canondata/test.test_union_all-union_all_with_discard_into_result-default.txt-Results_/extracted b/ydb/library/yql/tests/sql/dq_file/part5/canondata/test.test_union_all-union_all_with_discard_into_result-default.txt-Results_/extracted
deleted file mode 100644
index 87b8a1087d7..00000000000
--- a/ydb/library/yql/tests/sql/dq_file/part5/canondata/test.test_union_all-union_all_with_discard_into_result-default.txt-Results_/extracted
+++ /dev/null
@@ -1,15 +0,0 @@
-<tmp_path>/program.sql:<main>: Warning: Parse Sql
-
-    <tmp_path>/program.sql:<main>:5:8: Warning: Use of deprecated DisableAnsiOrderByLimitInUnionAll pragma. It will be dropped soon
-    	pragma DisableAnsiOrderByLimitInUnionAll;
-	       ^
-<tmp_path>/program.sql:<main>: Warning: Parse Sql
-
-    <tmp_path>/program.sql:<main>:5:8: Warning: Use of deprecated DisableAnsiOrderByLimitInUnionAll pragma. It will be dropped soon
-    	pragma DisableAnsiOrderByLimitInUnionAll;
-	       ^
-<tmp_path>/program.sql:<main>: Warning: Parse Sql
-
-    <tmp_path>/program.sql:<main>:5:8: Warning: Use of deprecated DisableAnsiOrderByLimitInUnionAll pragma. It will be dropped soon
-    	pragma DisableAnsiOrderByLimitInUnionAll;
-	       ^
\ No newline at end of file
diff --git a/ydb/library/yql/tests/sql/dq_file/part8/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part8/canondata/result.json
index 572ae715cfe..eefdcc73a61 100644
--- a/ydb/library/yql/tests/sql/dq_file/part8/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part8/canondata/result.json
@@ -5570,35 +5570,6 @@
         }
     ],
     "test.test[union_all-union_all_with_parenthesis-default.txt-Results]": [],
-    "test.test[union_all-union_all_with_top_level_limits-default.txt-Analyze]": [
-        {
-            "checksum": "c205197fb58eb3d0b647394c9d6c8dd1",
-            "size": 4430,
-            "uri": "https://{canondata_backend}/1784117/057de7157c05b789acc46697650e0ed4485e7764/resource.tar.gz#test.test_union_all-union_all_with_top_level_limits-default.txt-Analyze_/plan.txt"
-        },
-        {
-            "uri": "file://test.test_union_all-union_all_with_top_level_limits-default.txt-Analyze_/extracted"
-        }
-    ],
-    "test.test[union_all-union_all_with_top_level_limits-default.txt-Debug]": [
-        {
-            "checksum": "a93f54ef0f43846fe74f16fb1e156d74",
-            "size": 1550,
-            "uri": "https://{canondata_backend}/1784117/057de7157c05b789acc46697650e0ed4485e7764/resource.tar.gz#test.test_union_all-union_all_with_top_level_limits-default.txt-Debug_/opt.yql_patched"
-        }
-    ],
-    "test.test[union_all-union_all_with_top_level_limits-default.txt-Plan]": [
-        {
-            "checksum": "c205197fb58eb3d0b647394c9d6c8dd1",
-            "size": 4430,
-            "uri": "https://{canondata_backend}/1784117/057de7157c05b789acc46697650e0ed4485e7764/resource.tar.gz#test.test_union_all-union_all_with_top_level_limits-default.txt-Plan_/plan.txt"
-        }
-    ],
-    "test.test[union_all-union_all_with_top_level_limits-default.txt-Results]": [
-        {
-            "uri": "file://test.test_union_all-union_all_with_top_level_limits-default.txt-Results_/extracted"
-        }
-    ],
     "test.test[view-file_eval--Results]": [
         {
             "uri": "file://test.test_view-file_eval--Results_/extracted"
diff --git a/ydb/library/yql/tests/sql/dq_file/part8/canondata/test.test_union_all-union_all_with_top_level_limits-default.txt-Analyze_/extracted b/ydb/library/yql/tests/sql/dq_file/part8/canondata/test.test_union_all-union_all_with_top_level_limits-default.txt-Analyze_/extracted
deleted file mode 100644
index 87b8a1087d7..00000000000
--- a/ydb/library/yql/tests/sql/dq_file/part8/canondata/test.test_union_all-union_all_with_top_level_limits-default.txt-Analyze_/extracted
+++ /dev/null
@@ -1,15 +0,0 @@
-<tmp_path>/program.sql:<main>: Warning: Parse Sql
-
-    <tmp_path>/program.sql:<main>:5:8: Warning: Use of deprecated DisableAnsiOrderByLimitInUnionAll pragma. It will be dropped soon
-    	pragma DisableAnsiOrderByLimitInUnionAll;
-	       ^
-<tmp_path>/program.sql:<main>: Warning: Parse Sql
-
-    <tmp_path>/program.sql:<main>:5:8: Warning: Use of deprecated DisableAnsiOrderByLimitInUnionAll pragma. It will be dropped soon
-    	pragma DisableAnsiOrderByLimitInUnionAll;
-	       ^
-<tmp_path>/program.sql:<main>: Warning: Parse Sql
-
-    <tmp_path>/program.sql:<main>:5:8: Warning: Use of deprecated DisableAnsiOrderByLimitInUnionAll pragma. It will be dropped soon
-    	pragma DisableAnsiOrderByLimitInUnionAll;
-	       ^
\ No newline at end of file
diff --git a/ydb/library/yql/tests/sql/dq_file/part8/canondata/test.test_union_all-union_all_with_top_level_limits-default.txt-Results_/extracted b/ydb/library/yql/tests/sql/dq_file/part8/canondata/test.test_union_all-union_all_with_top_level_limits-default.txt-Results_/extracted
deleted file mode 100644
index 87b8a1087d7..00000000000
--- a/ydb/library/yql/tests/sql/dq_file/part8/canondata/test.test_union_all-union_all_with_top_level_limits-default.txt-Results_/extracted
+++ /dev/null
@@ -1,15 +0,0 @@
-<tmp_path>/program.sql:<main>: Warning: Parse Sql
-
-    <tmp_path>/program.sql:<main>:5:8: Warning: Use of deprecated DisableAnsiOrderByLimitInUnionAll pragma. It will be dropped soon
-    	pragma DisableAnsiOrderByLimitInUnionAll;
-	       ^
-<tmp_path>/program.sql:<main>: Warning: Parse Sql
-
-    <tmp_path>/program.sql:<main>:5:8: Warning: Use of deprecated DisableAnsiOrderByLimitInUnionAll pragma. It will be dropped soon
-    	pragma DisableAnsiOrderByLimitInUnionAll;
-	       ^
-<tmp_path>/program.sql:<main>: Warning: Parse Sql
-
-    <tmp_path>/program.sql:<main>:5:8: Warning: Use of deprecated DisableAnsiOrderByLimitInUnionAll pragma. It will be dropped soon
-    	pragma DisableAnsiOrderByLimitInUnionAll;
-	       ^
\ No newline at end of file
diff --git a/ydb/library/yql/tests/sql/sql2yql/canondata/result.json b/ydb/library/yql/tests/sql/sql2yql/canondata/result.json
index c192e9b3747..ed4c6e894e4 100644
--- a/ydb/library/yql/tests/sql/sql2yql/canondata/result.json
+++ b/ydb/library/yql/tests/sql/sql2yql/canondata/result.json
@@ -15861,13 +15861,6 @@
             "uri": "https://{canondata_backend}/1936947/659b615f15086142a8960946dabd06b519d43335/resource.tar.gz#test_sql2yql.test_union_all-union_all_trivial_/sql.yql"
         }
     ],
-    "test_sql2yql.test[union_all-union_all_with_discard_into_result]": [
-        {
-            "checksum": "778c276b749c389dc6be7c3fbf0ea255",
-            "size": 3225,
-            "uri": "https://{canondata_backend}/1936947/659b615f15086142a8960946dabd06b519d43335/resource.tar.gz#test_sql2yql.test_union_all-union_all_with_discard_into_result_/sql.yql"
-        }
-    ],
     "test_sql2yql.test[union_all-union_all_with_discard_into_result_ansi]": [
         {
             "checksum": "778c276b749c389dc6be7c3fbf0ea255",
@@ -15889,13 +15882,6 @@
             "uri": "https://{canondata_backend}/1936947/659b615f15086142a8960946dabd06b519d43335/resource.tar.gz#test_sql2yql.test_union_all-union_all_with_parenthesis_/sql.yql"
         }
     ],
-    "test_sql2yql.test[union_all-union_all_with_top_level_limits]": [
-        {
-            "checksum": "d444dafad497df18d0abcf00c694a05c",
-            "size": 2453,
-            "uri": "https://{canondata_backend}/1936947/659b615f15086142a8960946dabd06b519d43335/resource.tar.gz#test_sql2yql.test_union_all-union_all_with_top_level_limits_/sql.yql"
-        }
-    ],
     "test_sql2yql.test[union_all-union_all_with_top_level_limits_ansi]": [
         {
             "checksum": "d45172932beb2e7d3e67d0f90c885846",
@@ -30631,13 +30617,6 @@
             "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_union_all-union_all_trivial_/formatted.sql"
         }
     ],
-    "test_sql_format.test[union_all-union_all_with_discard_into_result]": [
-        {
-            "checksum": "abc9ff2a94c52456ad47808b6259440b",
-            "size": 242,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_union_all-union_all_with_discard_into_result_/formatted.sql"
-        }
-    ],
     "test_sql_format.test[union_all-union_all_with_discard_into_result_ansi]": [
         {
             "checksum": "3306d164909d9468e13ce08ced46266d",
@@ -30659,13 +30638,6 @@
             "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_union_all-union_all_with_parenthesis_/formatted.sql"
         }
     ],
-    "test_sql_format.test[union_all-union_all_with_top_level_limits]": [
-        {
-            "checksum": "fb0f98922018b4dd6e571d824cb32acb",
-            "size": 250,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_union_all-union_all_with_top_level_limits_/formatted.sql"
-        }
-    ],
     "test_sql_format.test[union_all-union_all_with_top_level_limits_ansi]": [
         {
             "checksum": "35216ec4d3f9fa5744aa11a4bc88ef3e",
@@ -32171,6 +32143,13 @@
             "uri": "https://{canondata_backend}/1936997/f4bbe2471ffe783d223031755d813351406a3697/resource.tar.gz#test_sql_negative.test_udf-named_args_for_script_with_wrong_order-default.txt_/err_file_v1.out"
         }
     ],
+    "test_sql_negative.test[union_all-union_all_with_top_level_limits-default.txt]": [
+        {
+            "checksum": "cef00afbcdfa2a07b6b3724865dc1a22",
+            "size": 161,
+            "uri": "https://{canondata_backend}/1942173/79b1ce458deca8dbc4c2b729963a9f308a1a24ac/resource.tar.gz#test_sql_negative.test_union_all-union_all_with_top_level_limits-default.txt_/err_file.out"
+        }
+    ],
     "test_sql_negative.test[weak_field-weak_field_join_no_src-default.txt]": [
         {
             "checksum": "3a0d55db3a3f6e446904e78518f765d5",
diff --git a/ydb/library/yql/tests/sql/suites/union_all/union_all_with_discard_into_result.sql b/ydb/library/yql/tests/sql/suites/union_all/union_all_with_discard_into_result.sql
deleted file mode 100644
index 7a4cb50af05..00000000000
--- a/ydb/library/yql/tests/sql/suites/union_all/union_all_with_discard_into_result.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-/* syntax version 1 */
-/* postgres can not */
-
-use plato;
-pragma DisableAnsiOrderByLimitInUnionAll;
-
-select * from Input
-union all
-select * from Input into result aaa;
-
-discard
-select * from Input
-union all
-select * from Input;
diff --git a/ydb/library/yql/tests/sql/suites/union_all/union_all_with_top_level_limits.sql b/ydb/library/yql/tests/sql/suites/union_all/union_all_with_top_level_limits.sqlx
index 261bf97a83e..261bf97a83e 100644
--- a/ydb/library/yql/tests/sql/suites/union_all/union_all_with_top_level_limits.sql
+++ b/ydb/library/yql/tests/sql/suites/union_all/union_all_with_top_level_limits.sqlx
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part5/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part5/canondata/result.json
index 3179c094c3f..0be9637f385 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part5/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part5/canondata/result.json
@@ -5007,30 +5007,6 @@
             "uri": "https://{canondata_backend}/1937150/b466c661905bdae484e68f0651bb2615aefc377c/resource.tar.gz#test.test_union_all-union_all_trivial-default.txt-Results_/results.txt"
         }
     ],
-    "test.test[union_all-union_all_with_discard_into_result-default.txt-Debug]": [
-        {
-            "checksum": "ec9213943d802859094dca8b89be367d",
-            "size": 1036,
-            "uri": "https://{canondata_backend}/1900335/f6b43bac88c9eedace0e625fc88e352465a42191/resource.tar.gz#test.test_union_all-union_all_with_discard_into_result-default.txt-Debug_/opt.yql"
-        }
-    ],
-    "test.test[union_all-union_all_with_discard_into_result-default.txt-Plan]": [
-        {
-            "checksum": "24259695dcd25b206f942b7e4e8e333c",
-            "size": 3097,
-            "uri": "https://{canondata_backend}/1937150/b466c661905bdae484e68f0651bb2615aefc377c/resource.tar.gz#test.test_union_all-union_all_with_discard_into_result-default.txt-Plan_/plan.txt"
-        }
-    ],
-    "test.test[union_all-union_all_with_discard_into_result-default.txt-Results]": [
-        {
-            "checksum": "9efb6e014fe4bc6435aee93394380d89",
-            "size": 2217,
-            "uri": "https://{canondata_backend}/1937150/b466c661905bdae484e68f0651bb2615aefc377c/resource.tar.gz#test.test_union_all-union_all_with_discard_into_result-default.txt-Results_/results.txt"
-        },
-        {
-            "uri": "file://test.test_union_all-union_all_with_discard_into_result-default.txt-Results_/extracted"
-        }
-    ],
     "test.test[union_all-union_all_with_limits-default.txt-Debug]": [
         {
             "checksum": "09d3fa7b53f159a8cdba40df5c316e9b",
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part5/canondata/test.test_union_all-union_all_with_discard_into_result-default.txt-Results_/extracted b/ydb/library/yql/tests/sql/yt_native_file/part5/canondata/test.test_union_all-union_all_with_discard_into_result-default.txt-Results_/extracted
deleted file mode 100644
index 95823d96bac..00000000000
--- a/ydb/library/yql/tests/sql/yt_native_file/part5/canondata/test.test_union_all-union_all_with_discard_into_result-default.txt-Results_/extracted
+++ /dev/null
@@ -1,5 +0,0 @@
-<tmp_path>/program.sql:<main>: Warning: Parse Sql
-
-    <tmp_path>/program.sql:<main>:5:8: Warning: Use of deprecated DisableAnsiOrderByLimitInUnionAll pragma. It will be dropped soon
-    	pragma DisableAnsiOrderByLimitInUnionAll;
-	       ^
\ No newline at end of file
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part8/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part8/canondata/result.json
index 7f557116275..ef63ce113ed 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part8/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part8/canondata/result.json
@@ -4929,30 +4929,6 @@
             "uri": "https://{canondata_backend}/1900335/4871e48d29e4933514d3ed0c9c5d19de571eda1f/resource.tar.gz#test.test_union_all-union_all_with_parenthesis-default.txt-Results_/results.txt"
         }
     ],
-    "test.test[union_all-union_all_with_top_level_limits-default.txt-Debug]": [
-        {
-            "checksum": "43fe2e6b1f08e0cb1ef90abf4112e387",
-            "size": 1380,
-            "uri": "https://{canondata_backend}/1781765/de147e1386c9b98546ba3e14eb71ae4a038b981c/resource.tar.gz#test.test_union_all-union_all_with_top_level_limits-default.txt-Debug_/opt.yql"
-        }
-    ],
-    "test.test[union_all-union_all_with_top_level_limits-default.txt-Plan]": [
-        {
-            "checksum": "3a72baf0c1032d2e1b3c713096d8873e",
-            "size": 5161,
-            "uri": "https://{canondata_backend}/1900335/4871e48d29e4933514d3ed0c9c5d19de571eda1f/resource.tar.gz#test.test_union_all-union_all_with_top_level_limits-default.txt-Plan_/plan.txt"
-        }
-    ],
-    "test.test[union_all-union_all_with_top_level_limits-default.txt-Results]": [
-        {
-            "checksum": "5b53edff6d8f7dd8cbcdd120f139f5dd",
-            "size": 1924,
-            "uri": "https://{canondata_backend}/1900335/4871e48d29e4933514d3ed0c9c5d19de571eda1f/resource.tar.gz#test.test_union_all-union_all_with_top_level_limits-default.txt-Results_/results.txt"
-        },
-        {
-            "uri": "file://test.test_union_all-union_all_with_top_level_limits-default.txt-Results_/extracted"
-        }
-    ],
     "test.test[view-file_eval--Debug]": [],
     "test.test[view-file_eval--Plan]": [],
     "test.test[view-file_eval--Results]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part8/canondata/test.test_union_all-union_all_with_top_level_limits-default.txt-Results_/extracted b/ydb/library/yql/tests/sql/yt_native_file/part8/canondata/test.test_union_all-union_all_with_top_level_limits-default.txt-Results_/extracted
deleted file mode 100644
index 95823d96bac..00000000000
--- a/ydb/library/yql/tests/sql/yt_native_file/part8/canondata/test.test_union_all-union_all_with_top_level_limits-default.txt-Results_/extracted
+++ /dev/null
@@ -1,5 +0,0 @@
-<tmp_path>/program.sql:<main>: Warning: Parse Sql
-
-    <tmp_path>/program.sql:<main>:5:8: Warning: Use of deprecated DisableAnsiOrderByLimitInUnionAll pragma. It will be dropped soon
-    	pragma DisableAnsiOrderByLimitInUnionAll;
-	       ^
\ No newline at end of file