@reldens/storage 0.34.0 → 0.36.0

package/bin/generate-prisma-schema.js

@@ -12,7 +12,7 @@ const { Logger } = require('@reldens/utils');
 let args = process.argv.slice(2);
 
 let connectionData = {
-    client: 'mysql2',
+    client: 'mysql',
     config: {
         user: '',
         password: '',
@@ -70,10 +70,7 @@ if(!connectionData.config.user || !connectionData.config.database){
     process.exit();
 }
 
-let generator = new PrismaSchemaGenerator({
-    ...connectionData,
-    prismaSchemaPath: projectPath+'/prisma'
-});
+let generator = new PrismaSchemaGenerator({...connectionData, prismaSchemaPath: projectPath+'/prisma'});
 
 generator.generate().then((success) => {
     if(!success){

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

@@ -77,17 +77,103 @@ class PrismaDataServer extends BaseDataServer
     async rawQuery(content)
     {
         try {
-            let queryResult = await this.prisma.$queryRawUnsafe(content);
-            if(!sc.isArray(queryResult) || 0 === queryResult.length){
+            let statements = this.splitSqlStatements(content);
+            let results = [];
+            for(let statement of statements){
+                let cleanStatement = statement.trim();
+                if('' === cleanStatement){
+                    continue;
+                }
+                try {
+                    let queryResult = await this.prisma.$executeRawUnsafe(cleanStatement);
+                    results.push(queryResult);
+                } catch(stmtError) {
+                    Logger.error('Statement "'+cleanStatement+'" execution failed: '+stmtError.message);
+                    return false;
+                }
+            }
+            if(0 === results.length){
                 return false;
             }
-            return queryResult;
+            return 1 === results.length ? results[0] : results;
         } catch(error) {
             Logger.error('Raw query failed: '+error.message);
             return false;
         }
     }
 
+    splitSqlStatements(sqlContent)
+    {
+        let statements = [];
+        let currentStatement = '';
+        let inQuote = false;
+        let quoteChar = '';
+        let inComment = false;
+        let commentType = '';
+        for(let i = 0; i < sqlContent.length; i++){
+            let char = sqlContent.charAt(i);
+            let nextChar = i < sqlContent.length - 1 ? sqlContent.charAt(i + 1) : '';
+            if(inComment){
+                let shouldEndComment = false;
+                if('*' === commentType && '*' === char && '/' === nextChar){
+                    shouldEndComment = true;
+                    i++;
+                }
+                if('-' === commentType && '\n' === char){
+                    shouldEndComment = true;
+                }
+                if(shouldEndComment){
+                    inComment = false;
+                }
+                continue;
+            }
+            let shouldStartComment = this.shouldStartComment(char, nextChar, inQuote);
+            if(shouldStartComment){
+                inComment = true;
+                commentType = '/' === char ? '*' : '-';
+                continue;
+            }
+            let isQuoteChar = ('"' === char || '\'' === char || '`' === char);
+            let isEscaped = (i > 0 && '\\' === sqlContent.charAt(i-1));
+            if(isQuoteChar && !isEscaped){
+                if(!inQuote){
+                    inQuote = true;
+                    quoteChar = char;
+                    currentStatement += char;
+                    continue;
+                }
+                let shouldEndQuote = quoteChar === char;
+                if(shouldEndQuote){
+                    inQuote = false;
+                }
+                currentStatement += char;
+                continue;
+            }
+            let shouldEndStatement = (';' === char && !inQuote);
+            if(shouldEndStatement){
+                statements.push(currentStatement);
+                currentStatement = '';
+                continue;
+            }
+            currentStatement += char;
+        }
+        let hasRemainingStatement = '' !== currentStatement.trim();
+        if(hasRemainingStatement){
+            statements.push(currentStatement);
+        }
+        return statements;
+    }
+
+    shouldStartComment(char, nextChar, inQuote)
+    {
+        if(inQuote){
+            return false;
+        }
+        let isBlockComment = ('/' === char && '*' === nextChar);
+        let isLineComment = ('-' === char && '-' === nextChar);
+        return isBlockComment || isLineComment;
+    }
+
     async fetchEntitiesFromDatabase()
     {
         if(!this.initialized){

package/lib/prisma/prisma-driver.js

@@ -30,7 +30,7 @@ class PrismaDriver extends BaseDriver
         this.initFieldMetadata();
     }
 
-    async initFieldMetadata()
+    initFieldMetadata()
     {
         try {
             let dmmf = this.prisma._baseDmmf;

package/lib/prisma/prisma-schema-generator.js

@@ -16,10 +16,8 @@ class PrismaSchemaGenerator
         this.config = sc.get(props, 'config', {});
         this.client = sc.get(props, 'client', 'mysql');
         this.debug = sc.get(props, 'debug', false);
-        this.prismaSchemaPath = sc.get(props, 'prismaSchemaPath',
-            FileHandler.joinPaths(process.cwd(), 'prisma'));
-        this.schemaFilePath = FileHandler.joinPaths(this.prismaSchemaPath,
-            'schema.prisma');
+        this.prismaSchemaPath = sc.get(props, 'prismaSchemaPath', FileHandler.joinPaths(process.cwd(), 'prisma'));
+        this.schemaFilePath = FileHandler.joinPaths(this.prismaSchemaPath, 'schema.prisma');
     }
 
     async generate()

package/package.json

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