Support geometry column with no typmod

geoalchemy · Jul 30, 2017 · a7cc505 · a7cc505
1 parent 30f1c06
commit a7cc505
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/geoalchemy2/types.py b/geoalchemy2/types.py
@@ -6,6 +6,7 @@
 Reference
 ---------
 """
+import warnings
 
 from sqlalchemy.types import UserDefinedType, Integer
 from sqlalchemy.sql import func
@@ -47,11 +48,15 @@ class _GISType(UserDefinedType):
           * ``"MULTILINESTRING"``,
           * ``"MULTIPOLYGON"``,
           * ``"GEOMETRYCOLLECTION"``
-          * ``"CURVE"``.
+          * ``"CURVE"``,
+          * ``None``.
 
        The latter is actually not supported with
        :class:`geoalchemy2.types.Geography`.
 
+       When set to ``None`` then no "geometry type" constraints will be attached to the geometry
+       type declaration.
+
        Default is ``"GEOMETRY"``.
 
     ``srid``
@@ -103,15 +108,21 @@ class _GISType(UserDefinedType):
 
     def __init__(self, geometry_type='GEOMETRY', srid=-1, dimension=2,
                  spatial_index=True, management=False, use_typmod=None):
-        self.geometry_type = geometry_type.upper()
+        self.geometry_type = geometry_type
         self.srid = int(srid)
+        if self.geometry_type:
+            self.geometry_type = self.geometry_type.upper()
+        elif self.srid > 0:
+            warnings.warn('srid not enforced when geometry_type is None')
         self.dimension = dimension
         self.spatial_index = spatial_index
         self.management = management
         self.use_typmod = use_typmod
         self.extended = self.as_binary == 'ST_AsEWKB'
 
     def get_col_spec(self):
+        if not self.geometry_type:
+            return self.name
         return '%s(%s,%d)' % (self.name, self.geometry_type, self.srid)
 
     def column_expression(self, col):

diff --git a/tests/test_types.py b/tests/test_types.py
@@ -35,6 +35,10 @@ def test_get_col_spec(self):
         g = Geometry(srid=900913)
         assert g.get_col_spec() == 'geometry(GEOMETRY,900913)'
 
+    def test_get_col_spec_no_typmod(self):
+        g = Geometry(geometry_type=None)
+        assert g.get_col_spec() == 'geometry'
+
     def test_column_expression(self, geometry_table):
         s = select([geometry_table.c.geom])
         eq_sql(s, 'SELECT ST_AsEWKB("table".geom) AS geom FROM "table"')
@@ -77,6 +81,10 @@ def test_get_col_spec(self):
         g = Geography(srid=900913)
         assert g.get_col_spec() == 'geography(GEOMETRY,900913)'
 
+    def test_get_col_spec_no_typmod(self):
+        g = Geography(geometry_type=None)
+        assert g.get_col_spec() == 'geography'
+
     def test_column_expression(self, geography_table):
         s = select([geography_table.c.geom])
         eq_sql(s, 'SELECT ST_AsBinary("table".geom) AS geom FROM "table"')