GeoAlchemy2 0.17.1__py3-none-any.whl → 0.18.0__py3-none-any.whl

geoalchemy2/types/__init__.py

@@ -5,14 +5,14 @@ The :class:`geoalchemy2.types.Geometry`, :class:`geoalchemy2.types.Geography`, a
 columns/properties in models.
 """
 
+import re
 import warnings
 from typing import Any
 from typing import Dict
 from typing import Optional
 
+from sqlalchemy import Computed
 from sqlalchemy.dialects import postgresql
-from sqlalchemy.dialects.postgresql.base import ischema_names as _postgresql_ischema_names
-from sqlalchemy.dialects.sqlite.base import ischema_names as _sqlite_ischema_names
 from sqlalchemy.ext.compiler import compiles
 from sqlalchemy.sql import func
 from sqlalchemy.types import Float
@@ -116,17 +116,17 @@ class _GISType(UserDefinedType):
     def __init__(
         self,
         geometry_type: Optional[str] = "GEOMETRY",
-        srid=-1,
-        dimension=2,
-        spatial_index=True,
-        use_N_D_index=False,
+        srid: int = -1,
+        dimension: Optional[int] = None,
+        spatial_index: bool = True,
+        use_N_D_index: bool = False,
         use_typmod: Optional[bool] = None,
         from_text: Optional[str] = None,
         name: Optional[str] = None,
-        nullable=True,
+        nullable: bool = True,
         _spatial_index_reflected=None,
     ) -> None:
-        geometry_type, srid = self.check_ctor_args(
+        geometry_type, srid, dimension = self.check_ctor_args(
             geometry_type, srid, dimension, use_typmod, nullable
         )
         self.geometry_type = geometry_type
@@ -195,7 +195,21 @@ class _GISType(UserDefinedType):
                 'The "nullable" and "use_typmod" arguments can not be used together'
             )
 
-        return geometry_type, srid
+        if dimension not in [None, 2, 3, 4]:
+            raise ValueError("dimension must be one of [None, 2, 3, 4] " "but got %s" % dimension)
+        if geometry_type is not None:
+            if geometry_type.endswith("ZM"):
+                if dimension not in [None, 4]:
+                    raise ValueError("dimension must be 4 when geometry_type ends with 'ZM'")
+                dimension = 4
+            elif geometry_type[-1] in ["Z", "M"]:
+                if dimension not in [None, 3]:
+                    raise ValueError("dimension must be 3 when geometry_type ends with 'Z' or 'M'")
+                dimension = 3
+            else:
+                dimension = 2
+
+        return geometry_type, srid, dimension
 
 
 @compiles(_GISType, "mysql")
@@ -206,10 +220,23 @@ def get_col_spec_mysql(self, compiler, *args, **kwargs):
     else:
         spec = "GEOMETRY"
 
-    if not self.nullable or self.spatial_index:
-        spec += " NOT NULL"
-    if self.srid > 0 and compiler.dialect.name != "mariadb":
-        spec += " SRID %d" % self.srid
+    type_expression = kwargs.get("type_expression", None)
+    if type_expression is None or type_expression.computed is None:
+        if not self.nullable or self.spatial_index:
+            spec += " NOT NULL"
+        if self.srid > 0 and compiler.dialect.name != "mariadb":
+            spec += " SRID %d" % self.srid
+    return spec
+
+
+@compiles(Computed, "mysql")
+@compiles(Computed, "mariadb")
+def get_col_spec_computed_mysql(self, compiler, *args, **kwargs):
+    # MySQL uses a different syntax for computed columns
+    # than PostgreSQL, so we need to handle it here.
+    spec = self.sqltext.compile(compiler, **kwargs).string
+    pattern = re.compile("st_", re.IGNORECASE)
+    spec = "AS (%s)" % re.sub(pattern, "", spec)
     return spec
 
 
@@ -246,7 +273,7 @@ class Geometry(_GISType):
         ``result_processor`` method. """
 
     cache_ok = True
-    """ Disable cache for this type. """
+    """ Enable cache for this type. """
 
 
 class Geography(_GISType):
@@ -276,7 +303,7 @@ class Geography(_GISType):
         ``result_processor`` method. """
 
     cache_ok = True
-    """ Disable cache for this type. """
+    """ Enable cache for this type. """
 
 
 class Raster(_GISType):
@@ -316,26 +343,34 @@ class Raster(_GISType):
         ``result_processor`` method. """
 
     cache_ok = True
-    """ Disable cache for this type. """
+    """ Enable cache for this type. """
 
-    def __init__(self, spatial_index=True, from_text=None, name=None, nullable=True) -> None:
+    def __init__(
+        self,
+        spatial_index=True,
+        from_text=None,
+        name=None,
+        nullable=True,
+        _spatial_index_reflected=None,
+    ) -> None:
         # Enforce default values
         super(Raster, self).__init__(
             geometry_type=None,
             srid=-1,
-            dimension=2,
+            dimension=None,
             spatial_index=spatial_index,
             use_N_D_index=False,
             use_typmod=False,
             from_text=from_text,
             name=name,
             nullable=nullable,
+            _spatial_index_reflected=_spatial_index_reflected,
         )
         self.extended = None
 
     @staticmethod
     def check_ctor_args(*args, **kwargs):
-        return None, -1
+        return None, -1, None
 
 
 class _DummyGeometry(Geometry):
@@ -383,23 +418,6 @@ class GeometryDump(CompositeType):
     """ Enable cache for this type. """
 
 
-# Register Geometry, Geography and Raster to SQLAlchemy's reflection subsystems.
-_postgresql_ischema_names["geometry"] = Geometry
-_postgresql_ischema_names["geography"] = Geography
-_postgresql_ischema_names["raster"] = Raster
-
-_sqlite_ischema_names["GEOMETRY"] = Geometry
-_sqlite_ischema_names["POINT"] = Geometry
-_sqlite_ischema_names["LINESTRING"] = Geometry
-_sqlite_ischema_names["POLYGON"] = Geometry
-_sqlite_ischema_names["MULTIPOINT"] = Geometry
-_sqlite_ischema_names["MULTILINESTRING"] = Geometry
-_sqlite_ischema_names["MULTIPOLYGON"] = Geometry
-_sqlite_ischema_names["CURVE"] = Geometry
-_sqlite_ischema_names["GEOMETRYCOLLECTION"] = Geometry
-_sqlite_ischema_names["RASTER"] = Raster
-
-
 class SummaryStats(CompositeType):
     """Define the composite type returned by the function ST_SummaryStatsAgg."""
 

geoalchemy2/types/dialects/mariadb.py

@@ -42,6 +42,21 @@ def bind_processor_process(spatial_type, bindvalue):
             bindvalue.srid = spatial_type.srid
         return bindvalue
     elif isinstance(bindvalue, WKBElement):
-        # With MariaDB we use Shapely to convert the WKBElement to an EWKT string
-        return to_shape(bindvalue).wkt
+        if "wkb" not in spatial_type.from_text.lower():
+            # With MariaDB we use Shapely to convert the WKBElement to an EWKT string
+            wkt = to_shape(bindvalue).wkt
+            if "multipoint" in wkt[:20].lower():
+                # Shapely>=2.1 adds parentheses around each sub-point which is not supported
+                first_idx = wkt.find("(")
+                last_idx = wkt.rfind(")")
+                wkt = (
+                    wkt[: first_idx + 1]
+                    + wkt[first_idx:last_idx].replace("(", "").replace(")", "")
+                    + wkt[last_idx:]
+                )
+            return wkt
+        # MariaDB does not support raw binary data so we use the hex representation
+        return bindvalue.desc
+    elif isinstance(bindvalue, memoryview):
+        return bindvalue.tobytes().hex()
     return bindvalue

geoalchemy2/types/dialects/mysql.py

@@ -38,11 +38,11 @@ def bind_processor_process(spatial_type, bindvalue):
 
     if isinstance(bindvalue, WKTElement):
         bindvalue = bindvalue.as_wkt()
-        if bindvalue.srid == -1:
+        if bindvalue.srid <= 0:
             bindvalue.srid = spatial_type.srid
         return bindvalue
     elif isinstance(bindvalue, WKBElement):
         if "wkb" not in spatial_type.from_text.lower():
             # With MySQL we use Shapely to convert the WKBElement to an EWKT string
             return to_shape(bindvalue).wkt
-        return bindvalue
+    return bindvalue

{GeoAlchemy2-0.17.1.dist-info → geoalchemy2-0.18.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: GeoAlchemy2
-Version: 0.17.1
+Version: 0.18.0
 Summary: Using SQLAlchemy with Spatial Databases
 Home-page: https://geoalchemy-2.readthedocs.io/en/stable/
 Author: Eric Lemoine
@@ -13,16 +13,14 @@ Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Plugins
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Intended Audience :: Information Technology
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Topic :: Scientific/Engineering :: GIS
-Requires-Python: >=3.7
+Requires-Python: >=3.10
 License-File: COPYING.rst
 Requires-Dist: SQLAlchemy>=1.4
 Requires-Dist: packaging
@@ -35,6 +33,7 @@ Dynamic: description
 Dynamic: home-page
 Dynamic: keywords
 Dynamic: license
+Dynamic: license-file
 Dynamic: project-url
 Dynamic: provides-extra
 Dynamic: requires-dist

geoalchemy2-0.18.0.dist-info/RECORD

@@ -0,0 +1,35 @@
+geoalchemy2/__init__.py,sha256=YCZ2cWjNdpRLtIuGPi6Q4GX7l-4DV8YQ-D7QVYboSPk,1389
+geoalchemy2/_functions.py,sha256=WuCmli7S6NzFnMyCX4KU2etLxU6AQ9XHLx32WXlQy8s,63872
+geoalchemy2/_functions_helpers.py,sha256=5UEF72WdOif9ljtuDHSgSMrxjYZB5-aQDnJ1mAtxET0,2698
+geoalchemy2/alembic_helpers.py,sha256=3U0Co-VdkkZ44MaRDG-ukN93dRk6qWDz2BOgcEOpTl4,27906
+geoalchemy2/comparator.py,sha256=k-MdwOK4IThJi0_d_yiyRIRmfC54nbS5tR2SN5_ZEv0,8136
+geoalchemy2/elements.py,sha256=ynXBSH2QeAdClfaPLSGOVuK4atQqzshXujALhsQpFuc,15312
+geoalchemy2/exc.py,sha256=Nn9bRKB_35skWDMkEf4_Y2GL6gvguPVycPZcbOfa69g,226
+geoalchemy2/functions.py,sha256=_s1j-PEu-KrtT_l_dOy5CpH9WP_ybNxZCLGpvD8QZ2I,10381
+geoalchemy2/functions.pyi,sha256=K9OH6yiJO6YqcMA-ddjOYA4xXMxypjESn3TOV0_lmys,126010
+geoalchemy2/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+geoalchemy2/shape.py,sha256=TLeWa6NwXZqBxh3Zj-l96wBB5kPviEhnZ44kyr8v678,2735
+geoalchemy2/utils.py,sha256=OYWYnT64tjp4DWhPdq3KIxHbVti932xPMtGGxajtu-I,488
+geoalchemy2/admin/__init__.py,sha256=O5kr1ETm3lTpEELm16Oxq6344KztOZmUaapf0ZIP6b8,4016
+geoalchemy2/admin/plugin.py,sha256=2U5p4_JdZM7b2MOXXBfP8KhtXlLHu-ASjxTq4mF-thg,4332
+geoalchemy2/admin/dialects/__init__.py,sha256=z4gBrdglClnmp9VdDW0WwEAGNoemMUSvMCeFFvuQcgs,422
+geoalchemy2/admin/dialects/common.py,sha256=er5twNOw_31xG5DpY9Gg-Ipyi0nt34R_gPdfy851JlU,3750
+geoalchemy2/admin/dialects/geopackage.py,sha256=0KK61SRh6g6KDa5_0GjODhnSWBag7XHHfUuEXAmzTkQ,14788
+geoalchemy2/admin/dialects/mariadb.py,sha256=pv1InVcLHmMuBLS8yo4SUnZpzm_V0rd8AU78rvmvAy0,4176
+geoalchemy2/admin/dialects/mysql.py,sha256=0pIdR3_TiEGbwC61CakjMlKIMpaY1Hk_O0lVJRx2Z-g,8163
+geoalchemy2/admin/dialects/postgresql.py,sha256=Ax8zhHl1K1D4ERH933PPVcwVKmj7s-3zF_aOU51jDV8,8900
+geoalchemy2/admin/dialects/sqlite.py,sha256=YbGQhV0XFjNkoZ1yh4Y-lScY-e4X54AwLKm68s4ieQA,16289
+geoalchemy2/types/__init__.py,sha256=KyZL-w7-re1cvJDJcqlwvBjFqGRpQ0y0M6M9UvduuF4,14868
+geoalchemy2/types/dialects/__init__.py,sha256=GYqO6nDtzElvsV22VN1SSUet2elaZG4ZuRrM-asbstM,414
+geoalchemy2/types/dialects/common.py,sha256=eiIKe-sFAdzgvQ7YT0cV29tYAPrs55GXKJi3p1UvjPQ,158
+geoalchemy2/types/dialects/geopackage.py,sha256=nRmN_PnF-CWMEHkWhKVdsybnw3SvXZIBXAHIHXJLTqw,147
+geoalchemy2/types/dialects/mariadb.py,sha256=9MXIe9jFB5HUu1B2JyO8FdgU97Mg0F8prXLBddBX4qw,2434
+geoalchemy2/types/dialects/mysql.py,sha256=J689ycYgy1n5nBnrBZfuLBSyfdLZkfNHNG3PWcttx6I,1785
+geoalchemy2/types/dialects/postgresql.py,sha256=7NBKEbDJXMwX8Sgs6o_N2bAUHgjUcjbrdmYOA7sDiRw,1117
+geoalchemy2/types/dialects/sqlite.py,sha256=B-yLzaQcqL_4dXoOPX9D9IXw2ZQlq-Tibv_kqUIBeb4,2104
+geoalchemy2-0.18.0.dist-info/licenses/COPYING.rst,sha256=-bQKftq9uMOROzF7oN65kYBBIJKxTmBuDoftp27IC3I,1056
+geoalchemy2-0.18.0.dist-info/METADATA,sha256=H_xDsK9r7TTAVSsEvuwLiX7jo7-fOXU05YVQxyxXXvo,2251
+geoalchemy2-0.18.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+geoalchemy2-0.18.0.dist-info/entry_points.txt,sha256=izFHecGE8cNV6IjoLkc0uEmKH13rYbbvozc4fEwRl6Y,70
+geoalchemy2-0.18.0.dist-info/top_level.txt,sha256=3kGUTcfBeXd61zFpof6-qiuw1peNF_HuZabgHQgrdis,12
+geoalchemy2-0.18.0.dist-info/RECORD,,

{GeoAlchemy2-0.17.1.dist-info → geoalchemy2-0.18.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

GeoAlchemy2-0.17.1.dist-info/RECORD

@@ -1,35 +0,0 @@
-geoalchemy2/__init__.py,sha256=aGo3WcjOBcqrvqYXBuzCff1d_WiFUFObgtcyR11gg6M,2043
-geoalchemy2/_functions.py,sha256=e8v584Fx_fmh8XnJvkuYEXrcyPDiWV95Mu2yw6L-LHY,62863
-geoalchemy2/_functions_helpers.py,sha256=V_e58pX6aalDD3HeECZbUen__2vHhEhMZty2qIZSBGA,2680
-geoalchemy2/alembic_helpers.py,sha256=3U0Co-VdkkZ44MaRDG-ukN93dRk6qWDz2BOgcEOpTl4,27906
-geoalchemy2/comparator.py,sha256=WUDXn10doDlJVnYiWbVIAhhBu7N5AO9BI8sNf2mhpA4,8100
-geoalchemy2/elements.py,sha256=5yd_7dUQGbrLvgYvo6A2YYAFwTvP4_BskIdBCB0DrlM,13002
-geoalchemy2/exc.py,sha256=Nn9bRKB_35skWDMkEf4_Y2GL6gvguPVycPZcbOfa69g,226
-geoalchemy2/functions.py,sha256=8VzEoE1jANlOmWM4Y6i8eGPwYSwRMLZLulqpyyCgkMs,10375
-geoalchemy2/functions.pyi,sha256=bQUzlBCuJXGiDVPHKwGCO5tDYH5KRYxgnERGn37BVn8,108665
-geoalchemy2/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-geoalchemy2/shape.py,sha256=TLeWa6NwXZqBxh3Zj-l96wBB5kPviEhnZ44kyr8v678,2735
-geoalchemy2/utils.py,sha256=OYWYnT64tjp4DWhPdq3KIxHbVti932xPMtGGxajtu-I,488
-geoalchemy2/admin/__init__.py,sha256=O5kr1ETm3lTpEELm16Oxq6344KztOZmUaapf0ZIP6b8,4016
-geoalchemy2/admin/plugin.py,sha256=2U5p4_JdZM7b2MOXXBfP8KhtXlLHu-ASjxTq4mF-thg,4332
-geoalchemy2/admin/dialects/__init__.py,sha256=z4gBrdglClnmp9VdDW0WwEAGNoemMUSvMCeFFvuQcgs,422
-geoalchemy2/admin/dialects/common.py,sha256=p-CGtcooIESy-BiwZ8bmmdAORjuJtTK-sq_X0jnjHB0,3036
-geoalchemy2/admin/dialects/geopackage.py,sha256=PgOhRftDN4I_OIqqOfop7jgmospReCq6qJi6BGW-Gts,13596
-geoalchemy2/admin/dialects/mariadb.py,sha256=4PtkC1Gv4jcAl_grO5lJwxPsIChi4_8g36soZXnMM3w,4267
-geoalchemy2/admin/dialects/mysql.py,sha256=NP0qXGsvssHZKegP8m8-4Vqbx8CosNHTsq6qfSD2MHs,7181
-geoalchemy2/admin/dialects/postgresql.py,sha256=VwB_h3TC8M5aQ6aKE3UYgxHfbEKav3eIHJeLx534Zzg,6191
-geoalchemy2/admin/dialects/sqlite.py,sha256=iW5MBhbxVKGMVghN5Do0iF-_9Pbtrv65NTXmW9mOyZA,13802
-geoalchemy2/types/__init__.py,sha256=Ud1_6gukAs3gSzN3BThZnC-p0naHnTcNEjlyD5Ahm-M,14240
-geoalchemy2/types/dialects/__init__.py,sha256=GYqO6nDtzElvsV22VN1SSUet2elaZG4ZuRrM-asbstM,414
-geoalchemy2/types/dialects/common.py,sha256=eiIKe-sFAdzgvQ7YT0cV29tYAPrs55GXKJi3p1UvjPQ,158
-geoalchemy2/types/dialects/geopackage.py,sha256=nRmN_PnF-CWMEHkWhKVdsybnw3SvXZIBXAHIHXJLTqw,147
-geoalchemy2/types/dialects/mariadb.py,sha256=tPZpfj95XlVSOm8zC52iFbqVrIOdj-EDH5KVJP1Gd9c,1723
-geoalchemy2/types/dialects/mysql.py,sha256=zMNi1920v0XlVaCJWSwtq0b0P5YQRn8y3X_rBxC5KEw,1790
-geoalchemy2/types/dialects/postgresql.py,sha256=7NBKEbDJXMwX8Sgs6o_N2bAUHgjUcjbrdmYOA7sDiRw,1117
-geoalchemy2/types/dialects/sqlite.py,sha256=B-yLzaQcqL_4dXoOPX9D9IXw2ZQlq-Tibv_kqUIBeb4,2104
-GeoAlchemy2-0.17.1.dist-info/COPYING.rst,sha256=-bQKftq9uMOROzF7oN65kYBBIJKxTmBuDoftp27IC3I,1056
-GeoAlchemy2-0.17.1.dist-info/METADATA,sha256=MWAit1vb7ST4fMZOE0nkxAXMDMGyfAsLFZNLumLynGo,2327
-GeoAlchemy2-0.17.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-GeoAlchemy2-0.17.1.dist-info/entry_points.txt,sha256=izFHecGE8cNV6IjoLkc0uEmKH13rYbbvozc4fEwRl6Y,70
-GeoAlchemy2-0.17.1.dist-info/top_level.txt,sha256=3kGUTcfBeXd61zFpof6-qiuw1peNF_HuZabgHQgrdis,12
-GeoAlchemy2-0.17.1.dist-info/RECORD,,