mythix 2.7.0 → 2.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix",
-  "version": "2.7.0",
+  "version": "2.7.2",
   "description": "Mythix is a NodeJS web-app framework",
   "main": "src/index",
   "scripts": {
@@ -35,7 +35,7 @@
     "form-data": "^4.0.0",
     "luxon": "^3.0.4",
     "micromatch": "^4.0.5",
-    "mythix-orm": "^1.8.0",
+    "mythix-orm": "^1.8.1",
     "nife": "^1.12.1",
     "prompts": "^2.4.2"
   }

package/src/models/model-module.js

@@ -96,7 +96,7 @@ class ModelModule extends BaseModule {
       }
     }
 
-    models = connection.registerModels(models);
+    models = connection.registerModels(models, { forceConnectionBinding: true });
 
     return models;
   }

package/src/models/model-utils.js

@@ -1,9 +1,9 @@
 'use strict';
 
-const { Types, Utils } = require('mythix-orm');
+const { Types } = require('mythix-orm');
 const { Model: ModelBase } = require('./model');
 
-function _setupModel(modelName, _Model, { application, connection: applicationConnection }) {
+function _setupModel(modelName, _Model, { application }) {
   let Model       = _Model;
   let tableName   = Model.getTableName();
   let tablePrefix = application.getDBTablePrefix();
@@ -14,21 +14,6 @@ function _setupModel(modelName, _Model, { application, connection: applicationCo
   Model.getTableName  = () => tableName;
   Model.getModelName  = () => modelName;
   Model.getApplication = () => application;
-  Model.getLogger = () => application.getLogger();
-  Model._getConnection = (_connection) => {
-    if (_connection)
-      return _connection;
-
-    let { connection } = Model.getModelContext();
-    if (connection)
-      return connection;
-
-    connection = Utils.getContextValue('connection');
-    if (connection)
-      return connection;
-
-    return applicationConnection;
-  };
 
   return { [modelName]: Model };
 }

package/src/models/model.js

@@ -48,11 +48,12 @@ class Model extends _Model {
     return null;
   }
 
-  getConnection(connection) {
+  static _getConnection(_connection) {
+    let connection = _Model._getConnection(_connection);
     if (connection)
       return connection;
 
-    return this.getDBConnection();
+    return this.getApplication().getDBConnection();
   }
 }
 

package/src/utils/test-utils.js

@@ -64,18 +64,6 @@ function createTestApplication(ApplicationClass) {
       return defaultModules;
     }
 
-    createDatabaseConnection() {
-      const NOOP = () => {};
-
-      return {
-        isStarted:      () => true,
-        start:          NOOP,
-        stop:           NOOP,
-        registerModels: NOOP,
-        getModels:      () => ({}),
-      };
-    }
-
     constructor(_opts) {
       let opts = Nife.extend(true, {
         environment:  'test',
@@ -97,6 +85,20 @@ function createTestApplication(ApplicationClass) {
           value:        new HTTPInterface(),
         },
       });
+
+      if (!this.createDatabaseConnection) {
+        this.createDatabaseConnection = (function createDatabaseConnection() {
+          const NOOP = () => {};
+
+          return {
+            isStarted:      () => true,
+            start:          NOOP,
+            stop:           NOOP,
+            registerModels: NOOP,
+            getModels:      () => ({}),
+          };
+        }).bind(this);
+      }
     }
 
     getTestingLoggerConfig(loggerOpts) {