Fix: Guard against None in as_binary_wkb and drop unused default_srid from bind key helper

Author: adrien-berchet

geoalchemy2/admin/dialects/mysql.py

@@ -476,7 +476,7 @@ def _mysql_dynamic_ewkb_source_token(source_bind, compiler=None):
     return f"{source_name}_{ordinal}"
 
 
-def _mysql_dynamic_ewkb_bind_keys(source_bind, *, default_srid=None, source_token=None):
+def _mysql_dynamic_ewkb_bind_keys(source_bind, *, source_token=None):
     source_name = source_token or getattr(source_bind, "_orig_key", None) or source_bind.key
     source_name = str(source_name)
     key_token = re.sub(r"[^0-9A-Za-z_]+", "_", source_name).strip("_") or "param"
@@ -495,7 +495,6 @@ def _make_mysql_dynamic_ewkb_bind_clauses(
 ):
     wkb_key, srid_key = _mysql_dynamic_ewkb_bind_keys(
         wkb_clause,
-        default_srid=default_srid,
         source_token=source_token,
     )
     wkb_bind_kwargs = {
@@ -876,7 +875,6 @@ def _get_mysql_dynamic_ewkb_bind_mappings(clauseelement, dialect):
 
         wkb_key, srid_key = _mysql_dynamic_ewkb_bind_keys(
             source_bind,
-            default_srid=default_srid,
             source_token=source_token,
         )
         dynamic_bind_mappings.append(

geoalchemy2/types/dialects/common.py

@@ -37,6 +37,8 @@ def _validate_wkb_bindvalue_srid(bindvalue, column_srid):
 
 
 def as_binary_wkb(bindvalue, *, strip_srid=False, column_srid=None):
+    if bindvalue is None:
+        return None
     if strip_srid:
         _validate_wkb_bindvalue_srid(bindvalue, column_srid)
         if isinstance(bindvalue, WKBElement):

tests/test_types.py

@@ -633,7 +633,6 @@ def test_geom_from_ewkb_defaulted_bindparam_uses_dynamic_srid_processor(self):
         compiled_expr = expr.compile(dialect=mysql.dialect())
         wkb_key, srid_key = _mysql_admin._mysql_dynamic_ewkb_bind_keys(
             source_bind,
-            default_srid=4326,
         )
         wkb_processor = compiled_expr._bind_processors[wkb_key]
         srid_processor = compiled_expr._bind_processors[srid_key]
@@ -656,7 +655,6 @@ def test_mysql_before_execute_expands_dynamic_ewkb_bindparams(self):
         stmt = select([func.ST_GeomFromEWKB(source_bind)])
         wkb_key, srid_key = _mysql_admin._mysql_dynamic_ewkb_bind_keys(
             source_bind,
-            default_srid=4326,
         )
         override = bytes.fromhex(WEB_MERCATOR_EWKB_HEX)
 
@@ -689,7 +687,6 @@ def get_wkb():
         compiled_expr = expr.compile(dialect=mysql.dialect())
         wkb_key, srid_key = _mysql_admin._mysql_dynamic_ewkb_bind_keys(
             source_bind,
-            default_srid=0,
         )
 
         assert self.normalize_sql(compiled_expr) == "ST_GeomFromWKB(%s, %s)"
@@ -946,7 +943,6 @@ def test_geom_from_ewkb_defaulted_bindparam_uses_dynamic_srid_processor(self):
         compiled_expr = expr.compile(dialect=self.dialect())
         wkb_key, srid_key = _mysql_admin._mysql_dynamic_ewkb_bind_keys(
             source_bind,
-            default_srid=4326,
         )
         wkb_processor = compiled_expr._bind_processors[wkb_key]
         srid_processor = compiled_expr._bind_processors[srid_key]
@@ -969,7 +965,6 @@ def test_mariadb_before_execute_expands_dynamic_ewkb_bindparams(self):
         stmt = select([func.ST_GeomFromEWKB(source_bind)])
         wkb_key, srid_key = _mysql_admin._mysql_dynamic_ewkb_bind_keys(
             source_bind,
-            default_srid=4326,
         )
         override = bytes.fromhex(WEB_MERCATOR_EWKB_HEX)
 
@@ -1002,7 +997,6 @@ def get_wkb():
         compiled_expr = expr.compile(dialect=self.dialect())
         wkb_key, srid_key = _mysql_admin._mysql_dynamic_ewkb_bind_keys(
             source_bind,
-            default_srid=0,
         )
 
         assert self.normalize_sql(compiled_expr) == "ST_GeomFromWKB(unhex(%s), %s)"