Skip to content

Commit ce8b8ec

Browse files
authored
do not switch ddl/dml when using query service (#13011)
1 parent d37edc3 commit ce8b8ec

File tree

1 file changed

+4
-19
lines changed

1 file changed

+4
-19
lines changed

ydb/tests/functional/suite_tests/test_base.py

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import enum
1212
from concurrent import futures
1313

14-
from hamcrest import assert_that, is_, equal_to, raises, none
14+
from hamcrest import assert_that, equal_to, raises
1515
import yatest
1616
from yatest.common import source_path, test_source_path
1717

@@ -298,10 +298,10 @@ def assert_statement(self, parsed_statement):
298298
parsed_statement.at_line, parsed_statement.suite_name, end_time - start_time))
299299

300300
def assert_statement_ok(self, statement):
301-
actual = safe_execute(lambda: self.execute_ydb_ok(statement.text), statement)
301+
actual = safe_execute(lambda: self.execute_query(statement.text))
302302
assert_that(
303-
actual,
304-
is_(none()),
303+
len(actual),
304+
1,
305305
str(statement),
306306
)
307307

@@ -407,16 +407,6 @@ def assert_statement_stream_query(self, statement):
407407
universal_lines=True,
408408
)
409409

410-
def is_probably_scheme(self, yql_text):
411-
lwr = yql_text.lower()
412-
return 'create table' in lwr or 'drop table' in lwr
413-
414-
def execute_ydb_ok(self, statement_text):
415-
if self.is_probably_scheme(statement_text):
416-
self.execute_scheme(statement_text)
417-
else:
418-
self.execute_query(statement_text)
419-
420410
def explain(self, query):
421411
yql_text = patch_yql_statement(query, self.table_path_prefix)
422412
# seems explain not working with query service ?
@@ -430,11 +420,6 @@ def explain(self, query):
430420

431421
return self.legacy_pool.retry_operation_sync(lambda s: s.explain(yql_text)).query_plan
432422

433-
def execute_scheme(self, statement_text):
434-
yql_text = patch_yql_statement(statement_text, self.table_path_prefix)
435-
self.pool.execute_with_retries(yql_text)
436-
return None
437-
438423
def execute_query(self, statement_text):
439424
yql_text = patch_yql_statement(statement_text, self.table_path_prefix)
440425
result = self.pool.execute_with_retries(yql_text)

0 commit comments

Comments
 (0)