@travetto/model-postgres 7.0.0-rc.0 → 7.0.0-rc.2

package/README.md

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-postgres",
-  "version": "7.0.0-rc.0",
+  "version": "7.0.0-rc.2",
   "description": "PostgreSQL backing for the travetto model module, with real-time modeling support for SQL schemas.",
   "keywords": [
     "sql",
@@ -27,12 +27,12 @@
     "directory": "module/model-postgres"
   },
   "dependencies": {
-    "@travetto/cli": "^7.0.0-rc.0",
-    "@travetto/config": "^7.0.0-rc.0",
-    "@travetto/context": "^7.0.0-rc.0",
-    "@travetto/model": "^7.0.0-rc.0",
-    "@travetto/model-query": "^7.0.0-rc.0",
-    "@travetto/model-sql": "^7.0.0-rc.0",
+    "@travetto/cli": "^7.0.0-rc.2",
+    "@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/pg": "^8.15.6",
     "pg": "^8.16.3"
   },

package/src/connection.ts

@@ -40,9 +40,9 @@ export class PostgreSQLConnection extends Connection<PoolClient> {
 
     await this.runWithActive(() =>
       this.runWithTransaction('required', () =>
-        this.execute(this.active!, 'CREATE EXTENSION IF NOT EXISTS pgcrypto;').catch(err => {
-          if (!(err instanceof Error && err.message.includes('already exists'))) {
-            throw err;
+        this.execute(this.active!, 'CREATE EXTENSION IF NOT EXISTS pgcrypto;').catch(error => {
+          if (!(error instanceof Error && error.message.includes('already exists'))) {
+            throw error;
           }
         })
       )
@@ -52,17 +52,17 @@ export class PostgreSQLConnection extends Connection<PoolClient> {
     ShutdownManager.onGracefulShutdown(() => this.#pool.end());
   }
 
-  async execute<T = unknown>(conn: PoolClient, query: string, values?: unknown[]): Promise<{ count: number, records: T[] }> {
+  async execute<T = unknown>(pool: PoolClient, query: string, values?: unknown[]): Promise<{ count: number, records: T[] }> {
     console.debug('Executing query', { query });
     try {
-      const out = await conn.query(query, values);
-      const records: T[] = [...out.rows].map(v => ({ ...v }));
+      const out = await pool.query(query, values);
+      const records: T[] = [...out.rows].map(value => ({ ...value }));
       return { count: out.rowCount!, records };
-    } catch (err) {
-      if (err instanceof Error && err.message.includes('duplicate key value')) {
+    } catch (error) {
+      if (error instanceof Error && error.message.includes('duplicate key value')) {
         throw new ExistsError('query', query);
       } else {
-        throw err;
+        throw error;
       }
     }
   }
@@ -71,7 +71,7 @@ export class PostgreSQLConnection extends Connection<PoolClient> {
     return this.#pool.connect();
   }
 
-  release(conn: PoolClient): void {
-    conn.release();
+  release(pool: PoolClient): void {
+    pool.release();
   }
 }

package/src/dialect.ts

@@ -14,11 +14,11 @@ import { PostgreSQLConnection } from './connection.ts';
 @Injectable()
 export class PostgreSQLDialect extends SQLDialect {
 
-  conn: PostgreSQLConnection;
+  connection: PostgreSQLConnection;
 
   constructor(context: AsyncContext, config: SQLModelConfig) {
     super(config.namespace);
-    this.conn = new PostgreSQLConnection(context, config);
+    this.connection = new PostgreSQLConnection(context, config);
     this.ID_AFFIX = '"';
 
     // Special operators
@@ -50,8 +50,8 @@ export class PostgreSQLDialect 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});`;
   }
 
   /**