@mlagie/sql-connector 1.4.1 → 1.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mlagie/sql-connector",
-  "version": "1.4.1",
+  "version": "1.4.3",
   "description": "Le module sql-connector permet de gérer les connexions à une base de données MySQL, de définir des schémas de tables, et d'interagir avec les données de manière simple et efficace.",
   "main": "index.js",
   "scripts": {
@@ -25,6 +25,6 @@
   "dependencies": {
     "@mlagie/logger": "1.0.1",
     "glob": "^11.0.3",
-    "mysql2": "3.14.5"
+    "mysql2": "3.15.1"
   }
 }

package/src/models/Model.js

@@ -480,8 +480,6 @@ class Model {
             sql_request += ` LIMIT ${limit}`;
         }
 
-        logs(sql_request)
-
         return new Promise((resolve, reject) => {
             getConnexion().promise().query(sql_request).then(([rows]) => {
                 const instances = rows.map(row => new ModelInstance(this.name, row, this.schema));
@@ -503,13 +501,12 @@ class Model {
         const sql_request = `SELECT ${fields.join(", ")} FROM ${this.name} WHERE ${generateCondition(formatObject(filter))}`;
 
         return new Promise((resolve, reject) => {
-            getConnexion().promise().query(sql_request).then((rows) => {
-                if (rows.length == 0) return resolve(0);
-
-                resolve(new ModelInstance(this.name, Object.values(rows[0])[0], this.schema));
+            getConnexion().promise().query(sql_request).then(([rows]) => {
+                if (!rows || rows.length === 0) return resolve(0);
+                resolve(new ModelInstance(this.name, rows[0], this.schema));
             }).catch((err) => {
                 error(`Error executing query: ${err}`);
-                return 0;
+                return resolve(0);
             });
         });
     }
@@ -591,7 +588,6 @@ class Model {
      */
     async delete(filter) {
         const sql_request = `DELETE FROM ${this.name} WHERE ${generateCondition(formatObject(filter))}`;
-
         return new Promise((resolve, reject) => {
             getConnexion().promise().query(sql_request).then((rows) => {
                 if (rows[1] != undefined) return resolve(0);

package/src/utils/generateCondition.js

@@ -19,12 +19,14 @@ module.exports = function (filter, isUpdate = false, schema = null) {
     const keys = Object.keys(filter);
     const values = Object.values(filter);
 
+    const filteredKeys = isUpdate ? keys.filter(key => filter[key] !== undefined) : keys;
+    const filteredValues = isUpdate ? filteredKeys.map(key => filter[key]) : values;
+
     if (!isUpdate && schema && schema.schemaDict) {
-        const uniqueKeys = keys.filter(key => {
+        const uniqueKeys = filteredKeys.filter(key => {
             const field = schema.schemaDict[key];
             return field && field.unique === true;
         });
-
         if (uniqueKeys.length > 0) {
             return uniqueKeys.map(key => {
                 const value = filter[key];
@@ -36,14 +38,14 @@ module.exports = function (filter, isUpdate = false, schema = null) {
                     return `JSON_CONTAINS(${key}, '${jsonVal}')`;
                 }
                 if (value === null || value === "null") return `${key} IS NULL`;
-                return `${key} = ${typeof value === "string" ? `"${value}"` : value}`;
+                return `${key} = ${typeof value === "string" ? `"${v}"` : value}`;
             }).join(" AND ");
         }
     }
 
     // Comportement par défaut
-    const conditions = keys.map((key, index) => {
-        const value = values[index];
+    const conditions = filteredKeys.map((key, index) => {
+        const value = filteredValues[index];
 
         if (Array.isArray(value)) {
             return `${key} IN (${value.map(v => `"${v}"`).join(", ")})`;
@@ -59,6 +61,5 @@ module.exports = function (filter, isUpdate = false, schema = null) {
         if ((value === null || value === "null") && isUpdate == false) return `${key} IS NULL`;
         return `${key} = ${typeof value === "string" ? `"${value}"` : value}`;
     }).join(` ${isUpdate == false ? "AND" : ","} `);
-
     return conditions;
 }