@mlagie/sql-connector 3.0.0 → 3.0.2

package/README.md

@@ -188,7 +188,7 @@ await Model.syncAllTables();
 await userModel.save({ email: 'user@example.com', status: 'active' });
 
 const user = await userModel.find({ where: { email: 'user@example.com' }});
-await user[0].deleteOne();
+await user[0].delete();
 ```
 
 ## save function
@@ -471,14 +471,14 @@ await User.save({ email: "user@example.com", status: "active", uuid: uuid, my_uu
 
 - `updateOne(model)` updates the row
 - `delete(model)` deletes the row using a filter
-- `deleteOne()` deletes the instance row
+- `delete()` deletes the instance row
 - `customRequest(custom)` runs a custom query
 
 ```js
 const userInstance = await find({ select: "users", where: { email: 'user@example.com' }})[0];
 
 await userInstance.updateOne({ status: 'inactive' });
-await userInstance.deleteOne();
+await userInstance.delete();
 ```
 
 ## SQL types

package/docs/fr/README_FR.md

@@ -158,7 +158,7 @@ await Model.syncAllTables();
 await userModel.save({ email: 'user@example.com', status: 'active' });
 
 const user = await userModel.find({ where: { email: 'user@example.com' }});
-await user[0].deleteOne();
+await user[0].delete();
 ```
 
 ## Fonction save
@@ -444,14 +444,14 @@ await User.save({ email: "user@example.com", status: "active", uuid: uuid, my_uu
 
 - `updateOne(model)` met à jour la ligne
 - `delete(model)` supprime la ligne avec un filtre
-- `deleteOne()` supprime la ligne de l'instance
+- `delete()` supprime la ligne de l'instance
 - `customRequest(custom)` exécute une requête personnalisée
 
 ```javascript
 const userInstance = new ModelInstance('users', { email: 'user@example.com' });
 
 await userInstance.updateOne({ status: 'inactive' });
-await userInstance.deleteOne();
+await userInstance.delete();
 ```
 
 ## Types SQL

package/index.d.ts

@@ -351,12 +351,7 @@ export class ModelInstance<TData extends Record<string, any> = Record<string, an
      * @throws {Error} Throws an error if the deletion fails.
      */
     delete(filter: Record<string, any>): Promise<number>;
-    /**
-     * Deletes a single entry in the database table based on the instance data.
-     * @returns {Promise<number>} A promise that resolves to the number of rows deleted.
-     * @throws {Error} Throws an error if the deletion fails.
-     */
-    deleteOne(): Promise<number>;
+
     /**
      * Runs a custom SQL_request query.
      * @param {string} custom The custom SQL_request query to execute.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mlagie/sql-connector",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "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/Model.js

@@ -105,7 +105,6 @@ class Model {
             const deps = getSafe(dependencies, table)
             for (const dep of deps) {
                 if (dep !== table && getSafe(modelMap, dep)) {
-                    console.log(`Table ${table} depends on ${dep}.`);
                     visit(dep, [...stack, table]);
                 }
             }

package/src/models/ModelInstance.js

@@ -157,11 +157,9 @@ class ModelInstance {
      * @returns {Promise<Object>} A promise that resolves with the data deleted.
      * @throws {Error} Throws an error if the deletion fails.
      */
-    async delete(filter) {
+    async delete(filter = { where: this.getRecordData() }) {
         const { sql: whereClause, values } = buildQueryParts(filter);
-
-        const sql_request = `DELETE FROM ${this._name} ${whereClause}`;
-
+        const sql_request = `DELETE FROM ${getDialect().escape(this._name)} ${whereClause}`;
         const result = await getDialect().execute(getConnexion(), sql_request, values).catch((err) => {
             error(`Error executing query delete: ${err}`);
             throw err;
@@ -170,22 +168,6 @@ class ModelInstance {
         return getDialect().getAffectedRows(result) === 0 ? 0 : 1;
     }
 
-    /**
-     * Deletes a single entry in the database table based on the instance data.
-     * @returns {Promise<number>} A promise that resolves to the number of rows deleted.
-     * @throws {Error} Throws an error if the deletion fails.
-     */
-    async deleteOne() {
-        const { sql: whereClause, values } = buildQueryParts(this.getRecordData());
-        const sql_request = `DELETE FROM ${this._name} ${whereClause}`;
-        const result = await getDialect().execute(getConnexion(), sql_request, values).catch((err) => {
-            error(`Error executing query deleteOne: ${err}`);
-            throw err;
-        });
-
-        return getDialect().getAffectedRows(result) === 0 ? 0 : 1;
-    }
-
     /**
      * Runs a custom SQL_request query.
      * @param {string} custom The custom SQL_request query to execute.

package/src/utils/buildQuery/buildQuery.js

@@ -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(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(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(values.length)}`);
         values.push(value);
     }
 
@@ -169,7 +176,7 @@ function buildQueryParts(options) {
         if (!Number.isInteger(options.limit) || options.limit < 0) {
             throw new Error("Invalid LIMIT value");
         }
-        
+
         parts.push(`LIMIT ?`);
         values.push(options.limit);
     }