Skip to content

fix columns order in returning list #6861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 19, 2024
Merged

fix columns order in returning list #6861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9173720
fix columns order
ssmike Jul 19, 2024
aa4c5fc
add query service based test
ssmike Jul 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions ydb/core/kqp/provider/yql_kikimr_opt_build.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,9 @@ bool ExploreTx(TExprBase node, TExprContext& ctx, const TKiDataSink& dataSink, T
.Update(node)
.Columns(write.ReturningColumns())
.Build()
.Settings().Build()
.Settings()
.Add().Name().Value("columns").Build().Value(write.ReturningColumns()).Build()
.Build()
.Done());
}

Expand Down Expand Up @@ -491,7 +493,9 @@ bool ExploreTx(TExprBase node, TExprContext& ctx, const TKiDataSink& dataSink, T
.Update(node)
.Columns(update.ReturningColumns())
.Build()
.Settings().Build()
.Settings()
.Add().Name().Value("columns").Build().Value(update.ReturningColumns()).Build()
.Build()
.Done());
}

Expand Down Expand Up @@ -524,7 +528,9 @@ bool ExploreTx(TExprBase node, TExprContext& ctx, const TKiDataSink& dataSink, T
.Update(node)
.Columns(del.ReturningColumns())
.Build()
.Settings().Build()
.Settings()
.Add().Name().Value("columns").Build().Value(del.ReturningColumns()).Build()
.Build()
.Done());
}

Expand Down
40 changes: 40 additions & 0 deletions ydb/core/kqp/ut/opt/kqp_returning_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,46 @@ Y_UNIT_TEST(ReturningSerial) {
}
}

Y_UNIT_TEST(ReturningColumnsOrder) {
auto kikimr = DefaultKikimrRunner();

auto client = kikimr.GetTableClient();
auto session = client.CreateSession().GetValueSync().GetSession();
auto db = kikimr.GetQueryClient();

const auto queryCreate = Q_(R"(
CREATE TABLE test1 (id Int32, v Text, PRIMARY KEY(id));
)");

auto resultCreate = session.ExecuteSchemeQuery(queryCreate).GetValueSync();
UNIT_ASSERT_C(resultCreate.IsSuccess(), resultCreate.GetIssues().ToString());

{
const auto query = Q_(R"(
UPSERT INTO test1 (id, v) VALUES (1, '321') RETURNING id, v;
REPLACE INTO test1 (id, v) VALUES (1, '111') RETURNING v, id;
)");

auto result = session.ExecuteDataQuery(query, TTxControl::BeginTx().CommitTx()).GetValueSync();
UNIT_ASSERT(result.IsSuccess());
CompareYson(R"([[[1];["321"]]])", FormatResultSetYson(result.GetResultSet(0)));
CompareYson(R"([[["111"];[1]]])", FormatResultSetYson(result.GetResultSet(1)));
}

auto settings = NYdb::NQuery::TExecuteQuerySettings()
.Syntax(NYdb::NQuery::ESyntax::YqlV1);
{
auto result = db.ExecuteQuery(R"(
UPSERT INTO test1 (id, v) VALUES (1, '321') RETURNING id, v;
REPLACE INTO test1 (id, v) VALUES (1, '111') RETURNING v, id;
)", NYdb::NQuery::TTxControl::BeginTx().CommitTx(), settings).ExtractValueSync();
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
CompareYson(R"([[[1];["321"]]])", FormatResultSetYson(result.GetResultSet(0)));
CompareYson(R"([[["111"];[1]]])", FormatResultSetYson(result.GetResultSet(1)));
}

}

Y_UNIT_TEST(ReturningTypes) {
auto kikimr = DefaultKikimrRunner();

Expand Down