@reldens/storage 0.60.0 → 0.61.0

package/lib/base-data-server.js

@@ -5,7 +5,7 @@
  */
 
 const { EntityManager } = require('./entity-manager');
-const { ErrorManager, sc } = require('@reldens/utils');
+const { ErrorManager, Logger, sc } = require('@reldens/utils');
 
 class BaseDataServer
 {
@@ -16,6 +16,9 @@ class BaseDataServer
         if(!this.config.host){
             this.config.host = 'localhost';
         }
+        if(!this.config.port){
+            this.config.port = 3306;
+        }
         this.client = sc.get(props, 'client', '');
         this.poolConfig = sc.get(props, 'poolConfig', {});
         this.connectStringOptions = sc.get(props, 'connectStringOptions', '');
@@ -33,11 +36,17 @@ class BaseDataServer
 
     createConnectionString()
     {
-        return (this.client || 'client-not-specified')+'://'
-            +(this.config.user || 'user-not-specified')
+        if('' === this.client){
+            Logger.warning('Client is empty, connection may fail.');
+        }
+        if('' === this.config.user){
+            Logger.warning('User is empty, connection may fail.');
+        }
+        return (this.client || '')+'://'
+            +(this.config.user || '')
             +(this.config.password ? ':'+this.config.password : '')
             +'@'+this.config.host
-            +':'+(this.config.port || 3306)
+            +':'+this.config.port
             +(this.config.database ? '/'+this.config.database : '')
             +(this.connectStringOptions ? '?'+this.connectStringOptions : '');
     }

package/lib/prisma/prisma-driver.js

@@ -38,7 +38,7 @@ class PrismaDriver extends BaseDriver
 
     initModelMetadata()
     {
-        let dmmf = this.prisma._runtimeDataModel || Prisma.dmmf?.datamodel;
+        let dmmf = this.getDmmf();
         if(!dmmf){
             Logger.warning('Could not access Prisma DMMF metadata');
             return;
@@ -61,6 +61,28 @@ class PrismaDriver extends BaseDriver
         }
     }
 
+    getDmmf()
+    {
+        try {
+            if(this.prisma._dmmf){
+                return this.prisma._dmmf.datamodel;
+            }
+            if(this.prisma._getDmmf && sc.isFunction(this.prisma._getDmmf)){
+                return this.prisma._getDmmf().datamodel;
+            }
+            if(this.prisma._runtimeDataModel){
+                return this.prisma._runtimeDataModel;
+            }
+            if(Prisma.dmmf && Prisma.dmmf.datamodel){
+                return Prisma.dmmf.datamodel;
+            }
+            return null;
+        } catch(error) {
+            Logger.warning('Failed to access DMMF: '+error.message);
+            return null;
+        }
+    }
+
     processFieldMetadata(field)
     {
         this.fieldTypes[field.name] = field.type;
@@ -312,7 +334,7 @@ class PrismaDriver extends BaseDriver
 
     tableName()
     {
-        return this.model.name || '';
+        return this.model.$name || this.model.name || '';
     }
 
     property(propertyName)
@@ -337,7 +359,7 @@ class PrismaDriver extends BaseDriver
         return data;
     }
 
-    prepareDataWithRelations(params)
+    prepareDataWithRelations(params, isCreate = false)
     {
         let data = {};
         let relations = {};
@@ -351,9 +373,11 @@ class PrismaDriver extends BaseDriver
                     };
                     continue;
                 }
-                relations[relationName] = {
-                    disconnect: true
-                };
+                if(!isCreate){
+                    relations[relationName] = {
+                        disconnect: true
+                    };
+                }
                 continue;
             }
             let fieldType = this.fieldTypes[key];
@@ -476,7 +500,7 @@ class PrismaDriver extends BaseDriver
 
     async create(params)
     {
-        let preparedData = this.prepareDataWithRelations(params);
+        let preparedData = this.prepareDataWithRelations(params, true);
         this.ensureRequiredFields(preparedData);
         try {
             return await this.model.create({

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@reldens/storage",
     "scope": "@reldens",
-    "version": "0.60.0",
+    "version": "0.61.0",
     "description": "Reldens - Storage",
     "author": "Damian A. Pastorini",
     "license": "MIT",
@@ -45,13 +45,13 @@
         "@mikro-orm/core": "^6.4.16",
         "@mikro-orm/mongodb": "^6.4.16",
         "@mikro-orm/mysql": "^6.4.16",
-        "@prisma/client": "^6.10.1",
-        "@reldens/server-utils": "^0.20.0",
+        "@prisma/client": "^6.11.0",
+        "@reldens/server-utils": "^0.21.0",
         "@reldens/utils": "^0.50.0",
         "knex": "^3.1.0",
         "mysql": "^2.18.1",
         "mysql2": "^3.14.1",
         "objection": "^3.1.5",
-        "prisma": "^6.10.1"
+        "prisma": "^6.11.0"
     }
 }