Merge pull request #1191 from phenobarbital/refactor-2.7-scylladb

fixing dependencies and some tests

asyncdb/drivers/outputs/record.py

@@ -4,7 +4,7 @@
 Returning a asyncdb Record row Format.
 """
 import logging
-from ...meta import Record
+from ...meta.record import Record
 from .base import OutputFormat
 
 

asyncdb/drivers/outputs/recordset.py

@@ -4,7 +4,7 @@
 Returning a asyncdb Recordset Result Format.
 """
 import logging
-from ...meta import Recordset
+from ...meta.recordset import Recordset
 from .base import OutputFormat
 
 

asyncdb/drivers/postgres.py

@@ -41,7 +41,7 @@
 from ..utils.encoders import (
     BaseEncoder,
 )
-from ..meta import Recordset
+from asyncdb.meta.recordset import Recordset
 from .sql import SQLDriver
 
 # from .abstract import BaseCursor

asyncdb/drivers/sa.py

@@ -12,7 +12,7 @@
 from sqlalchemy.exc import DatabaseError, OperationalError, SQLAlchemyError, ProgrammingError, InvalidRequestError
 from sqlalchemy import text
 from sqlalchemy.ext.asyncio import create_async_engine, AsyncSession
-from ..meta import Record
+from asyncdb.meta.record import Record
 from ..exceptions import (
     EmptyStatement,
     NoDataFound,

asyncdb/interfaces.py

@@ -22,7 +22,7 @@
 from functools import partial
 from concurrent.futures import ThreadPoolExecutor, ProcessPoolExecutor
 from datamodel.exceptions import ValidationError
-from .meta import Record, Recordset
+from .meta.record import Record
 from .exceptions import default_exception_handler, DriverError, EmptyStatement
 from .models import Model, Field, is_missing, is_dataclass
 from .utils.types import Entity, SafeDict
@@ -465,7 +465,7 @@ async def execute_many(self, sentence: list, *args) -> Optional[Any]:
         """
 
     @abstractmethod
-    async def query(self, sentence: Union[str, list], **kwargs) -> Optional[Recordset]:
+    async def query(self, sentence: Union[str, list], **kwargs) -> Optional[Sequence]:
         """queryrow.
 
         Making a Query and returns a resultset.

asyncdb/meta/__init__.py

@@ -1,10 +1,3 @@
 """
 Meta Objects for records and recordset for AsyncDB.
 """
-from .record import Record
-from .recordset import Recordset
-
-__all__ = [
-    "Record",
-    "Recordset",
-]

asyncdb/meta/record.py

@@ -5,7 +5,6 @@
 """
 from collections.abc import MutableMapping, Iterator
 from typing import Any, Union
-from google.cloud.bigquery import Row
 
 
 class Record(MutableMapping):

asyncdb/version.py

@@ -3,7 +3,7 @@
 __title__ = "asyncdb"
 __description__ = "Library for Asynchronous data source connections \
     Collection of asyncio drivers."
-__version__ = "2.7.16"
+__version__ = "2.7.17"
 __author__ = "Jesus Lara"
 __author_email__ = "[email protected]"
 __license__ = "BSD"

tests/test_aiosqlite.py

@@ -1,9 +1,10 @@
 import asyncio
 import pytest
-from asyncdb import AsyncDB
 import polars as pl
 import datatable as dt
-from asyncdb.meta import Record, Recordset
+from asyncdb import AsyncDB
+from asyncdb.meta.record import Record
+from asyncdb.meta.recordset import Recordset
 
 DRIVER = "sqlite"
 PARAMS = {"database": ":memory:"}

tests/test_asyncpg.py

@@ -8,7 +8,8 @@
 import pandas
 import polars as pl
 import datatable as dt
-from asyncdb.meta import Record, Recordset
+from asyncdb.meta.record import Record
+from asyncdb.meta.recordset import Recordset
 
 DRIVER = 'pg'
 DSN = "postgres://troc_pgdata:[email protected]:5432/navigator"

tests/test_postgres.py

@@ -5,7 +5,8 @@
 from io import BytesIO
 from pathlib import Path
 import pytest_asyncio
-from asyncdb.meta import Record, Recordset
+from asyncdb.meta.record import Record
+from asyncdb.meta.recordset import Recordset
 
 DRIVER = 'postgres'
 DSN = "postgres://troc_pgdata:[email protected]:5432/navigator"

tests/test_rethink.py

@@ -4,7 +4,8 @@
 import pytest_asyncio
 import pandas
 import datatable as dt
-from asyncdb.meta import Record, Recordset
+from asyncdb.meta.record import Record
+from asyncdb.meta.recordset import Recordset
 from asyncdb import AsyncDB
 
 DRIVER = 'rethink'

tests/test_sqlalchemy.py

@@ -4,7 +4,8 @@
 import pytest_asyncio
 import polars as pl
 import datatable as dt
-from asyncdb.meta import Record, Recordset
+from asyncdb.meta.record import Record
+from asyncdb.meta.recordset import Recordset
 
 DRIVER = "sql_alchemy"
 PARAMS = {
@@ -35,7 +36,7 @@ async def test_connect(event_loop):
         result, error = conn.test_connection()
         pytest.assume(result.one == 1)
     assert db.is_closed() is True
-    
+
 async def test_connect_by_dsn(event_loop):
     db = AsyncDB(DRIVER, dsn=DSN, loop=event_loop)
     pytest.assume(db.is_connected() is False)

tests/test_sqlserver.py

@@ -7,7 +7,8 @@
 import pytest_asyncio
 import pandas
 import datatable as dt
-from asyncdb.meta import Record, Recordset
+from asyncdb.meta.record import Record
+from asyncdb.meta.recordset import Recordset
 
 DRIVER = 'sqlserver'
 params = {