diff options
| author | ssmike <[email protected]> | 2023-12-06 21:48:43 +0300 |
|---|---|---|
| committer | ssmike <[email protected]> | 2023-12-06 23:58:50 +0300 |
| commit | 50525833ed09067aa2f03551c08a54f7a839c2b7 (patch) | |
| tree | 52c13ed2a435d039bead795cb603674455d16643 | |
| parent | 40302d2a5a8b044cc96c75e956916c2a18ad4fdb (diff) | |
Change primary marker KIKIMR-10864
| -rw-r--r-- | ydb/core/kqp/ut/opt/kqp_ne_ut.cpp | 2 | ||||
| -rw-r--r-- | ydb/library/yql/sql/v1/SQLv1.g.in | 2 | ||||
| -rw-r--r-- | ydb/library/yql/sql/v1/query.cpp | 2 | ||||
| -rw-r--r-- | ydb/library/yql/sql/v1/sql_ut.cpp | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/ydb/core/kqp/ut/opt/kqp_ne_ut.cpp b/ydb/core/kqp/ut/opt/kqp_ne_ut.cpp index 4eff74a2def..89b2f10a182 100644 --- a/ydb/core/kqp/ut/opt/kqp_ne_ut.cpp +++ b/ydb/core/kqp/ut/opt/kqp_ne_ut.cpp @@ -3896,7 +3896,7 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) { auto result = session.ExecuteDataQuery(R"( --!syntax_v1 - SELECT * FROM `/Root/SecondaryKeys` VIEW @primary WHERE Fk <= 1; + SELECT * FROM `/Root/SecondaryKeys` VIEW PRIMARY KEY WHERE Fk <= 1; )", TTxControl::BeginTx(TTxSettings::SerializableRW()), querySettings).GetValueSync(); AssertSuccessResult(result); AssertTableReads(result, "/Root/SecondaryKeys/Index/indexImplTable", 0); diff --git a/ydb/library/yql/sql/v1/SQLv1.g.in b/ydb/library/yql/sql/v1/SQLv1.g.in index 294f1b57251..fe76d2246ad 100644 --- a/ydb/library/yql/sql/v1/SQLv1.g.in +++ b/ydb/library/yql/sql/v1/SQLv1.g.in @@ -1013,7 +1013,7 @@ an_id_hint: id_hint | STRING_VALUE; an_id_pure: identifier | STRING_VALUE; an_id_as_compat: id_as_compat | STRING_VALUE; -view_name: an_id | AT PRIMARY; +view_name: an_id | PRIMARY KEY; opt_id_prefix: (an_id DOT)?; cluster_expr: (an_id COLON)? (pure_column_or_named | ASTERISK); diff --git a/ydb/library/yql/sql/v1/query.cpp b/ydb/library/yql/sql/v1/query.cpp index c0414b919e1..7e23082d760 100644 --- a/ydb/library/yql/sql/v1/query.cpp +++ b/ydb/library/yql/sql/v1/query.cpp @@ -17,7 +17,7 @@ namespace NSQLTranslationV1 { bool ValidateView(TPosition pos, TContext& ctx, TStringBuf service, TViewDescription& view) { if (view.PrimaryFlag && !(service == KikimrProviderName || service == YdbProviderName)) { - ctx.Error(pos) << "@primary is not supported for " << service << " tables"; + ctx.Error(pos) << "primary view is not supported for " << service << " tables"; return false; } return true; diff --git a/ydb/library/yql/sql/v1/sql_ut.cpp b/ydb/library/yql/sql/v1/sql_ut.cpp index 053d69a1604..9b0b0aca436 100644 --- a/ydb/library/yql/sql/v1/sql_ut.cpp +++ b/ydb/library/yql/sql/v1/sql_ut.cpp @@ -1152,7 +1152,7 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) { Y_UNIT_TEST(UnionAggregationTest) { NYql::TAstParseResult res = SqlToYql(R"( - SELECT 1 + SELECT 1 UNION ALL SELECT 1 UNION ALL SELECT 1 UNION ALL SELECT 1 UNION @@ -3197,9 +3197,9 @@ Y_UNIT_TEST_SUITE(SqlToYQLErrors) { } Y_UNIT_TEST(PrimaryViewAbortMapReduce) { - NYql::TAstParseResult res = SqlToYql("SELECT key FROM plato.Input VIEW @primary"); + NYql::TAstParseResult res = SqlToYql("SELECT key FROM plato.Input VIEW PRIMARY KEY"); UNIT_ASSERT(!res.Root); - UNIT_ASSERT_NO_DIFF(Err2Str(res), "<main>:1:17: Error: @primary is not supported for yt tables\n"); + UNIT_ASSERT_NO_DIFF(Err2Str(res), "<main>:1:17: Error: primary view is not supported for yt tables\n"); } Y_UNIT_TEST(InsertAbortMapReduce) { |