@mlagie/sql-connector 1.4.5 → 1.4.6

package/README.md

@@ -1,6 +1,6 @@
 # sql-connector
-<img src="https://api.visitorbadge.io/api/VisitorHit?user=lagie-marin&repo=sql-connector-badge&countColor=%237B1E7A" height="20px"/> ![GitHub package.json version](https://img.shields.io/github/package-json/v/lagie-marin/sql-connector?color=#008000) ![NPM Downloads](https://img.shields.io/npm/d18m/%40mlagie%2Fsql-connector?color=#008000) ![NPM Downloads](https://img.shields.io/npm/dw/%40mlagie%2Fsql-connector?color=#008000) ![GitHub followers](https://img.shields.io/github/followers/lagie-marin?style=plastic&color=color%3D%23008000) ![GitHub repo size](https://img.shields.io/github/repo-size/lagie-marin/sql-connector?color=%green)
- ![GitHub last commit](https://img.shields.io/github/last-commit/lagie-marin/sql-connector) ![GitHub forks](https://img.shields.io/github/forks/lagie-marin/sql-connector?style=plastic&color=%green)
+![GitHub package.json version](https://img.shields.io/github/package-json/v/lagie-marin/sql-connector?color=#008000) ![NPM Downloads](https://img.shields.io/npm/d18m/%40mlagie%2Fsql-connector?color=#008000) ![NPM Downloads](https://img.shields.io/npm/dw/%40mlagie%2Fsql-connector?color=#008000) ![GitHub followers](https://img.shields.io/github/followers/lagie-marin?style=plastic&color=color%3D%23008000) ![GitHub repo size](https://img.shields.io/github/repo-size/lagie-marin/sql-connector?color=%green)
+ ![GitHub last commit](https://img.shields.io/github/last-commit/lagie-marin/sql-connector)
 
 # Documentation du module `sql-connector`
 
@@ -9,7 +9,7 @@ Le module `sql-connector` permet de gérer les connexions à une base de donnée
 ## Importation du module
 
 ```javascript
-const { Schema, connect, logout, Model, client, sqlType } = require('sql-connector');
+const { Schema, connect, logout, Model, client, sqlTypeMap } = require('sql-connector');
 ```
 
 ### Fonctions
@@ -244,7 +244,7 @@ await userInstance.updateOne({ mdp: 'newpassword' });
 await userInstance.delete({ token: 'abc123' });
 ```
 # Types SQL
-Le module fournit également une map des types SQL courants via `sqlType`.
+Le module fournit une map des types SQL courants via `sqlTypeMap`.
 ## Type
 * String
 * Number
@@ -258,7 +258,6 @@ Le module fournit également une map des types SQL courants via `sqlType`.
 * Timestamp
 * ### Exemple
 ```javascript
-console.log(sqlType.String); // "String"
 console.log(sqlTypeMap.String); // "VARCHAR"
 ```
 ## Conclusion

package/index.d.ts

@@ -248,4 +248,4 @@ export class ModelInstance {
 }
 
 export const client: Record<string, any>;
-export const sqlType: Record<string, SqlType>;
+export const sqlTypeMap: Record<SqlType, string>;

package/index.js

@@ -2,9 +2,8 @@ const { Model } = require("./src/models/Model");
 const { ModelInstance } = require("./src/models/ModelInstance");
 const { connect, logout } = require("./src/db/connect");
 const {Schema} = require("./src/models/Schema");
-const { sqlType } = require("./src/utils/sqlType");
 const { sqlTypeMap } = require("./src/utils/sqlTypeMap");
 
 let client = {};
 
-module.exports = { client, connect, logout, Schema, Model, ModelInstance, sqlType, sqlTypeMap }
+module.exports = { client, connect, logout, Schema, Model, ModelInstance, sqlTypeMap }

package/package.json

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

@@ -19,6 +19,70 @@ function getFieldType(field) {
     }
 }
 
+function isDateLikeType(fieldType) {
+    const normalizedType = String(fieldType ?? "").toLowerCase();
+    return ["date", "datetime", "timestamp", "now"].includes(normalizedType);
+}
+
+function isSqlTemporalDefault(defaultValue) {
+    if (typeof defaultValue !== "string") return false;
+
+    const normalizedValue = defaultValue.trim().toUpperCase();
+    return ["CURRENT_TIMESTAMP", "CURRENT_TIMESTAMP()", "NOW()"].includes(normalizedValue);
+}
+
+function formatDefaultSql(defaultValue, fieldType) {
+    if (defaultValue === undefined) return null;
+    if (defaultValue === null) return "DEFAULT NULL";
+
+    if (typeof defaultValue === "function") {
+        if (isDateLikeType(fieldType)) return "DEFAULT CURRENT_TIMESTAMP";
+        return formatDefaultSql(defaultValue(), fieldType);
+    }
+
+    if (defaultValue instanceof Date) {
+        const formattedDate = defaultValue.toISOString().slice(0, 19).replace("T", " ");
+        return `DEFAULT "${formattedDate}"`;
+    }
+
+    if (isSqlTemporalDefault(defaultValue)) return "DEFAULT CURRENT_TIMESTAMP";
+    if (typeof defaultValue === "string") return `DEFAULT "${defaultValue.replace(/"/g, '\\"')}"`;
+    if (typeof defaultValue === "number" || typeof defaultValue === "bigint") return `DEFAULT ${defaultValue}`;
+    if (typeof defaultValue === "boolean") return `DEFAULT ${defaultValue ? 1 : 0}`;
+    if (typeof defaultValue === "object") return `DEFAULT "${JSON.stringify(defaultValue).replace(/"/g, '\\"')}"`;
+
+    return `DEFAULT "${String(defaultValue).replace(/"/g, '\\"')}"`;
+}
+
+function normalizeDefaultValue(defaultValue, fieldType) {
+    if (defaultValue === undefined) return null;
+    if (defaultValue === null) return "null";
+
+    if (typeof defaultValue === "function") {
+        if (isDateLikeType(fieldType)) return "current_timestamp";
+        return normalizeDefaultValue(defaultValue(), fieldType);
+    }
+
+    if (defaultValue instanceof Date) {
+        return defaultValue.toISOString().slice(0, 19).replace("T", " ");
+    }
+
+    if (isSqlTemporalDefault(defaultValue)) return "current_timestamp";
+    if (typeof defaultValue === "boolean") return defaultValue ? "1" : "0";
+    if (typeof defaultValue === "object") return JSON.stringify(defaultValue);
+
+    return String(defaultValue);
+}
+
+function normalizeDbDefaultValue(defaultValue) {
+    if (defaultValue === null || defaultValue === undefined) return null;
+
+    const normalizedValue = String(defaultValue).trim();
+    if (/^current_timestamp(\(\))?$/i.test(normalizedValue)) return "current_timestamp";
+    if (/^now\(\)$/i.test(normalizedValue)) return "current_timestamp";
+    return normalizedValue;
+}
+
 function generateValueSQL(value) {
     return value.map(item => {
         if (item === null) return 'NULL';
@@ -67,8 +131,8 @@ function getColumnDefinition(fieldName, field) {
         colDef = `${sqlTypeMap[fieldType]}${(sqlTypeMap[fieldType] == "VARCHAR" || sqlTypeMap[fieldType] == "INT") ? `(${field.length > 0 ? field.length : 255})` : ""}`;
     }
     if (field.required) colDef += ' NOT NULL';
-    if (field.default !== undefined && field.default != null) colDef += ` DEFAULT "${field.default}"`;
-    if (field.default === null) colDef += ` DEFAULT NULL`;
+    const defaultDefinition = formatDefaultSql(field.default, fieldType);
+    if (defaultDefinition !== null) colDef += ` ${defaultDefinition}`;
     if (field.unique) colDef += ' UNIQUE';
     if (field.auto_increment) colDef += ' AUTO_INCREMENT';
     if (field.primary_key) colDef += ' PRIMARY KEY';
@@ -294,8 +358,8 @@ class Model {
                         }
 
                         // --- Vérification DEFAULT VALUE ---
-                        const expectedDefault = field.default !== undefined ? field.default : null;
-                        const currentDefault = currentCol.Default;
+                        const expectedDefault = normalizeDefaultValue(field.default, fieldType);
+                        const currentDefault = normalizeDbDefaultValue(currentCol.Default);
 
                         // Gestion spéciale pour les valeurs par défaut
                         if (expectedDefault !== null && currentDefault === null) {

package/src/utils/sqlTypeMap.js

@@ -10,6 +10,7 @@ const sqlTypeMap = {
     Text: 'TEXT',
     DateTime: "DATETIME",
     Timestamp: "TIMESTAMP",
+    CurrentTimestamp: "CURRENT_TIMESTAMP"
 };
 
 module.exports = {sqlTypeMap}

package/src/utils/sqlType.js

@@ -1,15 +0,0 @@
-const sqlType = {
-    String: "String",
-    Number: "Number",
-    Boolean: "Boolean",
-    Date: "Date",
-    Object: "Object",
-    Array: "Array",
-    Now: "Now",
-    Float: "Float",
-    Text: "Text",
-    DateTime: "DateTime",
-    Timestamp: "Timestamp",
-};
-
-module.exports = { sqlType }