SA20: Fix unexpected keyword argument 'info_cache' on introspection

Both methods `CrateDialect.{has_schema,has_table}` need to accept and
forward keyword arguments, in order to comply to the intended interface,
starting with SQLAlchemy 2.0.

Otherwise, those errors would be raised:

- TypeError: CrateDialect.has_schema() got an unexpected keyword argument 'info_cache'
- TypeError: CrateDialect.has_table() got an unexpected keyword argument 'info_cache'

Author: amotl

CHANGES.txt

@@ -5,6 +5,7 @@ Changes for crate
 Unreleased
 ==========
 
+- Fixed SQLAlchemy 2.0 incompatibility with ``CrateDialect.{has_schema,has_table}``
 
 2023/02/16 0.30.0
 =================

src/crate/client/sqlalchemy/dialect.py

@@ -227,11 +227,11 @@ def import_dbapi(cls):
     def dbapi(cls):
         return cls.import_dbapi()
 
-    def has_schema(self, connection, schema):
-        return schema in self.get_schema_names(connection)
+    def has_schema(self, connection, schema, **kw):
+        return schema in self.get_schema_names(connection, **kw)
 
-    def has_table(self, connection, table_name, schema=None):
-        return table_name in self.get_table_names(connection, schema=schema)
+    def has_table(self, connection, table_name, schema=None, **kw):
+        return table_name in self.get_table_names(connection, schema=schema, **kw)
 
     @reflection.cache
     def get_schema_names(self, connection, **kw):

src/crate/client/sqlalchemy/tests/dialect_test.py

@@ -20,20 +20,22 @@
 # software solely pursuant to the terms of the relevant commercial agreement.
 
 from datetime import datetime
-from unittest import TestCase
+from unittest import TestCase, skipIf
 from unittest.mock import MagicMock, patch
 
 import sqlalchemy as sa
 
 from crate.client.cursor import Cursor
+from crate.client.sqlalchemy import SA_VERSION
+from crate.client.sqlalchemy.sa_version import SA_1_4, SA_2_0
 from crate.client.sqlalchemy.types import Object
 from sqlalchemy import inspect
 from sqlalchemy.orm import Session
 try:
     from sqlalchemy.orm import declarative_base
 except ImportError:
     from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.testing import eq_, in_
+from sqlalchemy.testing import eq_, in_, is_true
 
 FakeCursor = MagicMock(name='FakeCursor', spec=Cursor)
 
@@ -70,6 +72,13 @@ class Character(self.base):
 
         self.session = Session(bind=self.engine)
 
+    def init_mock(self, return_value=None):
+        self.fake_cursor.rowcount = 1
+        self.fake_cursor.description = (
+            ('foo', None, None, None, None, None, None),
+        )
+        self.fake_cursor.fetchall = MagicMock(return_value=return_value)
+
     def test_primary_keys_2_3_0(self):
         insp = inspect(self.session.bind)
         self.engine.dialect.server_version_info = (2, 3, 0)
@@ -126,3 +135,22 @@ def test_get_view_names(self):
             ['v1', 'v2'])
         eq_(self.executed_statement, "SELECT table_name FROM information_schema.views "
                                      "ORDER BY table_name ASC, table_schema ASC")
+
+    @skipIf(SA_VERSION < SA_1_4, "Inspector.has_table only available on SQLAlchemy>=1.4")
+    def test_has_table(self):
+        self.init_mock(return_value=[["foo"], ["bar"]])
+        insp = inspect(self.session.bind)
+        is_true(insp.has_table("bar"))
+        eq_(self.executed_statement,
+            "SELECT table_name FROM information_schema.tables "
+            "WHERE table_schema = ? AND table_type = 'BASE TABLE' "
+            "ORDER BY table_name ASC, table_schema ASC")
+
+    @skipIf(SA_VERSION < SA_2_0, "Inspector.has_schema only available on SQLAlchemy>=2.0")
+    def test_has_schema(self):
+        self.init_mock(
+            return_value=[["blob"], ["doc"], ["information_schema"], ["pg_catalog"], ["sys"]])
+        insp = inspect(self.session.bind)
+        is_true(insp.has_schema("doc"))
+        eq_(self.executed_statement,
+            "select schema_name from information_schema.schemata order by schema_name asc")