@mlagie/sql-connector 3.0.1 → 3.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mlagie/sql-connector",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "description": "The sql-connector module allows you to manage connections to a MySQL database, define table schemas, and interact with data in a simple and efficient way.",
   "main": "index.js",
   "exports": {

package/src/models/ModelInstance.js

@@ -88,8 +88,8 @@ class ModelInstance {
         const dialect = getDialect();
         const values = Object.values(model);
 
-        const setClause = setKeys.map(key => {
-            return `${dialect.escape(key)} = ?`;
+        const setClause = setKeys.map((key, i) => {
+            return `${dialect.escape(key)} = ${dialect.getPlaceholder(i)}`;
         }).join(', ');
 
         let targetCriteria;
@@ -126,7 +126,7 @@ class ModelInstance {
             targetCriteria = fallbackRec;
         }
 
-        const { sql: whereClause, values: whereValues } = buildQueryParts({ where: targetCriteria });
+        const { sql: whereClause, values: whereValues } = buildQueryParts({ where: targetCriteria }, setKeys.length);
         values.push(...whereValues);
 
         const sql_request = `UPDATE ${dialect.escape(this._name)} SET ${setClause} ${whereClause}`;

package/src/utils/buildQuery/buildQuery.js

@@ -61,7 +61,7 @@ function buildSelect(select = []) {
         .join(',\n');
 }
 
-function buildWhere(where, values) {
+function buildWhere(where, values, offset = 0) {
     const conditions = [];
 
     for (const [key, value] of Object.entries(where)) {
@@ -70,7 +70,7 @@ function buildWhere(where, values) {
                 throw new Error("OR conditions cannot be empty");
             }
             const clauses = value
-                .map((item) => buildWhere(item, values))
+                .map((item) => buildWhere(item, values, offset))
                 .filter(Boolean);
 
             if (clauses.length) {
@@ -85,7 +85,7 @@ function buildWhere(where, values) {
                 throw new Error("AND conditions cannot be empty");
             }
             const clauses = value
-                .map((item) => buildWhere(item, values))
+                .map((item) => buildWhere(item, values, offset))
                 .filter(Boolean);
 
             if (clauses.length) {
@@ -106,15 +106,17 @@ function buildWhere(where, values) {
                 for (const [operator, operatorValue] of Object.entries(value)) {
                     if (operator === "IN" || operator === "NOT IN") {
                         const placeholders = operatorValue
-                            .map(() => "?")
+                            .map((_, i) => getDialect().getPlaceholder(offset + values.length + i))
                             .join(",");
 
                         conditions.push(
                             `${getDialect().escape(key)} ${operator} (${placeholders})`
                         );
                         values.push(...operatorValue);
+                    } else if (operatorValue === null && (operator === "=" || operator === "!=")) {
+                        conditions.push(`${getDialect().escape(key)} IS ${operator === "!=" ? "NOT " : ""}NULL`);
                     } else {
-                        conditions.push(`${getDialect().escape(key)} ${operator} ?`);
+                        conditions.push(`${getDialect().escape(key)} ${operator} ${getDialect().getPlaceholder(offset + values.length)}`);
                         values.push(operatorValue);
                     }
                 }
@@ -122,7 +124,12 @@ function buildWhere(where, values) {
             }
         }
 
-        conditions.push(`${getDialect().escape(key)} = ?`);
+        if (value === null) {
+            conditions.push(`${getDialect().escape(key)} IS NULL`);
+            continue;
+        }
+
+        conditions.push(`${getDialect().escape(key)} = ${getDialect().getPlaceholder(offset + values.length)}`);
         values.push(value);
     }
 
@@ -132,9 +139,10 @@ function buildWhere(where, values) {
 /**
  * Construit les parties de la requête et extrait les valeurs sécurisées
  * @param {Object} options Options de filtrage, tri et pagination
+ * @param {number} [valueOffset=0] Décalage d'index pour les placeholders (utile quand des valeurs ont déjà été liées avant le WHERE, ex: SET d'un UPDATE)
  * @returns {Object} Un objet contenant la chaîne SQL générée et le tableau des valeurs { sql, values }
  */
-function buildQueryParts(options) {
+function buildQueryParts(options, valueOffset = 0) {
     const parts = [];
     const values = [];
 
@@ -145,7 +153,7 @@ function buildQueryParts(options) {
         if (typeof options.where !== 'object' || Array.isArray(options.where)) {
             throw new Error("Raw string WHERE clauses are not allowed. Use a structured filter instead.");
         }
-        parts.push(`WHERE ${buildWhere(options.where, values)}`);
+        parts.push(`WHERE ${buildWhere(options.where, values, valueOffset)}`);
     }
 
     if (options.groupBy) {
@@ -169,8 +177,8 @@ function buildQueryParts(options) {
         if (!Number.isInteger(options.limit) || options.limit < 0) {
             throw new Error("Invalid LIMIT value");
         }
-        
-        parts.push(`LIMIT ?`);
+
+        parts.push(`LIMIT ${getDialect().getPlaceholder(valueOffset + values.length)}`);
         values.push(options.limit);
     }