@itrocks/mysql-maintainer 0.0.12 → 0.0.14

package/cjs/mysql-maintainer.js

@@ -24,6 +24,7 @@ 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);
+const DELETION = false;
 class MysqlMaintainer {
     connection;
     constructor(connection) {
@@ -54,14 +55,10 @@ CONSTRAINT \`${joinTable}.${table2}_id\` FOREIGN KEY (${table2}_id) REFERENCES \
         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);
-        console.log('throw', error);
-        console.log('context', context);
         switch (error.code) {
             case 'ER_BAD_FIELD_ERROR':
             case 'ER_CANNOT_ADD_FOREIGN':
@@ -96,14 +93,14 @@ CONSTRAINT \`${joinTable}.${table2}_id\` FOREIGN KEY (${table2}_id) REFERENCES \
         new mysql_to_schema_1.MysqlToTable(this.connection).normalize(classTable);
         const mysqlTable = await ((new mysql_to_schema_1.MysqlToTable(this.connection)).convert(tableName));
         const schemaDiff = new schema_diff_1.TableDiff(mysqlTable, classTable);
-        console.dir(schemaDiff.additions, { depth: null });
-        console.dir(schemaDiff.changes, { depth: null });
-        console.dir(schemaDiff.deletions, { depth: null });
-        if (!schemaDiff.additions && !schemaDiff.changes && !schemaDiff.deletions && !schemaDiff.tableChanges()) {
+        if (!schemaDiff.additions.length
+            && !schemaDiff.changes.length
+            && (!schemaDiff.deletions.length || !DELETION)
+            && !schemaDiff.tableChanges()) {
             return false;
         }
         const schemaDiffMysql = new schema_diff_mysql_1.SchemaDiffMysql();
-        const sql = schemaDiffMysql.sql(schemaDiff);
+        const sql = schemaDiffMysql.sql(schemaDiff, DELETION);
         await this.connection.query(sql);
         return true;
     }

package/cjs/mysql.d.ts

@@ -1,6 +1,7 @@
 import { KeyOf } from '@itrocks/class-type';
 import { ObjectOrType } from '@itrocks/class-type';
 import { Type } from '@itrocks/class-type';
+import { Options } from '@itrocks/storage';
 import { Mysql as M } from '@itrocks/mysql';
 import { Entity } from '@itrocks/storage';
 import { Identifier } from '@itrocks/storage';
@@ -19,6 +20,6 @@ export declare class Mysql extends M {
     }>[]>;
     readCollectionIds<T extends object, PT extends object>(object: Entity<T>, property: KeyOf<T>, type?: Type<PT>): Promise<Identifier[]>;
     readMultiple<T extends object>(type: Type<T>, ids: Identifier[]): Promise<Entity<T>[]>;
-    search<T extends object>(type: Type<T>, search?: SearchType<T>): Promise<Entity<T>[]>;
+    search<T extends object>(type: Type<T>, search?: SearchType<T>, options?: Options): Promise<Entity<T>[]>;
     update<T extends object>(object: Entity<T>): Promise<Entity<T>>;
 }

package/cjs/mysql.js

@@ -64,10 +64,10 @@ class Mysql extends mysql_1.Mysql {
         contexts.pop();
         return result;
     }
-    async search(type, search = {}) {
+    async search(type, search = {}, options) {
         const contexts = (this.connection ?? await this.connect()).contexts;
         contexts.push(type);
-        const result = await super.search(type, search);
+        const result = await super.search(type, search, options);
         contexts.pop();
         return result;
     }

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 * from './mysql';
+const DELETION = false;
 export class MysqlMaintainer {
     connection;
     constructor(connection) {
@@ -37,14 +38,10 @@ CONSTRAINT \`${joinTable}.${table2}_id\` FOREIGN KEY (${table2}_id) REFERENCES \
         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);
-        console.log('throw', error);
-        console.log('context', context);
         switch (error.code) {
             case 'ER_BAD_FIELD_ERROR':
             case 'ER_CANNOT_ADD_FOREIGN':
@@ -79,14 +76,14 @@ CONSTRAINT \`${joinTable}.${table2}_id\` FOREIGN KEY (${table2}_id) REFERENCES \
         new MysqlToTable(this.connection).normalize(classTable);
         const mysqlTable = await ((new MysqlToTable(this.connection)).convert(tableName));
         const schemaDiff = new TableDiff(mysqlTable, classTable);
-        console.dir(schemaDiff.additions, { depth: null });
-        console.dir(schemaDiff.changes, { depth: null });
-        console.dir(schemaDiff.deletions, { depth: null });
-        if (!schemaDiff.additions && !schemaDiff.changes && !schemaDiff.deletions && !schemaDiff.tableChanges()) {
+        if (!schemaDiff.additions.length
+            && !schemaDiff.changes.length
+            && (!schemaDiff.deletions.length || !DELETION)
+            && !schemaDiff.tableChanges()) {
             return false;
         }
         const schemaDiffMysql = new SchemaDiffMysql();
-        const sql = schemaDiffMysql.sql(schemaDiff);
+        const sql = schemaDiffMysql.sql(schemaDiff, DELETION);
         await this.connection.query(sql);
         return true;
     }

package/esm/mysql.d.ts

@@ -1,6 +1,7 @@
 import { KeyOf } from '@itrocks/class-type';
 import { ObjectOrType } from '@itrocks/class-type';
 import { Type } from '@itrocks/class-type';
+import { Options } from '@itrocks/storage';
 import { Mysql as M } from '@itrocks/mysql';
 import { Entity } from '@itrocks/storage';
 import { Identifier } from '@itrocks/storage';
@@ -19,6 +20,6 @@ export declare class Mysql extends M {
     }>[]>;
     readCollectionIds<T extends object, PT extends object>(object: Entity<T>, property: KeyOf<T>, type?: Type<PT>): Promise<Identifier[]>;
     readMultiple<T extends object>(type: Type<T>, ids: Identifier[]): Promise<Entity<T>[]>;
-    search<T extends object>(type: Type<T>, search?: SearchType<T>): Promise<Entity<T>[]>;
+    search<T extends object>(type: Type<T>, search?: SearchType<T>, options?: Options): Promise<Entity<T>[]>;
     update<T extends object>(object: Entity<T>): Promise<Entity<T>>;
 }

package/esm/mysql.js

@@ -61,10 +61,10 @@ export class Mysql extends M {
         contexts.pop();
         return result;
     }
-    async search(type, search = {}) {
+    async search(type, search = {}, options) {
         const contexts = (this.connection ?? await this.connect()).contexts;
         contexts.push(type);
-        const result = await super.search(type, search);
+        const result = await super.search(type, search, options);
         contexts.pop();
         return result;
     }

package/package.json

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