@mlagie/sql-connector 1.1.1-beta → 1.1.3-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mlagie/sql-connector",
-  "version": "1.1.1-beta",
+  "version": "1.1.3-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,4 +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") {
@@ -81,7 +83,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);
@@ -160,7 +162,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}`);
@@ -198,7 +200,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}`);
@@ -217,7 +219,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));
@@ -254,7 +256,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));
@@ -282,7 +284,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));
@@ -307,7 +309,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);
@@ -332,7 +334,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}`);
@@ -361,11 +363,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) => {