review fixes

Author: vgvoleg

tests/query/test_query_client_settings.py

@@ -2,7 +2,7 @@
 
 import ydb
 
-from datetime import date, datetime, timedelta, timezone
+from datetime import date, datetime, timedelta
 
 
 @pytest.fixture
@@ -31,37 +31,27 @@ def settings_off():
     return settings
 
 
-test_td = timedelta(microseconds=-100)
-test_now = datetime.utcnow()
-test_today = test_now.date()
-test_dt_today = datetime.today()
-tz4h = timezone(timedelta(hours=4))
-
-
 params = pytest.mark.parametrize(
-    "value,ydb_type,casted_result,uncasted_type",
+    "value,ydb_type,casted_result,uncasted_result",
     [
-        (test_today, "Date", test_today, int),
-        (365, "Date", date(1971, 1, 1), int),
-        (3600 * 24 * 365, "Datetime", datetime(1971, 1, 1, 0, 0), int),
-        (datetime(1970, 1, 1, 4, 0, tzinfo=tz4h), "Timestamp", datetime(1970, 1, 1, 0, 0), int),
-        (test_td, "Interval", test_td, int),
-        (test_now, "Timestamp", test_now, int),
+        (365, "Date", date(1971, 1, 1), 365),
+        (3600 * 24 * 365, "Datetime", datetime(1971, 1, 1, 0, 0), 3600 * 24 * 365),
+        (timedelta(seconds=1), "Interval", timedelta(seconds=1), 1000000),
         (
             1511789040123456,
             "Timestamp",
             datetime.fromisoformat("2017-11-27 13:24:00.123456"),
-            int,
+            1511789040123456,
         ),
-        ('{"foo": "bar"}', "Json", {"foo": "bar"}, str),
-        ('{"foo": "bar"}', "JsonDocument", {"foo": "bar"}, str),
+        ('{"foo": "bar"}', "Json", {"foo": "bar"}, '{"foo": "bar"}'),
+        ('{"foo": "bar"}', "JsonDocument", {"foo": "bar"}, '{"foo":"bar"}'),
     ],
 )
 
 
 class TestQueryClientSettings:
     @params
-    def test_driver_turn_on(self, driver_sync, settings_on, value, ydb_type, casted_result, uncasted_type):
+    def test_driver_turn_on(self, driver_sync, settings_on, value, ydb_type, casted_result, uncasted_result):
         driver_sync._driver_config.query_client_settings = settings_on
         pool = ydb.QuerySessionPool(driver_sync)
         result = pool.execute_with_retries(
@@ -72,18 +62,18 @@ def test_driver_turn_on(self, driver_sync, settings_on, value, ydb_type, casted_
         pool.stop()
 
     @params
-    def test_driver_turn_off(self, driver_sync, settings_off, value, ydb_type, casted_result, uncasted_type):
+    def test_driver_turn_off(self, driver_sync, settings_off, value, ydb_type, casted_result, uncasted_result):
         driver_sync._driver_config.query_client_settings = settings_off
         pool = ydb.QuerySessionPool(driver_sync)
         result = pool.execute_with_retries(
             f"DECLARE $param as {ydb_type}; SELECT $param as value",
             {"$param": (value, getattr(ydb.PrimitiveType, ydb_type))},
         )
-        assert type(result[0].rows[0].value) == uncasted_type
+        assert result[0].rows[0].value == uncasted_result
         pool.stop()
 
     @params
-    def test_session_pool_turn_on(self, driver_sync, settings_on, value, ydb_type, casted_result, uncasted_type):
+    def test_session_pool_turn_on(self, driver_sync, settings_on, value, ydb_type, casted_result, uncasted_result):
         pool = ydb.QuerySessionPool(driver_sync, query_client_settings=settings_on)
         result = pool.execute_with_retries(
             f"DECLARE $param as {ydb_type}; SELECT $param as value",
@@ -93,18 +83,18 @@ def test_session_pool_turn_on(self, driver_sync, settings_on, value, ydb_type, c
         pool.stop()
 
     @params
-    def test_session_pool_turn_off(self, driver_sync, settings_off, value, ydb_type, casted_result, uncasted_type):
+    def test_session_pool_turn_off(self, driver_sync, settings_off, value, ydb_type, casted_result, uncasted_result):
         pool = ydb.QuerySessionPool(driver_sync, query_client_settings=settings_off)
         result = pool.execute_with_retries(
             f"DECLARE $param as {ydb_type}; SELECT $param as value",
             {"$param": (value, getattr(ydb.PrimitiveType, ydb_type))},
         )
-        assert type(result[0].rows[0].value) == uncasted_type
+        assert result[0].rows[0].value == uncasted_result
         pool.stop()
 
     @pytest.mark.asyncio
     @params
-    async def test_driver_async_turn_on(self, driver, settings_on, value, ydb_type, casted_result, uncasted_type):
+    async def test_driver_async_turn_on(self, driver, settings_on, value, ydb_type, casted_result, uncasted_result):
         driver._driver_config.query_client_settings = settings_on
         pool = ydb.aio.QuerySessionPool(driver)
         result = await pool.execute_with_retries(
@@ -116,19 +106,21 @@ async def test_driver_async_turn_on(self, driver, settings_on, value, ydb_type,
 
     @pytest.mark.asyncio
     @params
-    async def test_driver_async_turn_off(self, driver, settings_off, value, ydb_type, casted_result, uncasted_type):
+    async def test_driver_async_turn_off(self, driver, settings_off, value, ydb_type, casted_result, uncasted_result):
         driver._driver_config.query_client_settings = settings_off
         pool = ydb.aio.QuerySessionPool(driver)
         result = await pool.execute_with_retries(
             f"DECLARE $param as {ydb_type}; SELECT $param as value",
             {"$param": (value, getattr(ydb.PrimitiveType, ydb_type))},
         )
-        assert type(result[0].rows[0].value) == uncasted_type
+        assert result[0].rows[0].value == uncasted_result
         await pool.stop()
 
     @pytest.mark.asyncio
     @params
-    async def test_session_pool_async_turn_on(self, driver, settings_on, value, ydb_type, casted_result, uncasted_type):
+    async def test_session_pool_async_turn_on(
+        self, driver, settings_on, value, ydb_type, casted_result, uncasted_result
+    ):
         pool = ydb.aio.QuerySessionPool(driver, query_client_settings=settings_on)
         result = await pool.execute_with_retries(
             f"DECLARE $param as {ydb_type}; SELECT $param as value",
@@ -140,12 +132,12 @@ async def test_session_pool_async_turn_on(self, driver, settings_on, value, ydb_
     @pytest.mark.asyncio
     @params
     async def test_session_pool_async_turn_off(
-        self, driver, settings_off, value, ydb_type, casted_result, uncasted_type
+        self, driver, settings_off, value, ydb_type, casted_result, uncasted_result
     ):
         pool = ydb.aio.QuerySessionPool(driver, query_client_settings=settings_off)
         result = await pool.execute_with_retries(
             f"DECLARE $param as {ydb_type}; SELECT $param as value",
             {"$param": (value, getattr(ydb.PrimitiveType, ydb_type))},
         )
-        assert type(result[0].rows[0].value) == uncasted_type
+        assert result[0].rows[0].value == uncasted_result
         await pool.stop()

ydb/aio/query/pool.py

@@ -27,6 +27,7 @@ def __init__(
         self,
         driver: common_utils.SupportedDriverType,
         size: int = 100,
+        *,
         query_client_settings: Optional[QueryClientSettings] = None,
     ):
         """

ydb/query/pool.py

@@ -32,6 +32,7 @@ def __init__(
         self,
         driver: common_utils.SupportedDriverType,
         size: int = 100,
+        *,
         query_client_settings: Optional[QueryClientSettings] = None,
     ):
         """