db-crud-api 0.3.16 → 0.3.23

package/lib/mssql.js

@@ -11,24 +11,49 @@ const pools = {};
 
 // Common
 function stringifyValue(fieldName, value, tSchema) {
-    if (value == undefined) { return 'null' }
-    if (typeof value !== 'string' || value.trimStart().charAt(0) !== '[') {
-        if (tSchema.table.fields && tSchema.table.fields[fieldName] && tSchema.table.fields[fieldName].type) {
-            if (tSchema.table.fields[fieldName].type == 'datetime') {
-                if (typeof value == 'datetime' || typeof value == 'object') return `\'${value.toISOString()}\'`;
-                if (typeof value == 'string' && value.trimStart().charAt(0) !== '\'' && value.trimStart().charAt(0) !== '\"') return `\'${value}\'`;
-                return value;
-            }
-            if (tSchema.table.fields[fieldName].type == 'boolean' && typeof value == 'boolean') return `\'${value}\'`;
-            if (tSchema.table.fields[fieldName].type == 'string' && value.trimStart().charAt(0) !== '\'' && value.trimStart().charAt(0) !== '\"') return `\'${value}\'`;
-            if (tSchema.table.fields[fieldName].type == 'uuid' && value.trimStart().charAt(0) !== '\'' && value.trimStart().charAt(0) !== '\"') return `\'${value}\'`;
+
+    // null or undefined
+    if (value == undefined) 
+        return 'null';
+
+    // detect field type from schema
+    let _fieldType = undefined;
+    if (tSchema.table.fields && tSchema.table.fields[fieldName] && tSchema.table.fields[fieldName].type) {
+        _fieldType = tSchema.table.fields[fieldName].type;
+    }
+
+    // if datetime
+    if (_fieldType == 'datetime') {
+        // my-sql not accepts 'Z' at end of ISO string
+        if (value instanceof Date) return `\'${value.toISOString()}\'`;
+        if (typeof value == 'string') {
+            const valueDate = new Date(Date.parse(value));
+            return `\'${valueDate.toISOString()}\'`;
         }
-        else {
-            // if (typeof value == 'datetime') return `\'${value.toISOString()}\'`;
-            if (typeof value == 'boolean') return `\'${value}\'`;
-            if (typeof value == 'string' && value.trimStart().charAt(0) !== '\'' && value.trimStart().charAt(0) !== '\"') return `\'${value}\'`;
+        return value;
+    }
+                
+    // if boolean
+    if (_fieldType == 'boolean' && typeof value == 'boolean') 
+        return `\'${value}\'`;
+
+    // if string or uuid
+    if (_fieldType == 'string' || _fieldType == 'uuid') {
+        if (value.trimStart().charAt(0) !== '\'' && value.trimStart().charAt(0) !== '\"') {
+            return `\'${value}\'`;
         }
     }
+
+    // field not in schema
+    if (_fieldType == undefined) {
+        if (value instanceof Date) 
+            return `\'${value.toISOString()}\'`;
+        if (typeof value == 'boolean') 
+            return `\'${value}\'`;
+        if (typeof value == 'string' && value.trimStart().charAt(0) !== '\'' && value.trimStart().charAt(0) !== '\"') 
+            return `\'${value}\'`;
+    }
+
     return value;
 }
 
@@ -129,14 +154,36 @@ export async function query(connection, dbOpes) {
     return sqlresult.recordset;
 }
 
-// Normalize SpecialName
-function normalizeSpecialName(name) {
-    let _odd = false;  // interpreted as 0
-    return name.replaceAll('\`', (_m) => {
-        _odd = !_odd;
-        if (_odd) return '[';
-        else return ']';
-    });
+// Normalize SQL to replace backticks with square brackets, considering quoted strings
+function normalizeSpecialName(sqlString) {
+    let result = "";
+    let inSingleQuote = false;
+    let inDoubleQuote = false;
+    let msSqlOpening = true; // Serve per alternare [ e ] in modalità mssql
+
+    for (let i = 0; i < sqlString.length; i++) {
+        const char = sqlString[i];
+
+        // Gestione delle stringhe (costanti)
+        if (char === "'" && !inDoubleQuote) {
+            inSingleQuote = !inSingleQuote;
+        } else if (char === '"' && !inSingleQuote) {
+            inDoubleQuote = !inDoubleQuote;
+        }
+
+        // Se siamo fuori dalle citazioni, applichiamo la logica di conversione
+        if (!inSingleQuote && !inDoubleQuote) {
+            if (char === '`') {
+                result += msSqlOpening ? '[' : ']';
+                msSqlOpening = !msSqlOpening; // Alterna per il prossimo backtick
+                continue;
+            }
+        }
+
+        result += char;
+    }
+
+    return result;
 }
 
 // Compose fully qualified table name

package/lib/mysql.js

@@ -12,27 +12,55 @@ const pools = {};
 
 // Common
 function stringifyValue(fieldName, value, tSchema) {
-    if (value == undefined) { return 'null' }
-    if (typeof value !== 'string' || value.trimStart().charAt(0) !== '\`') {
-        if (tSchema.table.fields && tSchema.table.fields[fieldName] && tSchema.table.fields[fieldName].type) {
-            if (tSchema.table.fields[fieldName].type == 'datetime') {
-                if (typeof value == 'datetime' || typeof value == 'object') return `\'${value.toISOString().slice(0, 19).replace('T', ' ')}\'`;
-                if (typeof value == 'string' && value.trimStart().charAt(0) !== '\'' && value.trimStart().charAt(0) !== '\"') return `\'${value}\'`;
-                return value;
-            }
-            if (tSchema.table.fields[fieldName].type == 'boolean' && typeof value == 'boolean') return `\'${value}\'`;
-            if (tSchema.table.fields[fieldName].type == 'string' && value.trimStart().charAt(0) !== '\'' && value.trimStart().charAt(0) !== '\"') return `\'${value}\'`;
-            if (tSchema.table.fields[fieldName].type == 'uuid' && value.trimStart().charAt(0) !== '\'' && value.trimStart().charAt(0) !== '\"') return `\'${value}\'`;
+
+    // null or undefined
+    if (value == undefined)  
+        return 'null';
+
+    // detect field type
+    let _fieldType = undefined;
+    if (tSchema.table.fields && tSchema.table.fields[fieldName] && tSchema.table.fields[fieldName].type) {
+        _fieldType = tSchema.table.fields[fieldName].type;
+    }
+
+    // if datetime
+    if (_fieldType == 'datetime') {
+        // my-sql not accepts 'Z' at end of ISO string
+        if (value instanceof Date) 
+            return `\'${value.toISOString().slice(0, -1)}\'`;
+        if (typeof value == 'string') {
+            const valueDate = new Date(Date.parse(value));
+            return `\'${valueDate.toISOString().slice(0, -1)}\'`;
         }
-        else {
-            // if (typeof value == 'datetime') return `\'${value.toISOString().slice(0, 19).replace('T', ' ')}\'`;
-            if (typeof value == 'boolean') return `\'${value}\'`;
-            if (typeof value == 'string' && value.trimStart().charAt(0) !== '\'' && value.trimStart().charAt(0) !== '\"') return `\'${value}\'`;
+        return value;
+    }
+                
+    // if boolean
+    if (_fieldType == 'boolean' && typeof value == 'boolean') 
+        return `\'${value}\'`;
+
+    // if string or uuid
+    if (_fieldType == 'string' || _fieldType == 'uuid') {
+        if (value.trimStart().charAt(0) !== '\'' && value.trimStart().charAt(0) !== '\"') {
+            return `\'${value}\'`;
         }
     }
+
+    // field not in schema
+    if (_fieldType == undefined) {
+        if (value instanceof Date) 
+            return `\'${value.toISOString().slice(0, -1)}\'`;
+        if (typeof value == 'boolean') 
+            return `\'${value}\'`;
+        if (typeof value == 'string' && value.trimStart().charAt(0) !== '\'' && value.trimStart().charAt(0) !== '\"') 
+            return `\'${value}\'`;
+    }
+
     return value;
 }
 
+
+
 // Create config object for pool
 export function prepareConnection(tSchema) {
     return {
@@ -128,9 +156,36 @@ export async function query(connection, dbOpes) {
     return sqlresult[0];
 }
 
-// Normalize SpecialName
-function normalizeSpecialName(name) {
-    return name.replaceAll('[', '\`').replaceAll(']', '\`');
+// Normalize special name to replace square brackets with backticks, considering quoted strings
+function normalizeSpecialName(sql) {
+    let result = "";
+    let inSingleQuote = false;
+    let inDoubleQuote = false;
+
+    for (let i = 0; i < sql.length; i++) {
+        const char = sql[i];
+
+        // Gestione delle virgolette singole '
+        if (char === "'" && !inDoubleQuote) {
+            inSingleQuote = !inSingleQuote;
+        } 
+        // Gestione delle virgolette doppie "
+        else if (char === '"' && !inSingleQuote) {
+            inDoubleQuote = !inDoubleQuote;
+        }
+
+        // Se non siamo all'interno di una stringa, sostituiamo le quadre
+        if (!inSingleQuote && !inDoubleQuote) {
+            if (char === '[' || char === ']') {
+                result += '`';
+                continue;
+            }
+        }
+
+        result += char;
+    }
+
+    return result;
 }
 
 // Compose fully qualified table name
@@ -138,7 +193,6 @@ function fullyQualifiedTableName(tSchema) {
     return (tSchema.database.realName + '.' + tSchema.table.realName);
 }
 
-
 function containLIMIT(s) {
     const _return = s?.match(_match_LIMIT_n);
     if (_return) return _return[0];

package/lib/schema.js

@@ -1,11 +1,14 @@
-export default {
-    servers: {
-    },
-    config: {
-        log: {
-            level: 0,
-            callback: undefined,
-            maxAsyncInstance: 50
-        }
-    }
+export default {
+    servers: {
+    },
+    config: {
+        log: {
+            level: 0,
+            callback: undefined,
+            maxAsyncInstance: 50
+        },
+        session: {
+            tablePath: 'sessions'        
+        }
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "db-crud-api",
-  "version": "0.3.16",
+  "version": "0.3.23",
   "type": "module",
   "description": "CRUD api for database tables",
   "main": "index.js",
@@ -12,11 +12,19 @@
   "dependencies": {
     "mssql": "^12.0.0",
     "mysql2": "^3.15.3",
-    "uuid": "^11.1.0"
+    "uuid": "^11.1.0",
+    "express-session": "^1.18.2"
   },
   "keywords": [
     "db",
     "crud",
     "api"
+  ],
+  "files": [
+    "lib/",
+    "CHANGELOG.md",
+    "README.md",
+    "index.js",
+    "package.json"
   ]
 }