From dffc12acf95248fe644c7a64a71abcd5467b4bf8 Mon Sep 17 00:00:00 2001
From: Aleksey Myasnikov <asmyasnikov@ydb.tech>
Date: Wed, 18 Dec 2024 00:17:06 +0300
Subject: [PATCH] Enabled by default enable_antlr4_parser feature-flag for ydb
 tests and local-ydb docker image (#11880)

---
 ydb/tests/fq/s3/test_ydb_over_fq.py                  | 2 +-
 ydb/tests/fq/yds/test_select_1.py                    | 2 +-
 ydb/tests/library/harness/resources/default_yaml.yml | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ydb/tests/fq/s3/test_ydb_over_fq.py b/ydb/tests/fq/s3/test_ydb_over_fq.py
index 571b352acc42..0b48b9c2310b 100644
--- a/ydb/tests/fq/s3/test_ydb_over_fq.py
+++ b/ydb/tests/fq/s3/test_ydb_over_fq.py
@@ -292,7 +292,7 @@ def test_execute_data_query_error(self, kikimr, s3, client, unique_prefix, yq_ve
         with session.transaction() as tx:
             assert_that(
                 calling(tx.execute).with_args("BAD QUERY"),
-                raises(ydb.issues.InternalError, "Unexpected token .* : cannot match to any predicted input"),
+                raises(ydb.issues.InternalError, "(mismatched input .* expecting)|(Unexpected token .* : cannot match to any predicted input)"),
             )
         with session.transaction() as tx:
             query = "select * from {}{}".format("bindings." if yq_version == "v1" else "", "WRONG_BIND")
diff --git a/ydb/tests/fq/yds/test_select_1.py b/ydb/tests/fq/yds/test_select_1.py
index 782b84bcd1a5..27255da7bde4 100644
--- a/ydb/tests/fq/yds/test_select_1.py
+++ b/ydb/tests/fq/yds/test_select_1.py
@@ -118,7 +118,7 @@ def test_compile_error(self, client, yq_version):
         assert (
             "Query failed with code " + ("ABORTED" if yq_version == "v1" else "GENERIC_ERROR") in describe_string
         ), describe_string
-        assert "Unexpected token" in describe_string, describe_string
+        assert "extraneous input" in describe_string or "Unexpected token" in describe_string, describe_string
         # Failed to parse query is added in YQv1 only
         if yq_version == "v1":
             assert "Failed to parse query" in describe_string, describe_string
diff --git a/ydb/tests/library/harness/resources/default_yaml.yml b/ydb/tests/library/harness/resources/default_yaml.yml
index fc157171501d..11112c4c3616 100644
--- a/ydb/tests/library/harness/resources/default_yaml.yml
+++ b/ydb/tests/library/harness/resources/default_yaml.yml
@@ -160,6 +160,7 @@ feature_flags:
   enable_persistent_query_stats: true
   enable_scheme_transactions_at_scheme_shard: true
   enable_mvcc_snapshot_reads: true
+  enable_antlr4_parser: true
 kqpconfig:
   settings:
   - name: "_ResultRowsLimit"