@reldens/storage 0.16.0 → 0.18.0

package/lib/base-data-server.js

@@ -20,6 +20,8 @@ class BaseDataServer
         this.poolConfig = sc.get(props, 'poolConfig', {});
         this.connectStringOptions = sc.get(props, 'connectStringOptions', '');
         this.connectString = sc.get(props, 'connectString', this.createConnectionString());
+        this.debug = sc.get(props, 'debug', false);
+        this.multipleStatements = sc.get(props, 'multipleStatements', false);
         this.rawModel = sc.get(props, 'rawModel', false);
         this.name = sc.get(props, 'name', false);
         this.initialized = sc.get(props, 'initialized', false);

package/lib/base-driver.js

@@ -165,6 +165,11 @@ class BaseDriver
         return this.rawModel[methodName](methodOptions, this);
     }
 
+    async rawQuery(content)
+    {
+        ErrorManager.error('BaseDriver rawQuery() not implemented.');
+    }
+
 }
 
 module.exports.BaseDriver = BaseDriver;

package/lib/mikro-orm/mikro-orm-data-server.js

@@ -7,7 +7,7 @@
 const { MikroOrmDriver } = require('./mikro-orm-driver');
 const { BaseDataServer } = require('../base-data-server');
 const { MikroORM } = require('@mikro-orm/core');
-const { Logger } = require('@reldens/utils');
+const { Logger, ErrorManager } = require('@reldens/utils');
 
 class MikroOrmDataServer extends BaseDataServer
 {
@@ -64,6 +64,12 @@ class MikroOrmDataServer extends BaseDataServer
         return this.name || 'Mikro-ORM Data Server Driver';
     }
 
+    async rawQuery(content)
+    {
+        // @TODO - BETA - Implement.
+        ErrorManager.error('MikroORM rawQuery() not implemented.');
+    }
+
 }
 
 module.exports.MikroOrmDataServer = MikroOrmDataServer;

package/lib/objection-js/objection-js-data-server.js

@@ -27,11 +27,22 @@ class ObjectionJsDataServer extends BaseDataServer
         if(this.initialized){
             return this.initialized;
         }
-        // initialize knex, the query builder:
-        this.knex = await Knex({client: this.client, connection: this.config, pool: this.poolConfig});
-        // give the knex instance to Objection:
-        this.rawModel.knex(this.knex);
-        this.initialized = Date.now();
+        this.knex = await Knex({
+            client: this.client,
+            connection: this.config,
+            pool: this.poolConfig,
+            debug: this.debug,
+            multipleStatements: this.multipleStatements
+        });
+        await this.rawModel.knex(this.knex);
+        try {
+            const [[{ currentTime }]] = await this.rawModel.knex().raw(
+                'SELECT ROUND(UNIX_TIMESTAMP(NOW(6)) * 1000 + MICROSECOND(NOW(6)) / 1000) AS currentTime;'
+            );
+            this.initialized = currentTime;
+        } catch (err) {
+            Logger.critical('Connection failed, Objection JS error.', err);
+        }
         return this.initialized;
     }
 
@@ -55,6 +66,11 @@ class ObjectionJsDataServer extends BaseDataServer
         return this.name || 'Objection JS Data Server Driver';
     }
 
+    async rawQuery(content)
+    {
+        return await this.knex.raw(content);
+    }
+
 }
 
 module.exports.ObjectionJsDataServer = ObjectionJsDataServer;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@reldens/storage",
     "scope": "@reldens",
-    "version": "0.16.0",
+    "version": "0.18.0",
     "description": "Reldens - Storage",
     "author": "Damian A. Pastorini",
     "license": "MIT",
@@ -44,9 +44,9 @@
         "url": "https://github.com/damian-pastorini/reldens-storage/issues"
     },
     "dependencies": {
-        "@mikro-orm/core": "^5.8.10",
-        "@mikro-orm/mongodb": "^5.8.10",
-        "@reldens/utils": "^0.20.1",
+        "@mikro-orm/core": "^5.9.3",
+        "@mikro-orm/mongodb": "^5.9.3",
+        "@reldens/utils": "^0.21.0",
         "knex": "^3.0.1",
         "mysql": "^2.18.1",
         "objection": "^3.1.2"