Fixes

Author: shnikd

ydb/core/kqp/provider/yql_kikimr_type_ann.cpp

@@ -164,6 +164,17 @@ class TKiSourceTypeAnnotationTransformer : public TKiSourceVisitorTransformer {
 
                 auto listSelectType = ctx.MakeType<TListExprType>(selectType);
 
+                if (!SessionCtx->Config().FeatureFlags.GetEnableShowCreate()) {
+                    for (auto setting : readTable.Settings()) {
+                        auto name = setting.Name().Value();
+                        if (name == "showCreateTable") {
+                            ctx.AddError(TIssue(ctx.GetPosition(node.Pos()), 
+                                TStringBuilder() << "SHOW CREATE statement is not supported"));
+                            return TStatus::Error;
+                        }
+                    }
+                }
+
                 TTypeAnnotationNode::TListType children;
                 children.push_back(node.World().Ref().GetTypeAnn());
                 children.push_back(listSelectType);

ydb/core/kqp/ut/service/kqp_qs_queries_ut.cpp

@@ -2762,7 +2762,7 @@ Y_UNIT_TEST_SUITE(KqpQueryService) {
     }
 
     Y_UNIT_TEST(ShowCreateTable) {
-        auto serverSettings = TKikimrSettings();
+        auto serverSettings = TKikimrSettings().SetEnableShowCreate(true);
 
         TKikimrRunner kikimr(serverSettings);
         auto db = kikimr.GetQueryClient();
@@ -2793,6 +2793,50 @@ Y_UNIT_TEST_SUITE(KqpQueryService) {
         }
     }
 
+    Y_UNIT_TEST(ShowCreateTableDisable) {
+        auto serverSettings = TKikimrSettings().SetEnableShowCreate(false);
+
+        TKikimrRunner kikimr(serverSettings);
+        auto db = kikimr.GetQueryClient();
+        auto session = db.GetSession().GetValueSync().GetSession();
+
+        {
+            auto result = session.ExecuteQuery(R"(
+                CREATE TABLE test_show_create (
+                    Key Uint32,
+                    Value Uint32,
+                    PRIMARY KEY (Key)
+                );
+            )", TTxControl::NoTx()).ExtractValueSync();
+            UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
+        }
+
+        {
+            auto result = session.ExecuteQuery(R"(
+                SHOW CREATE TABLE `/Root/test_show_create`;
+            )", TTxControl::NoTx()).ExtractValueSync();
+            UNIT_ASSERT(!result.IsSuccess());
+            
+            UNIT_ASSERT_VALUES_EQUAL("<main>: Error: Type annotation, code: 1030\n    <main>:2:35: Error: At function: KiReadTable!\n        <main>:2:35: Error: SHOW CREATE statement is not supported\n", 
+                result.GetIssues().ToString());
+        }
+    }
+
+    Y_UNIT_TEST(ShowCreateTableNotSuccess) {
+        auto serverSettings = TKikimrSettings().SetEnableShowCreate(true);
+
+        TKikimrRunner kikimr(serverSettings);
+        auto db = kikimr.GetQueryClient();
+        auto session = db.GetSession().GetValueSync().GetSession();
+
+        {
+            auto result = session.ExecuteQuery(R"(
+                SHOW CREATE TABLE test_show_create;
+            )", TTxControl::NoTx()).ExtractValueSync();
+            UNIT_ASSERT(!result.IsSuccess());
+        }
+    }
+
     Y_UNIT_TEST(DdlCache) {
         NKikimrConfig::TAppConfig appConfig;
         auto setting = NKikimrKqp::TKqpSetting();

ydb/core/protos/feature_flags.proto

@@ -196,4 +196,5 @@ message TFeatureFlags {
     optional bool EnableChangefeedsImport = 170 [default = false];
     optional bool EnablePermissionsExport = 171 [default = false];
     optional bool EnableDataErasure = 172 [default = false];
+    optional bool EnableShowCreate = 173 [default = false];
 }

ydb/core/sys_view/show_create/show_create.cpp

@@ -49,16 +49,21 @@ class TShowCreate : public TScanActorBase<TShowCreate> {
 
 private:
     void StartScan() {
+        if (!AppData()->FeatureFlags.GetEnableShowCreate()) {
+            ReplyErrorAndDie(Ydb::StatusIds::SCHEME_ERROR, 
+                TStringBuilder() << "Sys view is not supported: " << ShowCreateName);
+        }
+
         const auto& cellsFrom = TableRange.From.GetCells();
 
         if (cellsFrom.size() != 2 || cellsFrom[0].IsNull() || cellsFrom[1].IsNull()) {
             ReplyErrorAndDie(Ydb::StatusIds::SCHEME_ERROR, "Invalid read key");
         }
 
-        if (!TableRange.Point && !TableRange.To.GetCells().empty()) {
+        if (!TableRange.To.GetCells().empty()) {
             const auto& cellsTo = TableRange.To.GetCells();
             if (cellsTo.size() != 2 || cellsTo[0].IsNull() || cellsTo[1].IsNull()) {
-                ReplyErrorAndDie(Ydb::StatusIds::SCHEME_ERROR, "Invalid table range");
+                ReplyErrorAndDie(Ydb::StatusIds::SCHEME_ERROR, "Invalid read key");
             }
 
             if (cellsFrom[0].AsBuf() != cellsTo[0].AsBuf() || cellsFrom[1].AsBuf() != cellsTo[1].AsBuf()) {

ydb/core/sys_view/ut_common.cpp

@@ -52,6 +52,7 @@ TTestEnv::TTestEnv(ui32 staticNodes, ui32 dynamicNodes, const TTestEnvSettings&
     Settings->SetEnableDbCounters(settings.EnableSVP);
     Settings->SetEnableForceFollowers(settings.EnableForceFollowers);
     Settings->SetEnableTablePgTypes(true);
+    Settings->SetEnableShowCreate(true);
 
     NKikimrConfig::TAppConfig appConfig;
     *appConfig.MutableFeatureFlags() = Settings->FeatureFlags;

ydb/core/testlib/basics/feature_flags.h

@@ -76,6 +76,7 @@ class TTestFeatureFlagsHolder {
     FEATURE_FLAG_SETTER(EnableStrictUserManagement)
     FEATURE_FLAG_SETTER(EnableDatabaseAdmin)
     FEATURE_FLAG_SETTER(EnablePermissionsExport)
+    FEATURE_FLAG_SETTER(EnableShowCreate)
 
     #undef FEATURE_FLAG_SETTER
 };