Skip to content

Commit e308931

Browse files
committed
Enable antlr4 parser by default (#12737)
1 parent 7d944e3 commit e308931

File tree

7 files changed

+106
-98
lines changed

7 files changed

+106
-98
lines changed

ydb/core/kqp/ut/indexes/kqp_indexes_ut.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4046,8 +4046,8 @@ R"([[#;#;["Primary1"];[41u]];[["Secondary2"];[2u];["Primary2"];[42u]];[["Seconda
40464046
query,
40474047
TTxControl::BeginTx(TTxSettings::SerializableRW()).CommitTx())
40484048
.ExtractValueSync();
4049-
UNIT_ASSERT(result.GetIssues().ToString().contains("Unexpected token"));
40504049
UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), NYdb::EStatus::GENERIC_ERROR);
4050+
UNIT_ASSERT_STRING_CONTAINS_C(result.GetIssues().ToString(), "mismatched input", result.GetIssues().ToString());
40514051
}
40524052

40534053
{
@@ -4059,8 +4059,8 @@ R"([[#;#;["Primary1"];[41u]];[["Secondary2"];[2u];["Primary2"];[42u]];[["Seconda
40594059
query,
40604060
TTxControl::BeginTx(TTxSettings::SerializableRW()).CommitTx())
40614061
.ExtractValueSync();
4062-
UNIT_ASSERT(result.GetIssues().ToString().contains("Unexpected token"));
40634062
UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), NYdb::EStatus::GENERIC_ERROR);
4063+
UNIT_ASSERT_STRING_CONTAINS_C(result.GetIssues().ToString(), "mismatched input", result.GetIssues().ToString());
40644064
}
40654065

40664066
{
@@ -4072,8 +4072,8 @@ R"([[#;#;["Primary1"];[41u]];[["Secondary2"];[2u];["Primary2"];[42u]];[["Seconda
40724072
query,
40734073
TTxControl::BeginTx(TTxSettings::SerializableRW()).CommitTx())
40744074
.ExtractValueSync();
4075-
UNIT_ASSERT(result.GetIssues().ToString().contains("Unexpected token"));
40764075
UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), NYdb::EStatus::GENERIC_ERROR);
4076+
UNIT_ASSERT_STRING_CONTAINS_C(result.GetIssues().ToString(), "mismatched input", result.GetIssues().ToString());
40774077
}
40784078

40794079
{
@@ -4085,8 +4085,8 @@ R"([[#;#;["Primary1"];[41u]];[["Secondary2"];[2u];["Primary2"];[42u]];[["Seconda
40854085
query,
40864086
TTxControl::BeginTx(TTxSettings::SerializableRW()).CommitTx())
40874087
.ExtractValueSync();
4088-
UNIT_ASSERT(result.GetIssues().ToString().contains("Unexpected token"));
40894088
UNIT_ASSERT_VALUES_EQUAL(result.GetStatus(), NYdb::EStatus::GENERIC_ERROR);
4089+
UNIT_ASSERT_STRING_CONTAINS_C(result.GetIssues().ToString(), "mismatched input", result.GetIssues().ToString());
40904090
}
40914091

40924092
}

ydb/core/kqp/ut/query/kqp_query_ut.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1968,7 +1968,7 @@ Y_UNIT_TEST_SUITE(KqpQuery) {
19681968
SELECT * FROM `/Root/RowSrc`;
19691969
)", NYdb::NQuery::TTxControl::NoTx()).ExtractValueSync();
19701970
UNIT_ASSERT_C(!result.IsSuccess(), result.GetIssues().ToString());
1971-
UNIT_ASSERT_STRING_CONTAINS_C(result.GetIssues().ToString(), "Unexpected token", result.GetIssues().ToString());
1971+
UNIT_ASSERT_STRING_CONTAINS_C(result.GetIssues().ToString(), "no viable alternative at input 'CREATE IF'", result.GetIssues().ToString());
19721972
}
19731973

19741974
{
@@ -1981,7 +1981,7 @@ Y_UNIT_TEST_SUITE(KqpQuery) {
19811981
SELECT * FROM `/Root/RowSrc`;
19821982
)", NYdb::NQuery::TTxControl::NoTx()).ExtractValueSync();
19831983
UNIT_ASSERT_C(!result.IsSuccess(), result.GetIssues().ToString());
1984-
UNIT_ASSERT_STRING_CONTAINS_C(result.GetIssues().ToString(), "Unexpected token", result.GetIssues().ToString());
1984+
UNIT_ASSERT_STRING_CONTAINS_C(result.GetIssues().ToString(), "extraneous input", result.GetIssues().ToString());
19851985
}
19861986

19871987
{

0 commit comments

Comments
 (0)