mythix-orm-sql-base 1.0.5 → 1.1.2

package/lib/sql-connection-base.js

@@ -426,7 +426,7 @@ class SQLConnectionBase extends ConnectionBase {
       // Operation handler
       async (Model, preparedModels, options, queryGenerator) => {
         let sqlStr  = queryGenerator.generateInsertStatement(Model, preparedModels, options);
-        let results = await this.query(sqlStr, { logger: options.logger });
+        let results = await this.query(sqlStr, options);
 
         this.updateModelsFromResults(Model, preparedModels.models, results);
       },
@@ -439,7 +439,7 @@ class SQLConnectionBase extends ConnectionBase {
         for (let dirtyModel of dirtyModels) {
           let Model   = dirtyModel.getModel();
           let sqlStr  = queryGenerator.generateUpdateStatement(Model, dirtyModel, null, options);
-          let results = await this.query(sqlStr, { logger: options.logger });
+          let results = await this.query(sqlStr, options);
 
           this.updateModelsFromResults(Model, [ dirtyModel ], results);
         }
@@ -484,7 +484,7 @@ class SQLConnectionBase extends ConnectionBase {
           if (!sqlStr)
             continue;
 
-          let results = await this.query(sqlStr, { logger: options.logger });
+          let results = await this.query(sqlStr, options);
           this.updateModelsFromResults(Model, [ model ], results);
         }
       },
@@ -510,7 +510,7 @@ class SQLConnectionBase extends ConnectionBase {
 
     // TODO: Use "RETURNING" to return pks of of updated rows
 
-    return await this.query(sqlStr, { logger: options.logger });
+    return await this.query(sqlStr, options);
   }
 
   async destroyModels(Model, _models, _options) {
@@ -522,7 +522,7 @@ class SQLConnectionBase extends ConnectionBase {
       let queryGenerator  = this.getQueryGenerator();
       let sqlStr          = queryGenerator.generateDeleteStatement(Model, Model.where.unscoped(), options);
 
-      return await this.query(sqlStr, { logger: options.logger });
+      return await this.query(sqlStr, options);
     }
 
     let models = Nife.toArray(_models).filter(Boolean);
@@ -560,7 +560,7 @@ class SQLConnectionBase extends ConnectionBase {
         if (!sqlStr)
           return;
 
-        await this.query(sqlStr, { logger: options.logger });
+        await this.query(sqlStr, options);
       },
     );
   }
@@ -588,7 +588,7 @@ class SQLConnectionBase extends ConnectionBase {
     let options         = modelsOrOptions || {};
     let queryGenerator  = this.getQueryGenerator();
     let sqlStr          = queryGenerator.generateDeleteStatement(rootModel, queryEngine, options);
-    return await this.query(sqlStr, { logger: options.logger });
+    return await this.query(sqlStr, options);
   }
 
   async *select(_queryEngine, _options) {
@@ -612,7 +612,7 @@ class SQLConnectionBase extends ConnectionBase {
     while (true) {
       let query         = queryEngine.clone().LIMIT(batchSize).OFFSET(startIndex);
       let sqlStatement  = queryGenerator.generateSelectStatement(query, options);
-      let result        = await this.query(sqlStatement, { logger: options.logger });
+      let result        = await this.query(sqlStatement, options);
 
       if (!result.rows || result.rows.length === 0)
         break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix-orm-sql-base",
-  "version": "1.0.5",
+  "version": "1.1.2",
   "description": "SQL base support for Mythix ORM",
   "main": "lib/index.js",
   "type": "commonjs",
@@ -33,7 +33,7 @@
   },
   "homepage": "https://github.com/th317erd/mythix-orm-sql-base#readme",
   "peerDependencies": {
-    "mythix-orm": "^1.1.0"
+    "mythix-orm": "^1.3.0"
   },
   "dependencies": {
     "nife": "^1.11.3",