GeoAlchemy2 0.13.1__py3-none-any.whl → 0.13.2__py3-none-any.whl

{GeoAlchemy2-0.13.1.dist-info → GeoAlchemy2-0.13.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GeoAlchemy2
-Version: 0.13.1
+Version: 0.13.2
 Summary: Using SQLAlchemy with Spatial Databases
 Home-page: https://geoalchemy-2.readthedocs.io/en/latest/
 Author: Eric Lemoine

{GeoAlchemy2-0.13.1.dist-info → GeoAlchemy2-0.13.2.dist-info}/RECORD

@@ -1,18 +1,18 @@
 geoalchemy2/__init__.py,sha256=osB4UEZhXaj5uscV-Nzy1bXroSBw9MTAmGTM1g97iTc,4874
 geoalchemy2/_functions.py,sha256=JdZdgGgRrjv7EySEEHfo1WDIJaGyldTqpCD6jUXVzEQ,62680
-geoalchemy2/alembic_helpers.py,sha256=f_AWdeONENrOZZVyA7hZgfacQUJq-J9y4opcv8KldkM,24739
-geoalchemy2/comparator.py,sha256=tOkIZ7bSuxbkAZXeqrG8lpSnCPH2u2c4MYbKwHaCXmE,7278
+geoalchemy2/alembic_helpers.py,sha256=zNuiBTv-zBgv-tU_F6RK6qdv9If5UlzHZpAJUrqjxhU,24834
+geoalchemy2/comparator.py,sha256=1GkzKi2-kmHPjwoTxMgGGEzMChlo3_XXEv_Vm9-YKIg,7277
 geoalchemy2/elements.py,sha256=XOEJUfzHiULxFflLyrlvm-korIA9wvAz3CHSrHsIrWg,8032
 geoalchemy2/exc.py,sha256=Nn9bRKB_35skWDMkEf4_Y2GL6gvguPVycPZcbOfa69g,226
-geoalchemy2/functions.py,sha256=dKAOHEJjLALdF4DjubVkfs8KHzmh4RZVlceYND0xZhA,11393
+geoalchemy2/functions.py,sha256=BhT_tRBxQw9k4pMaDwR9gICo7tmgwTtbyZGsoPq8_x4,10037
 geoalchemy2/shape.py,sha256=uLs2vCW7VnSsaS58f43bg60VjuyoEr9Eq_g7pMGI4-0,3432
 geoalchemy2/types.py,sha256=F8Qa7ZsDgOB7wjawlgpsJPtzhaTOFNjWdmWlByQ9emU,16733
 geoalchemy2/dialects/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geoalchemy2/dialects/common.py,sha256=5fC6w59JtAkqigkq01TBaQo5teGmknfYA0wyvXeHpEs,2744
 geoalchemy2/dialects/postgresql.py,sha256=btr-a5ckQRXoEUZCCddoyPAyl2bqTZQuuvRllrAtDCQ,6751
-geoalchemy2/dialects/sqlite.py,sha256=uNM028igtOK38NUeOTcxgGrHivFsmHZZcmSDHIpXArI,8305
-GeoAlchemy2-0.13.1.dist-info/COPYING.rst,sha256=-bQKftq9uMOROzF7oN65kYBBIJKxTmBuDoftp27IC3I,1056
-GeoAlchemy2-0.13.1.dist-info/METADATA,sha256=G-AmhVP4isJfpwx-9x8XGPuz_Z4u0tXXbB48kBMPt1k,1751
-GeoAlchemy2-0.13.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-GeoAlchemy2-0.13.1.dist-info/top_level.txt,sha256=3kGUTcfBeXd61zFpof6-qiuw1peNF_HuZabgHQgrdis,12
-GeoAlchemy2-0.13.1.dist-info/RECORD,,
+geoalchemy2/dialects/sqlite.py,sha256=g4frIyZYGzalhi_PlPOnDUvkeIDJ0KObgjwWH9JkY2g,9253
+GeoAlchemy2-0.13.2.dist-info/COPYING.rst,sha256=-bQKftq9uMOROzF7oN65kYBBIJKxTmBuDoftp27IC3I,1056
+GeoAlchemy2-0.13.2.dist-info/METADATA,sha256=T_VK6Fuyzg21OLIlD8EC2S3nUTNEdHmhZ4iw8fvRg1A,1751
+GeoAlchemy2-0.13.2.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+GeoAlchemy2-0.13.2.dist-info/top_level.txt,sha256=3kGUTcfBeXd61zFpof6-qiuw1peNF_HuZabgHQgrdis,12
+GeoAlchemy2-0.13.2.dist-info/RECORD,,

{GeoAlchemy2-0.13.1.dist-info → GeoAlchemy2-0.13.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.38.4)
+Generator: bdist_wheel (0.40.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

geoalchemy2/alembic_helpers.py

@@ -41,11 +41,14 @@ def _monkey_patch_get_indexes_for_sqlite():
     def spatial_behavior(self, connection, table_name, schema=None, **kw):
         indexes = self._get_indexes_normal_behavior(connection, table_name, schema=None, **kw)
 
-        # Check that SpatiaLite was loaded into the DB
-        is_spatial_db = connection.exec_driver_sql(
-            """PRAGMA main.table_info(geometry_columns)"""
-        ).fetchall()
-        if not is_spatial_db:
+        try:
+            # Check that SpatiaLite was loaded into the DB
+            is_spatial_db = connection.exec_driver_sql(
+                """PRAGMA main.table_info(geometry_columns)"""
+            ).fetchall()
+            if not is_spatial_db:
+                return indexes
+        except AttributeError:
             return indexes
 
         # Get spatial indexes

geoalchemy2/comparator.py

@@ -77,7 +77,6 @@ class BaseComparator(UserDefinedType.Comparator):
     key = None
 
     def __getattr__(self, name):
-
         # Function names that don't start with "ST_" are rejected.
         # This is not to mess up with SQLAlchemy's use of
         # hasattr/getattr on Column objects.

geoalchemy2/dialects/sqlite.py

@@ -2,9 +2,11 @@
 import os
 
 from sqlalchemy import text
+from sqlalchemy.ext.compiler import compiles
 from sqlalchemy.sql import func
 from sqlalchemy.sql import select
 
+from geoalchemy2 import functions
 from geoalchemy2.dialects.common import _check_spatial_type
 from geoalchemy2.dialects.common import _format_select_args
 from geoalchemy2.dialects.common import _spatial_idx_name
@@ -185,8 +187,7 @@ def after_create(table, bind, **kw):
             col.type = col._actual_type
             del col._actual_type
             dimension = get_col_dim(col)
-            args = [table.schema] if table.schema else []
-            args.extend([table.name, col.name, col.type.srid, col.type.geometry_type, dimension])
+            args = [table.name, col.name, col.type.srid, col.type.geometry_type, dimension]
 
             stmt = select(*_format_select_args(func.RecoverGeometryColumn(*args)))
             stmt = stmt.execution_options(autocommit=True)
@@ -211,8 +212,7 @@ def before_drop(table, bind, **kw):
         # Disable spatial indexes if present
         disable_spatial_index(bind, table, col)
 
-        args = [table.schema] if table.schema else []
-        args.extend([table.name, col.name])
+        args = [table.name, col.name]
 
         stmt = select(*_format_select_args(func.DiscardGeometryColumn(*args)))
         stmt = stmt.execution_options(autocommit=True)
@@ -222,3 +222,40 @@ def before_drop(table, bind, **kw):
 def after_drop(table, bind, **kw):
     """Handle spatial indexes during the after_drop event."""
     table.columns = table.info.pop("_saved_columns")
+
+
+# Define compiled versions for functions in SpatiaLite whose names don't have
+# the ST_ prefix.
+_SQLITE_FUNCTIONS = {
+    "ST_GeomFromEWKT": "GeomFromEWKT",
+    "ST_GeomFromEWKB": "GeomFromEWKB",
+    "ST_AsBinary": "AsBinary",
+    "ST_AsEWKB": "AsEWKB",
+    "ST_AsGeoJSON": "AsGeoJSON",
+}
+
+
+def _compiles_sqlite(cls, fn):
+    def _compile_sqlite(element, compiler, **kw):
+        return "{}({})".format(fn, compiler.process(element.clauses, **kw))
+
+    compiles(getattr(functions, cls), "sqlite")(_compile_sqlite)
+
+
+def register_sqlite_mapping(mapping):
+    """Register compilation mappings for the given functions.
+
+    Args:
+        mapping: Should have the following form::
+
+                {
+                    "function_name_1": "sqlite_function_name_1",
+                    "function_name_2": "sqlite_function_name_2",
+                    ...
+                }
+    """
+    for cls, fn in mapping.items():
+        _compiles_sqlite(cls, fn)
+
+
+register_sqlite_mapping(_SQLITE_FUNCTIONS)

geoalchemy2/functions.py

@@ -125,7 +125,6 @@ except ImportError:
 
 
 class TableRowElement(ColumnElement):
-
     inherit_cache = False
     """The cache is disabled for this class."""
 
@@ -278,54 +277,3 @@ for name, type_, doc in _FUNCTIONS:
         attributes["__doc__"] = "\n\n".join(docs)
 
     globals()[name] = type(name, (GenericFunction,), attributes)
-
-
-#
-# Define compiled versions for functions in SpatiaLite whose names don't have
-# the ST_ prefix.
-#
-
-
-_SQLITE_FUNCTIONS = {
-    "ST_GeomFromEWKT": "GeomFromEWKT",
-    "ST_GeomFromEWKB": "GeomFromEWKB",
-    "ST_AsBinary": "AsBinary",
-    "ST_AsEWKB": "AsEWKB",
-    "ST_AsGeoJSON": "AsGeoJSON",
-}
-
-
-# Default handlers are required for SQLAlchemy < 1.1
-# See more details in https://github.com/geoalchemy/geoalchemy2/issues/213
-def _compiles_default(cls):
-    def _compile_default(element, compiler, **kw):
-        return "{}({})".format(cls, compiler.process(element.clauses, **kw))
-
-    compiles(globals()[cls])(_compile_default)
-
-
-def _compiles_sqlite(cls, fn):
-    def _compile_sqlite(element, compiler, **kw):
-        return "{}({})".format(fn, compiler.process(element.clauses, **kw))
-
-    compiles(globals()[cls], "sqlite")(_compile_sqlite)
-
-
-def register_sqlite_mapping(mapping):
-    """Register compilation mappings for the given functions.
-
-    Args:
-        mapping: Should have the following form::
-
-                {
-                    "function_name_1": "sqlite_function_name_1",
-                    "function_name_2": "sqlite_function_name_2",
-                    ...
-                }
-    """
-    for cls, fn in mapping.items():
-        _compiles_default(cls)
-        _compiles_sqlite(cls, fn)
-
-
-register_sqlite_mapping(_SQLITE_FUNCTIONS)