@reldens/storage 0.36.0 → 0.38.0

package/README.md

@@ -104,7 +104,7 @@ Then, use the PrismaDataServer in your code:
 const { PrismaDataServer } = require('@reldens/storage');
 
 const server = new PrismaDataServer({
-    client: 'mysql2',
+    client: 'mysql',
     config: {
         user: 'reldens',
         password: 'reldens',

package/index.js

@@ -29,6 +29,11 @@ module.exports = {
         'mikro-orm': MikroOrmDataServer,
         'prisma': PrismaDataServer
     },
+    DriversClassMap: {
+        'ObjectionJsDataServer': 'objection-js',
+        'MikroOrmDataServer': 'mikro-orm',
+        'PrismaDataServer': 'prisma-server'
+    },
     // objection-js:
     ObjectionJsDataServer,
     ObjectionJsDriver,

package/lib/entities-generator.js

@@ -37,6 +37,11 @@ class EntitiesGenerator
             'mikro-orm': MikroOrmDataServer,
             'prisma': PrismaDataServer
         };
+        this.driversClassMap = {
+            'ObjectionJsDataServer': 'objection-js',
+            'MikroOrmDataServer': 'mikro-orm',
+            'PrismaDataServer': 'prisma-server'
+        };
         this.server = sc.get(props, 'server', false);
         this.connectionData = sc.get(props, 'connectionData', false);
         if(!this.server && !this.connectionData){
@@ -194,7 +199,7 @@ class EntitiesGenerator
 
     addTypeAttribute(props, column, type)
     {
-        if(this.isForeignKey(column)){
+        if(column.referencedTable){
             props.push('type: \'reference\'');
             props.push('reference: \''+this.getReferenceTable(column)+'\'');
             return;
@@ -247,8 +252,7 @@ class EntitiesGenerator
             return [];
         }
         let valuesString = match[1];
-        let values = valuesString.split('\',\'');
-        return values;
+        return valuesString.split('\',\'');
     }
 
     addRequiredAttribute(props, column)
@@ -258,14 +262,6 @@ class EntitiesGenerator
         }
     }
 
-    isForeignKey(column)
-    {
-        if(column.referencedTable){
-            return true;
-        }
-        return false;
-    }
-
     getReferenceTable(column)
     {
         if(column.referencedTable){
@@ -562,14 +558,24 @@ class EntitiesGenerator
         try {
             await this.server.connect();
         } catch (error) {
-            ErrorManager.error('Failed to connect to database: '+error.message);
+            Logger.critical('Failed to connect to database: '+error.message);
+            return false;
         }
         let tables = await this.server.fetchEntitiesFromDatabase();
         if(!tables){
-            ErrorManager.error('Failed to fetch tables from database.');
+            Logger.critical('EntitiesGenerator tables fetch failed.');
+            return false;
         }
         this.ensureFoldersExist();
-        let driverKey = sc.get(this.connectionData, 'driver', 'objection-js');
+        let driverKey = sc.get(
+            this.connectionData,
+            'driver',
+            (this.server ? sc.get(this.driversClassMap, this.server.constructor.name, false) : false)
+        );
+        if(!driverKey){
+            Logger.critical('Failed to fetch driver key.');
+            return false;
+        }
         for(let tableName in tables){
             let tableData = tables[tableName];
             await this.generateEntityFile(tableName, tableData);
@@ -583,6 +589,9 @@ class EntitiesGenerator
 
     createServer()
     {
+        if(this.server){
+            return this.server;
+        }
         let driverKey = sc.get(this.connectionData, 'driver', 'objection-js');
         let driverClassMapped = this.driverMap[driverKey];
         if(!driverClassMapped){
@@ -598,6 +607,7 @@ class EntitiesGenerator
                 port: sc.get(this.connectionData, 'port', 3306)
             }
         });
+        return this.server;
     }
 
 }

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

@@ -102,7 +102,7 @@ class MikroOrmDataServer extends BaseDataServer
     async fetchEntitiesFromDatabase()
     {
         if(!this.initialized){
-            Logger.error('Connection was not initialized, please use the connect method first.');
+            Logger.critical('Connection was not initialized, please use the connect method first.');
             return false;
         }
         try {
@@ -120,10 +120,11 @@ class MikroOrmDataServer extends BaseDataServer
                 }
                 return tables;
             }
-            ErrorManager.error('Unsupported client type: '+this.client);
+            Logger.critical('Unsupported client type: '+this.client);
         } catch(error) {
-            ErrorManager.error('Failed to fetch tables from database: ' + error.message);
+            Logger.critical('MikroORM tables fetch failed. ' + error.message);
         }
+        return false;
     }
 
 }

package/lib/mysql-tables-provider.js

@@ -11,8 +11,7 @@ class MySQLTablesProvider
 
     static async fetchTables(server)
     {
-        let tablesQuery = 
-            'SELECT ' +
+        let tablesQuery = 'SELECT ' +
             '    TABLE_NAME, ' +
             '    COLUMN_NAME, ' +
             '    DATA_TYPE, ' +
@@ -27,7 +26,7 @@ class MySQLTablesProvider
             'WHERE ' +
             '    TABLE_SCHEMA = \'' + server.config.database + '\' ' +
             'ORDER BY ' +
-            '    TABLE_NAME, ORDINAL_POSITION';
+            '    TABLE_NAME, ORDINAL_POSITION;';
         try {
             let result = await server.rawQuery(tablesQuery);
             if(!sc.isArray(result) || 0 === result.length){
@@ -52,8 +51,7 @@ class MySQLTablesProvider
                     default: row.COLUMN_DEFAULT
                 };
             }
-            let foreignKeysQuery = 
-                'SELECT ' +
+            let foreignKeysQuery = 'SELECT ' +
                 '    TABLE_NAME, ' +
                 '    COLUMN_NAME, ' +
                 '    REFERENCED_TABLE_NAME, ' +
@@ -62,15 +60,12 @@ class MySQLTablesProvider
                 '    information_schema.KEY_COLUMN_USAGE ' +
                 'WHERE ' +
                 '    TABLE_SCHEMA = \'' + server.config.database + '\' ' +
-                '    AND REFERENCED_TABLE_NAME IS NOT NULL';
-            
+                '    AND REFERENCED_TABLE_NAME IS NOT NULL;';
+
             let foreignKeysResult = await server.rawQuery(foreignKeysQuery);
             if(sc.isArray(foreignKeysResult) && 0 < foreignKeysResult.length){
                 for(let row of foreignKeysResult){
-                    if(
-                        tables[row.TABLE_NAME] && 
-                        tables[row.TABLE_NAME].columns[row.COLUMN_NAME]
-                    ){
+                    if(tables[row.TABLE_NAME] && tables[row.TABLE_NAME].columns[row.COLUMN_NAME]){
                         tables[row.TABLE_NAME].columns[row.COLUMN_NAME].referencedTable = row.REFERENCED_TABLE_NAME;
                         tables[row.TABLE_NAME].columns[row.COLUMN_NAME].referencedColumn = row.REFERENCED_COLUMN_NAME;
                     }

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

@@ -7,7 +7,7 @@
 const { BaseDataServer } = require('../base-data-server');
 const { PrismaDriver } = require('./prisma-driver');
 const { MySQLTablesProvider } = require('../mysql-tables-provider');
-const { ErrorManager, Logger, sc } = require('@reldens/utils');
+const { Logger } = require('@reldens/utils');
 
 class PrismaDataServer extends BaseDataServer
 {
@@ -85,8 +85,7 @@ class PrismaDataServer extends BaseDataServer
                     continue;
                 }
                 try {
-                    let queryResult = await this.prisma.$executeRawUnsafe(cleanStatement);
-                    results.push(queryResult);
+                    results.push(await this.executeStatement(cleanStatement));
                 } catch(stmtError) {
                     Logger.error('Statement "'+cleanStatement+'" execution failed: '+stmtError.message);
                     return false;
@@ -102,6 +101,14 @@ class PrismaDataServer extends BaseDataServer
         }
     }
 
+    async executeStatement(statement)
+    {
+        if(statement.trim().toUpperCase().startsWith('SELECT')){
+            return await this.prisma.$queryRawUnsafe(statement);
+        }
+        return await this.prisma.$executeRawUnsafe(statement);
+    }
+
     splitSqlStatements(sqlContent)
     {
         let statements = [];
@@ -177,13 +184,14 @@ class PrismaDataServer extends BaseDataServer
     async fetchEntitiesFromDatabase()
     {
         if(!this.initialized){
-            Logger.error('Connection was not initialized, please use the connect method first.');
+            Logger.critical('Connection was not initialized, please use the connect method first.');
             return false;
         }
         try {
             return await MySQLTablesProvider.fetchTables(this);
         } catch(error) {
-            ErrorManager.error('Failed to fetch tables from database: '+error.message);
+            Logger.critical('Prisma Data Server tables fetch failed. '+error.message);
+            return false;
         }
     }
 

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@reldens/storage",
     "scope": "@reldens",
-    "version": "0.36.0",
+    "version": "0.38.0",
     "description": "Reldens - Storage",
     "author": "Damian A. Pastorini",
     "license": "MIT",
@@ -25,6 +25,8 @@
         "mikro",
         "mikroorm",
         "mikro-orm",
+        "prisma",
+        "prisma-orm",
         "driver",
         "orm",
         "database",