@reldens/storage 0.37.0 → 0.39.0

package/index.js

@@ -32,7 +32,7 @@ module.exports = {
     DriversClassMap: {
         'ObjectionJsDataServer': 'objection-js',
         'MikroOrmDataServer': 'mikro-orm',
-        'PrismaDataServer': 'prisma-server'
+        'PrismaDataServer': 'prisma'
     },
     // objection-js:
     ObjectionJsDataServer,

package/lib/entities-generator.js

@@ -40,7 +40,7 @@ class EntitiesGenerator
         this.driversClassMap = {
             'ObjectionJsDataServer': 'objection-js',
             'MikroOrmDataServer': 'mikro-orm',
-            'PrismaDataServer': 'prisma-server'
+            'PrismaDataServer': 'prisma'
         };
         this.server = sc.get(props, 'server', false);
         this.connectionData = sc.get(props, 'connectionData', false);
@@ -306,7 +306,7 @@ class EntitiesGenerator
     {
         let modelTemplatePath = this.templates[driverKey];
         if(!FileHandler.exists(modelTemplatePath)){
-            ErrorManager.error('Model template file not found: '+modelTemplatePath);
+            ErrorManager.error('Model template file "'+modelTemplatePath+'" not found for driver "'+driverKey+'".');
         }
         let modelTemplateContent;
         try {

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 = [];

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@reldens/storage",
     "scope": "@reldens",
-    "version": "0.37.0",
+    "version": "0.39.0",
     "description": "Reldens - Storage",
     "author": "Damian A. Pastorini",
     "license": "MIT",
@@ -53,13 +53,13 @@
         "@mikro-orm/core": "^6.4.15",
         "@mikro-orm/mongodb": "^6.4.15",
         "@mikro-orm/mysql": "^6.4.15",
-        "@prisma/client": "^6.7.0",
-        "@reldens/server-utils": "^0.15.0",
+        "@prisma/client": "^6.8.2",
+        "@reldens/server-utils": "^0.16.0",
         "@reldens/utils": "^0.47.0",
         "knex": "^3.1.0",
         "mysql": "^2.18.1",
         "mysql2": "^3.14.1",
         "objection": "^3.1.5",
-        "prisma": "^6.7.0"
+        "prisma": "^6.8.2"
     }
 }