db-crud-api 0.3.6 → 0.3.10

package/lib/mssql.js

@@ -3,7 +3,8 @@
 import sql from 'mssql';
 
 // Regex
-const _match_LIMIT = /(?:^|\W)(LIMIT )/ig
+const _match_LIMIT_n = /\bLIMIT\b +\d+/ig
+const _match_LIMIT = /\bLIMIT\b/ig
 
 const pools = {};
 
@@ -88,6 +89,8 @@ export async function query(connection, dbOpes) {
     if (Array.isArray(dbOpes)) dbOpes.forEach((dbOpe, index) => { sqlString += ToSql(dbOpe, sqlRequest); });
     else sqlString += ToSql(dbOpes, sqlRequest);
 
+    sqlString = normalizeSpecialName(sqlString);
+
     // Run query
     const sqlresult = await sqlRequest.query(sqlString);
 
@@ -97,21 +100,35 @@ export async function query(connection, dbOpes) {
     else return sqlresult.recordsets;
 }
 
-// Normalize field name
-//function toFieldName(s) {
-//    if ( s.trimStart().charAt(0) === '[' ) return s;
-//    else return `\[${s}\]`;
-//}
+// Normalize SpecialName
+function normalizeSpecialName(name) {
+    let _odd = false;  // interpreted as 0
+    return name.replaceAll('\`', (_m) => {
+        _odd = !_odd; 
+        if (_odd) return '[';
+        else return ']';
+    });
+}
 
 // Compose fully qualified table name
 function fullyQualifiedTableName(tSchema) {
     return (tSchema.database.realName + '.' + (tSchema.table.schema ?? '') + '.' + tSchema.table.realName);
 }
 
+function containLIMIT(s) {
+    const _return = s?.match(_match_LIMIT_n);
+    if (_return) return _return[0];
+    else return undefined;
+};
+
 function replaceLIMITToTOP(s) {
-    return s.replace(_match_LIMIT,' TOP ')
+    const _replace = containLIMIT(s);
+    if (_replace) { return s.replace(_match_LIMIT_n, _replace.replace(_match_LIMIT, 'TOP')); }
+    else return s;
 }
 
+
+
 // Parse oprations object to sql string
 function ToSql(dbOpe, sqlRequest) {
     if (dbOpe.get) return getToSql(dbOpe, sqlRequest);
@@ -145,12 +162,12 @@ function getToSql(dbOpe, sqlRequest) {
 
     let result = 'select'
 
-    if ((dbOpe.get.options) && (Object.keys(dbOpe.get.options).length > 0)) {
+    if (dbOpe.get.options && dbOpe.get.options.length > 0) {
         if (Array.isArray(dbOpe.get.options)) { for (const s of dbOpe.get.options) { result += ' ' + replaceLIMITToTOP(s); }}
         else result += ' ' + replaceLIMITToTOP(dbOpe.get.options);
     }
 
-    if ((dbOpe.get.fields) && (Object.keys(dbOpe.get.fields).length > 0)) {
+    if (dbOpe.get.fields && dbOpe.get.fields.length > 0) {
         if (Array.isArray(dbOpe.get.fields)) result += ' '  + dbOpe.get.fields.join(',') 
         else result += ' ' + dbOpe.get.fields;
     }
@@ -158,22 +175,22 @@ function getToSql(dbOpe, sqlRequest) {
 
     result += ' from ' + fullyQualifiedTableName(dbOpe.get.schema);
 
-    if ((dbOpe.get.filters) && (Object.keys(dbOpe.get.filters).length > 0)) {
+    if (dbOpe.get.filters && dbOpe.get.filters.length > 0) {
         if (Array.isArray(dbOpe.get.filters)) result += ' where ' + dbOpe.get.filters.join(' ');
         else result += ' where ' + dbOpe.get.filters;
     }
 
-    if ((dbOpe.get.groups) && (Object.keys(dbOpe.get.groups).length > 0)) {
+    if (dbOpe.get.groups && dbOpe.get.groups.length > 0) {
         if (Array.isArray(dbOpe.get.groups)) result += ' group by ' + dbOpe.get.groups.join(', ');
         else result += ' group by ' + dbOpe.get.groups;
     }
 
-    if ((dbOpe.get.groupsFilters) && (Object.keys(dbOpe.get.groupsFilters).length > 0)) {
+    if (dbOpe.get.groupsFilters && dbOpe.get.groupsFilters.length > 0) {
         if (Array.isArray(dbOpe.get.groupsFilters)) result += ' having ' + dbOpe.get.groupsFilters.join(' ');
         else result += ' having ' + dbOpe.get.groupsFilters;
     }
 
-    if ((dbOpe.get.orderBy) && (Object.keys(dbOpe.get.orderBy).length > 0)) {
+    if (dbOpe.get.orderBy && dbOpe.get.orderBy.length > 0) {
         if (Array.isArray(dbOpe.get.orderBy)) result += ' order by ' + dbOpe.get.orderBy.join(', ');
         else result += ' order by ' + dbOpe.get.orderBy;
     }
@@ -189,10 +206,12 @@ function getToSql(dbOpe, sqlRequest) {
 function patchToSql(dbOpe, sqlRequest) {
     let result = 'update ' + fullyQualifiedTableName(dbOpe.patch.schema);
 
-    if (dbOpe.patch.sets) { result += ' set ' + Object.entries(dbOpe.patch.sets).map(e => { return e[0] + '=' + stringifyValue(e[0], e[1], dbOpe.patch.schema) }).join(', '); }
+    if (dbOpe.patch.sets) { 
+        result += ' set ' + Object.entries(dbOpe.patch.sets).map(e => { return e[0] + '=' + stringifyValue(e[0], e[1], dbOpe.patch.schema) }).join(', '); 
+    }
     else { throw new Error('sets is missing.'); }
 
-    if ((dbOpe.patch.filters) && (Object.keys(dbOpe.patch.filters).length > 0)) {
+    if (dbOpe.patch.filters && dbOpe.patch.filters.length > 0) {
         if (Array.isArray(dbOpe.patch.filters)) result += ' where ' + dbOpe.patch.filters.join(' ');
         else result += ' where ' + dbOpe.patch.filters;
     }
@@ -231,7 +250,7 @@ function putToSql(dbOpe, sqlRequest) {
 function deleteToSql(dbOpe, sqlRequest) {
     let result = 'delete from ' + fullyQualifiedTableName(dbOpe.delete.schema);
 
-    if ((dbOpe.delete.filters) && (Object.keys(dbOpe.delete.filters).length > 0)) {
+    if (dbOpe.delete.filters && dbOpe.delete.filters.length > 0) {
         if (Array.isArray(dbOpe.delete.filters)) result += ' where ' + dbOpe.delete.filters.join(' ');
         else result += ' where ' + dbOpe.delete.filters;
     }

package/lib/mysql.js

@@ -3,8 +3,9 @@
 import sql from 'mysql2/promise';
 
 // Regex
-const _match_LIMIT = /(?:^|\W)(LIMIT )/ig
-const _match_TOP = /(?:^|\W)(TOP )/ig
+const _match_LIMIT_n = /\bLIMIT\b +\d+/ig
+const _match_TOP_n = /\bTOP\b +\d+/ig
+const _match_TOP = /\bTOP\b/ig
 
 const pools = {};
 
@@ -86,6 +87,8 @@ export async function query(connection, dbOpes) {
     if (Array.isArray(dbOpes)) dbOpes.forEach((dbOpe, index) => { sqlString += ToSql(dbOpe, pool); });
     else sqlString += ToSql(dbOpes, pool);
 
+    sqlString = normalizeSpecialName(sqlString);
+
     // Run query
     let sqlresult = undefined;
     let sqlconn = undefined;
@@ -102,11 +105,10 @@ export async function query(connection, dbOpes) {
     else return sqlresult[0];
 }
 
-// Normalize field name
-//function toFieldName(s) {
-//    if ( s.trimStart().charAt(0) === '\`' ) return s;
-//    else return `\`${s}\``;
-//}
+// Normalize SpecialName
+function normalizeSpecialName(name) {
+    return name.replaceAll('[', '\`').replaceAll(']', '\`');
+}
 
 // Compose fully qualified table name
 function fullyQualifiedTableName(tSchema) {
@@ -115,15 +117,21 @@ function fullyQualifiedTableName(tSchema) {
 
 
 function containLIMIT(s) {
-    return s.match(_match_LIMIT);
+    const _return = s?.match(_match_LIMIT_n);
+    if (_return) return _return[0];
+    else return undefined;
 };
 
 function containTOP(s) {
-    return s.match(_match_TOP);
+    const _return = s?.match(_match_TOP_n);
+    if (_return) return _return[0];
+    else return undefined;
 };
 
 function replaceTOPToLIMIT(s) {
-    return s.replace(_match_TOP, ' LIMIT ')
+    const _replace = containTOP(s);
+    if (_replace) { return s.replace(_match_TOP_n, _replace.replace(_match_TOP, 'LIMIT')); }
+    else return s;
 }
 
 // Parse oprations object to sql string
@@ -160,14 +168,14 @@ function getToSql(dbOpe, sqlRequest) {
     let result = 'select'
 
     // omit 'limit' or 'top'
-    if ((dbOpe.get.options) && (Object.keys(dbOpe.get.options).length > 0)) {
+    if (dbOpe.get.options && dbOpe.get.options.length > 0) {
         if (Array.isArray(dbOpe.get.options)) {
             for (const s of dbOpe.get.options) { if (!containLIMIT(s) && !containTOP(s)) result += ' ' + s; }
         }
         else if (!containLIMIT(dbOpe.get.options) && !containTOP(dbOpe.get.options)) result += ' ' + dbOpe.get.options;
     }
 
-    if ((dbOpe.get.fields) && (Object.keys(dbOpe.get.fields).length > 0)) {
+    if (dbOpe.get.fields && dbOpe.get.fields.length > 0) {
         if (Array.isArray(dbOpe.get.fields)) result += ' ' + dbOpe.get.fields.join(',')
         else result += ' ' + dbOpe.get.fields;
     }
@@ -175,28 +183,28 @@ function getToSql(dbOpe, sqlRequest) {
 
     result += ' from ' + fullyQualifiedTableName(dbOpe.get.schema);
 
-    if ((dbOpe.get.filters) && (Object.keys(dbOpe.get.filters).length > 0)) {
+    if (dbOpe.get.filters && dbOpe.get.filters.length > 0) {
         if (Array.isArray(dbOpe.get.filters)) result += ' where ' + dbOpe.get.filters.join(' ');
         else result += ' where ' + dbOpe.get.filters;
     }
 
-    if ((dbOpe.get.groups) && (Object.keys(dbOpe.get.groups).length > 0)) {
+    if (dbOpe.get.groups && dbOpe.get.groups.length > 0) {
         if (Array.isArray(dbOpe.get.groups)) result += ' group by ' + dbOpe.get.groups.join(', ');
         else result += ' group by ' + dbOpe.get.groups;
     }
 
-    if ((dbOpe.get.groupsFilters) && (Object.keys(dbOpe.get.groupsFilters).length > 0)) {
+    if (dbOpe.get.groupsFilters && dbOpe.get.groupsFilters.length > 0) {
         if (Array.isArray(dbOpe.get.groupsFilters)) result += ' having ' + dbOpe.get.groupsFilters.join(' ');
         else result += ' having ' + dbOpe.get.groupsFilters;
     }
 
-    if ((dbOpe.get.orderBy) && (Object.keys(dbOpe.get.orderBy).length > 0)) {
+    if (dbOpe.get.orderBy && dbOpe.get.orderBy.length > 0) {
         if (Array.isArray(dbOpe.get.orderBy)) result += ' order by ' + dbOpe.get.orderBy.join(', ');
         else result += ' order by ' + dbOpe.get.orderBy;
     }
 
     // search if 'limit' or 'top'
-    if ((dbOpe.get.options) && (Object.keys(dbOpe.get.options).length > 0)) {
+    if (dbOpe.get.options && dbOpe.get.options.length > 0) {
         if (Array.isArray(dbOpe.get.options)) {
             for (const s of dbOpe.get.options) { if (containLIMIT(s) || containTOP(s)) result += ' ' + replaceTOPToLIMIT(s); }
         }
@@ -217,7 +225,7 @@ function patchToSql(dbOpe, sqlRequest) {
     if (dbOpe.patch.sets) { result += ' set ' + Object.entries(dbOpe.patch.sets).map(e => { return e[0] + '=' + stringifyValue(e[0], e[1], dbOpe.patch.schema) }).join(', '); }
     else { throw new Error('sets is missing.'); }
 
-    if ((dbOpe.patch.filters) && (Object.keys(dbOpe.patch.filters).length > 0)) {
+    if (dbOpe.patch.filters && dbOpe.patch.filters.length > 0) {
         if (Array.isArray(dbOpe.patch.filters)) result += ' where ' + dbOpe.patch.filters.join(' ');
         else result += ' where ' + dbOpe.patch.filters;
     }
@@ -256,7 +264,7 @@ function putToSql(dbOpe, sqlRequest) {
 function deleteToSql(dbOpe, sqlRequest) {
     let result = 'delete from ' + fullyQualifiedTableName(dbOpe.delete.schema);
 
-    if ((dbOpe.delete.filters) && (Object.keys(dbOpe.delete.filters).length > 0)) {
+    if (dbOpe.delete.filters && dbOpe.delete.filters.length > 0) {
         if (Array.isArray(dbOpe.delete.filters)) result += ' where ' + dbOpe.delete.filters.join(' ');
         else result += ' where ' + dbOpe.delete.filters;
     }

package/package.json

@@ -1,22 +1,22 @@
-{
-  "name": "db-crud-api",
-  "version": "0.3.6",
-  "type": "module",
-  "description": "CRUD api for database tables",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "FF",
-  "license": "MIT",
-  "dependencies": {
-    "mssql": "^11.0.1",
-    "mysql2": "^3.12.0",
-    "uuid": "^11.0.3"
-  },
-  "keywords": [
-    "db",
-    "crud",
-    "api"
-  ]
-}
+{
+  "name": "db-crud-api",
+  "version": "0.3.10",
+  "type": "module",
+  "description": "CRUD api for database tables",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "FF",
+  "license": "MIT",
+  "dependencies": {
+    "mssql": "^11.0.1",
+    "mysql2": "^3.12.0",
+    "uuid": "^11.0.3"
+  },
+  "keywords": [
+    "db",
+    "crud",
+    "api"
+  ]
+}