Skip to content

Commit 91cc23a

Browse files
vitalyisaev2vitalyisaev2
authored
Merge 5be02c5 into c808caf 
2 parents c808caf + 5be02c5 commit 91cc23a

File tree

19 files changed

+728
-58
lines changed

19 files changed

+728
-58
lines changed

‎ydb/library/yql/providers/generic/connector/tests/datasource/clickhouse/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ services:
66
CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: 1
77
CLICKHOUSE_PASSWORD: password
88
CLICKHOUSE_USER: user
9-
image: clickhouse/clickhouse-server:23-alpine@sha256:b078c1cd294632afa2aeba3530e7ba2e568513da23304354f455a25fab575c06
9+
image: mirror.gcr.io/clickhouse/clickhouse-server:23-alpine@sha256:d75017307e76d1bca81a5ac7ada94620567782c0610541f525d1e443e23f76e3
1010
ports:
1111
- 9000
1212
- 8123
1313
fq-connector-go:
1414
container_name: fq-tests-ch-fq-connector-go
15-
image: ghcr.io/ydb-platform/fq-connector-go:v0.2.20@sha256:a1771f348dc8be6219865e332f788429907cdfec3677b3e98f0bc6f7dd542dc6
15+
image: ghcr.io/ydb-platform/fq-connector-go:v0.4.1@sha256:61ad8d7b7b981b9ef5709a0ce71d10702f49396bd307437c9efd876c6ad6e90e
1616
ports:
1717
- 2130
1818
volumes:

‎ydb/library/yql/providers/generic/connector/tests/datasource/postgresql/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
services:
22
fq-connector-go:
33
container_name: fq-tests-pg-fq-connector-go
4-
image: ghcr.io/ydb-platform/fq-connector-go:v0.2.20@sha256:a1771f348dc8be6219865e332f788429907cdfec3677b3e98f0bc6f7dd542dc6
4+
image: ghcr.io/ydb-platform/fq-connector-go:v0.4.1@sha256:61ad8d7b7b981b9ef5709a0ce71d10702f49396bd307437c9efd876c6ad6e90e
55
ports:
66
- 2130
77
volumes:
@@ -20,7 +20,7 @@ services:
2020
POSTGRES_DB: db
2121
POSTGRES_PASSWORD: password
2222
POSTGRES_USER: user
23-
image: postgres:15-bullseye@sha256:3411b9f2e5239cd7867f34fcf22fe964230f7d447a71d63c283e3593d3f84085
23+
image: mirror.gcr.io/library/postgres:15-bullseye@sha256:2e89ed90224245851ea2b01e0b20c4b893e69141eb36e7a1cece7fb9e19f21f0
2424
ports:
2525
- 5432
2626
version: "3.4"

‎ydb/library/yql/providers/generic/connector/tests/datasource/ydb/collection.py‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22

33
from ydb.library.yql.providers.generic.connector.api.common.data_source_pb2 import EDataSourceKind
44

5-
# import ydb.library.yql.providers.generic.connector.tests.common_test_cases.select_missing_database as select_missing_database
6-
# import ydb.library.yql.providers.generic.connector.tests.common_test_cases.select_missing_table as select_missing_table
5+
import ydb.library.yql.providers.generic.connector.tests.common_test_cases.select_missing_database as select_missing_database
6+
import ydb.library.yql.providers.generic.connector.tests.common_test_cases.select_missing_table as select_missing_table
7+
import select_positive
78
import ydb.library.yql.providers.generic.connector.tests.common_test_cases.select_positive_common as select_positive_common
89

910
from ydb.library.yql.providers.generic.connector.tests.utils.settings import Settings
@@ -14,9 +15,10 @@ class Collection(object):
1415

1516
def __init__(self, ss: Settings):
1617
self._test_cases = {
17-
# 'select_missing_database': select_missing_database.Factory().make_test_cases(EDataSourceKind.YDB),
18-
# 'select_missing_table': select_missing_table.Factory().make_test_cases(EDataSourceKind.YDB),
19-
'select_positive': select_positive_common.Factory(ss).make_test_cases(EDataSourceKind.YDB),
18+
'select_missing_database': select_missing_database.Factory().make_test_cases(EDataSourceKind.YDB),
19+
'select_missing_table': select_missing_table.Factory().make_test_cases(EDataSourceKind.YDB),
20+
'select_positive': select_positive_common.Factory(ss).make_test_cases(EDataSourceKind.YDB)
21+
+ select_positive.Factory().make_test_cases(),
2022
}
2123

2224
def get(self, key: str) -> Sequence:

‎ydb/library/yql/providers/generic/connector/tests/datasource/ydb/docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services:
55
echo \"$$(dig fq-tests-ydb-ydb +short) fq-tests-ydb-ydb\" >> /etc/hosts; cat /etc/hosts;
66
/opt/ydb/bin/fq-connector-go server -c /opt/ydb/cfg/fq-connector-go.yaml"
77
container_name: fq-tests-ydb-fq-connector-go
8-
image: ghcr.io/ydb-platform/fq-connector-go:v0.2.20@sha256:a1771f348dc8be6219865e332f788429907cdfec3677b3e98f0bc6f7dd542dc6
8+
image: ghcr.io/ydb-platform/fq-connector-go:v0.4.1@sha256:61ad8d7b7b981b9ef5709a0ce71d10702f49396bd307437c9efd876c6ad6e90e
99
ports:
1010
- 2130
1111
volumes:

‎ydb/library/yql/providers/generic/connector/tests/datasource/ydb/init/01_basic.sh‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,106 @@ set -ex
4444
(1, 2),
4545
(10, 20);
4646
COMMIT;
47+
48+
CREATE TABLE primitive_types_NATIVE (
49+
col_00_id Int32,
50+
col_01_bool Bool,
51+
col_02_int8 Int8,
52+
col_03_int16 Int16,
53+
col_04_int32 Int32,
54+
col_05_int64 Int64,
55+
col_06_uint8 Uint8,
56+
col_07_uint16 Uint16,
57+
col_08_uint32 Uint32,
58+
col_09_uint64 Uint64,
59+
col_10_float Float,
60+
col_11_double Double,
61+
col_12_string String,
62+
col_13_utf8 Utf8,
63+
col_14_date Date,
64+
col_15_datetime Datetime,
65+
col_16_timestamp Timestamp,
66+
PRIMARY KEY (col_00_id)
67+
);
68+
COMMIT;
69+
INSERT INTO
70+
primitive_types_NATIVE
71+
(col_00_id, col_01_bool, col_02_int8, col_03_int16, col_04_int32, col_05_int64, col_06_uint8,
72+
col_07_uint16, col_08_uint32, col_09_uint64, col_10_float, col_11_double, col_12_string,
73+
col_13_utf8, col_14_date, col_15_datetime, col_16_timestamp)
74+
VALUES (1, false, 2, 3, 4, 5, 6, 7, 8, 9, 10.10f, 11.11f, "аз", "az",
75+
Date("1988-11-20"), Datetime("1988-11-20T12:55:28Z"), Timestamp("1988-11-20T12:55:28.111Z")),
76+
(2, true, -2, -3, -4, -5, 6, 7, 8, 9, -10.10f, -11.11f, "буки", "buki",
77+
Date("2024-05-27"), Datetime("2024-05-27T18:43:32Z"), Timestamp("2024-05-27T18:43:32.123456Z"));
78+
COMMIT;
79+
80+
CREATE TABLE optional_types_NATIVE (
81+
col_00_id Int32 NOT NULL,
82+
col_01_bool Bool,
83+
col_02_int8 Int8,
84+
col_03_int16 Int16,
85+
col_04_int32 Int32,
86+
col_05_int64 Int64,
87+
col_06_uint8 Uint8,
88+
col_07_uint16 Uint16,
89+
col_08_uint32 Uint32,
90+
col_09_uint64 Uint64,
91+
col_10_float Float,
92+
col_11_double Double,
93+
col_12_string String,
94+
col_13_utf8 Utf8,
95+
col_14_date Date,
96+
col_15_datetime Datetime,
97+
col_16_timestamp Timestamp,
98+
PRIMARY KEY (col_00_id)
99+
);
100+
COMMIT;
101+
INSERT INTO
102+
optional_types_NATIVE
103+
(col_00_id, col_01_bool, col_02_int8, col_03_int16, col_04_int32, col_05_int64, col_06_uint8,
104+
col_07_uint16, col_08_uint32, col_09_uint64, col_10_float, col_11_double, col_12_string,
105+
col_13_utf8, col_14_date, col_15_datetime, col_16_timestamp)
106+
VALUES (1, false, 2, 3, 4, 5, 6, 7, 8, 9, 10.10f, 11.11f, "аз", "az",
107+
Date("1988-11-20"), Datetime("1988-11-20T12:55:28Z"), Timestamp("1988-11-20T12:55:28.111Z")),
108+
(2, true, -2, -3, -4, -5, 6, 7, 8, 9, -10.10f, -11.11f, "буки", "buki",
109+
Date("2024-05-27"), Datetime("2024-05-27T18:43:32Z"), Timestamp("2024-05-27T18:43:32.123456Z")),
110+
(3, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
111+
NULL, NULL, NULL);
112+
COMMIT;
113+
114+
CREATE TABLE constant_NATIVE (col_00_id Int32 NOT NULL, PRIMARY KEY (col_00_id));
115+
COMMIT;
116+
INSERT INTO constant_NATIVE (col_00_id) VALUES
117+
(1),
118+
(2),
119+
(3);
120+
COMMIT;
121+
122+
CREATE TABLE count_NATIVE (col_00_id Int32 NOT NULL, PRIMARY KEY (col_00_id));
123+
COMMIT;
124+
INSERT INTO count_NATIVE (col_00_id) VALUES
125+
(1),
126+
(2),
127+
(3),
128+
(4);
129+
COMMIT;
130+
131+
CREATE TABLE pushdown_NATIVE (col_00_id Int32 NOT NULL, col_01_string String, PRIMARY KEY (col_00_id));
132+
COMMIT;
133+
INSERT INTO pushdown_NATIVE (col_00_id, col_01_string) VALUES
134+
(1, "one"),
135+
(2, "two"),
136+
(3, "three");
137+
COMMIT;
138+
139+
-- As of 2024.05.31, INTERVAL type is not supported, so we use it to check behavior of connector
140+
-- when reading table containing usupported type columns.
141+
CREATE TABLE unsupported_types_NATIVE (col_00_id Int32 NOT NULL, col_01_interval INTERVAL, PRIMARY KEY (col_00_id));
142+
COMMIT;
143+
INSERT INTO unsupported_types_NATIVE (col_00_id, col_01_interval) VALUES
144+
(1, DATE("2024-01-01") - DATE("2023-01-01")),
145+
(2, DATE("2022-01-01") - DATE("2023-01-01"));
146+
COMMIT;
47147
'
48148

49149
echo $(date +"%T.%6N") "SUCCESS"

0 commit comments

Comments
 (0)