GeoAlchemy2 0.14.7__tar.gz → 0.15.1__tar.gz

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/.github/workflows/test_and_publish.yml

@@ -41,7 +41,7 @@ jobs:
 
     services:
       postgres:
-        image: mdillon/postgis:11
+        image: postgis/postgis:16-3.4
         env:
           POSTGRES_DB: gis
           POSTGRES_PASSWORD: gis
@@ -84,11 +84,17 @@ jobs:
         psql -h localhost -p 5432 -U gis -d gis -c 'CREATE SCHEMA gis;'
 
         # Add PostGIS extension to "gis" database
-        psql -h localhost -p 5432 -U gis -d gis -c 'CREATE EXTENSION IF NOT EXISTS postgis;'
+        psql -h localhost -p 5432 -U gis -d gis -c 'CREATE EXTENSION IF NOT EXISTS postgis SCHEMA public;'
 
         # Drop PostGIS Tiger Geocoder extension to "gis" database
         psql -h localhost -p 5432 -U gis -d gis -c 'DROP EXTENSION IF EXISTS postgis_tiger_geocoder CASCADE;'
 
+        # Add PostGISRaster extension to "gis" database
+        psql -h localhost -p 5432 -U gis -d gis -c 'CREATE EXTENSION IF NOT EXISTS postgis_raster SCHEMA public;'
+
+        # Drop PostGIS Topology extension to "gis" database
+        psql -h localhost -p 5432 -U gis -d gis -c 'DROP EXTENSION IF EXISTS postgis_topology;'
+
     # Setup MySQL
     - name: Set up MySQL
       run: |

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/.pre-commit-config.yaml

@@ -13,11 +13,11 @@ repos:
       - id: end-of-file-fixer
       - id: trailing-whitespace
   - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
       - id: isort
   - repo: https://github.com/psf/black
-    rev: 23.10.0
+    rev: 24.3.0
     hooks:
       - id: black
   - repo: https://github.com/codespell-project/codespell
@@ -31,7 +31,7 @@ repos:
         additional_dependencies: ["tomli"]
         exclude: "tests"
   - repo: https://github.com/PyCQA/flake8
-    rev: 6.1.0
+    rev: 7.0.0
     hooks:
       - id: flake8
 ci:

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/CHANGES.txt

@@ -1,6 +1,18 @@
 GeoAlchemy 2 Changelog
 ======================
 
+0.15.1
+------
+
+* Fix: Default SRID is bypassed when using floating point coordinates @aballet (#509)
+* Test: Dispose of the connection pools of the test engines @adrien-berchet (#511)
+
+0.15.0
+------
+
+* Specific process for geometries with Z or M coordinate with SpatiaLite dialect @spd5 (#506)
+* Chore: Fix type hints on stubs @adrien-berchet (#504)
+
 0.14.7
 ------
 

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1/GeoAlchemy2.egg-info}/PKG-INFO

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

{GeoAlchemy2-0.14.7/GeoAlchemy2.egg-info → geoalchemy2-0.15.1}/PKG-INFO

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

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/doc/conf.py

@@ -60,6 +60,9 @@ copyright = "2012, Eric Lemoine"
 #
 version = release = geoalchemy2.__version__
 
+# Remove some Sphinx warnings
+suppress_warnings = ["config.cache"]
+
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 # language = None

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/doc/spatialite_tutorial.rst

@@ -54,7 +54,7 @@ Declare a Mapping
 Now that we have a working connection we can go ahead and create a mapping between
 a Python class and a database table::
 
-    >>> from sqlalchemy.ext.declarative import declarative_base
+    >>> from sqlalchemy.orm import declarative_base
     >>> from sqlalchemy import Column, Integer, String
     >>> from geoalchemy2 import Geometry
     >>>

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/geoalchemy2/__init__.py

@@ -1,4 +1,5 @@
 """GeoAlchemy2 package."""
+
 from geoalchemy2 import admin
 from geoalchemy2 import elements  # noqa
 from geoalchemy2 import exc  # noqa

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/geoalchemy2/_functions_helpers.py

@@ -60,8 +60,8 @@ class TableRowElement(ColumnElement):
     """The cache is disabled for this class."""
 
     def __init__(self, selectable: bool) -> None: ...
-    @property
-    def _from_objects(self) -> List[bool]: ...  # type: ignore[override]
+    @property  # type: ignore[override]
+    def _from_objects(self) -> List[bool]: ...
 '''
     stub_file_parts = [header]
 

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/geoalchemy2/admin/__init__.py

@@ -1,4 +1,5 @@
 """This module defines the functions used for administration tasks."""
+
 from sqlalchemy import Column
 from sqlalchemy import Index
 from sqlalchemy import Table

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/geoalchemy2/admin/dialects/__init__.py

@@ -1,4 +1,5 @@
 """This module defines some dialect-specific functions used for administration tasks."""
+
 from geoalchemy2.admin.dialects import common  # noqa
 from geoalchemy2.admin.dialects import geopackage  # noqa
 from geoalchemy2.admin.dialects import mysql  # noqa

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/geoalchemy2/admin/dialects/common.py

@@ -1,4 +1,5 @@
 """This module defines functions used by several dialects."""
+
 import sqlalchemy
 from packaging import version
 from sqlalchemy import Column

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/geoalchemy2/admin/dialects/geopackage.py

@@ -2,6 +2,7 @@
 
 See GeoPackage specifications here: http://www.geopackage.org/spec/
 """
+
 import re
 
 from sqlalchemy import text

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/geoalchemy2/admin/dialects/mysql.py

@@ -1,4 +1,5 @@
 """This module defines specific functions for MySQL dialect."""
+
 from sqlalchemy import text
 from sqlalchemy.ext.compiler import compiles
 from sqlalchemy.sql.sqltypes import NullType

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/geoalchemy2/admin/dialects/postgresql.py

@@ -1,4 +1,5 @@
 """This module defines specific functions for Postgresql dialect."""
+
 from sqlalchemy import Index
 from sqlalchemy import text
 from sqlalchemy.sql import func

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/geoalchemy2/admin/dialects/sqlite.py

@@ -1,4 +1,5 @@
 """This module defines specific functions for SQLite dialect."""
+
 import os
 from typing import Optional
 

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/geoalchemy2/alembic_helpers.py

@@ -1,4 +1,5 @@
 """Some helpers to use with Alembic migration tool."""
+
 from alembic.autogenerate import renderers
 from alembic.autogenerate import rewriter
 from alembic.autogenerate.render import _add_column

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/geoalchemy2/comparator.py

@@ -36,6 +36,7 @@ Using the ORM::
 
     Session.query(Cls).order_by(Cls.geom.distance_box('POINT(0 0)')).limit(10)
 """
+
 from typing import Union
 
 from sqlalchemy import types as sqltypes

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/geoalchemy2/elements.py

@@ -117,6 +117,7 @@ class WKTElement(_SpatialElement):
     """
 
     _REMOVE_SRID = re.compile("(SRID=([0-9]+); ?)?(.*)")
+    SPLIT_WKT_PATTERN = re.compile(r"((SRID=\d+) *; *)?([\w ]+) *(\([\d\. ,\(\)]+\))")
 
     geom_from: str = "ST_GeomFromText"
     geom_from_extended_version: str = "ST_GeomFromEWKT"

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/geoalchemy2/functions.py

@@ -66,6 +66,7 @@ Reference
 ---------
 
 """
+
 import re
 from typing import List
 from typing import Type

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/geoalchemy2/functions.pyi

@@ -13,8 +13,8 @@ class TableRowElement(ColumnElement):
     """The cache is disabled for this class."""
 
     def __init__(self, selectable: bool) -> None: ...
-    @property
-    def _from_objects(self) -> List[bool]: ...  # type: ignore[override]
+    @property  # type: ignore[override]
+    def _from_objects(self) -> List[bool]: ...
 
 class ST_AsGeoJSON(GenericFunction):
     """

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/geoalchemy2/shape.py

@@ -5,6 +5,7 @@
     As GeoAlchemy 2 itself has no dependency on `Shapely`, applications using
     functions of this module have to ensure that `Shapely` is available.
 """
+
 from contextlib import contextmanager
 from typing import List
 from typing import Optional

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/geoalchemy2/types/__init__.py

@@ -4,6 +4,7 @@ The :class:`geoalchemy2.types.Geometry`, :class:`geoalchemy2.types.Geography`, a
 :class:`geoalchemy2.types.Raster` classes are used when defining geometry, geography and raster
 columns/properties in models.
 """
+
 import warnings
 from typing import Any
 from typing import Dict

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/geoalchemy2/types/dialects/__init__.py

@@ -1,4 +1,5 @@
 """This module defines some dialect-specific functions used for Column types."""
+
 from geoalchemy2.types.dialects import common  # noqa
 from geoalchemy2.types.dialects import geopackage  # noqa
 from geoalchemy2.types.dialects import mysql  # noqa

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/geoalchemy2/types/dialects/geopackage.py

@@ -1,2 +1,3 @@
 """This module defines specific functions for GeoPackage dialect."""
+
 from geoalchemy2.types.dialects.sqlite import bind_processor_process  # noqa

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/geoalchemy2/types/dialects/mysql.py

@@ -1,4 +1,5 @@
 """This module defines specific functions for MySQL dialect."""
+
 from geoalchemy2.elements import WKBElement
 from geoalchemy2.elements import WKTElement
 from geoalchemy2.elements import _SpatialElement

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/geoalchemy2/types/dialects/postgresql.py

@@ -1,4 +1,5 @@
 """This module defines specific functions for Postgresql dialect."""
+
 from geoalchemy2.elements import RasterElement
 from geoalchemy2.elements import WKBElement
 from geoalchemy2.elements import WKTElement

geoalchemy2-0.15.1/geoalchemy2/types/dialects/sqlite.py

@@ -0,0 +1,50 @@
+"""This module defines specific functions for SQLite dialect."""
+
+import re
+
+from geoalchemy2.elements import RasterElement
+from geoalchemy2.elements import WKBElement
+from geoalchemy2.elements import WKTElement
+from geoalchemy2.shape import to_shape
+
+
+def format_geom_type(wkt, default_srid=None):
+    """Format the Geometry type for SQLite."""
+    match = re.match(WKTElement.SPLIT_WKT_PATTERN, wkt)
+    if match is None:
+        return wkt
+    _, srid, geom_type, coords = match.groups()
+    geom_type = geom_type.replace(" ", "")
+    if geom_type.endswith("ZM"):
+        geom_type = geom_type[:-2]
+    elif geom_type.endswith("Z"):
+        geom_type = geom_type[:-1]
+    if srid is None and default_srid is not None:
+        srid = f"SRID={default_srid}"
+    if srid is not None:
+        return "%s;%s%s" % (srid, geom_type, coords)
+    else:
+        return "%s%s" % (geom_type, coords)
+
+
+def bind_processor_process(spatial_type, bindvalue):
+    if isinstance(bindvalue, WKTElement):
+        return format_geom_type(
+            bindvalue.data,
+            default_srid=bindvalue.srid if bindvalue.srid >= 0 else spatial_type.srid,
+        )
+    elif isinstance(bindvalue, WKBElement):
+        # With SpatiaLite we use Shapely to convert the WKBElement to an EWKT string
+        shape = to_shape(bindvalue)
+        # shapely.wkb.loads returns geom_type with a 'Z', for example, 'LINESTRING Z'
+        # which is a limitation with SpatiaLite. Hence, a temporary fix.
+        res = format_geom_type(
+            shape.wkt, default_srid=bindvalue.srid if bindvalue.srid >= 0 else spatial_type.srid
+        )
+        return res
+    elif isinstance(bindvalue, RasterElement):
+        return "%s" % (bindvalue.data)
+    elif isinstance(bindvalue, str):
+        return format_geom_type(bindvalue, default_srid=spatial_type.srid)
+    else:
+        return bindvalue

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/test_container/Dockerfile

@@ -5,7 +5,7 @@ RUN /install_requirements.sh
 
 COPY ./helpers/init_postgres.sh /
 env PGDATA="/var/lib/postgresql/data"
-env POSTGRES_PATH="/usr/lib/postgresql/14"
+env POSTGRES_PATH="/usr/lib/postgresql/16"
 RUN su postgres -c /init_postgres.sh
 
 ENV SPATIALITE_LIBRARY_PATH="/usr/lib/x86_64-linux-gnu/mod_spatialite.so"

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/test_container/helpers/install_requirements.sh

@@ -29,9 +29,9 @@ packages=(
     python3.12-venv
 
     # PostgreSQL and PostGIS
-    postgresql
-    postgresql-14-postgis-3
-    postgresql-14-postgis-3-scripts
+    postgresql-16
+    postgresql-16-postgis-3
+    postgresql-16-postgis-3-scripts
     libpq-dev
     libgeos-dev
 
@@ -56,8 +56,10 @@ packages=(
 export DEBIAN_FRONTEND=noninteractive
 
 apt-get update -y
-apt-get install --no-install-recommends -y software-properties-common gnupg2
+apt-get install --no-install-recommends -y software-properties-common gnupg2 wget
 add-apt-repository ppa:deadsnakes/ppa
+sh -c 'echo "deb https://apt.PostgreSQL.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+wget --quiet -O - https://www.PostgreSQL.org/media/keys/ACCC4CF8.asc | apt-key add -
 apt-get update -y
 
 apt-get install --no-install-recommends -y "${packages[@]}"

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/tests/conftest.py

@@ -161,18 +161,23 @@ def engine(tmpdir, db_url, _engine_echo):
         # Copy the input SQLite DB to a temporary file and return an engine to it
         input_url = str(db_url)[10:]
         output_file = "test_spatial_db.sqlite"
-        return copy_and_connect_sqlite_db(input_url, tmpdir / output_file, _engine_echo, "sqlite")
-
-    if db_url.startswith("gpkg:///"):
+        current_engine = copy_and_connect_sqlite_db(
+            input_url, tmpdir / output_file, _engine_echo, "sqlite"
+        )
+    elif db_url.startswith("gpkg:///"):
         # Copy the input SQLite DB to a temporary file and return an engine to it
         input_url = str(db_url)[8:]
         output_file = "test_spatial_db.gpkg"
-        return copy_and_connect_sqlite_db(input_url, tmpdir / output_file, _engine_echo, "gpkg")
+        current_engine = copy_and_connect_sqlite_db(
+            input_url, tmpdir / output_file, _engine_echo, "gpkg"
+        )
+    else:
+        # For other dialects the engine is directly returned
+        current_engine = create_engine(db_url, echo=_engine_echo)
+        current_engine.update_execution_options(search_path=["gis", "public"])
 
-    # For other dialects the engine is directly returned
-    engine = create_engine(db_url, echo=_engine_echo)
-    engine.update_execution_options(search_path=["gis", "public"])
-    return engine
+    yield current_engine
+    current_engine.dispose()
 
 
 @pytest.fixture

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/tests/gallery/test_decipher_raster.py

@@ -7,6 +7,7 @@ usually better to convert them into TIFF, PNG, JPEG or whatever. Nevertheless, i
 possible to decipher the WKB to get a 2D list of values.
 This example uses SQLAlchemy ORM queries.
 """
+
 import binascii
 import struct
 

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/tests/gallery/test_disable_wrapping.py

@@ -7,6 +7,7 @@ the wrapping of geometry columns with a `ST_AsEWKB()` function might be annoying
 this case it is possible to disable this wrapping.
 This example uses SQLAlchemy ORM queries.
 """
+
 from sqlalchemy import Column
 from sqlalchemy import Integer
 from sqlalchemy import func

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/tests/gallery/test_insert_raster.py

@@ -13,6 +13,7 @@ This example uses SQLAlchemy ORM queries.
     raster and re-importing it using this method will properly import the values but might not
     keep the same internal types.
 """
+
 import struct
 from sys import byteorder
 

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/tests/gallery/test_length_at_insert.py

@@ -6,6 +6,7 @@ It is possible to insert a geometry and ask PostgreSQL to compute its length at
 time.
 This example uses SQLAlchemy core queries.
 """
+
 from sqlalchemy import Column
 from sqlalchemy import Float
 from sqlalchemy import Integer

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/tests/gallery/test_orm_mapped_v2.py

@@ -6,6 +6,7 @@ New ORM Declarative Mapping Style
 ``sqlalchemy.orm.DeclarativeBase`` base class.
 This example shows how to use GeoAlchemy2 types in this context.
 """
+
 import pytest
 from pkg_resources import parse_version
 from sqlalchemy import __version__ as SA_VERSION

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/tests/gallery/test_raster_transform.py

@@ -9,6 +9,7 @@ function on `Raster` requires minor tweaking.
 
 This example uses both SQLAlchemy core and ORM queries.
 """
+
 from sqlalchemy import Column
 from sqlalchemy import Integer
 from sqlalchemy import MetaData

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/tests/gallery/test_specific_compilation.py

@@ -28,6 +28,7 @@ with it.
 
 This example uses SQLAlchemy core queries.
 """
+
 from sqlalchemy import MetaData
 from sqlalchemy import func
 from sqlalchemy.ext.compiler import compiles

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/tests/gallery/test_summarystatsagg.py

@@ -5,6 +5,7 @@ Use CompositeType
 Some functions return composite types. This example shows how to deal with this
 kind of functions.
 """
+
 import pytest
 from pkg_resources import parse_version
 from sqlalchemy import Column

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/tests/gallery/test_type_decorator.py

@@ -8,6 +8,7 @@ are projected in the DB. To avoid having to always tweak the query with a
 ``ST_Transform()``, it is possible to define a `TypeDecorator
 <https://docs.sqlalchemy.org/en/13/core/custom_types.html#sqlalchemy.types.TypeDecorator>`_
 """
+
 import re
 from typing import Any
 

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/tests/schema_fixtures.py

@@ -1,4 +1,5 @@
 """Declare tables used in tests."""
+
 import pytest
 from sqlalchemy import Column
 from sqlalchemy import Integer
@@ -119,7 +120,7 @@ class TransformedGeometry(TypeDecorator):
         SRID of the resulting WKBElement is correct"""
         return getattr(func, self.impl.as_binary)(
             func.ST_Transform(col, self.app_srid),
-            type_=self.__class__.impl(srid=self.app_srid)
+            type_=self.__class__.impl(srid=self.app_srid),
             # srid could also be -1 so that the SRID is deduced from the
             # WKB data
         )

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/tests/test_alembic_migrations.py

@@ -1,4 +1,5 @@
 """Test alembic migrations of spatial columns."""
+
 import pytest
 import sqlalchemy as sa  # noqa (This import is only used in the migration scripts)
 from alembic import command

{GeoAlchemy2-0.14.7 → geoalchemy2-0.15.1}/tests/test_functional.py

@@ -275,6 +275,152 @@ class TestInsertionCore:
         srid = conn.execute(row[1].ST_SRID()).scalar()
         assert srid == 4326
 
+    @pytest.mark.parametrize(
+        "geom_type,wkt",
+        [
+            pytest.param("POINT", "(1 2)", id="Point"),
+            pytest.param("POINTZ", "(1 2 3)", id="Point Z"),
+            pytest.param("POINTM", "(1 2 3)", id="Point M"),
+            pytest.param("POINTZM", "(1 2 3 4)", id="Point ZM"),
+            pytest.param("LINESTRING", "(1 2, 3 4)", id="LineString"),
+            pytest.param("LINESTRINGZ", "(1 2 3, 4 5 6)", id="LineString Z"),
+            pytest.param("LINESTRINGM", "(1 2 3, 4 5 6)", id="LineString M"),
+            pytest.param("LINESTRINGZM", "(1 2 3 4, 5 6 7 8)", id="LineString ZM"),
+            pytest.param("POLYGON", "((1 2, 3 4, 5 6, 1 2))", id="Polygon"),
+            pytest.param("POLYGONZ", "((1 2 3, 4 5 6, 7 8 9, 1 2 3))", id="Polygon Z"),
+            pytest.param("POLYGONM", "((1 2 3, 4 5 6, 7 8 9, 1 2 3))", id="Polygon M"),
+            pytest.param(
+                "POLYGONZM", "((1 2 3 4,  5 6 7 8, 9 10 11 12, 1 2 3 4))", id="Polygon ZM"
+            ),
+            pytest.param("MULTIPOINT", "(1 2, 3 4)", id="Multi Point"),
+            pytest.param("MULTIPOINTZ", "(1 2 3, 4 5 6)", id="Multi Point Z"),
+            pytest.param("MULTIPOINTM", "(1 2 3, 4 5 6)", id="Multi Point M"),
+            pytest.param("MULTIPOINTZM", "(1 2 3 4, 5 6 7 8)", id="Multi Point ZM"),
+            pytest.param("MULTILINESTRING", "((1 2, 3 4), (10 20, 30 40))", id="Multi LineString"),
+            pytest.param(
+                "MULTILINESTRINGZ",
+                "((1 2 3, 4 5 6), (10 20 30, 40 50 60))",
+                id="Multi LineString Z",
+            ),
+            pytest.param(
+                "MULTILINESTRINGM",
+                "((1 2 3, 4 5 6), (10 20 30, 40 50 60))",
+                id="Multi LineString M",
+            ),
+            pytest.param(
+                "MULTILINESTRINGZM",
+                "((1 2 3 4, 5 6 7 8), (10 20 30 40, 50 60 70 80))",
+                id="Multi LineString ZM",
+            ),
+            pytest.param(
+                "MULTIPOLYGON",
+                "(((1 2, 3 4, 5 6, 1 2)), ((10 20, 30 40, 50 60, 10 20)))",
+                id="Multi Polygon",
+            ),
+            pytest.param(
+                "MULTIPOLYGONZ",
+                "(((1 2 3, 4 5 6, 7 8 9, 1 2 3)), ((10 20 30, 40 50 60, 70 80 90, 10 20 30)))",
+                id="Multi Polygon Z",
+            ),
+            pytest.param(
+                "MULTIPOLYGONM",
+                "(((1 2 3, 4 5 6, 7 8 9, 1 2 3)), ((10 20 30, 40 50 60, 70 80 90, 10 20 30)))",
+                id="Multi Polygon M",
+            ),
+            pytest.param(
+                "MULTIPOLYGONZM",
+                "(((1 2 3 4, 5 6 7 8, 9 10 11 12, 1 2 3 4)),"
+                " ((10 20 30 40, 50 60 70 80, 90 100 100 120, 10 20 30 40)))",
+                id="Multi Polygon ZM",
+            ),
+        ],
+    )
+    @pytest.mark.parametrize(
+        "use_floating_point",
+        [
+            pytest.param(True, id="Use floating point"),
+            pytest.param(False, id="Do not use floating point"),
+        ],
+    )
+    def test_insert_all_geom_types(
+        self, dialect_name, base, conn, metadata, geom_type, wkt, use_floating_point
+    ):
+        """Test insertion and selection of all geometry types."""
+        ndims = 2
+        if "Z" in geom_type[-2:]:
+            ndims += 1
+        if geom_type.endswith("M"):
+            ndims += 1
+            has_m = True
+        else:
+            has_m = False
+
+        if ndims > 2 and dialect_name == "mysql":
+            # Explicitly skip MySQL dialect to show that it can only work with 2D geometries
+            pytest.xfail(reason="MySQL only supports 2D geometry types")
+
+        class GeomTypeTable(base):
+            __tablename__ = "test_geom_types"
+            id = Column(Integer, primary_key=True)
+            geom = Column(Geometry(srid=4326, geometry_type=geom_type, dimension=ndims))
+
+        metadata.drop_all(bind=conn, checkfirst=True)
+        metadata.create_all(bind=conn)
+
+        if use_floating_point:
+            wkt = wkt.replace("1 2", "1.5 2.5")
+
+        inserted_wkt = f"{geom_type}{wkt}"
+
+        # Use the DB to generate the corresponding raw WKB
+        raw_wkb = conn.execute(
+            text("SELECT ST_AsBinary(ST_GeomFromText('{}', 4326))".format(inserted_wkt))
+        ).scalar()
+
+        wkb_elem = WKBElement(raw_wkb, srid=4326)
+        inserted_elements = [
+            {"geom": inserted_wkt},
+            {"geom": f"SRID=4326;{inserted_wkt}"},
+            {"geom": WKTElement(inserted_wkt, srid=4326)},
+            {"geom": WKTElement(f"SRID=4326;{inserted_wkt}")},
+        ]
+        if dialect_name not in ["postgresql", "sqlite"] or not has_m:
+            # Currently Shapely does not support geometry types with M dimension
+            inserted_elements.append({"geom": wkb_elem})
+            inserted_elements.append({"geom": wkb_elem.as_ewkb()})
+
+        # Insert the elements
+        conn.execute(
+            GeomTypeTable.__table__.insert(),
+            inserted_elements,
+        )
+
+        # Select the elements
+        query = select(
+            [
+                GeomTypeTable.__table__.c.id,
+                GeomTypeTable.__table__.c.geom.ST_AsText(),
+                GeomTypeTable.__table__.c.geom.ST_SRID(),
+            ],
+        )
+        results = conn.execute(query)
+        rows = results.all()
+
+        # Check that the selected elements are the same as the inputs
+        for row_id, row, srid in rows:
+            checked_wkt = row.upper().replace(" ", "")
+            expected_wkt = inserted_wkt.upper().replace(" ", "")
+            if "MULTIPOINT" in geom_type:
+                # Some dialects return MULTIPOINT geometries with nested parenthesis and others
+                # do not so we remove them before checking the results
+                checked_wkt = re.sub(r"\(([0-9\.]+)\)", "\\1", checked_wkt)
+            if row_id >= 5 and dialect_name in ["geopackage"] and has_m:
+                # Currently Shapely does not support geometry types with M dimension
+                assert checked_wkt != expected_wkt
+            else:
+                assert checked_wkt == expected_wkt
+            assert srid == 4326
+
     @test_only_with_dialects("postgresql", "sqlite")
     def test_insert_geom_poi(self, conn, Poi, setup_tables):
         conn.execute(
@@ -380,7 +526,7 @@ class TestInsertionORM:
         lake = Lake("LINESTRING(0 0,1 1)")
         session.add(lake)
 
-        if (dialect_name == "postgresql" and postgis_version < 3) or dialect_name == "sqlite":
+        if dialect_name == "postgresql" and postgis_version < 3:
             with pytest.raises((DataError, IntegrityError)):
                 session.flush()
         else:

GeoAlchemy2-0.14.7/geoalchemy2/types/dialects/sqlite.py

@@ -1,21 +0,0 @@
-"""This module defines specific functions for SQLite dialect."""
-from geoalchemy2.elements import RasterElement
-from geoalchemy2.elements import WKBElement
-from geoalchemy2.elements import WKTElement
-from geoalchemy2.shape import to_shape
-
-
-def bind_processor_process(spatial_type, bindvalue):
-    if isinstance(bindvalue, WKTElement):
-        if bindvalue.extended:
-            return "%s" % (bindvalue.data)
-        else:
-            return "SRID=%d;%s" % (bindvalue.srid, bindvalue.data)
-    elif isinstance(bindvalue, WKBElement):
-        # With SpatiaLite we use Shapely to convert the WKBElement to an EWKT string
-        shape = to_shape(bindvalue)
-        return "SRID=%d;%s" % (bindvalue.srid, shape.wkt)
-    elif isinstance(bindvalue, RasterElement):
-        return "%s" % (bindvalue.data)
-    else:
-        return bindvalue