@travetto/model-sqlite 8.0.0-alpha.29 → 8.0.0-alpha.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-sqlite",
-  "version": "8.0.0-alpha.29",
+  "version": "8.0.0-alpha.30",
   "type": "module",
   "description": "SQLite backing for the travetto model module, with real-time modeling support for SQL schemas.",
   "keywords": [
@@ -31,7 +31,7 @@
     "@travetto/context": "^8.0.0-alpha.22",
     "@travetto/model": "^8.0.0-alpha.25",
     "@travetto/model-query": "^8.0.0-alpha.27",
-    "@travetto/model-sql": "^8.0.0-alpha.29"
+    "@travetto/model-sql": "^8.0.0-alpha.30"
   },
   "travetto": {
     "displayName": "SQLite Model Service"

package/src/dialect.ts

@@ -1,6 +1,6 @@
 import { AbstractANSI99Dialect, type ResolvedPathContext, type TableContext, type TransactionStatements } from '@travetto/model-sql';
 import { type Class, castTo, JSONUtil } from '@travetto/runtime';
-import { type SchemaFieldConfig, SchemaRegistryIndex } from '@travetto/schema';
+import type { SchemaFieldConfig } from '@travetto/schema';
 
 export class SqliteDialect extends AbstractANSI99Dialect {
   returningSupport = true;
@@ -9,6 +9,16 @@ export class SqliteDialect extends AbstractANSI99Dialect {
     begin: 'BEGIN IMMEDIATE;'
   };
 
+  override getUpsertSQL(
+    context: TableContext,
+    columns: string[],
+    placeholders: string[],
+    conflictTarget: string[],
+    updates: string[]
+  ): string {
+    return `INSERT INTO ${this.escapeIdentifier(context.tableName)} (${columns.join(', ')}) VALUES (${placeholders.join(', ')}) ON CONFLICT (${conflictTarget.join(', ')}) DO UPDATE SET ${updates.join(', ')} RETURNING *;`;
+  }
+
   getComplexColumnType(field: SchemaFieldConfig): string {
     return 'TEXT';
   }
@@ -38,7 +48,7 @@ export class SqliteDialect extends AbstractANSI99Dialect {
   }
 
   compileJsonIndexPath(columnName: string, jsonPath: string[]): string {
-    return `json_extract(${columnName}, '$.${jsonPath.join('.')}')`;
+    return `json_extract(${columnName}, '$.${this.formatJsonPath(jsonPath)}')`;
   }
 
   #getSqliteArrayExpression(context: ResolvedPathContext): string {
@@ -55,22 +65,10 @@ export class SqliteDialect extends AbstractANSI99Dialect {
       return onLeaf(parentExpression);
     }
 
-    const arraySegmentIndices: number[] = [];
-    let currentClass: Class | undefined = context.arrayField?.type;
-
-    for (let index = 0; index < context.subPath.length; index++) {
-      const segment = context.subPath[index];
-      if (currentClass) {
-        const classConfiguration = SchemaRegistryIndex.getOptional(currentClass)?.get();
-        const fieldConfiguration = classConfiguration?.fields[segment];
-        if (fieldConfiguration) {
-          if (fieldConfiguration.array) {
-            arraySegmentIndices.push(index);
-          }
-          currentClass = fieldConfiguration.type;
-        }
-      }
-    }
+    const subPathMetadata = this.getSchemaSubPathMetadata(context.arrayField?.type, context.subPath);
+    const arraySegmentIndices = subPathMetadata
+      .map((metadataItem, metadataIndex) => (metadataItem.isArray ? metadataIndex : -1))
+      .filter(itemIndex => itemIndex !== -1);
 
     if (arraySegmentIndices.length === 0) {
       const leafExpression = `json_extract(${parentExpression}, '$.${context.subPath.join('.')}')`;
@@ -135,15 +133,7 @@ EXISTS (
 
     if (typeof values === 'object' && values !== null) {
       return {
-        sql: this.#buildArrayElementExists(
-          context,
-          leafExpression => `
-NOT EXISTS (
-  SELECT 1 
-  FROM json_each(${identifier}) AS req 
-  WHERE json_extract(${leafExpression}, '$.' || req.key) IS NOT req.value
-)`
-        ),
+        sql: this.#buildArrayElementExists(context, leafExpression => `json_patch(${leafExpression}, ${identifier}) = ${leafExpression}`),
         formatted: JSONUtil.toUTF8(values)
       };
     }