@reldens/storage 0.79.0 → 0.81.0

package/lib/entities-generator.js

@@ -385,7 +385,7 @@ class EntitiesGenerator
             if(!this.prismaClient && this.server.prisma){
                 this.prismaClient = this.server.prisma;
             }
-            Logger.debug('Extract Prisma relations metadata.');
+            //Logger.debug('Extract Prisma relations metadata.');
             this.extractPrismaRelationsMetadata();
         }
         let tables = await this.server.fetchEntitiesFromDatabase();

package/lib/entity-templates/objection-js-model.template

@@ -13,7 +13,7 @@ class {{modelClassName}} extends ObjectionJsRawModel
     {
         return '{{tableName}}';
     }
-    {{modelRelations}}
+{{idColumn}}{{modelRelations}}
 }
 
 module.exports.{{modelClassName}} = {{modelClassName}};

package/lib/generators/models-generation.js

@@ -41,13 +41,15 @@ class ModelsGeneration extends BaseGenerator
             .join('\n        ');
         let modelRelations = this.generateModelRelations(tableName, tableData, relationMetadata, driverKey);
         let entityPropertiesDefinition = this.getEntityPropertiesDefinition(tableData.columns, driverKey);
+        let idColumn = this.generateIdColumn(tableData.columns, driverKey);
         let replacements = {
             modelClassName,
             tableName: 'prisma' === driverKey ? tableName.toLowerCase() : tableName,
             modelPropertiesList,
             modelPropertiesConstructor,
             modelRelations,
-            entityPropertiesDefinition
+            entityPropertiesDefinition,
+            idColumn
         };
         let modelContent = this.applyReplacements(modelTemplateContent, replacements);
         let fileName = sc.kebabCase(tableName)+'-model.js';
@@ -67,6 +69,29 @@ class ModelsGeneration extends BaseGenerator
         return true;
     }
 
+    generateIdColumn(columns, driverKey)
+    {
+        if('objection-js' !== driverKey){
+            return '';
+        }
+        let primaryKeyColumn = this.detectPrimaryKeyColumn(columns);
+        if(!primaryKeyColumn || 'id' === primaryKeyColumn){
+            return '';
+        }
+        return '\n    static get idColumn()\n    {\n        return \''+primaryKeyColumn+'\';\n    }\n';
+    }
+
+    detectPrimaryKeyColumn(columns)
+    {
+        for(let columnName of Object.keys(columns)){
+            let column = columns[columnName];
+            if('PRI' === column.key){
+                return columnName;
+            }
+        }
+        return null;
+    }
+
     setAllTablesData(allTablesData)
     {
         this.allTablesData = allTablesData;

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

@@ -120,7 +120,7 @@ class PrismaDataServer extends BaseDataServer
             return await this.prisma.$queryRawUnsafe(statement);
         }
         let result = await this.prisma.$executeRawUnsafe(statement);
-        Logger.debug('Raw result from Prisma: ' + result);
+        //Logger.debug('Raw result from Prisma: ' + result);
         if(
             trimmedStatement.startsWith('CREATE')
             || trimmedStatement.startsWith('ALTER')