@reldens/storage 0.55.0 → 0.56.0

package/lib/entities-generator.js

@@ -48,6 +48,7 @@ class EntitiesGenerator
         this.server = sc.get(props, 'server', false);
         this.connectionData = sc.get(props, 'connectionData', false);
         this.isOverride = sc.get(props, 'isOverride', false);
+        this.prismaClient = sc.get(props, 'prismaClient', false);
         this.generatedEntities = {};
         this.existingEntities = {};
         this.existingEntityFields = {};
@@ -327,7 +328,7 @@ class EntitiesGenerator
             Logger.critical('Unsupported driver: '+driverKey);
             return false;
         }
-        this.server = new driverClassMapped({
+        let serverConfig = {
             client: sc.get(this.connectionData, 'client', 'mysql2'),
             config: {
                 user: sc.get(this.connectionData, 'user', ''),
@@ -336,7 +337,11 @@ class EntitiesGenerator
                 host: sc.get(this.connectionData, 'host', 'localhost'),
                 port: sc.get(this.connectionData, 'port', 3306)
             }
-        });
+        };
+        if('prisma' === driverKey && this.prismaClient){
+            serverConfig.prismaClient = this.prismaClient;
+        }
+        this.server = new driverClassMapped(serverConfig);
         return this.server;
     }
 

package/lib/entity-templates/prisma-model.template

@@ -4,8 +4,6 @@
  *
  */
 
-const { PrismaClient } = require('@prisma/client');
-
 class {{modelClassName}}
 {
 
@@ -14,19 +12,6 @@ class {{modelClassName}}
         {{modelPropertiesConstructor}}
     }
 
-    static get client()
-    {
-        if(!this._client){
-            this._client = new PrismaClient();
-        }
-        return this._client;
-    }
-
-    static get model()
-    {
-        return this.client['{{tableName}}'];
-    }
-
     static get tableName()
     {
         return '{{tableName}}';

package/lib/mysql-tables-provider.js

@@ -15,7 +15,7 @@ class MySQLTablesProvider
             '    TABLE_NAME, ' +
             '    COLUMN_NAME, ' +
             '    DATA_TYPE, ' +
-            '    CHARACTER_MAXIMUM_LENGTH, ' +
+            '    CAST(CHARACTER_MAXIMUM_LENGTH AS CHAR) as CHARACTER_MAXIMUM_LENGTH, ' +
             '    COLUMN_TYPE, ' +
             '    IS_NULLABLE, ' +
             '    COLUMN_KEY, ' +

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

@@ -8,7 +8,7 @@ const { BaseDataServer } = require('../base-data-server');
 const { PrismaDriver } = require('./prisma-driver');
 const { MySQLTablesProvider } = require('../mysql-tables-provider');
 const { PrismaClient } = require('@prisma/client');
-const { Logger } = require('@reldens/utils');
+const { Logger, sc } = require('@reldens/utils');
 
 class PrismaDataServer extends BaseDataServer
 {
@@ -16,7 +16,7 @@ class PrismaDataServer extends BaseDataServer
     constructor(props)
     {
         super(props);
-        this.prisma = false;
+        this.prisma = sc.get(props, 'prismaClient', false);
     }
 
     async connect()
@@ -25,10 +25,15 @@ class PrismaDataServer extends BaseDataServer
             return this.initialized;
         }
         try {
-            this.prisma = new PrismaClient({
-                log: this.debug ? ['query', 'info', 'warn', 'error'] : ['error']
-            });
+            if(!this.prisma){
+                this.prisma = new PrismaClient({
+                    datasources: {db: {url: this.connectString}},
+                    log: this.debug ? ['query', 'info', 'warn', 'error'] : ['error']
+                });
+            }
             await this.prisma.$connect();
+            let dbTest = await this.prisma.$queryRaw`SELECT DATABASE() as current_db`;
+            Logger.info('Connected to database: ' + dbTest[0].current_db);
             this.initialized = Date.now();
             return this.initialized;
         } catch(error) {
@@ -86,7 +91,9 @@ class PrismaDataServer extends BaseDataServer
                     continue;
                 }
                 try {
-                    results.push(await this.executeStatement(cleanStatement));
+                    let result = await this.executeStatement(cleanStatement);
+                    results.push(result);
+                    Logger.debug('Statement executed, result: ' + JSON.stringify(result));
                 } catch(stmtError) {
                     Logger.error('Statement "'+cleanStatement+'" execution failed: '+stmtError.message);
                     return false;
@@ -109,7 +116,11 @@ class PrismaDataServer extends BaseDataServer
         if(trimmedStatement.startsWith('SELECT')){
             return await this.prisma.$queryRawUnsafe(statement);
         }
+        if(trimmedStatement.startsWith('SHOW')){
+            return await this.prisma.$queryRawUnsafe(statement);
+        }
         let result = await this.prisma.$executeRawUnsafe(statement);
+        Logger.debug('Raw result from Prisma: ' + result);
         if(
             trimmedStatement.startsWith('CREATE')
             || trimmedStatement.startsWith('ALTER')

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@reldens/storage",
     "scope": "@reldens",
-    "version": "0.55.0",
+    "version": "0.56.0",
     "description": "Reldens - Storage",
     "author": "Damian A. Pastorini",
     "license": "MIT",