@mlagie/sql-connector 2.0.5 → 2.0.7

package/src/models/ModelInstance.js

@@ -1,8 +1,7 @@
-const { error } = require("@mlagie/logger");
+const { error, logs } = require("@mlagie/logger");
 const { getConnexion } = require("../db/connexion");
 const formatObject = require("../utils/formatObject");
 const generateCondition = require("../utils/generateCondition");
-const util = require("util");
 const { getSafe, setSafe } = require("../utils/security/safe");
 
 /**
@@ -18,19 +17,19 @@ class ModelInstance {
      */
     constructor(name, data, schema = null) {
         Object.defineProperties(this, {
-            name: {
+            _name: {
                 value: name,
                 writable: true,
                 configurable: true,
                 enumerable: false
             },
-            data: {
+            _data: {
                 value: data,
                 writable: true,
                 configurable: true,
                 enumerable: true
             },
-            schema: {
+            _schema: {
                 value: schema,
                 writable: true,
                 configurable: true,
@@ -63,22 +62,18 @@ class ModelInstance {
      * @private
      */
     _getTargetRow() {
-        const rows = Array.isArray(this.data) && Array.isArray(this.data[0]) ? this.data[0] : this.data;
+        const rows = Array.isArray(this._data) && Array.isArray(this._data[0]) ? this._data[0] : this._data;
         return Array.isArray(rows) ? rows[0] : rows;
     }
 
     getRecordData() {
-        return Array.isArray(this.data) ? this.data[0] ?? this.data : this.data;
+        return Array.isArray(this._data) ? this._data[0] ?? this._data : this._data;
     }
 
     toJSON() {
         return this.getRecordData();
     }
 
-    [util.inspect.custom]() {
-        return this.getRecordData();
-    }
-
     /**
      * Updates a single entry in the database table.
      * 
@@ -96,15 +91,11 @@ class ModelInstance {
             let rawRec = Array.isArray(recordsArray) ? recordsArray[0] : recordsArray;
 
             if (typeof rawRec === 'string') {
-                try {
-                    rawRec = JSON.parse(rawRec);
-                } catch {
-                    rawRec = recordsArray;
-                }
+                rawRec = JSON.parse(rawRec);
             }
             const rec = rawRec;
 
-            const schemaDict = this.schema && this.schema.schemaDict ? this.schema.schemaDict : null;
+            const schemaDict = this._schema && this._schema.schemaDict ? this._schema.schemaDict : null;
             if (schemaDict) {
                 const pkKeys = Object.entries(schemaDict).filter(([, v]) => v && v.primary_key === true).map(([k]) => k);
                 if (pkKeys.length > 0) {
@@ -112,20 +103,19 @@ class ModelInstance {
                     for (const k of pkKeys) {
                         if (rec && Object.prototype.hasOwnProperty.call(rec, k)) setSafe(pkObj, k, getSafe(rec, k));
                     }
-                    if (Object.keys(pkObj).length > 0) whereClause = generateCondition(formatObject(pkObj), false, this.schema);
+                    if (Object.keys(pkObj).length > 0) whereClause = generateCondition(formatObject(pkObj), false, this._schema);
                 }
             }
-            if (!whereClause) whereClause = generateCondition(formatObject(rec), false, this.schema);
+            if (!whereClause) whereClause = generateCondition(formatObject(rec), false, this._schema);
         } catch {
             const originalFallbackRec = this.getRecordData();
             let fallbackRec = originalFallbackRec;
             if (Array.isArray(fallbackRec)) fallbackRec = fallbackRec[0];
             if (typeof fallbackRec === 'string') { try { fallbackRec = JSON.parse(fallbackRec); } catch { fallbackRec = originalFallbackRec; } }
-            whereClause = generateCondition(formatObject(fallbackRec), false, this.schema);
+            whereClause = generateCondition(formatObject(fallbackRec), false, this._schema);
         }
 
-        const sql_request = `UPDATE ${this.name} SET ${setClause} WHERE ${whereClause}`;
-
+        const sql_request = `UPDATE ${this._name} SET ${setClause} WHERE ${whereClause}`;
         const [result] = await getConnexion().promise().execute(sql_request).catch((err) => {
             error(`Error executing query updateOne: ${err}`);
             throw err;
@@ -135,10 +125,10 @@ class ModelInstance {
 
         if (affected > 0) {
             const record = this.getRecordData();
-            if (Array.isArray(this.data)) {
-                if (this.data[0] && typeof this.data[0] === 'object') Object.assign(this.data[0], model);
+            if (Array.isArray(this._data)) {
+                if (this._data[0] && typeof this._data[0] === 'object') Object.assign(this._data[0], model);
             } else if (record && typeof record === 'object') {
-                Object.assign(this.data, model);
+                Object.assign(this._data, model);
             }
         }
 
@@ -152,7 +142,7 @@ class ModelInstance {
      * @throws {Error} Throws an error if the deletion fails.
      */
     async delete(filter) {
-        const sql_request = `DELETE FROM ${this.name} WHERE ${generateCondition(formatObject(filter))}`;
+        const sql_request = `DELETE FROM ${this._name} WHERE ${generateCondition(formatObject(filter))}`;
 
         const rows = await getConnexion().promise().execute(sql_request).catch((err) => {
             error(`Error executing query delete: ${err}`);
@@ -168,8 +158,9 @@ class ModelInstance {
      * @throws {Error} Throws an error if the deletion fails.
      */
     async deleteOne() {
-        const sql_request = `DELETE FROM ${this.name} WHERE ${generateCondition(formatObject(this.getRecordData()))}`;
+        const sql_request = `DELETE FROM ${this._name} WHERE ${generateCondition(formatObject(this.getRecordData()))}`;
 
+        logs(sql_request)
         const rows = await getConnexion().promise().execute(sql_request).catch((err) => {
             error(`Error executing query deleteOne: ${err}`);
             throw err;
@@ -192,7 +183,7 @@ class ModelInstance {
 
         if (rows[0].length == 0) return 0;
 
-        return new ModelInstance(this.name, rows[0], this.schema).data;
+        return new ModelInstance(this._name, rows[0], this._schema)._data;
     }
 }
 

package/src/utils/{buildQuery.js → buildQuery/buildQuery.js}

@@ -1,10 +1,11 @@
-const formatObject = require("./formatObject");
-const generateCondition = require("./generateCondition");
-const { escapeIdentifier, escapeOrderDirection, escapeValue } = require("./sql");
+const formatObject = require("../formatObject");
+const generateCondition = require("../generateCondition");
+const { escapeIdentifier, escapeOrderDirection, escapeValue } = require("../sql");
+const count = require("./count");
 
 function buildGroupByItem(group) {
     if (typeof group !== 'string') {
-        return escapeIdentifier(group);
+        throw new Error("Group by items must be strings");
     }
 
     const trimmedGroup = group.trim();
@@ -40,8 +41,7 @@ function buildField(field) {
     else if (field.distinct)
         sql = `DISTINCT ${escapeIdentifier(field.distinct)}`;
     else if (field.count)
-        sql = `COUNT(${escapeIdentifier(field.count)})`;
-
+        sql = count(field.count);
     if (field.as)
         sql += ` AS ${escapeIdentifier(field.as)}`;
     else if (field.sum)

package/src/utils/buildQuery/count.js

@@ -0,0 +1,11 @@
+const { escapeIdentifier, escapeValue } = require("../sql");
+
+module.exports = (field) => {
+    if (typeof field === 'string') return `COUNT(${escapeIdentifier(field)})`;
+    if (field instanceof Array && field !== null) return field.map(col => `COUNT(${escapeIdentifier(col)})`).join(' + ');
+    if (field instanceof Object) {
+        const [key, value] = Object.entries(field)[0];
+        return `COUNT(CASE WHEN ${escapeIdentifier(key)} = ${escapeValue(value)} THEN 1 END)`;
+    }
+    throw new Error("Invalid field type for COUNT. Must be a string, array, or object.");
+} 

package/src/utils/formatObject.js

@@ -4,6 +4,7 @@ module.exports = function (obj) {
     for (const key in obj) {
         if (Object.prototype.hasOwnProperty.call(obj, key)) {
             const value = getSafe(obj, key);
+
             if (value instanceof Date) {
                 // convert Date to MySQL DATETIME (no timezone)
                 setSafe(obj, key, value.toISOString().slice(0, 19).replace('T', ' '));

package/src/utils/generateCondition.js

@@ -37,9 +37,6 @@ module.exports = function (filter, isUpdate = false, schema = null) {
                 // normalize strings that may contain surrounding quotes or escaped quotes
                 if (typeof value === 'string') {
                     value = value.trim();
-                    if ((value.startsWith('"') && value.endsWith('"')) || (value.startsWith("'") && value.endsWith("'"))) {
-                        value = value.slice(1, -1);
-                    }
                     value = value.replace(/\\"/g, '"').replace(/\\'/g, "'");
                 }
                 if (Array.isArray(value)) {
@@ -67,9 +64,6 @@ module.exports = function (filter, isUpdate = false, schema = null) {
 
         if (typeof value === 'string') {
             value = value.trim();
-            if ((value.startsWith('"') && value.endsWith('"')) || (value.startsWith("'") && value.endsWith("'"))) {
-                value = value.slice(1, -1);
-            }
             value = value.replace(/\\"/g, '"').replace(/\\'/g, "'");
         }
 
@@ -92,14 +86,12 @@ module.exports = function (filter, isUpdate = false, schema = null) {
         if (fieldDef) {
             if (fieldDef.type && fieldDef.type.name !== undefined) fieldType = fieldDef.type.name;
             else if (fieldDef.type !== undefined) fieldType = fieldDef.type;
-            else if (fieldDef && fieldDef.name !== undefined) fieldType = fieldDef.name;
         }
         const normalizedFieldType = String(fieldType ?? "").toLowerCase();
         const isDateLike = ["date", "datetime", "timestamp", "now"].includes(normalizedFieldType);
 
         if (typeof value === "string") {
             let val = value;
-            // strip surrounding quotes if any (double safety)
             if ((val.startsWith('"') && val.endsWith('"')) || (val.startsWith("'") && val.endsWith("'"))) val = val.slice(1,-1);
             // if ISO timestamp with Z, convert to MySQL DATETIME format
             if (isDateLike && /T/.test(val)) {