@itrocks/mysql-maintainer 0.0.18 → 0.1.1

package/cjs/contextual-connection.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Contextual = void 0;
 const mariadb_1 = require("mariadb");
 const mysql_maintainer_1 = require("./mysql-maintainer");
+const mysql_maintainer_2 = require("./mysql-maintainer");
 const MANAGED_ERROR_CODES = ['ER_BAD_FIELD_ERROR', 'ER_CANNOT_ADD_FOREIGN', 'ER_NO_SUCH_TABLE'];
 class Contextual {
     contexts = [];
@@ -15,16 +16,20 @@ class Contextual {
     }
     async query(sql, values) {
         try {
+            if (mysql_maintainer_1.DEBUG)
+                console.log(sql, values);
             return await this.superQuery(sql, values);
         }
         catch (error) {
             if (!(error instanceof mariadb_1.SqlError)
                 || !error.code
                 || !MANAGED_ERROR_CODES.includes(error.code)) {
+                if (mysql_maintainer_1.DEBUG)
+                    console.log('MAINTAINER: throw', error);
                 throw error;
             }
             // @ts-ignore query applies to a Connection
-            if (await new mysql_maintainer_1.MysqlMaintainer(this).manageError(error, this.contexts[this.contexts.length - 1], sql, values)) {
+            if (await new mysql_maintainer_2.MysqlMaintainer(this).manageError(error, this.contexts[this.contexts.length - 1], sql, values)) {
                 return this.query(sql, values);
             }
             throw error;

package/cjs/mysql-maintainer.d.ts

@@ -5,6 +5,7 @@ import { QueryOptions } from 'mariadb';
 import { SqlError } from 'mariadb';
 import { Context } from './contextual-connection';
 export { Mysql } from './mysql';
+export declare const DEBUG = false;
 export declare class MysqlMaintainer {
     connection: Connection;
     constructor(connection: Connection);

package/cjs/mysql-maintainer.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MysqlMaintainer = exports.Mysql = void 0;
+exports.MysqlMaintainer = exports.DEBUG = exports.Mysql = void 0;
 const class_type_1 = require("@itrocks/class-type");
 const mysql_1 = require("@itrocks/mysql");
 const mysql_to_schema_1 = require("@itrocks/mysql-to-schema");
@@ -11,6 +11,7 @@ const schema_to_mysql_1 = require("@itrocks/schema-to-mysql");
 const store_1 = require("@itrocks/store");
 var mysql_2 = require("./mysql");
 Object.defineProperty(exports, "Mysql", { enumerable: true, get: function () { return mysql_2.Mysql; } });
+exports.DEBUG = false;
 const DELETION = false;
 class MysqlMaintainer {
     connection;
@@ -51,6 +52,8 @@ CONSTRAINT \`${joinTable}.${table2}_id\` FOREIGN KEY (${table2}_id) REFERENCES \
         return (0, mysql_1.joinTableName)(table1, table2);
     }
     async manageError(error, context, sql, values) {
+        if (exports.DEBUG)
+            console.log('MAINTAINER: manageError', error);
         switch (error.code) {
             case 'ER_BAD_FIELD_ERROR':
             case 'ER_CANNOT_ADD_FOREIGN':

package/cjs/mysql.js

@@ -43,14 +43,16 @@ class Mysql extends mysql_1.Mysql {
         contexts.pop();
         return result;
     }
-    async readCollection(object, property, type = new reflect_1.ReflectProperty(object, property).collectionType.elementType.type) {
+    async readCollection(object, property, type) {
+        type ??= new reflect_1.ReflectProperty(object, property).collectionType.elementType.type;
         const contexts = (this.connection ?? await this.connect()).contexts;
         contexts.push([object, type]);
         const result = await super.readCollection(object, property, type);
         contexts.pop();
         return result;
     }
-    async readCollectionIds(object, property, type = new reflect_1.ReflectProperty(object, property).collectionType.elementType.type) {
+    async readCollectionIds(object, property, type) {
+        type ??= new reflect_1.ReflectProperty(object, property).collectionType.elementType.type;
         const contexts = (this.connection ?? await this.connect()).contexts;
         contexts.push([object, type]);
         const result = await super.readCollectionIds(object, property, type);

package/esm/contextual-connection.js

@@ -1,4 +1,5 @@
 import { SqlError } from 'mariadb';
+import { DEBUG } from './mysql-maintainer';
 import { MysqlMaintainer } from './mysql-maintainer';
 const MANAGED_ERROR_CODES = ['ER_BAD_FIELD_ERROR', 'ER_CANNOT_ADD_FOREIGN', 'ER_NO_SUCH_TABLE'];
 export class Contextual {
@@ -12,12 +13,16 @@ export class Contextual {
     }
     async query(sql, values) {
         try {
+            if (DEBUG)
+                console.log(sql, values);
             return await this.superQuery(sql, values);
         }
         catch (error) {
             if (!(error instanceof SqlError)
                 || !error.code
                 || !MANAGED_ERROR_CODES.includes(error.code)) {
+                if (DEBUG)
+                    console.log('MAINTAINER: throw', error);
                 throw error;
             }
             // @ts-ignore query applies to a Connection

package/esm/mysql-maintainer.d.ts

@@ -5,6 +5,7 @@ import { QueryOptions } from 'mariadb';
 import { SqlError } from 'mariadb';
 import { Context } from './contextual-connection';
 export { Mysql } from './mysql';
+export declare const DEBUG = false;
 export declare class MysqlMaintainer {
     connection: Connection;
     constructor(connection: Connection);

package/esm/mysql-maintainer.js

@@ -7,6 +7,7 @@ import { SchemaDiffMysql } from '@itrocks/schema-diff-mysql';
 import { SchemaToMysql } from '@itrocks/schema-to-mysql';
 import { storeOf } from '@itrocks/store';
 export { Mysql } from './mysql';
+export const DEBUG = false;
 const DELETION = false;
 export class MysqlMaintainer {
     connection;
@@ -47,6 +48,8 @@ CONSTRAINT \`${joinTable}.${table2}_id\` FOREIGN KEY (${table2}_id) REFERENCES \
         return joinTableName(table1, table2);
     }
     async manageError(error, context, sql, values) {
+        if (DEBUG)
+            console.log('MAINTAINER: manageError', error);
         switch (error.code) {
             case 'ER_BAD_FIELD_ERROR':
             case 'ER_CANNOT_ADD_FOREIGN':

package/esm/mysql.js

@@ -40,14 +40,16 @@ export class Mysql extends M {
         contexts.pop();
         return result;
     }
-    async readCollection(object, property, type = new ReflectProperty(object, property).collectionType.elementType.type) {
+    async readCollection(object, property, type) {
+        type ??= new ReflectProperty(object, property).collectionType.elementType.type;
         const contexts = (this.connection ?? await this.connect()).contexts;
         contexts.push([object, type]);
         const result = await super.readCollection(object, property, type);
         contexts.pop();
         return result;
     }
-    async readCollectionIds(object, property, type = new ReflectProperty(object, property).collectionType.elementType.type) {
+    async readCollectionIds(object, property, type) {
+        type ??= new ReflectProperty(object, property).collectionType.elementType.type;
         const contexts = (this.connection ?? await this.connect()).contexts;
         contexts.push([object, type]);
         const result = await super.readCollectionIds(object, property, type);

package/package.json

@@ -57,5 +57,5 @@
 		"build:esm": "tsc -p tsconfig.esm.json"
 	},
 	"types": "./esm/mysql-maintainer.d.ts",
-	"version": "0.0.18"
+	"version": "0.1.1"
 }