Skip to content
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

Merge fix delete on queries with default values #2569

Merged
merged 1 commit into from
Mar 8, 2024
Merged

Merge fix delete on queries with default values #2569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ydb/core/kqp/provider/yql_kikimr_type_ann.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ class TKiSinkTypeAnnotationTransformer : public TKiSinkVisitorTransformer
continue;
}

if (op == TYdbOperation::UpdateOn) {
if (op == TYdbOperation::UpdateOn || op == TYdbOperation::DeleteOn) {
continue;
}

Expand Down
93 changes: 93 additions & 0 deletions ydb/core/kqp/ut/scheme/kqp_constraints_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,99 @@ Y_UNIT_TEST_SUITE(KqpConstraints) {
TestSerialType("serial8");
}

Y_UNIT_TEST(DefaultsAndDeleteAndUpdate) {
NKikimrConfig::TAppConfig appConfig;
appConfig.MutableTableServiceConfig()->SetEnableSequences(false);
appConfig.MutableTableServiceConfig()->SetEnableColumnsWithDefault(true);
auto serverSettings = TKikimrSettings().SetAppConfig(appConfig);
TKikimrRunner kikimr(serverSettings);
auto db = kikimr.GetTableClient();
auto session = db.CreateSession().GetValueSync().GetSession();

{
auto query = R"(
--!syntax_v1
CREATE TABLE `/Root/DefaultsAndDeleteAndUpdate` (
Key Int32,
Value String DEFAULT "somestring",
PRIMARY KEY (Key)
);
)";

auto result = session.ExecuteSchemeQuery(query).GetValueSync();
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS,
result.GetIssues().ToString());
}

{
TString query = R"(
UPSERT INTO `/Root/DefaultsAndDeleteAndUpdate` (Key) VALUES (1), (2), (3), (4);
)";

NYdb::NTable::TExecDataQuerySettings execSettings;
execSettings.KeepInQueryCache(true);
execSettings.CollectQueryStats(ECollectQueryStatsMode::Basic);

auto result =
session
.ExecuteDataQuery(query, TTxControl::BeginTx().CommitTx(),
execSettings)
.ExtractValueSync();

UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS,
result.GetIssues().ToString());
}

{
TString query = R"(
SELECT * FROM `/Root/DefaultsAndDeleteAndUpdate`;
)";

NYdb::NTable::TExecDataQuerySettings execSettings;
execSettings.KeepInQueryCache(true);
execSettings.CollectQueryStats(ECollectQueryStatsMode::Basic);

auto result =
session
.ExecuteDataQuery(query, TTxControl::BeginTx().CommitTx(),
execSettings)
.ExtractValueSync();

UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS,
result.GetIssues().ToString());
CompareYson(R"(
[
[[1];["somestring"]];
[[2];["somestring"]];
[[3];["somestring"]];
[[4];["somestring"]]
]
)",
NYdb::FormatResultSetYson(result.GetResultSet(0)));
}

{
TString query = R"(
$object_pk = <|Key:1|>;
DELETE FROM `/Root/DefaultsAndDeleteAndUpdate` ON
SELECT * FROM AS_TABLE(AsList($object_pk));
)";

NYdb::NTable::TExecDataQuerySettings execSettings;
execSettings.KeepInQueryCache(true);
execSettings.CollectQueryStats(ECollectQueryStatsMode::Basic);

auto result =
session
.ExecuteDataQuery(query, TTxControl::BeginTx().CommitTx(),
execSettings)
.ExtractValueSync();

UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS,
result.GetIssues().ToString());
}
}

Y_UNIT_TEST(AlterTableAddColumnWithDefaultValue) {
NKikimrConfig::TAppConfig appConfig;
appConfig.MutableTableServiceConfig()->SetEnableSequences(false);
Expand Down
Loading