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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/src/models/Model.js +11 -10
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mlagie/sql-connector",
3
- "version": "1.1.2-beta",
3
+ "version": "1.1.3-beta",
4
4
  "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.",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -1,5 +1,6 @@
1
1
  const { logs, error, sql } = require("@mlagie/logger");
2
2
  const { sqlTypeMap } = require("../utils/sqlTypeMap");
3
+ const { getConnexion } = require("../db/connexion");
3
4
 
4
5
  function getFieldType(field) {
5
6
  if (typeof field === "object") {
@@ -82,7 +83,7 @@ class Model {
82
83
  for (const table of sorted) {
83
84
  const model = modelMap[table];
84
85
  await new Promise((resolve, reject) => {
85
- connexion.query(model.generateCreateTableStatement(model.schema.schemaDict), (err) => {
86
+ getConnexion().query(model.generateCreateTableStatement(model.schema.schemaDict), (err) => {
86
87
  if (err) {
87
88
  error(`Error creating table: ${err} with table name: ${model.name}`);
88
89
  return reject(err);
@@ -161,7 +162,7 @@ class Model {
161
162
  const sql_request = `INSERT INTO ${this.name} (${keys.join(', ')}) VALUES (${generateValueSQL(Object.values(data))})`;
162
163
  sql(this.name, sql_request);
163
164
  try {
164
- const result = await connexion.promise().query(sql_request);
165
+ const result = await getConnexion().promise().query(sql_request);
165
166
  return result;
166
167
  } catch (err) {
167
168
  error(`Error inserting data into ${this.name}: ${err}`);
@@ -199,7 +200,7 @@ class Model {
199
200
  }
200
201
 
201
202
  return new Promise((resolve, reject) => {
202
- connexion.promise().query(sql_request).then(([rows]) => {
203
+ getConnexion().promise().query(sql_request).then(([rows]) => {
203
204
  resolve(rows);
204
205
  }).catch((err) => {
205
206
  error(`Error executing findAll: ${err}`);
@@ -218,7 +219,7 @@ class Model {
218
219
  const sql_request = `SELECT ${fields.join(", ")} FROM ${this.name} WHERE ${generateCondition(formatObject(filter))}`;
219
220
 
220
221
  return new Promise((resolve, reject) => {
221
- connexion.promise().query(sql_request).then((rows) => {
222
+ getConnexion().promise().query(sql_request).then((rows) => {
222
223
  if (rows.length == 0) return resolve(0);
223
224
 
224
225
  resolve(new ModelInstance(this.name, Object.values(rows[0])[0], this.schema));
@@ -255,7 +256,7 @@ class Model {
255
256
  const sql_request = `SELECT ${fields.join(", ")} FROM ${this.name} WHERE ${generateCondition(formatObject(filter))}`;
256
257
 
257
258
  return new Promise((resolve, reject) => {
258
- connexion.promise().query(sql_request).then((rows) => {
259
+ getConnexion().promise().query(sql_request).then((rows) => {
259
260
  if (rows.length == 0) return resolve(0);
260
261
 
261
262
  resolve(new ModelInstance(this.name, Object.values(rows[0]), this.schema));
@@ -283,7 +284,7 @@ class Model {
283
284
  */
284
285
  async customRequest(custom) {
285
286
  return new Promise(async (resolve, reject) => {
286
- await connexion.promise().query(custom).then((rows) => {
287
+ await getConnexion().promise().query(custom).then((rows) => {
287
288
  if (rows.length == 0) return resolve(0);
288
289
 
289
290
  resolve(new ModelInstance(this.name, Object.values(rows[0]), this.schema));
@@ -308,7 +309,7 @@ class Model {
308
309
  const sql_request = `DELETE FROM ${this.name} WHERE ${generateCondition(formatObject(filter))}`;
309
310
 
310
311
  return new Promise((resolve, reject) => {
311
- connexion.promise().query(sql_request).then((rows) => {
312
+ getConnexion().promise().query(sql_request).then((rows) => {
312
313
  if (rows[1] != undefined) return resolve(0);
313
314
 
314
315
  return resolve(1);
@@ -333,7 +334,7 @@ class Model {
333
334
  const sql_request = `DROP TABLE IF EXISTS ${this.name};`;
334
335
 
335
336
  return new Promise((resolve, reject) => {
336
- connexion.promise().query(sql_request).then((rows) => {
337
+ getConnexion().promise().query(sql_request).then((rows) => {
337
338
  console.log(rows);
338
339
  }).catch((err) => {
339
340
  error(`Error executing query: ${err}`);
@@ -362,11 +363,11 @@ class Model {
362
363
  * @throws {Error} If there is an error executing the SQL_request query.
363
364
  */
364
365
  async generate_uuid(var_uuid = "uuid") {
365
- const uuid = (await connexion.promise().query("SELECT UUID();"))[0][0]["UUID()"];
366
+ const uuid = (await getConnexion().promise().query("SELECT UUID();"))[0][0]["UUID()"];
366
367
  const sql_request = `SELECT COUNT(*) FROM ${this.name} WHERE ${var_uuid}="${uuid}";`;
367
368
 
368
369
  return new Promise((resolve, reject) => {
369
- connexion.promise().query(sql_request).then((rows) => {
370
+ getConnexion().promise().query(sql_request).then((rows) => {
370
371
  if (rows[0][0]['COUNT(*)'] == 0) return resolve(uuid);
371
372
  resolve(null);
372
373
  }).catch((err) => {