@travetto/model-sql 8.0.0-alpha.13 → 8.0.0-alpha.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-sql",
-  "version": "8.0.0-alpha.13",
+  "version": "8.0.0-alpha.14",
   "type": "module",
   "description": "SQL backing for the travetto model module, with real-time modeling support for SQL schemas.",
   "keywords": [
@@ -31,8 +31,8 @@
     "@travetto/config": "^8.0.0-alpha.12",
     "@travetto/context": "^8.0.0-alpha.11",
     "@travetto/model": "^8.0.0-alpha.12",
-    "@travetto/model-indexed": "^8.0.0-alpha.13",
-    "@travetto/model-query": "^8.0.0-alpha.12"
+    "@travetto/model-indexed": "^8.0.0-alpha.14",
+    "@travetto/model-query": "^8.0.0-alpha.13"
   },
   "peerDependencies": {
     "@travetto/cli": "^8.0.0-alpha.17",

package/src/dialect/base.ts

@@ -746,15 +746,16 @@ CREATE TABLE IF NOT EXISTS ${this.table(stack)} (
         }
         return [castTo(key), typeof value === 'number' ? value === 1 : (!!value)];
       });
-      return `CREATE ${idx.type === 'query:unique' ? 'UNIQUE ' : ''}INDEX ${constraint} ON ${this.identifier(table)} (${fields
+      return `CREATE ${idx.unique ? 'UNIQUE ' : ''}INDEX ${constraint} ON ${this.identifier(table)} (${fields
         .map(([name, sel]) => `${this.identifier(name)} ${sel ? 'ASC' : 'DESC'}`)
         .join(', ')});`;
     } else if (isModelIndexedIndex(idx)) {
-      if ([...idx.sortTemplate, ...idx.keyTemplate].find(field => field.path.length > 1)) {
+      const all = [...idx.keyTemplate, ...idx.sortTemplate];
+      if (all.find(field => field.path.length > 1)) {
         console.debug('Nested fields are not supported in ModelIndexed indices SQL', { index: idx.name });
         return;
       }
-      const fields = [...idx.sortTemplate, ...idx.keyTemplate]
+      const fields = all
         .map(({ path, value }) => `${this.identifier(path.join('_'))} ${value === -1 ? 'DESC' : 'ASC'}`)
         .join(', ');
       switch (idx.type) {
@@ -1094,10 +1095,9 @@ ${this.getWhereSQL(cls, where!)}`;
    */
   isIndexChanged(requested: IndexConfig, existing: SQLTableDescription['indices'][number]): boolean {
     if (isModelQueryIndex(requested)) {
-      let result =
-        (existing.is_unique && requested.type !== 'query:unique')
-        || requested.fields.length !== existing.columns.length;
-
+      const uniqueChanged = (existing.is_unique && !requested.unique);
+      const columnSizeChanged = requested.fields.length !== existing.columns.length;
+      let result = uniqueChanged || columnSizeChanged;
       for (let i = 0; i < requested.fields.length && !result; i++) {
         const [[key, value]] = Object.entries(requested.fields[i]);
         const desc = value === -1;
@@ -1106,8 +1106,21 @@ ${this.getWhereSQL(cls, where!)}`;
 
       return result;
     } else if (isModelIndexedIndex(requested)) {
-      // TODO: Fill this out
-      return false;
+      const keys = Object.entries(requested.key);
+      const sort = Object.entries(requested.sort);
+      const all = [...keys, ...sort];
+
+      const uniqueChanged = (requested.type === 'indexed:keyed' && existing.is_unique && !requested.unique);
+      const columnSizeChanged = all.length !== existing.columns.length;
+      let result = uniqueChanged || columnSizeChanged;
+
+      for (let i = 0; i < all.length && !result; i++) {
+        const [key, value] = all[i];
+        const desc = value === -1;
+        result ||= key !== existing.columns[i].name && desc !== existing.columns[i].desc;
+      }
+
+      return result;
     } else {
       throw new IndexNotSupported(requested.class, requested, 'Only indexed and query indices are supported in SQL');
     }