@entity-access/entity-access 1.1.6 → 1.1.8

package/src/decorators/Index.ts

@@ -14,6 +14,7 @@ export default function Index<T>(
         unique,
         include,
         indexType,
+        spatial,
         filter
     }
     : IIndexDef<T>) {
@@ -27,6 +28,7 @@ export default function Index<T>(
             include: include ? include.map(NameParser.parseMember) : void 0,
             dropNames,
             indexType,
+            spatial,
             filter,
             columns
         };

package/src/migrations/Migrations.ts

@@ -55,6 +55,8 @@ export default abstract class Migrations {
             }
         }
 
+        let hasGeoSpatialTypes = false;
+
         for (const s of model.sources.values()) {
             const type = s[modelSymbol] as EntityType;
 
@@ -63,6 +65,11 @@ export default abstract class Migrations {
             }
 
             for (const column of type.columns) {
+                switch(column.dataType) {
+                    case "Geography":
+                        hasGeoSpatialTypes = true;
+                        break;
+                }
                 if (column.computed && typeof column.computed !== "string") {
                     // parse..
                     const source = context.query(type.typeClass) as EntityQuery<any>;
@@ -79,6 +86,10 @@ export default abstract class Migrations {
                 }
             }
 
+            if (hasGeoSpatialTypes) {
+                await this.enableGeoSpatialTypes();
+            }
+
             const schema = await this.getSchema(type);
 
             await this.migrateTable(context, type);
@@ -149,6 +160,10 @@ export default abstract class Migrations {
         return true;
     }
 
+    async enableGeoSpatialTypes() {
+        // do nothing...
+    }
+
     async hasVersion(context: EntityContext, name: string, version: string, table: string) {
         const { quote, escapeLiteral } = this.compiler;
 

package/src/migrations/postgres/PostgresAutomaticMigrations.ts

@@ -124,9 +124,15 @@ export default class PostgresAutomaticMigrations extends PostgresMigrations {
                         break;
                 }
             }
-            columns.push(`${columnName} ${operatorClass} ${column.descending ? "DESC" : "ASC"}`);
+            columns.push(`${columnName} ${operatorClass} ${ index.spatial ? "" : (column.descending ? "DESC" : "ASC")}`);
         }
-        let query = `CREATE ${index.unique ? "UNIQUE" : ""} INDEX IF NOT EXISTS ${indexName} ON ${name} ( ${columns.join(", ")})`;
+        let query = `CREATE ${index.unique ? "UNIQUE" : ""} INDEX IF NOT EXISTS ${indexName} ON ${name}`;
+
+        if (index.spatial) {
+            query += " USING GIST ";
+        }
+
+        query += ` ( ${columns.join(", ")})`;
 
         if (index.include) {
             query += ` INCLUDE (${index.include.join(",")})`;

package/src/migrations/postgres/PostgresMigrations.ts

@@ -77,6 +77,10 @@ export default abstract class PostgresMigrations extends Migrations {
         return new ExistingSchema(false, { columns, foreignKeys, indexes, constraints });
     }
 
+    async enableGeoSpatialTypes(): Promise<void> {
+        await this.connection.executeQuery(`CREATE EXTENSION IF NOT EXISTS postgis;`);
+    }
+
     protected getColumnDefinition(iterator: IColumn) {
         if (iterator.dataType === "Decimal") {
             if (iterator.precision && iterator.scale) {
@@ -123,10 +127,8 @@ export default abstract class PostgresMigrations extends Migrations {
                 return "jsonb";
             case "UUID":
                 return "uuid";
-            case "Geometry":
-                return "geometry";
-            case "Point":
-                return "point";
+            case "Geography":
+                return "geography";
         }
         const a: never = iterator.dataType;
         throw new Error("Not Defined");

package/src/migrations/sql-server/SqlServerAutomaticMigrations.ts

@@ -124,11 +124,14 @@ export default class SqlServerAutomaticMigrations extends SqlServerMigrations {
         const columns = [];
         for (const column of index.columns) {
             const columnName = column.name;
-            columns.push(`${columnName} ${column.descending ? "DESC" : "ASC"}`);
+            columns.push(`${columnName} ${ index.spatial ? "" : (column.descending ? "DESC" : "ASC")}`);
         }
+
+        const indexType = index.spatial ? " SPATIAL " : "";
+
         let query = `IF NOT EXISTS(SELECT * FROM sys.indexes WHERE name = '${indexName}' AND object_id = OBJECT_ID('${name}'))
         BEGIN   
-            CREATE ${index.unique ? "UNIQUE" : ""} INDEX ${indexName} ON ${name} ( ${columns.join(", ")})`;
+            CREATE ${index.unique ? "UNIQUE" : ""} ${indexType} INDEX ${indexName} ON ${name} ( ${columns.join(", ")})`;
 
         if (index.include) {
             query += ` INCLUDE (${index.include.join(",")})`;

package/src/migrations/sql-server/SqlServerMigrations.ts

@@ -139,10 +139,8 @@ export default abstract class SqlServerMigrations extends Migrations {
                 return "jsonb";
             case "UUID":
                 return "UniqueIdentifier";
-            case "Geometry":
-                return "geometry";
-            case "Point":
-                return "geometry";
+            case "Geography":
+                return "geography";
         }
         const a: never = iterator.dataType;
         throw new Error("Not Defined");

package/tests/local-unit-tests/docker-compose.yml

@@ -11,7 +11,7 @@ services:
     ports:
       - 1433:1433
   postgresdb:
-    image: postgres:alpine
+    image: postgis/postgis:18-3.6-alpine
     container_name: pg-test
     restart: unless-stopped
     environment: