crate 0.30.0__py2.py3-none-any.whl → 0.30.1__py2.py3-none-any.whl

crate/client/__init__.py

@@ -29,7 +29,7 @@ __all__ = [
 
 # version string read from setup.py using a regex. Take care not to break the
 # regex!
-__version__ = "0.30.0"
+__version__ = "0.30.1"
 
 apilevel = "2.0"
 threadsafety = 2

crate/client/sqlalchemy/dialect.py

@@ -227,11 +227,11 @@ class CrateDialect(default.DefaultDialect):
     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):

crate/client/sqlalchemy/tests/dialect_test.py

@@ -20,12 +20,14 @@
 # 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
@@ -33,7 +35,7 @@ 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 SqlAlchemyDialectTest(TestCase):
 
         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 @@ class SqlAlchemyDialectTest(TestCase):
             ['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")

{crate-0.30.0.dist-info → crate-0.30.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: crate
-Version: 0.30.0
+Version: 0.30.1
 Summary: CrateDB Python Client
 Home-page: https://github.com/crate/crate-python
 Author: Crate.io

{crate-0.30.0.dist-info → crate-0.30.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
-crate-0.30.0-py3.9-nspkg.pth,sha256=nqN0-lx5dVfXKgm9N7WRgI0lrvtTYi2PUOtTjfAMtjY,534
-crate/client/__init__.py,sha256=z5D8kjYBUjvUtHy7dinOeoB9c5WsxF4N7O9sBlH1BGg,1305
+crate-0.30.1-py3.9-nspkg.pth,sha256=nqN0-lx5dVfXKgm9N7WRgI0lrvtTYi2PUOtTjfAMtjY,534
+crate/client/__init__.py,sha256=aMAGsfGO3MHvq3jgbmIS_lW8HceoBkyDx2-yuzPwsiQ,1305
 crate/client/_pep440.py,sha256=5KfZQ9kC9qfVK2YhRaMCuTETTbu-d3bMUOuC4RgHM38,14585
 crate/client/blob.py,sha256=plTwGEULg5s1VdKIMW6a0Zljdkng7xw0WXkXyiwNaSU,3496
 crate/client/connection.py,sha256=evWWrPFzI0lg2gPVz3Oy8PIo5AwfR-NhCSHowlpnYlw,8297
@@ -14,7 +14,7 @@ crate/client/test_util.py,sha256=xR9bdoHZplNBqIPnXSkHPNIo6bzUeKLnyqxcCmy-4Jw,163
 crate/client/tests.py,sha256=UBRgBRskvPNHfiyXF1PywVkjfZUdtFzW2Wm-nx-RrPE,12986
 crate/client/sqlalchemy/__init__.py,sha256=RKwu3filTgFGaw-X200qaQa89gRutnFaG-vlxjA6elU,1965
 crate/client/sqlalchemy/compiler.py,sha256=DL6exuoe-liZR4BqbAyYfi2PzlXnl3ccf1gfFJEh8Rc,7837
-crate/client/sqlalchemy/dialect.py,sha256=2BMH18LwdZBZkDyWXanUPRD_fEFn7WbYNCw5Sn6K_UM,12916
+crate/client/sqlalchemy/dialect.py,sha256=Kz83VQNJNYdqxlLL4Sg4H0n7jN_Kg17-L-fSxb3SMgA,12940
 crate/client/sqlalchemy/sa_version.py,sha256=exLPKCalcinLZ9geiqPX_pFWOoxnDkkxTy5AOabf9zw,1181
 crate/client/sqlalchemy/types.py,sha256=8aXPln79WQ5QNqDJZL2TSvG31XO0pWo9EqF2XOzzgYU,8257
 crate/client/sqlalchemy/compat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -30,7 +30,7 @@ crate/client/sqlalchemy/tests/compiler_test.py,sha256=M62a0h23jDjfO5Ohkw4pv_8eah
 crate/client/sqlalchemy/tests/connection_test.py,sha256=LW2hIlEbhQWopZZ-Zp1nejRxEfMmaGwFbxwfQFQ8sBk,4596
 crate/client/sqlalchemy/tests/create_table_test.py,sha256=nvVphw-shsf8JMUopQk66-jJN89AVxYSIiAPV43KmtI,9176
 crate/client/sqlalchemy/tests/datetime_test.py,sha256=E84Xd-g7kIshKdGQ6J2RMvuao-Od0iCpz11JLfyA5s8,3170
-crate/client/sqlalchemy/tests/dialect_test.py,sha256=lWIwI7imR_55zoJ2CkaOspjvkH6mKTPR8dv2i8xOfRg,4948
+crate/client/sqlalchemy/tests/dialect_test.py,sha256=ugTljMQZ5Qkloxop3G5ptkCuBLSR_2h_2UZaiX8Dl2c,6275
 crate/client/sqlalchemy/tests/dict_test.py,sha256=SJPBUs3-MPZ3XxYPF1KGz7bxbWKCArZz0dvtqhysuWk,16600
 crate/client/sqlalchemy/tests/function_test.py,sha256=XQrPW8WKPI_aLgZo9kpfO2Wjx6dWp3ureqtgkghl2xk,1824
 crate/client/sqlalchemy/tests/insert_from_select_test.py,sha256=UeSk-34qh_mrZNr4q1uriFI9UxPieFPJ2eKjNhHkEPc,3256
@@ -43,11 +43,11 @@ crate/testing/settings.py,sha256=YTqod79NO4Lv_agPgMLGlB_fMe6baAhLXFKBZnuytBk,165
 crate/testing/test_layer.py,sha256=9x3FiyJcsB9oSY5vVzMaL_DvwJt91a_hquXS7gbDYdQ,11525
 crate/testing/tests.py,sha256=seACn7a4HbQIGxJmKXiUDkuE9ossO7UsSMTwMYimOA0,1287
 crate/testing/util.py,sha256=qtc72rKfvfTA9VMKjE2JSukffobd7ffCcddoTiAdO6A,690
-crate-0.30.0.dist-info/LICENSE,sha256=1QGh4tR_JmDKn33ztoDv2UkER0Q4Zh1kC5J3vMWwRso,12854
-crate-0.30.0.dist-info/METADATA,sha256=G8rjC6PEYA5FXnQTkenQ6fjhI9cDlaASImiBy_hRjL8,4526
-crate-0.30.0.dist-info/NOTICE,sha256=vwbBS8sykCOndA1kjuu8dUInljH27kk3lcPBzQ2SMns,1159
-crate-0.30.0.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
-crate-0.30.0.dist-info/entry_points.txt,sha256=DN4zBP45-6hmDwuOAR9LFoxzrg-A9MqPh1Hn6UXEFPQ,68
-crate-0.30.0.dist-info/namespace_packages.txt,sha256=2wP2HlpxdhgTLMl9ipi168xkm6FMq9_2bf0xGGxF_OI,6
-crate-0.30.0.dist-info/top_level.txt,sha256=2wP2HlpxdhgTLMl9ipi168xkm6FMq9_2bf0xGGxF_OI,6
-crate-0.30.0.dist-info/RECORD,,
+crate-0.30.1.dist-info/LICENSE,sha256=1QGh4tR_JmDKn33ztoDv2UkER0Q4Zh1kC5J3vMWwRso,12854
+crate-0.30.1.dist-info/METADATA,sha256=_BAElXFOJzZY9u7hMcU-PEHoUCxuocEDwTjYAYw2XIU,4526
+crate-0.30.1.dist-info/NOTICE,sha256=vwbBS8sykCOndA1kjuu8dUInljH27kk3lcPBzQ2SMns,1159
+crate-0.30.1.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
+crate-0.30.1.dist-info/entry_points.txt,sha256=DN4zBP45-6hmDwuOAR9LFoxzrg-A9MqPh1Hn6UXEFPQ,68
+crate-0.30.1.dist-info/namespace_packages.txt,sha256=2wP2HlpxdhgTLMl9ipi168xkm6FMq9_2bf0xGGxF_OI,6
+crate-0.30.1.dist-info/top_level.txt,sha256=2wP2HlpxdhgTLMl9ipi168xkm6FMq9_2bf0xGGxF_OI,6
+crate-0.30.1.dist-info/RECORD,,