@travetto/model-sqlite 7.0.0-rc.1 → 7.0.0-rc.2

package/README.md

@@ -37,8 +37,8 @@ import { SqliteDialect } from '@travetto/model-sqlite';
 
 export class Init {
   @InjectableFactory({ primary: true })
-  static getModelService(ctx: AsyncContext, conf: SQLModelConfig) {
-    return new SQLModelService(ctx, conf, new SqliteDialect(ctx, conf));
+  static getModelService(ctx: AsyncContext, config: SQLModelConfig) {
+    return new SQLModelService(ctx, config, new SqliteDialect(ctx, config));
   }
 }
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-sqlite",
-  "version": "7.0.0-rc.1",
+  "version": "7.0.0-rc.2",
   "description": "SQLite backing for the travetto model module, with real-time modeling support for SQL schemas.",
   "keywords": [
     "sql",
@@ -26,11 +26,11 @@
     "directory": "module/model-sqlite"
   },
   "dependencies": {
-    "@travetto/config": "^7.0.0-rc.1",
-    "@travetto/context": "^7.0.0-rc.1",
-    "@travetto/model": "^7.0.0-rc.1",
-    "@travetto/model-query": "^7.0.0-rc.1",
-    "@travetto/model-sql": "^7.0.0-rc.1",
+    "@travetto/config": "^7.0.0-rc.2",
+    "@travetto/context": "^7.0.0-rc.2",
+    "@travetto/model": "^7.0.0-rc.2",
+    "@travetto/model-query": "^7.0.0-rc.2",
+    "@travetto/model-sql": "^7.0.0-rc.2",
     "@types/better-sqlite3": "^7.6.13",
     "better-sqlite3": "^12.4.6"
   },

package/src/connection.ts

@@ -27,17 +27,17 @@ export class SqliteConnection extends Connection<Database> {
     this.#config = config;
   }
 
-  async #withRetries<T>(op: () => Promise<T>, retries = 10, delay = 250): Promise<T> {
+  async #withRetries<T>(operation: () => Promise<T>, retries = 10, delay = 250): Promise<T> {
     for (; ;) {
       try {
-        return await op();
-      } catch (err) {
-        if (err instanceof Error && retries > 1 && err.message.includes('database is locked')) {
+        return await operation();
+      } catch (error) {
+        if (error instanceof Error && retries > 1 && error.message.includes('database is locked')) {
           console.error('Failed, and waiting', retries);
           await Util.blockingTimeout(delay);
           retries -= 1;
         } else {
-          throw err;
+          throw error;
         }
       }
     }
@@ -72,22 +72,22 @@ export class SqliteConnection extends Connection<Database> {
     ShutdownManager.onGracefulShutdown(() => this.#pool.clear());
   }
 
-  async execute<T = unknown>(conn: Database, query: string, values?: unknown[]): Promise<{ count: number, records: T[] }> {
+  async execute<T = unknown>(connection: Database, query: string, values?: unknown[]): Promise<{ count: number, records: T[] }> {
     return this.#withRetries(async () => {
       console.debug('Executing query', { query });
       try {
-        const out = await conn.prepare<unknown[], T>(query)[query.trim().startsWith('SELECT') ? 'all' : 'run'](...values ?? []);
+        const out = await connection.prepare<unknown[], T>(query)[query.trim().startsWith('SELECT') ? 'all' : 'run'](...values ?? []);
         if (Array.isArray(out)) {
-          const records: T[] = out.map(v => ({ ...v }));
+          const records: T[] = out.map(item => ({ ...item }));
           return { count: out.length, records };
         } else {
           return { count: out.changes, records: [] };
         }
-      } catch (err) {
-        if (err instanceof Error && err.message.includes('UNIQUE constraint failed')) {
+      } catch (error) {
+        if (error instanceof Error && error.message.includes('UNIQUE constraint failed')) {
           throw new ExistsError('query', query);
         } else {
-          throw err;
+          throw error;
         }
       }
     });

package/src/dialect.ts

@@ -14,12 +14,12 @@ import { SqliteConnection } from './connection.ts';
 @Injectable()
 export class SqliteDialect extends SQLDialect {
 
-  conn: SqliteConnection;
+  connection: SqliteConnection;
   config: SQLModelConfig;
 
   constructor(context: AsyncContext, config: SQLModelConfig) {
     super(config.namespace);
-    this.conn = new SqliteConnection(context, config);
+    this.connection = new SqliteConnection(context, config);
     this.config = config;
 
     // Special operators
@@ -52,8 +52,8 @@ export class SqliteDialect extends SQLDialect {
   getModifyColumnSQL(stack: VisitStack[]): string {
     const field: SchemaFieldConfig = castTo(stack.at(-1));
     const type = this.getColumnType(field);
-    const ident = this.ident(field.name.toString());
-    return `ALTER TABLE ${this.parentTable(stack)} ALTER COLUMN ${ident} TYPE ${type} USING (${ident}::${type});`;
+    const identifier = this.identifier(field.name);
+    return `ALTER TABLE ${this.parentTable(stack)} ALTER COLUMN ${identifier} TYPE ${type} USING (${identifier}::${type});`;
   }
 
   /**