@mlagie/sql-connector 1.1.2-beta → 1.1.4-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mlagie/sql-connector",
-  "version": "1.1.2-beta",
+  "version": "1.1.4-beta",
   "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": {

package/src/models/Model.js

@@ -1,5 +1,6 @@
 const { logs, error, sql } = require("@mlagie/logger");
 const { sqlTypeMap } = require("../utils/sqlTypeMap");
+const { getConnexion } = require("../db/connexion");
 
 function getFieldType(field) {
     if (typeof field === "object") {
@@ -21,6 +22,29 @@ function generateValueSQL(value) {
     }).join(", ");
 }
 
+const reservedKeywords = ['ADD', 'ALL', 'ALTER', 'AND', 'AS', 'ASC', 'BETWEEN', 'BY', 'CASE', 'CHECK', 'COLUMN', 'CONSTRAINT', 'CREATE', 'CURRENT_DATE', 'CURRENT_TIME', 'CURRENT_TIMESTAMP', 'DEFAULT', 'DELETE', 'DESC', 'DISTINCT', 'DROP', 'ELSE', 'END', 'ESCAPE', 'EXCEPT', 'EXISTS', 'FOR', 'FOREIGN', 'FROM', 'FULL', 'GROUP', 'HAVING', 'IN', 'INNER', 'INSERT', 'INTERSECT', 'INTO', 'IS', 'JOIN', 'LEFT', 'LIKE', 'LIMIT', 'NOT', 'NULL', 'ON', 'OR', 'ORDER', 'OUTER', 'PRIMARY', 'REFERENCES', 'RIGHT', 'SELECT', 'SET', 'SOME', 'TABLE', 'THEN', 'UNION', 'UNIQUE', 'UPDATE', 'VALUES', 'WHEN', 'WHERE'];
+
+/**
+ * Checks if a table name is a reserved keyword.
+ * 
+ * @param {string} tableName Le nom de la table à vérifier.
+ * @returns {boolean} `true` si le nom de la table est un mot-clé réservé, sinon `false`.
+ * 
+ * @example
+ * const isReserved = ifReservedKeywords('SELECT');
+ * console.log(isReserved); // true
+ *
+ * @example
+ * const isReserved = ifReservedKeywords('myTable');
+ * console.log(isReserved); // false
+ */
+function ifReservedKeywords(tableName) {
+    if (reservedKeywords.includes(tableName.toUpperCase())) {
+        return true;
+    }
+    return false;
+}
+
 /**
  * Represents a database model.
  * @class
@@ -82,7 +106,7 @@ class Model {
         for (const table of sorted) {
             const model = modelMap[table];
             await new Promise((resolve, reject) => {
-                connexion.query(model.generateCreateTableStatement(model.schema.schemaDict), (err) => {
+                getConnexion().query(model.generateCreateTableStatement(model.schema.schemaDict), (err) => {
                     if (err) {
                         error(`Error creating table: ${err} with table name: ${model.name}`);
                         return reject(err);
@@ -161,7 +185,7 @@ class Model {
         const sql_request = `INSERT INTO ${this.name} (${keys.join(', ')}) VALUES (${generateValueSQL(Object.values(data))})`;
         sql(this.name, sql_request);
         try {
-            const result = await connexion.promise().query(sql_request);
+            const result = await getConnexion().promise().query(sql_request);
             return result;
         } catch (err) {
             error(`Error inserting data into ${this.name}: ${err}`);
@@ -199,7 +223,7 @@ class Model {
         }
 
         return new Promise((resolve, reject) => {
-            connexion.promise().query(sql_request).then(([rows]) => {
+            getConnexion().promise().query(sql_request).then(([rows]) => {
                 resolve(rows);
             }).catch((err) => {
                 error(`Error executing findAll: ${err}`);
@@ -218,7 +242,7 @@ class Model {
         const sql_request = `SELECT ${fields.join(", ")} FROM ${this.name} WHERE ${generateCondition(formatObject(filter))}`;
 
         return new Promise((resolve, reject) => {
-            connexion.promise().query(sql_request).then((rows) => {
+            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));
@@ -255,7 +279,7 @@ class Model {
         const sql_request = `SELECT ${fields.join(", ")} FROM ${this.name} WHERE ${generateCondition(formatObject(filter))}`;
 
         return new Promise((resolve, reject) => {
-            connexion.promise().query(sql_request).then((rows) => {
+            getConnexion().promise().query(sql_request).then((rows) => {
                 if (rows.length == 0) return resolve(0);
 
                 resolve(new ModelInstance(this.name, Object.values(rows[0]), this.schema));
@@ -283,7 +307,7 @@ class Model {
      */
     async customRequest(custom) {
         return new Promise(async (resolve, reject) => {
-            await connexion.promise().query(custom).then((rows) => {
+            await getConnexion().promise().query(custom).then((rows) => {
                 if (rows.length == 0) return resolve(0);
 
                 resolve(new ModelInstance(this.name, Object.values(rows[0]), this.schema));
@@ -308,7 +332,7 @@ class Model {
         const sql_request = `DELETE FROM ${this.name} WHERE ${generateCondition(formatObject(filter))}`;
 
         return new Promise((resolve, reject) => {
-            connexion.promise().query(sql_request).then((rows) => {
+            getConnexion().promise().query(sql_request).then((rows) => {
                 if (rows[1] != undefined) return resolve(0);
 
                 return resolve(1);
@@ -333,7 +357,7 @@ class Model {
         const sql_request = `DROP TABLE IF EXISTS ${this.name};`;
 
         return new Promise((resolve, reject) => {
-            connexion.promise().query(sql_request).then((rows) => {
+            getConnexion().promise().query(sql_request).then((rows) => {
                 console.log(rows);
             }).catch((err) => {
                 error(`Error executing query: ${err}`);
@@ -362,11 +386,11 @@ class Model {
      * @throws {Error} If there is an error executing the SQL_request query.
      */
     async generate_uuid(var_uuid = "uuid") {
-        const uuid = (await connexion.promise().query("SELECT UUID();"))[0][0]["UUID()"];
+        const uuid = (await getConnexion().promise().query("SELECT UUID();"))[0][0]["UUID()"];
         const sql_request = `SELECT COUNT(*) FROM ${this.name} WHERE ${var_uuid}="${uuid}";`;
 
         return new Promise((resolve, reject) => {
-            connexion.promise().query(sql_request).then((rows) => {
+            getConnexion().promise().query(sql_request).then((rows) => {
                 if (rows[0][0]['COUNT(*)'] == 0) return resolve(uuid);
                 resolve(null);
             }).catch((err) => {

package/src/utils/reservedKeywords.js

@@ -1,24 +0,0 @@
-const reservedKeywords = ['ADD', 'ALL', 'ALTER', 'AND', 'AS', 'ASC', 'BETWEEN', 'BY', 'CASE', 'CHECK', 'COLUMN', 'CONSTRAINT', 'CREATE', 'CURRENT_DATE', 'CURRENT_TIME', 'CURRENT_TIMESTAMP', 'DEFAULT', 'DELETE', 'DESC', 'DISTINCT', 'DROP', 'ELSE', 'END', 'ESCAPE', 'EXCEPT', 'EXISTS', 'FOR', 'FOREIGN', 'FROM', 'FULL', 'GROUP', 'HAVING', 'IN', 'INNER', 'INSERT', 'INTERSECT', 'INTO', 'IS', 'JOIN', 'LEFT', 'LIKE', 'LIMIT', 'NOT', 'NULL', 'ON', 'OR', 'ORDER', 'OUTER', 'PRIMARY', 'REFERENCES', 'RIGHT', 'SELECT', 'SET', 'SOME', 'TABLE', 'THEN', 'UNION', 'UNIQUE', 'UPDATE', 'VALUES', 'WHEN', 'WHERE'];
-
-/**
- * Checks if a table name is a reserved keyword.
- * 
- * @param {string} tableName Le nom de la table à vérifier.
- * @returns {boolean} `true` si le nom de la table est un mot-clé réservé, sinon `false`.
- * 
- * @example
- * const isReserved = ifReservedKeywords('SELECT');
- * console.log(isReserved); // true
- *
- * @example
- * const isReserved = ifReservedKeywords('myTable');
- * console.log(isReserved); // false
- */
-function ifReservedKeywords(tableName) {
-    if (reservedKeywords.includes(tableName.toUpperCase())) {
-        return true;
-    }
-    return false;
-}
-
-module.exports = { ifReservedKeywords }