Rollback some changes from #12403 (#12690)

ydb-platform · Dec 17, 2024 · 661f6de · 661f6de
1 parent 2d03a86
commit 661f6de
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/ydb/tests/functional/postgresql/ya.make b/ydb/tests/functional/postgresql/ya.make
@@ -12,6 +12,7 @@ DEPENDS(
 
 ENV(PYTHONWARNINGS="ignore")
 ENV(YDB_DRIVER_BINARY="ydb/apps/ydbd/ydbd")
+ENV(YDB_TABLE_ENABLE_PREPARED_DDL=true)
 ENV(YDB_USE_IN_MEMORY_PDISKS=true)
 ENV(YDB_ALLOCATE_PGWIRE_PORT=true)
 ENV(YDB_ALLOCATE_PGWIRE_PORT=true)

diff --git a/ydb/tests/library/harness/kikimr_config.py b/ydb/tests/library/harness/kikimr_config.py
@@ -67,6 +67,8 @@ def _load_default_yaml(default_tablet_node_ids, ydb_domain_name, static_erasure,
     if isinstance(data, bytes):
         data = data.decode('utf-8')
     data = data.format(
+        ydb_result_rows_limit=os.getenv("YDB_KQP_RESULT_ROWS_LIMIT", 1000),
+        ydb_yql_syntax_version=os.getenv("YDB_YQL_SYNTAX_VERSION", "1"),
         ydb_defaut_tablet_node_ids=str(default_tablet_node_ids),
         ydb_default_log_level=int(LogLevels.from_string(os.getenv("YDB_DEFAULT_LOG_LEVEL", "NOTICE"))),
         ydb_domain_name=ydb_domain_name,
@@ -250,6 +252,9 @@ def __init__(
             self.yaml_config["local_pg_wire_config"] = {}
             self.yaml_config["local_pg_wire_config"]["listening_port"] = os.getenv('PGWIRE_LISTENING_PORT')
 
+        if os.getenv('YDB_TABLE_ENABLE_PREPARED_DDL', 'false').lower() == 'true':
+            self.yaml_config["table_service_config"]["enable_prepared_ddl"] = True
+
         if disable_iterator_reads:
             self.yaml_config["table_service_config"]["enable_kqp_scan_query_source_read"] = False
 

diff --git a/ydb/tests/library/harness/resources/default_yaml.yml b/ydb/tests/library/harness/resources/default_yaml.yml
@@ -134,6 +134,7 @@ grpc_config:
   host: "{ydb_grpc_host}"
   services:
   - "legacy"
+  - "tablet_service"
   - "yql"
   - "discovery"
   - "cms"
@@ -161,6 +162,10 @@ feature_flags:
   enable_mvcc_snapshot_reads: true
 kqpconfig:
   settings:
+  - name: "_ResultRowsLimit"
+    value: "{ydb_result_rows_limit}"
+  - name: "_KqpYqlSyntaxVersion"
+    value: "{ydb_yql_syntax_version}"
   - name: "_KqpAllowNewEngine"
     value: "true"
 interconnect_config:
@@ -255,5 +260,3 @@ federated_query_config:
       uri: ""
   pinger:
     ping_period: "30s"
-column_shard_config:
-  disabled_on_scheme_shard: false
diff --git a/ydb/tests/postgres_integrations/go-libpq/data/docker-compose.yaml b/ydb/tests/postgres_integrations/go-libpq/data/docker-compose.yaml
@@ -11,6 +11,7 @@ services:
       - "POSTGRES_USER=${YDB_PG_USER:-root}"
       - "POSTGRES_PASSWORD=${YDB_PG_PASSWORD:-1234}"
       - "YDB_FEATURE_FLAGS=enable_temp_tables"
+      - "YDB_TABLE_ENABLE_PREPARED_DDL=true"
     healthcheck:
       test: "/bin/sh /health_check"
       interval: 1s