@rws-framework/db 3.12.0 → 3.12.2

package/dist/helper/db/schema-generator.d.ts

@@ -22,6 +22,7 @@ export declare class SchemaGenerator {
      */
     static generateModelSections(model: OpModelType<any>, configService: IDbConfigHandler): Promise<string>;
     private static getSuperFieldFromModel;
+    private static getPrismaExec;
     /**
      * Install Prisma with the generated schema
      * @param configService The configuration service

package/dist/helper/db/schema-generator.js

@@ -7,6 +7,7 @@ exports.SchemaGenerator = void 0;
 const console_1 = require("@rws-framework/console");
 const chalk_1 = __importDefault(require("chalk"));
 const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
 const _model_1 = require("../../models/_model");
 const utils_1 = require("./utils");
 const type_converter_1 = require("./type-converter");
@@ -274,6 +275,9 @@ datasource db {
         }
         return superFieldElemName;
     }
+    static getPrismaExec() {
+        return path_1.default.join(console_1.rwsPath.findRootWorkspacePath(), 'node_modules', 'prisma/build/index.js');
+    }
     /**
      * Install Prisma with the generated schema
      * @param configService The configuration service
@@ -324,8 +328,20 @@ datasource db {
                 fs_1.default.unlinkSync(schemaPath);
             }
             fs_1.default.writeFileSync(schemaPath, template);
-            if (_EXECUTE_PRISMA_CMD)
-                await console_1.rwsShell.runCommand(`${utils_1.DbUtils.detectInstaller()} prisma generate --schema=${schemaPath}`, process.cwd());
+            if (_EXECUTE_PRISMA_CMD) {
+                const prismaPath = this.getPrismaExec();
+                // Set environment variables
+                const env = {
+                    ...process.env,
+                    [this.dbUrlVarName]: configService.get('db_url')
+                };
+                // Execute prisma db push programmatically
+                (0, child_process_1.execSync)(`node ${prismaPath} generate --schema=${schemaPath}`, {
+                    cwd: process.cwd(),
+                    stdio: 'inherit',
+                    env
+                });
+            }
             console.log(chalk_1.default.green('[RWS Init]') + ' prisma schema generated from ', schemaPath);
             if (_REMOVE_SCHEMA_FILE) {
                 fs_1.default.unlinkSync(schemaPath);
@@ -340,9 +356,9 @@ datasource db {
      */
     static async pushDBModels(configService, dbService, leaveFile = false) {
         process.env = { ...process.env, [this.dbUrlVarName]: configService.get('db_url') };
-        console.log({ env: process.env.PRISMA_DB_URL });
         const [_, schemaPath] = utils_1.DbUtils.getProcessedSchemaDir();
-        const prismaPath = require.resolve('prisma/build/index.js');
+        const prismaPath = this.getPrismaExec();
+        console.log({ prismaPath });
         // Set environment variables
         const env = {
             ...process.env,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rws-framework/db",
   "private": false,
-  "version": "3.12.0",
+  "version": "3.12.2",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/helper/db/schema-generator.ts

@@ -1,4 +1,4 @@
-import { rwsShell } from '@rws-framework/console';
+import { rwsPath, rwsShell } from '@rws-framework/console';
 import chalk from 'chalk';
 import fs from 'fs';
 import path from 'path';
@@ -355,6 +355,10 @@ datasource db {
         return superFieldElemName;
     }
 
+    private static getPrismaExec(): string {
+        return path.join(rwsPath.findRootWorkspacePath(), 'node_modules', 'prisma/build/index.js');
+    }
+
     /**
      * Install Prisma with the generated schema
      * @param configService The configuration service
@@ -424,9 +428,22 @@ datasource db {
 
             fs.writeFileSync(schemaPath, template);
 
-            if(_EXECUTE_PRISMA_CMD)
-            await rwsShell.runCommand(`${DbUtils.detectInstaller()} prisma generate --schema=${schemaPath}`, process.cwd());
-
+            if(_EXECUTE_PRISMA_CMD){
+                const prismaPath = this.getPrismaExec();
+                    
+                // Set environment variables
+                const env = {
+                    ...process.env,            
+                    [this.dbUrlVarName]: configService.get('db_url')
+                };
+
+                // Execute prisma db push programmatically
+                execSync(`node ${prismaPath} generate --schema=${schemaPath}`, {
+                    cwd: process.cwd(),
+                    stdio: 'inherit',
+                    env
+                });
+            }            
             
             console.log(chalk.green('[RWS Init]') + ' prisma schema generated from ', schemaPath);
 
@@ -445,11 +462,11 @@ datasource db {
     static async pushDBModels(configService: IDbConfigHandler, dbService: DBService, leaveFile = false): Promise<void> {
         process.env = { ...process.env, [this.dbUrlVarName]: configService.get('db_url') };
 
-        console.log({ env: process.env.PRISMA_DB_URL });
-
         const [_, schemaPath] = DbUtils.getProcessedSchemaDir();
 
-         const prismaPath = require.resolve('prisma/build/index.js');
+        const prismaPath = this.getPrismaExec();
+
+        console.log({prismaPath});
                     
         // Set environment variables
         const env = {