@galadrim/galadmin 0.1.130 → 0.1.132

package/src/front/src/utils/getFormattedValue.js

@@ -46,7 +46,7 @@ export default (column, record, config, onTable) => {
     } else if (column.dataType === "select" && column.options && column.options.constructor == Object) {
         return <div>{column.options[record[column.name]]}</div>
     } else if (column.dataType === "string[]") {
-        return <div>{record[column.name].join(", ")}</div>
+        return <div>{record[column.name]?.join(", ")}</div>
     } else {
         return <div>{record[column.name]}</div>
     }

package/src/utils/dbManager.ts

@@ -31,6 +31,42 @@ function convertQuery(mysqlQuery, params) {
     };
 }
 
+function quotePostgresQuery(query) {
+    query = query.replace(/`/g, '"');
+
+    const reservedWords = ["1", "COUNT", "*", "UPDATE", "SELECT", "SET", "=", "INSERT", "DELETE", "FROM", "WHERE", "AND", "OR", "JOIN", "ON", "AS", "IN", "LIKE", "EXISTS", "ALL", "ANY", "NOT", "NULL", "TRUE", "FALSE", "GROUP", "BY", "ORDER", "LIMIT", "OFFSET", "DESC"]
+
+    const wordsToAddQuotes = new Set()
+    const parts = query.split(/[ \(\)]/);
+
+    let inString = false;
+
+    for (let i = 0; i < parts.length; i++) {
+        const part = parts[i].trim();
+        if (!part) {
+            continue
+        }
+        if (part.split(/['"]/).length % 2 === 0) {
+            inString = !inString;
+        }
+
+        if (inString || part.startsWith("$") || part.includes("'") || part.includes('"') || reservedWords.includes(part.toUpperCase())) {
+
+        } else {
+            for (let x of part.split(".")) {
+                wordsToAddQuotes.add(x)
+            }
+        }
+    }
+
+    let newQuery = query;
+    for (let word of wordsToAddQuotes) {
+        newQuery = newQuery.replace(new RegExp(`(?<!["\'])\\b${word}\\b(?!["\'])`, 'g'), `"${word}"`)
+    }
+
+    return newQuery;
+}
+
 export default class dbManager {
     _db;
     dbType;
@@ -66,7 +102,7 @@ export default class dbManager {
         return new Promise((resolve, reject) => {
             if (this.dbType === "POSTGRESQL") {
                 const result = convertQuery(queryString, args);
-                queryString = result.pgQuery;
+                queryString = quotePostgresQuery(result.pgQuery);
                 args = result.pgParams;
             }
             this._db.query(queryString, args, (a, b, c) => {