sqlalchemy-firebird-async 0.2.4__tar.gz → 0.2.5__tar.gz

{sqlalchemy_firebird_async-0.2.4 → sqlalchemy_firebird_async-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlalchemy-firebird-async
-Version: 0.2.4
+Version: 0.2.5
 Summary: Asyncio support for Firebird in SQLAlchemy
 Project-URL: Homepage, https://github.com/attid/sqlalchemy-firebird-async
 Project-URL: Repository, https://github.com/attid/sqlalchemy-firebird-async
@@ -14,7 +14,7 @@ Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Database
 Requires-Dist: greenlet!=0.4.17
-Requires-Dist: sqlalchemy-firebird<2.2.0,>=2.0.0
+Requires-Dist: sqlalchemy-firebird>=2.0.0
 Requires-Dist: sqlalchemy>=2.0.0
 Provides-Extra: all
 Requires-Dist: fdb>=2.0; extra == 'all'

{sqlalchemy_firebird_async-0.2.4 → sqlalchemy_firebird_async-0.2.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "sqlalchemy-firebird-async"
-version = "0.2.4"
+version = "0.2.5"
 description = "Asyncio support for Firebird in SQLAlchemy"
 readme = "README.md"
 authors = [
@@ -20,7 +20,7 @@ classifiers = [
 ]
 dependencies = [
     "sqlalchemy>=2.0.0",
-    "sqlalchemy-firebird>=2.0.0,<2.2.0",
+    "sqlalchemy-firebird>=2.0.0",
     "greenlet!=0.4.17",
 ]
 

{sqlalchemy_firebird_async-0.2.4 → sqlalchemy_firebird_async-0.2.5}/src/sqlalchemy_firebird_async/compiler.py

@@ -31,13 +31,17 @@ class PatchedFBTypeCompiler(FBTypeCompiler):
                 text += f" COLLATE {collation}"
             return text
 
-        # Fix for TypeError: unsupported operand type(s) for +: 'int' and 'str'
         if not isinstance(name, str):
-            # Attempt to restore type name from the type object itself
-            if hasattr(type_, "__visit_name__"):
-                name = type_.__visit_name__.upper()
-            else:
-                name = "VARCHAR"
+            name = getattr(type_, "__visit_name__", "VARCHAR").upper()
+
+        if hasattr(super(), "_render_firebird_string_type"):
+            return super()._render_firebird_string_type(
+                name,
+                length_override,
+                getattr(type_, "collation", None),
+                getattr(type_, "charset", None),
+            )
+
         return super()._render_string_type(type_, name, length_override)
 
     def visit_VARCHAR(self, type_, **kw):

{sqlalchemy_firebird_async-0.2.4 → sqlalchemy_firebird_async-0.2.5}/src/sqlalchemy_firebird_async/fdb.py

@@ -1,6 +1,8 @@
 import asyncio
+from math import modf
 from concurrent.futures import ThreadPoolExecutor
 from functools import partial
+from sqlalchemy import util
 from sqlalchemy.util.concurrency import await_only
 from greenlet import getcurrent
 
@@ -162,8 +164,8 @@ class AsyncDBAPI:
         return AsyncConnection(sync_conn, loop, executor)
 
 from sqlalchemy.pool import AsyncAdaptedQueuePool
+from sqlalchemy_firebird.base import FBDialect
 from sqlalchemy_firebird.base import FBExecutionContext
-import sqlalchemy_firebird.fdb as fdb
 from .compiler import PatchedFBCompiler, PatchedFBDDLCompiler, PatchedFBTypeCompiler
 from .types import FBCHARCompat, FBVARCHARCompat
 from sqlalchemy import String, DateTime, Time, TIMESTAMP, VARCHAR, CHAR
@@ -187,7 +189,7 @@ class AsyncFDBExecutionContext(FBExecutionContext):
             driver_conn.begin()
 
 
-class AsyncFDBDialect(fdb.FBDialect_fdb):
+class AsyncFDBDialect(FBDialect):
     name = "firebird.fdb_async"
     driver = "fdb_async"
     is_async = True
@@ -196,12 +198,12 @@ class AsyncFDBDialect(fdb.FBDialect_fdb):
     statement_compiler = PatchedFBCompiler
     ddl_compiler = PatchedFBDDLCompiler
     execution_ctx_cls = AsyncFDBExecutionContext
-    ischema_names = fdb.FBDialect_fdb.ischema_names.copy()
+    ischema_names = FBDialect.ischema_names.copy()
     ischema_names["TEXT"] = FBCHARCompat
     ischema_names["VARYING"] = FBVARCHARCompat
     ischema_names["CSTRING"] = FBVARCHARCompat
     
-    colspecs = fdb.FBDialect_fdb.colspecs.copy()
+    colspecs = FBDialect.colspecs.copy()
     colspecs[String] = _FBSafeString
     colspecs[VARCHAR] = _FBSafeString
     colspecs[CHAR] = _FBSafeString
@@ -215,6 +217,26 @@ class AsyncFDBDialect(fdb.FBDialect_fdb):
         self.type_compiler_instance = PatchedFBTypeCompiler(self)
         self.type_compiler = self.type_compiler_instance
 
+    def create_connect_args(self, url):
+        opts = url.translate_connect_args(username="user")
+        if opts.get("port"):
+            opts["host"] = "%s/%s" % (opts["host"], opts["port"])
+            del opts["port"]
+        opts.update(url.query)
+
+        util.coerce_kw_type(opts, "type_conv", int)
+
+        return ([], opts)
+
+    def _get_server_version_info(self, connection):
+        dbapi_connection = (
+            connection.connection.dbapi_connection
+            if self.using_sqlalchemy2
+            else connection.connection
+        )
+        minor, major = modf(dbapi_connection.engine_version)
+        return (int(major), int(minor * 10))
+
     def dbapi_exception_translation(self, exception, statement, parameters, context):
         from sqlalchemy import exc
         

{sqlalchemy_firebird_async-0.2.4 → sqlalchemy_firebird_async-0.2.5}/src/sqlalchemy_firebird_async/firebirdsql.py

@@ -6,8 +6,8 @@ from greenlet import getcurrent
 
 import firebirdsql
 import firebirdsql.aio as aio
-import sqlalchemy_firebird.fdb as fdb
-from .compiler import PatchedFBTypeCompiler
+from sqlalchemy_firebird.base import FBDialect
+from .compiler import PatchedFBCompiler, PatchedFBDDLCompiler, PatchedFBTypeCompiler
 from sqlalchemy import String
 from .types import _FBSafeString
 
@@ -134,14 +134,16 @@ class AsyncPyfbDBAPI:
         return firebirdsql.Binary(value)
 
 
-class AsyncFirebirdSQLDialect(fdb.FBDialect_fdb):
+class AsyncFirebirdSQLDialect(FBDialect):
     name = "firebird.firebirdsql_async"
     driver = "firebirdsql_async"
     is_async = True
     supports_statement_cache = False
     poolclass = AsyncAdaptedQueuePool
+    statement_compiler = PatchedFBCompiler
+    ddl_compiler = PatchedFBDDLCompiler
     
-    colspecs = fdb.FBDialect_fdb.colspecs.copy()
+    colspecs = FBDialect.colspecs.copy()
     colspecs[String] = _FBSafeString
     
     def __init__(self, *args, **kwargs):
@@ -192,4 +194,4 @@ class AsyncFirebirdSQLDialect(fdb.FBDialect_fdb):
             minor = int(parts[1]) if len(parts) > 1 else 0
             return (major, minor)
         except (ValueError, IndexError):
-            return (0, 0)
+            return (0, 0)