Sqlite Migrations: Handle Z and M in spatial columns

Fixes #14257 (comment)
dotnet · Nov 19, 2020 · e117734 · e117734
1 parent a987c6a
commit e117734
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 1 deletion.
diff --git a/src/EFCore.Sqlite.Core/Storage/Internal/SqliteTypeMappingSource.cs b/src/EFCore.Sqlite.Core/Storage/Internal/SqliteTypeMappingSource.cs
@@ -29,13 +29,37 @@ private static readonly HashSet<string> _spatialiteTypes
             = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
             {
                 "GEOMETRY",
+                "GEOMETRYZ",
+                "GEOMETRYM",
+                "GEOMETRYZM",
                 "GEOMETRYCOLLECTION",
+                "GEOMETRYCOLLECTIONZ",
+                "GEOMETRYCOLLECTIONM",
+                "GEOMETRYCOLLECTIONZM",
                 "LINESTRING",
+                "LINESTRINGZ",
+                "LINESTRINGM",
+                "LINESTRINGZM",
                 "MULTILINESTRING",
+                "MULTILINESTRINGZ",
+                "MULTILINESTRINGM",
+                "MULTILINESTRINGZM",
                 "MULTIPOINT",
+                "MULTIPOINTZ",
+                "MULTIPOINTM",
+                "MULTIPOINTZM",
                 "MULTIPOLYGON",
+                "MULTIPOLYGONZ",
+                "MULTIPOLYGONM",
+                "MULTIPOLYGONZM",
                 "POINT",
-                "POLYGON"
+                "POINTZ",
+                "POINTM",
+                "POINTZM",
+                "POLYGON",
+                "POLYGONZ",
+                "POLYGONM",
+                "POLYGONZM"
             };
 
         private const string IntegerTypeName = "INTEGER";

diff --git a/test/EFCore.Sqlite.Tests/Migrations/SqliteMigrationsSqlGeneratorTest.cs b/test/EFCore.Sqlite.Tests/Migrations/SqliteMigrationsSqlGeneratorTest.cs
@@ -233,6 +233,25 @@ public override void AddColumnOperation_with_unicode_overridden()
 ");
         }
 
+        [ConditionalFact]
+        public virtual void AddColumnOperation_with_spatial_type()
+        {
+            Generate(
+                new AddColumnOperation
+                {
+                    Table = "Geometries",
+                    Name = "Geometry",
+                    [SqliteAnnotationNames.Srid] = 4326,
+                    ColumnType = "GEOMETRYZM",
+                    IsNullable = true
+                });
+
+            AssertSql(
+                @"SELECT AddGeometryColumn('Geometries', 'Geometry', 4326, 'GEOMETRYZM', -1, 0);
+");
+        }
+
+
         [ConditionalFact]
         public void DropSchemaOperation_is_ignored()
         {