@travetto/model-sql 5.0.17 → 5.0.19

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 ArcSine Technologies
+Copyright (c) 2020 ArcSine Technologies
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-sql",
-  "version": "5.0.17",
+  "version": "5.0.19",
   "description": "SQL backing for the travetto model module, with real-time modeling support for SQL schemas.",
   "keywords": [
     "sql",
@@ -27,14 +27,14 @@
     "directory": "module/model-sql"
   },
   "dependencies": {
-    "@travetto/cli": "^5.0.16",
-    "@travetto/config": "^5.0.13",
-    "@travetto/context": "^5.0.13",
-    "@travetto/model": "^5.0.14",
-    "@travetto/model-query": "^5.0.14"
+    "@travetto/cli": "^5.0.18",
+    "@travetto/config": "^5.0.15",
+    "@travetto/context": "^5.0.15",
+    "@travetto/model": "^5.0.16",
+    "@travetto/model-query": "^5.0.16"
   },
   "peerDependencies": {
-    "@travetto/test": "^5.0.15"
+    "@travetto/test": "^5.0.17"
   },
   "peerDependenciesMeta": {
     "@travetto/test": {

package/src/connection/base.ts

@@ -1,8 +1,8 @@
 import { castTo, Util } from '@travetto/runtime';
 import { AsyncContext } from '@travetto/context';
 
-const ContextActiveⲐ: unique symbol = Symbol.for('@travetto/model:sql-active');
-const TxActiveⲐ: unique symbol = Symbol.for('@travetto/model:sql-transaction');
+const ContextActiveSymbol: unique symbol = Symbol.for('@travetto/model:sql-active');
+const TxActiveSymbol: unique symbol = Symbol.for('@travetto/model:sql-transaction');
 
 export type TransactionType = 'required' | 'isolated' | 'force';
 
@@ -18,12 +18,12 @@ export abstract class Connection<C = unknown> {
 
   transactionDialect = {
     begin: 'BEGIN;',
-    beginNested: 'SAVEPOINT %;',
+    beginNested: 'SAVEPOINT $1;',
     isolate: 'SET TRANSACTION ISOLATION LEVEL READ COMMITTED;',
     rollback: 'ROLLBACK;',
-    rollbackNested: 'ROLLBACK TO %;',
+    rollbackNested: 'ROLLBACK TO $1;',
     commit: 'COMMIT;',
-    commitNested: 'RELEASE SAVEPOINT %;'
+    commitNested: 'RELEASE SAVEPOINT $1;'
   };
 
   constructor(public readonly context: AsyncContext) {
@@ -34,14 +34,14 @@ export abstract class Connection<C = unknown> {
    * Get active connection
    */
   get active(): C {
-    return this.context.get<C>(ContextActiveⲐ);
+    return this.context.get<C>(ContextActiveSymbol);
   }
 
   /**
    * Get active tx state
    */
   get activeTx(): boolean {
-    return !!this.context.get<boolean>(TxActiveⲐ);
+    return !!this.context.get<boolean>(TxActiveSymbol);
   }
 
   /**
@@ -54,7 +54,7 @@ export abstract class Connection<C = unknown> {
    * @param rawConnection
    * @param query
    */
-  abstract execute<T = unknown>(rawConnection: C, query: string): Promise<{ records: T[], count: number }>;
+  abstract execute<T = unknown>(rawConnection: C, query: string, values?: unknown[]): Promise<{ records: T[], count: number }>;
 
   /**
    * Acquire new connection
@@ -79,7 +79,7 @@ export abstract class Connection<C = unknown> {
 
     return this.context.run(async () => {
       try {
-        this.context.set(ContextActiveⲐ, await this.acquire());
+        this.context.set(ContextActiveSymbol, await this.acquire());
         return await op();
       } finally {
         if (this.active) {
@@ -103,7 +103,7 @@ export abstract class Connection<C = unknown> {
     const self = castTo<Connection>(this);
     yield* this.context.iterate(async function* () {
       try {
-        self.context.set(ContextActiveⲐ, await self.acquire());
+        self.context.set(ContextActiveSymbol, await self.acquire());
         yield* op();
       } finally {
         if (self.active) {
@@ -134,7 +134,7 @@ export abstract class Connection<C = unknown> {
       }
     } else {
       return this.runWithActive(() => {
-        this.context.set(TxActiveⲐ, true);
+        this.context.set(TxActiveSymbol, true);
         return this.runWithTransaction('force', op);
       });
     }
@@ -146,7 +146,7 @@ export abstract class Connection<C = unknown> {
   async startTx(conn: C, transactionId?: string): Promise<void> {
     if (transactionId) {
       if (this.nestedTransactions) {
-        await this.execute(conn, this.transactionDialect.beginNested.replace('%', transactionId));
+        await this.execute(conn, this.transactionDialect.beginNested, [transactionId]);
       }
     } else {
       if (this.isolatedTransactions) {
@@ -162,7 +162,7 @@ export abstract class Connection<C = unknown> {
   async commitTx(conn: C, transactionId?: string): Promise<void> {
     if (transactionId) {
       if (this.nestedTransactions) {
-        await this.execute(conn, this.transactionDialect.commitNested.replace('%', transactionId));
+        await this.execute(conn, this.transactionDialect.commitNested, [transactionId]);
       }
     } else {
       await this.execute(conn, this.transactionDialect.commit);
@@ -175,7 +175,7 @@ export abstract class Connection<C = unknown> {
   async rollbackTx(conn: C, transactionId?: string): Promise<void> {
     if (transactionId) {
       if (this.isolatedTransactions) {
-        await this.execute(conn, this.transactionDialect.rollbackNested.replace('%', transactionId));
+        await this.execute(conn, this.transactionDialect.rollbackNested, [transactionId]);
       }
     } else {
       await this.execute(conn, this.transactionDialect.rollback);

package/src/dialect/base.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @stylistic/indent */
 import { DataUtil, SchemaRegistry, FieldConfig, Schema } from '@travetto/schema';
-import { Class, AppError, TypedObject, describeFunction, TimeUtil, castTo, castKey } from '@travetto/runtime';
+import { Class, AppError, TypedObject, TimeUtil, castTo, castKey } from '@travetto/runtime';
 import { SelectClause, Query, SortClause, WhereClause, RetainFields } from '@travetto/model-query';
 import { BulkResponse, IndexConfig } from '@travetto/model';
 import { PointImpl } from '@travetto/model-query/src/internal/model/point';
@@ -634,11 +634,6 @@ ${this.getLimitSQL(cls, query)}`;
     const config = stack[stack.length - 1];
     const parent = stack.length > 1;
     const array = parent && config.array;
-
-    if (config.type && describeFunction(config.type)?.synthetic) {
-      throw new AppError(`Cannot create SQL tables for synthetic types, please convert ${SQLUtil.buildPath(stack)} to a concrete class`);
-    }
-
     const fields = SchemaRegistry.has(config.type) ?
       [...SQLUtil.getFieldsByLocation(stack).local] :
       (array ? [castTo<FieldConfig>(config)] : []);
@@ -754,7 +749,6 @@ CREATE TABLE IF NOT EXISTS ${this.table(stack)} (
     return out;
   }
 
-
   /**
    * Get INSERT sql for a given instance and a specific stack location
    */

package/src/internal/util.ts

@@ -2,14 +2,14 @@ import { castKey, castTo, Class, TypedObject } from '@travetto/runtime';
 import { SelectClause, SortClause } from '@travetto/model-query';
 import { ModelRegistry, ModelType, OptionalId } from '@travetto/model';
 import { SchemaRegistry, ClassConfig, FieldConfig, DataUtil } from '@travetto/schema';
-import { AllViewⲐ } from '@travetto/schema/src/internal/types';
+import { AllViewSymbol } from '@travetto/schema/src/internal/types';
 
 import { DialectState, InsertWrapper, VisitHandler, VisitState, VisitInstanceNode, OrderBy } from './types';
 
-const TableⲐ = Symbol.for('@travetto/model-sql:table');
+const TableSymbol = Symbol.for('@travetto/model-sql:table');
 
 export type VisitStack = {
-  [TableⲐ]?: string;
+  [TableSymbol]?: string;
   array?: boolean;
   type: Class;
   name: string;
@@ -79,14 +79,14 @@ export class SQLUtil {
     }
 
     const model = ModelRegistry.get(cls.class)!;
-    const conf = cls.views[AllViewⲐ];
+    const conf = cls.views[AllViewSymbol];
     const fields = conf.fields.map(x => ({ ...conf.schema[x] }));
 
     // Polymorphic
     if (model && (model.baseType ?? model.subType)) {
       const fieldMap = new Set(fields.map(f => f.name));
       for (const type of ModelRegistry.getClassesByBaseType(ModelRegistry.getBaseModel(cls.class))) {
-        const typeConf = SchemaRegistry.get(type).views[AllViewⲐ];
+        const typeConf = SchemaRegistry.get(type).views[AllViewSymbol];
         for (const f of typeConf.fields) {
           if (!fieldMap.has(f)) {
             fieldMap.add(f);
@@ -232,7 +232,7 @@ export class SQLUtil {
       if (typeof k === 'string' && !DataUtil.isPlainObject(select[k]) && localMap[k]) {
         if (!v) {
           if (toGet.size === 0) {
-            toGet = new Set(SchemaRegistry.get(cls).views[AllViewⲐ].fields);
+            toGet = new Set(SchemaRegistry.get(cls).views[AllViewSymbol].fields);
           }
           toGet.delete(k);
         } else {
@@ -254,7 +254,7 @@ export class SQLUtil {
       while (!found) {
         const key = Object.keys(cl)[0];
         const val = cl[key];
-        const field = { ...schema.views[AllViewⲐ].schema[key] };
+        const field = { ...schema.views[AllViewSymbol].schema[key] };
         if (DataUtil.isPrimitive(val)) {
           stack.push(field);
           found = { stack, asc: val === 1 };
@@ -305,10 +305,10 @@ export class SQLUtil {
    */
   static buildTable(list: VisitStack[]): string {
     const top = list[list.length - 1];
-    if (!top[TableⲐ]) {
-      top[TableⲐ] = list.map((el, i) => i === 0 ? ModelRegistry.getStore(el.type) : el.name).join('_');
+    if (!top[TableSymbol]) {
+      top[TableSymbol] = list.map((el, i) => i === 0 ? ModelRegistry.getStore(el.type) : el.name).join('_');
     }
-    return top[TableⲐ]!;
+    return top[TableSymbol]!;
   }
 
   /**

package/src/table-manager.ts

@@ -95,7 +95,6 @@ export class TableManager {
     }
   }
 
-
   /**
    * Get a valid connection
    */