@itrocks/mysql-maintainer 0.0.3 → 0.0.5

package/cjs/contextual-connection.d.ts

@@ -2,7 +2,7 @@ import { ObjectOrType } from '@itrocks/class-type';
 import { Connection } from 'mariadb';
 import { QueryOptions } from 'mariadb';
 export type Context = ObjectOrType | ObjectOrType[];
-export declare class Contextual {
+export declare class Contextual implements Partial<Connection> {
     context: Context[];
     superQuery: <T = any>(sql: string | QueryOptions, values?: any) => Promise<T>;
     applyTo(connection: ContextualConnection): Promise<ContextualConnection>;

package/cjs/contextual-connection.js

@@ -22,7 +22,8 @@ class Contextual {
                 || !['ER_BAD_FIELD_ERROR'].includes(error.code)) {
                 throw error;
             }
-            if (new mysql_maintainer_1.MysqlMaintainer(this).manageError(error, this.context[this.context.length - 1], sql, values)) {
+            // @ts-ignore query applies to a Connection
+            if (await new mysql_maintainer_1.MysqlMaintainer(this).manageError(error, this.context[this.context.length - 1], sql, values)) {
                 return this.query(sql, values);
             }
             throw error;

package/cjs/mysql-maintainer.d.ts

@@ -1,16 +1,16 @@
 import { Type } from '@itrocks/class-type';
+import { Connection } from 'mariadb';
 import { QueryOptions } from 'mariadb';
 import { SqlError } from 'mariadb';
 import { Context } from './contextual-connection';
-import { Contextual } from './contextual-connection';
 export * from './mysql';
 export declare class MysqlMaintainer {
-    connection: Contextual;
-    constructor(connection: Contextual);
+    connection: Connection;
+    constructor(connection: Connection);
     createContextTables(context: Context): boolean;
     createImplicitTables(sql: string | QueryOptions): boolean;
     createTable(type: Type): boolean;
-    manageError(error: SqlError, context: Context, sql: string | QueryOptions, values: any[]): boolean;
-    updateContextTables(context: Context): boolean;
-    updateTable(type: Type): boolean;
+    manageError(error: SqlError, context: Context, sql: string | QueryOptions, values: any[]): Promise<boolean>;
+    updateContextTables(context: Context): Promise<boolean>;
+    updateTable(type: Type): Promise<boolean>;
 }

package/cjs/mysql-maintainer.js

@@ -16,6 +16,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MysqlMaintainer = void 0;
 const class_type_1 = require("@itrocks/class-type");
+const mysql_to_schema_1 = require("@itrocks/mysql-to-schema");
+const reflect_to_schema_1 = require("@itrocks/reflect-to-schema");
+const schema_diff_1 = require("@itrocks/schema-diff");
+const store_1 = require("@itrocks/store");
 __exportStar(require("./mysql"), exports);
 class MysqlMaintainer {
     connection;
@@ -35,14 +39,14 @@ class MysqlMaintainer {
     createTable(type) {
         return false;
     }
-    manageError(error, context, sql, values) {
+    async manageError(error, context, sql, values) {
         console.log('query', sql, values);
         console.log('throw', error);
         console.log('context', context);
         switch (error.code) {
             case 'ER_BAD_FIELD_ERROR':
             case 'ER_CANNOT_ADD_FOREIGN':
-                return this.updateContextTables(context);
+                return await this.updateContextTables(context);
             case 'ER_CANT_CREATE_TABLE':
                 return this.createImplicitTables(sql);
             case 'ER_NO_SUCH_TABLE':
@@ -50,14 +54,31 @@ class MysqlMaintainer {
         }
         return false;
     }
-    updateContextTables(context) {
+    async updateContextTables(context) {
         const contexts = Array.isArray(context) ? context : [context];
         for (const context of contexts) {
-            this.updateTable((0, class_type_1.typeOf)(context));
+            await this.updateTable((0, class_type_1.typeOf)(context));
         }
         return false;
     }
-    updateTable(type) {
+    async updateTable(type) {
+        const tableName = (0, store_1.storeOf)(type);
+        if (!tableName) {
+            throw 'No table name for type';
+        }
+        console.log('##### UPDATE TABLE');
+        console.log('class table before normalize:');
+        const classTable = new reflect_to_schema_1.ReflectToTable().convert(type);
+        console.dir(classTable, { depth: null });
+        console.log('class table after normalize:');
+        new mysql_to_schema_1.MysqlToTable(this.connection).normalize(classTable);
+        console.dir(classTable, { depth: null });
+        console.log('mysql table:');
+        const mysqlTable = await ((new mysql_to_schema_1.MysqlToTable(this.connection)).convert(tableName));
+        console.dir(mysqlTable, { depth: null });
+        console.log('table diff:');
+        const tableSchemaDiff = new schema_diff_1.TableDiff(mysqlTable, classTable);
+        console.dir(tableSchemaDiff, { depth: null });
         return false;
     }
 }

package/esm/contextual-connection.d.ts

@@ -2,7 +2,7 @@ import { ObjectOrType } from '@itrocks/class-type';
 import { Connection } from 'mariadb';
 import { QueryOptions } from 'mariadb';
 export type Context = ObjectOrType | ObjectOrType[];
-export declare class Contextual {
+export declare class Contextual implements Partial<Connection> {
     context: Context[];
     superQuery: <T = any>(sql: string | QueryOptions, values?: any) => Promise<T>;
     applyTo(connection: ContextualConnection): Promise<ContextualConnection>;

package/esm/contextual-connection.js

@@ -19,7 +19,8 @@ export class Contextual {
                 || !['ER_BAD_FIELD_ERROR'].includes(error.code)) {
                 throw error;
             }
-            if (new MysqlMaintainer(this).manageError(error, this.context[this.context.length - 1], sql, values)) {
+            // @ts-ignore query applies to a Connection
+            if (await new MysqlMaintainer(this).manageError(error, this.context[this.context.length - 1], sql, values)) {
                 return this.query(sql, values);
             }
             throw error;

package/esm/mysql-maintainer.d.ts

@@ -1,16 +1,16 @@
 import { Type } from '@itrocks/class-type';
+import { Connection } from 'mariadb';
 import { QueryOptions } from 'mariadb';
 import { SqlError } from 'mariadb';
 import { Context } from './contextual-connection';
-import { Contextual } from './contextual-connection';
 export * from './mysql';
 export declare class MysqlMaintainer {
-    connection: Contextual;
-    constructor(connection: Contextual);
+    connection: Connection;
+    constructor(connection: Connection);
     createContextTables(context: Context): boolean;
     createImplicitTables(sql: string | QueryOptions): boolean;
     createTable(type: Type): boolean;
-    manageError(error: SqlError, context: Context, sql: string | QueryOptions, values: any[]): boolean;
-    updateContextTables(context: Context): boolean;
-    updateTable(type: Type): boolean;
+    manageError(error: SqlError, context: Context, sql: string | QueryOptions, values: any[]): Promise<boolean>;
+    updateContextTables(context: Context): Promise<boolean>;
+    updateTable(type: Type): Promise<boolean>;
 }

package/esm/mysql-maintainer.js

@@ -1,4 +1,8 @@
 import { typeOf } from '@itrocks/class-type';
+import { MysqlToTable } from '@itrocks/mysql-to-schema';
+import { ReflectToTable } from '@itrocks/reflect-to-schema';
+import { TableDiff } from '@itrocks/schema-diff';
+import { storeOf } from '@itrocks/store';
 export * from './mysql';
 export class MysqlMaintainer {
     connection;
@@ -18,14 +22,14 @@ export class MysqlMaintainer {
     createTable(type) {
         return false;
     }
-    manageError(error, context, sql, values) {
+    async manageError(error, context, sql, values) {
         console.log('query', sql, values);
         console.log('throw', error);
         console.log('context', context);
         switch (error.code) {
             case 'ER_BAD_FIELD_ERROR':
             case 'ER_CANNOT_ADD_FOREIGN':
-                return this.updateContextTables(context);
+                return await this.updateContextTables(context);
             case 'ER_CANT_CREATE_TABLE':
                 return this.createImplicitTables(sql);
             case 'ER_NO_SUCH_TABLE':
@@ -33,14 +37,31 @@ export class MysqlMaintainer {
         }
         return false;
     }
-    updateContextTables(context) {
+    async updateContextTables(context) {
         const contexts = Array.isArray(context) ? context : [context];
         for (const context of contexts) {
-            this.updateTable(typeOf(context));
+            await this.updateTable(typeOf(context));
         }
         return false;
     }
-    updateTable(type) {
+    async updateTable(type) {
+        const tableName = storeOf(type);
+        if (!tableName) {
+            throw 'No table name for type';
+        }
+        console.log('##### UPDATE TABLE');
+        console.log('class table before normalize:');
+        const classTable = new ReflectToTable().convert(type);
+        console.dir(classTable, { depth: null });
+        console.log('class table after normalize:');
+        new MysqlToTable(this.connection).normalize(classTable);
+        console.dir(classTable, { depth: null });
+        console.log('mysql table:');
+        const mysqlTable = await ((new MysqlToTable(this.connection)).convert(tableName));
+        console.dir(mysqlTable, { depth: null });
+        console.log('table diff:');
+        const tableSchemaDiff = new TableDiff(mysqlTable, classTable);
+        console.dir(tableSchemaDiff, { depth: null });
         return false;
     }
 }

package/package.json

@@ -6,8 +6,13 @@
 	"dependencies": {
 		"@itrocks/class-type": "latest",
 		"@itrocks/mysql": "latest",
+		"@itrocks/mysql-to-schema": "latest",
 		"@itrocks/reflect": "latest",
-		"@itrocks/storage": "latest"
+		"@itrocks/reflect-to-schema": "latest",
+		"@itrocks/schema-diff": "latest",
+		"@itrocks/storage": "latest",
+		"@itrocks/store": "latest",
+		"mariadb": "^3.4"
 	},
 	"description": "Reactively maintains database structure by updating schema and retrying on MySQL errors",
 	"devDependencies": {
@@ -48,5 +53,5 @@
 		"build:esm": "tsc -p tsconfig.esm.json"
 	},
 	"types": "./esm/mysql-maintainer.d.ts",
-	"version": "0.0.3"
+	"version": "0.0.5"
 }