Skip to content

Commit 7782482

Browse files
vitalyisaev2vitalyisaev2
authored
YDB FQ: fix tests after type renaming (#12589)
1 parent 7a1a682 commit 7782482

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+372
-354
lines changed

‎ydb/library/yql/providers/generic/connector/tests/common_test_cases/base.py‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from typing import Dict
55
import functools
66

7-
from ydb.library.yql.providers.generic.connector.api.common.data_source_pb2 import EDataSourceKind, EProtocol
7+
from yql.essentials.providers.common.proto.gateways_config_pb2 import EGenericDataSourceKind, EGenericProtocol
88
from ydb.library.yql.providers.generic.connector.api.service.protos.connector_pb2 import EDateTimeFormat
99
from ydb.library.yql.providers.generic.connector.tests.utils.database import Database
1010
from ydb.library.yql.providers.generic.connector.tests.utils.settings import GenericSettings
@@ -13,26 +13,26 @@
1313
@dataclass
1414
class BaseTestCase:
1515
name_: str
16-
data_source_kind: EDataSourceKind.ValueType
16+
data_source_kind: EGenericDataSourceKind.ValueType
1717
pragmas: Dict[str, str]
18-
protocol: EProtocol
18+
protocol: EGenericProtocol
1919

2020
@property
2121
def name(self) -> str:
2222
match self.data_source_kind:
23-
case EDataSourceKind.CLICKHOUSE:
23+
case EGenericDataSourceKind.CLICKHOUSE:
2424
# ClickHouse has two kinds of network protocols: NATIVE and HTTP,
2525
# so we append protocol name to the test case name
26-
return f'{self.name_}_{EProtocol.Name(self.protocol)}'
27-
case EDataSourceKind.MS_SQL_SERVER:
26+
return f'{self.name_}_{EGenericProtocol.Name(self.protocol)}'
27+
case EGenericDataSourceKind.MS_SQL_SERVER:
2828
return self.name_
29-
case EDataSourceKind.MYSQL:
29+
case EGenericDataSourceKind.MYSQL:
3030
return self.name_
31-
case EDataSourceKind.ORACLE:
31+
case EGenericDataSourceKind.ORACLE:
3232
return self.name_
33-
case EDataSourceKind.POSTGRESQL:
33+
case EGenericDataSourceKind.POSTGRESQL:
3434
return self.name_
35-
case EDataSourceKind.YDB:
35+
case EGenericDataSourceKind.YDB:
3636
return self.name_
3737
case _:
3838
raise Exception(f'invalid data source: {self.data_source_kind}')
@@ -45,17 +45,17 @@ def database(self) -> Database:
4545
'''
4646
# FIXME: do not hardcode databases here
4747
match self.data_source_kind:
48-
case EDataSourceKind.CLICKHOUSE:
48+
case EGenericDataSourceKind.CLICKHOUSE:
4949
return Database(self.name, self.data_source_kind)
50-
case EDataSourceKind.MS_SQL_SERVER:
50+
case EGenericDataSourceKind.MS_SQL_SERVER:
5151
return Database("master", self.data_source_kind)
52-
case EDataSourceKind.MYSQL:
52+
case EGenericDataSourceKind.MYSQL:
5353
return Database("db", self.data_source_kind)
54-
case EDataSourceKind.ORACLE:
54+
case EGenericDataSourceKind.ORACLE:
5555
return Database(self.name, self.data_source_kind)
56-
case EDataSourceKind.POSTGRESQL:
56+
case EGenericDataSourceKind.POSTGRESQL:
5757
return Database(self.name, self.data_source_kind)
58-
case EDataSourceKind.YDB:
58+
case EGenericDataSourceKind.YDB:
5959
return Database("local", self.data_source_kind)
6060

6161
@functools.cached_property
@@ -65,17 +65,17 @@ def table_name(self) -> str:
6565
so we provide a random table name instead where necessary.
6666
'''
6767
match self.data_source_kind:
68-
case EDataSourceKind.CLICKHOUSE:
68+
case EGenericDataSourceKind.CLICKHOUSE:
6969
return self.name_ # without protocol
70-
case EDataSourceKind.MS_SQL_SERVER:
70+
case EGenericDataSourceKind.MS_SQL_SERVER:
7171
return self.name
72-
case EDataSourceKind.MYSQL:
72+
case EGenericDataSourceKind.MYSQL:
7373
return self.name
74-
case EDataSourceKind.ORACLE:
74+
case EGenericDataSourceKind.ORACLE:
7575
return self.name
76-
case EDataSourceKind.POSTGRESQL:
76+
case EGenericDataSourceKind.POSTGRESQL:
7777
return 't' + make_random_string(8)
78-
case EDataSourceKind.YDB:
78+
case EGenericDataSourceKind.YDB:
7979
return self.name
8080
case _:
8181
raise Exception(f'invalid data source: {self.data_source_kind}')
@@ -90,34 +90,34 @@ def pragmas_sql_string(self) -> str:
9090
@property
9191
def generic_settings(self) -> GenericSettings:
9292
match self.data_source_kind:
93-
case EDataSourceKind.CLICKHOUSE:
93+
case EGenericDataSourceKind.CLICKHOUSE:
9494
return GenericSettings(
9595
date_time_format=EDateTimeFormat.YQL_FORMAT,
9696
clickhouse_clusters=[
97-
GenericSettings.ClickHouseCluster(database=self.database.name, protocol=EProtocol.NATIVE)
97+
GenericSettings.ClickHouseCluster(database=self.database.name, protocol=EGenericProtocol.NATIVE)
9898
],
9999
)
100-
case EDataSourceKind.MS_SQL_SERVER:
100+
case EGenericDataSourceKind.MS_SQL_SERVER:
101101
return GenericSettings(
102102
date_time_format=EDateTimeFormat.YQL_FORMAT,
103103
ms_sql_server_clusters=[GenericSettings.MsSQLServerCluster(database=self.database.name)],
104104
)
105-
case EDataSourceKind.MYSQL:
105+
case EGenericDataSourceKind.MYSQL:
106106
return GenericSettings(
107107
date_time_format=EDateTimeFormat.YQL_FORMAT,
108108
mysql_clusters=[GenericSettings.MySQLCluster(database=self.database.name)],
109109
)
110-
case EDataSourceKind.ORACLE:
110+
case EGenericDataSourceKind.ORACLE:
111111
return GenericSettings(
112112
date_time_format=EDateTimeFormat.YQL_FORMAT,
113113
oracle_clusters=[GenericSettings.OracleCluster(database=self.database.name, service_name=None)],
114114
)
115-
case EDataSourceKind.POSTGRESQL:
115+
case EGenericDataSourceKind.POSTGRESQL:
116116
return GenericSettings(
117117
date_time_format=EDateTimeFormat.YQL_FORMAT,
118118
postgresql_clusters=[GenericSettings.PostgreSQLCluster(database=self.database.name, schema=None)],
119119
)
120-
case EDataSourceKind.YDB:
120+
case EGenericDataSourceKind.YDB:
121121
return GenericSettings(
122122
date_time_format=EDateTimeFormat.YQL_FORMAT,
123123
ydb_clusters=[GenericSettings.YdbCluster(database=self.database.name)],

‎ydb/library/yql/providers/generic/connector/tests/common_test_cases/select_missing_database.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from dataclasses import dataclass
33

44
from ydb.library.yql.providers.generic.connector.tests.utils.settings import Settings
5-
from ydb.library.yql.providers.generic.connector.api.common.data_source_pb2 import EDataSourceKind, EProtocol
5+
from yql.essentials.providers.common.proto.gateways_config_pb2 import EGenericDataSourceKind, EGenericProtocol
66
from ydb.library.yql.providers.generic.connector.tests.common_test_cases.base import BaseTestCase
77
from ydb.library.yql.providers.generic.connector.tests.utils.settings import GenericSettings
88

@@ -16,14 +16,14 @@ def generic_settings(self) -> GenericSettings:
1616
gs = super().generic_settings
1717

1818
# Overload setting for MySQL database
19-
if self.data_source_kind == EDataSourceKind.MYSQL:
19+
if self.data_source_kind == EGenericDataSourceKind.MYSQL:
2020
for cluster in gs.mysql_clusters:
2121
cluster.database = "missing_database"
2222
for cluster in gs.oracle_clusters:
2323
if self.service_name is not None:
2424
cluster.service_name = self.service_name
2525

26-
if self.data_source_kind == EDataSourceKind.MS_SQL_SERVER:
26+
if self.data_source_kind == EGenericDataSourceKind.MS_SQL_SERVER:
2727
for cluster in gs.ms_sql_server_clusters:
2828
cluster.database = "missing_database"
2929

@@ -36,12 +36,12 @@ class Factory:
3636
def __init__(self, ss: Settings):
3737
self.ss = ss
3838

39-
def make_test_cases(self, data_source_kind: EDataSourceKind) -> List[TestCase]:
39+
def make_test_cases(self, data_source_kind: EGenericDataSourceKind) -> List[TestCase]:
4040
return [
4141
TestCase(
4242
name_="missing_database",
4343
data_source_kind=data_source_kind,
44-
protocol=EProtocol.NATIVE,
44+
protocol=EGenericProtocol.NATIVE,
4545
pragmas=dict(),
4646
service_name=self.ss.oracle.service_name if self.ss.oracle is not None else None,
4747
)

‎ydb/library/yql/providers/generic/connector/tests/common_test_cases/select_missing_table.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from typing import Sequence
44

55
from ydb.library.yql.providers.generic.connector.tests.utils.settings import Settings
6-
from ydb.library.yql.providers.generic.connector.api.common.data_source_pb2 import EDataSourceKind, EProtocol
6+
from yql.essentials.providers.common.proto.gateways_config_pb2 import EGenericDataSourceKind, EGenericProtocol
77
from ydb.library.yql.providers.generic.connector.tests.common_test_cases.base import BaseTestCase
88
from ydb.library.yql.providers.generic.connector.tests.utils.settings import GenericSettings
99

@@ -31,15 +31,15 @@ class Factory:
3131
def __init__(self, ss: Settings):
3232
self.ss = ss
3333

34-
def make_test_cases(self, data_source_kind: EDataSourceKind) -> List[TestCase]:
34+
def make_test_cases(self, data_source_kind: EGenericDataSourceKind) -> List[TestCase]:
3535
test_cases = []
3636

3737
test_case_name = 'missing_table'
3838

3939
test_case = TestCase(
4040
name_=test_case_name,
4141
data_source_kind=data_source_kind,
42-
protocol=EProtocol.NATIVE,
42+
protocol=EGenericProtocol.NATIVE,
4343
pragmas=dict(),
4444
service_name=self.ss.oracle.service_name if self.ss.oracle is not None else None,
4545
)

0 commit comments

Comments
 (0)