spatial check fixed for sql server

Author: ackava

package-lock.json

@@ -90,6 +90,17 @@ export default abstract class Migrations {
                 await this.enableGeoSpatialTypes();
             }
 
+            // for (const index of type.indexes) {
+            //     for (const column of index.columns) {
+            //         const c = type.getProperty(column.name);
+            //         if (c.field) {
+            //             column.name = c.field.columnName;
+            //         } else {
+            //             debugger;
+            //         }
+            //     }
+            // }
+
             const schema = await this.getSchema(type);
 
             await this.migrateTable(context, type);
@@ -217,12 +228,14 @@ export default abstract class Migrations {
         }
 
 
-        for (const column of index.columns) {
-            const c = type.getProperty(column.name);
-            if (c.field) {
-                column.name = c.field.columnName;
-            }
-        }
+        // for (const column of index.columns) {
+        //     const c = type.getProperty(column.name);
+        //     if (c.field) {
+        //         column.name = c.field.columnName;
+        //     } else {
+        //         debugger;
+        //     }
+        // }
 
         if (index.include) {
             index.include = index.include.map((c) => type.getProperty(c).field.columnName);

src/migrations/Migrations.ts

@@ -32,7 +32,7 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
                 : "";
             const indexDef: IIndex = {
                 name: `IX_${type.name}_${iterator.name}`,
-                columns: [{ name: iterator.quotedColumnName, descending: iterator.indexOrder !== "ascending"}],
+                columns: [{ name: iterator.columnName, descending: iterator.indexOrder !== "ascending"}],
                 filter
             };
             await this.migrateIndexInternal(context, indexDef, type);
@@ -123,20 +123,25 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
             : type.name;
         const indexName =  index.name;
         const columns = [];
-        let spatial = true;
+        let spatial = false;
         let nonSpatial = false;
         for (const column of index.columns) {
             const columnName = column.name;
             const c = type.getColumn(column.name);
             const isColumnSpatial = isSpatialType(c.dataType);
-            spatial &&= isColumnSpatial;
-            nonSpatial ||= !isColumnSpatial;
+            if (isColumnSpatial) {
+                spatial ||= true;
+            } else {
+                nonSpatial ||= true;
+            }
             columns.push(`${columnName} ${ isSpatialType(c.dataType) ? "" : (column.descending ? "DESC" : "ASC")}`);
         }
 
-        if (nonSpatial && spatial) {
-            console.warn(`SQL SERVER DOEST NOT SUPPORT SPATIAL AND OTHER DATATYPE INDEX so ${name} index is not created`);
-            return;
+        if (spatial) {
+            if (nonSpatial) {
+                console.warn(`SQL SERVER DOEST NOT SUPPORT SPATIAL AND OTHER DATATYPE INDEX so ${name} index is not created`);
+                return;
+            }
         }
 
         const indexType = spatial ? " SPATIAL " : "";

src/migrations/sql-server/SqlServerAutomaticMigrations.ts

@@ -44,6 +44,17 @@ const getOrCreateModel = (map: Map<any, EntityType>, type: IClassOf<any>, compil
     if (t.keys.length > 1) {
         t.keys.sort((a, b) => a.order - b.order);
     }
+
+    for(const index of t.indexes) {
+        for (const column of index.columns) {
+            const c = t.getProperty(column.name);
+            if (c.field) {
+                column.name = c.field.columnName;
+            } else {
+                debugger;
+            }
+        }
+    }
     for (const iterator of original.relations) {
         if (!iterator.relatedTypeClass) {
             iterator.relatedTypeClass = iterator.relatedTypeClassFactory();