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

package/README.md

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-mysql",
-  "version": "7.0.0-rc.0",
+  "version": "7.0.0-rc.2",
   "description": "MySQL backing for the travetto model module, with real-time modeling support for SQL schemas.",
   "keywords": [
     "sql",
@@ -27,12 +27,12 @@
     "directory": "module/model-mysql"
   },
   "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",
     "mysql2": "^3.15.3"
   },
   "travetto": {

package/src/connection.ts

@@ -6,9 +6,9 @@ import { AsyncContext } from '@travetto/context';
 import { ExistsError } from '@travetto/model';
 import { Connection, SQLModelConfig } from '@travetto/model-sql';
 
-function isSimplePacket(o: unknown): o is OkPacket | ResultSetHeader {
-  return o !== null && o !== undefined && typeof o === 'object' && 'constructor' in o && (
-    o.constructor.name === 'OkPacket' || o.constructor.name === 'ResultSetHeader'
+function isSimplePacket(value: unknown): value is OkPacket | ResultSetHeader {
+  return value !== null && value !== undefined && typeof value === 'object' && 'constructor' in value && (
+    value.constructor.name === 'OkPacket' || value.constructor.name === 'ResultSetHeader'
   );
 }
 
@@ -59,27 +59,27 @@ export class MySQLConnection extends Connection<PoolConnection> {
     return result;
   }
 
-  async execute<T = unknown>(conn: PoolConnection, query: string, values?: unknown[]): Promise<{ count: number, records: T[] }> {
+  async execute<T = unknown>(pool: PoolConnection, query: string, values?: unknown[]): Promise<{ count: number, records: T[] }> {
     console.debug('Executing query', { query });
     let prepared;
     try {
-      prepared = (values?.length ?? 0) > 0 ? await conn.prepare(query) : undefined;
-      const [results,] = await (prepared ? prepared.execute(values) : conn.query(query));
+      prepared = (values?.length ?? 0) > 0 ? await pool.prepare(query) : undefined;
+      const [results,] = await (prepared ? prepared.execute(values) : pool.query(query));
       if (isSimplePacket(results)) {
         return { records: [], count: results.affectedRows };
       } else {
         if (isSimplePacket(results[0])) {
           return { records: [], count: results[0].affectedRows };
         }
-        const records: T[] = [...results].map(v => castTo({ ...v }));
+        const records: T[] = [...results].map(value => castTo({ ...value }));
         return { records, count: records.length };
       }
-    } catch (err) {
-      console.debug('Failed query', { error: err, query });
-      if (err instanceof Error && err.message.startsWith('Duplicate entry')) {
+    } catch (error) {
+      console.debug('Failed query', { error, query });
+      if (error instanceof Error && error.message.startsWith('Duplicate entry')) {
         throw new ExistsError('query', query);
       } else {
-        throw err;
+        throw error;
       }
     } finally {
       try {
@@ -92,7 +92,7 @@ export class MySQLConnection extends Connection<PoolConnection> {
     return this.#pool.getConnection();
   }
 
-  release(conn: PoolConnection): void {
-    conn.release();
+  release(pool: PoolConnection): void {
+    pool.release();
   }
 }

package/src/dialect.ts

@@ -14,12 +14,12 @@ import { MySQLConnection } from './connection.ts';
 @Injectable()
 export class MySQLDialect extends SQLDialect {
 
-  conn: MySQLConnection;
+  connection: MySQLConnection;
   tablePostfix = 'COLLATE=utf8mb4_bin ENGINE=InnoDB';
 
   constructor(context: AsyncContext, config: SQLModelConfig) {
     super(config.namespace);
-    this.conn = new MySQLConnection(context, config);
+    this.connection = new MySQLConnection(context, config);
 
     // Custom types
     Object.assign(this.COLUMN_TYPES, {
@@ -31,9 +31,9 @@ export class MySQLDialect extends SQLDialect {
      * Set string length limit based on version
      */
     if (/^5[.][56]/.test(config.version)) {
-      this.DEFAULT_STRING_LEN = 191; // Mysql limitation with utf8 and keys
+      this.DEFAULT_STRING_LENGTH = 191; // Mysql limitation with utf8 and keys
     } else {
-      this.DEFAULT_STRING_LEN = 3072 / 4 - 1;
+      this.DEFAULT_STRING_LENGTH = 3072 / 4 - 1;
     }
 
     if (/^5[.].*/.test(config.version)) {