@itrocks/mysql-maintainer 0.0.6 → 0.0.8

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 MANAGED_ERROR_CODES = ['ER_BAD_FIELD_ERROR', 'ER_CANNOT_ADD_FOREIGN', 'ER_CANT_CREATE_TABLE', 'ER_NO_SUCH_TABLE'];
 class Contextual {
     context = [];
     superQuery = () => new Promise(() => { });
@@ -19,7 +20,7 @@ class Contextual {
         catch (error) {
             if (!(error instanceof mariadb_1.SqlError)
                 || !error.code
-                || !['ER_BAD_FIELD_ERROR'].includes(error.code)) {
+                || !MANAGED_ERROR_CODES.includes(error.code)) {
                 throw error;
             }
             // @ts-ignore query applies to a Connection

package/cjs/mysql-maintainer.d.ts

@@ -7,9 +7,8 @@ export * from './mysql';
 export declare class MysqlMaintainer {
     connection: Connection;
     constructor(connection: Connection);
-    createContextTables(context: Context): boolean;
     createImplicitTables(sql: string | QueryOptions): boolean;
-    createTable(type: Type): boolean;
+    createTable(type: Type): Promise<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

@@ -20,6 +20,7 @@ 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 schema_diff_mysql_1 = require("@itrocks/schema-diff-mysql");
+const schema_to_mysql_1 = require("@itrocks/schema-to-mysql");
 const store_1 = require("@itrocks/store");
 __exportStar(require("./mysql"), exports);
 class MysqlMaintainer {
@@ -27,18 +28,20 @@ class MysqlMaintainer {
     constructor(connection) {
         this.connection = connection;
     }
-    createContextTables(context) {
-        const contexts = Array.isArray(context) ? context : [context];
-        for (const context of contexts) {
-            this.createTable((0, class_type_1.typeOf)(context));
-        }
-        return false;
-    }
     createImplicitTables(sql) {
         return false;
     }
-    createTable(type) {
-        return false;
+    async createTable(type) {
+        const tableName = (0, store_1.storeOf)(type);
+        if (!tableName) {
+            throw 'No table name for type';
+        }
+        const tableSchema = new reflect_to_schema_1.ReflectToTable().convert(type);
+        const schemaToMysql = new schema_to_mysql_1.SchemaToMysql();
+        const sql = schemaToMysql.sql(tableSchema);
+        console.log(sql);
+        await this.connection.query(sql);
+        return true;
     }
     async manageError(error, context, sql, values) {
         console.log('query', sql, values);
@@ -51,38 +54,39 @@ class MysqlMaintainer {
             case 'ER_CANT_CREATE_TABLE':
                 return this.createImplicitTables(sql);
             case 'ER_NO_SUCH_TABLE':
-                return this.createContextTables(context);
+                return this.updateContextTables(context);
         }
         return false;
     }
     async updateContextTables(context) {
         const contexts = Array.isArray(context) ? context : [context];
         for (const context of contexts) {
-            await this.updateTable((0, class_type_1.typeOf)(context));
+            const type = (0, class_type_1.typeOf)(context);
+            const tableName = (0, store_1.storeOf)(type);
+            if (!tableName) {
+                throw 'No table name for type';
+            }
+            const exists = (await this.connection.query('SHOW TABLES LIKE ?', tableName));
+            await (exists.length ? this.updateTable(type) : this.createTable(type));
         }
-        return false;
+        return true;
     }
     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 schemaDiff = new schema_diff_1.TableDiff(mysqlTable, classTable);
-        console.dir(schemaDiff, { depth: null });
+        console.dir(schemaDiff.additions, { depth: null });
+        console.dir(schemaDiff.changes, { depth: null });
+        console.dir(schemaDiff.deletions, { depth: null });
         const schemaDiffMysql = new schema_diff_mysql_1.SchemaDiffMysql();
-        console.log(schemaDiffMysql.sql(schemaDiff, true));
-        return false;
+        const sql = schemaDiffMysql.sql(schemaDiff, true);
+        await this.connection.query(sql);
+        return true;
     }
 }
 exports.MysqlMaintainer = MysqlMaintainer;

package/cjs/mysql.js

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

package/esm/contextual-connection.js

@@ -1,5 +1,6 @@
 import { SqlError } from 'mariadb';
 import { MysqlMaintainer } from './mysql-maintainer';
+const MANAGED_ERROR_CODES = ['ER_BAD_FIELD_ERROR', 'ER_CANNOT_ADD_FOREIGN', 'ER_CANT_CREATE_TABLE', 'ER_NO_SUCH_TABLE'];
 export class Contextual {
     context = [];
     superQuery = () => new Promise(() => { });
@@ -16,7 +17,7 @@ export class Contextual {
         catch (error) {
             if (!(error instanceof SqlError)
                 || !error.code
-                || !['ER_BAD_FIELD_ERROR'].includes(error.code)) {
+                || !MANAGED_ERROR_CODES.includes(error.code)) {
                 throw error;
             }
             // @ts-ignore query applies to a Connection

package/esm/mysql-maintainer.d.ts

@@ -7,9 +7,8 @@ export * from './mysql';
 export declare class MysqlMaintainer {
     connection: Connection;
     constructor(connection: Connection);
-    createContextTables(context: Context): boolean;
     createImplicitTables(sql: string | QueryOptions): boolean;
-    createTable(type: Type): boolean;
+    createTable(type: Type): Promise<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

@@ -3,6 +3,7 @@ import { MysqlToTable } from '@itrocks/mysql-to-schema';
 import { ReflectToTable } from '@itrocks/reflect-to-schema';
 import { TableDiff } from '@itrocks/schema-diff';
 import { SchemaDiffMysql } from '@itrocks/schema-diff-mysql';
+import { SchemaToMysql } from '@itrocks/schema-to-mysql';
 import { storeOf } from '@itrocks/store';
 export * from './mysql';
 export class MysqlMaintainer {
@@ -10,18 +11,20 @@ export class MysqlMaintainer {
     constructor(connection) {
         this.connection = connection;
     }
-    createContextTables(context) {
-        const contexts = Array.isArray(context) ? context : [context];
-        for (const context of contexts) {
-            this.createTable(typeOf(context));
-        }
-        return false;
-    }
     createImplicitTables(sql) {
         return false;
     }
-    createTable(type) {
-        return false;
+    async createTable(type) {
+        const tableName = storeOf(type);
+        if (!tableName) {
+            throw 'No table name for type';
+        }
+        const tableSchema = new ReflectToTable().convert(type);
+        const schemaToMysql = new SchemaToMysql();
+        const sql = schemaToMysql.sql(tableSchema);
+        console.log(sql);
+        await this.connection.query(sql);
+        return true;
     }
     async manageError(error, context, sql, values) {
         console.log('query', sql, values);
@@ -34,38 +37,39 @@ export class MysqlMaintainer {
             case 'ER_CANT_CREATE_TABLE':
                 return this.createImplicitTables(sql);
             case 'ER_NO_SUCH_TABLE':
-                return this.createContextTables(context);
+                return this.updateContextTables(context);
         }
         return false;
     }
     async updateContextTables(context) {
         const contexts = Array.isArray(context) ? context : [context];
         for (const context of contexts) {
-            await this.updateTable(typeOf(context));
+            const type = typeOf(context);
+            const tableName = storeOf(type);
+            if (!tableName) {
+                throw 'No table name for type';
+            }
+            const exists = (await this.connection.query('SHOW TABLES LIKE ?', tableName));
+            await (exists.length ? this.updateTable(type) : this.createTable(type));
         }
-        return false;
+        return true;
     }
     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 schemaDiff = new TableDiff(mysqlTable, classTable);
-        console.dir(schemaDiff, { depth: null });
+        console.dir(schemaDiff.additions, { depth: null });
+        console.dir(schemaDiff.changes, { depth: null });
+        console.dir(schemaDiff.deletions, { depth: null });
         const schemaDiffMysql = new SchemaDiffMysql();
-        console.log(schemaDiffMysql.sql(schemaDiff, true));
-        return false;
+        const sql = schemaDiffMysql.sql(schemaDiff, true);
+        await this.connection.query(sql);
+        return true;
     }
 }
 //# sourceMappingURL=mysql-maintainer.js.map

package/esm/mysql.js

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

package/package.json

@@ -54,5 +54,5 @@
 		"build:esm": "tsc -p tsconfig.esm.json"
 	},
 	"types": "./esm/mysql-maintainer.d.ts",
-	"version": "0.0.6"
+	"version": "0.0.8"
 }