Skip to content

Commit 661f6de

Browse files
authored
Rollback some changes from #12403 (#12690)
1 parent 2d03a86 commit 661f6de

File tree

4 files changed

+12
-2
lines changed

4 files changed

+12
-2
lines changed

ydb/tests/functional/postgresql/ya.make

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ DEPENDS(
1212

1313
ENV(PYTHONWARNINGS="ignore")
1414
ENV(YDB_DRIVER_BINARY="ydb/apps/ydbd/ydbd")
15+
ENV(YDB_TABLE_ENABLE_PREPARED_DDL=true)
1516
ENV(YDB_USE_IN_MEMORY_PDISKS=true)
1617
ENV(YDB_ALLOCATE_PGWIRE_PORT=true)
1718
ENV(YDB_ALLOCATE_PGWIRE_PORT=true)

ydb/tests/library/harness/kikimr_config.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ def _load_default_yaml(default_tablet_node_ids, ydb_domain_name, static_erasure,
6767
if isinstance(data, bytes):
6868
data = data.decode('utf-8')
6969
data = data.format(
70+
ydb_result_rows_limit=os.getenv("YDB_KQP_RESULT_ROWS_LIMIT", 1000),
71+
ydb_yql_syntax_version=os.getenv("YDB_YQL_SYNTAX_VERSION", "1"),
7072
ydb_defaut_tablet_node_ids=str(default_tablet_node_ids),
7173
ydb_default_log_level=int(LogLevels.from_string(os.getenv("YDB_DEFAULT_LOG_LEVEL", "NOTICE"))),
7274
ydb_domain_name=ydb_domain_name,
@@ -250,6 +252,9 @@ def __init__(
250252
self.yaml_config["local_pg_wire_config"] = {}
251253
self.yaml_config["local_pg_wire_config"]["listening_port"] = os.getenv('PGWIRE_LISTENING_PORT')
252254

255+
if os.getenv('YDB_TABLE_ENABLE_PREPARED_DDL', 'false').lower() == 'true':
256+
self.yaml_config["table_service_config"]["enable_prepared_ddl"] = True
257+
253258
if disable_iterator_reads:
254259
self.yaml_config["table_service_config"]["enable_kqp_scan_query_source_read"] = False
255260

ydb/tests/library/harness/resources/default_yaml.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ grpc_config:
134134
host: "{ydb_grpc_host}"
135135
services:
136136
- "legacy"
137+
- "tablet_service"
137138
- "yql"
138139
- "discovery"
139140
- "cms"
@@ -161,6 +162,10 @@ feature_flags:
161162
enable_mvcc_snapshot_reads: true
162163
kqpconfig:
163164
settings:
165+
- name: "_ResultRowsLimit"
166+
value: "{ydb_result_rows_limit}"
167+
- name: "_KqpYqlSyntaxVersion"
168+
value: "{ydb_yql_syntax_version}"
164169
- name: "_KqpAllowNewEngine"
165170
value: "true"
166171
interconnect_config:
@@ -255,5 +260,3 @@ federated_query_config:
255260
uri: ""
256261
pinger:
257262
ping_period: "30s"
258-
column_shard_config:
259-
disabled_on_scheme_shard: false

ydb/tests/postgres_integrations/go-libpq/data/docker-compose.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ services:
1111
- "POSTGRES_USER=${YDB_PG_USER:-root}"
1212
- "POSTGRES_PASSWORD=${YDB_PG_PASSWORD:-1234}"
1313
- "YDB_FEATURE_FLAGS=enable_temp_tables"
14+
- "YDB_TABLE_ENABLE_PREPARED_DDL=true"
1415
healthcheck:
1516
test: "/bin/sh /health_check"
1617
interval: 1s

0 commit comments

Comments
 (0)