Allow writes in generic query. ()

2 files changed, 14 insertions, 9 deletions

diff --git a/ydb/core/kqp/host/kqp_runner.cpp b/ydb/core/kqp/host/kqp_runner.cpp
index 5f3cfbca78..d9f7c0fe34 100644
--- a/ydb/core/kqp/host/kqp_runner.cpp
+++ b/ydb/core/kqp/host/kqp_runner.cpp
@@ -185,15 +185,6 @@ public:
         YQL_ENSURE(TMaybeNode<TKiDataQueryBlocks>(query));
 
         TKiDataQueryBlocks dataQueryBlocks(query);
-        YQL_ENSURE(dataQueryBlocks.ArgCount() == 1);
-
-        const auto& queryBlock = dataQueryBlocks.Arg(0);
-        if (queryBlock.Effects().ArgCount() > 0) {
-            ctx.AddError(YqlIssue(ctx.GetPosition(dataQueryBlocks.Pos()), TIssuesIds::KIKIMR_PRECONDITION_FAILED,
-                "Data modifications not yet supported."));
-            return MakeKikimrResultHolder(ResultFromErrors<IKqpHost::TQueryResult>(ctx.IssueManager.GetIssues()));
-        }
-
         return PrepareQueryInternal(cluster, dataQueryBlocks, ctx, settings);
     }
 
diff --git a/ydb/core/kqp/ut/service/kqp_query_service_ut.cpp b/ydb/core/kqp/ut/service/kqp_query_service_ut.cpp
index ee2d91884b..13daa1c6de 100644
--- a/ydb/core/kqp/ut/service/kqp_query_service_ut.cpp
+++ b/ydb/core/kqp/ut/service/kqp_query_service_ut.cpp
@@ -167,6 +167,20 @@ Y_UNIT_TEST_SUITE(KqpQueryService) {
         CompareYson(R"([[6u]])", FormatResultSetYson(result.GetResultSet(1)));
     }
 
+    Y_UNIT_TEST(ExecuteQueryWrite) {
+        auto kikimr = DefaultKikimrRunner();
+        auto db = kikimr.GetQueryClient();
+
+        auto result = db.ExecuteQuery(R"(
+            UPSERT INTO TwoShard (Key, Value2) VALUES(0, 101);
+
+            SELECT Value2 FROM TwoShard WHERE Key = 0;
+        )", TTxControl::BeginTx().CommitTx()).ExtractValueSync();
+        UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
+
+        CompareYson(R"([[[101]]])", FormatResultSetYson(result.GetResultSet(0)));
+    }
+
     Y_UNIT_TEST(ExplainQuery) {
         auto kikimr = DefaultKikimrRunner();
         auto db = kikimr.GetQueryClient();