@dwtechs/antity-pgsql 0.2.0 → 0.3.0

package/dist/antity-pgsql.js

@@ -147,8 +147,22 @@ function deleteIdleProperties(res) {
     res._prebuiltEmptyResultObject = undefined;
 }
 
+const reserved = [
+    'all', 'analyse', 'analyze', 'and', 'any', 'array', 'as', 'asc', 'asymmetric',
+    'authorization', 'between', 'binary', 'both', 'case', 'cast', 'check', 'collate',
+    'column', 'constraint', 'create', 'cross', 'current_catalog', 'current_date',
+    'current_role', 'current_schema', 'current_time', 'current_timestamp', 'current_user',
+    'default', 'deferrable', 'desc', 'distinct', 'do', 'else', 'end', 'except', 'false',
+    'fetch', 'for', 'foreign', 'from', 'full', 'grant', 'group', 'having', 'ilike', 'in',
+    'initially', 'inner', 'intersect', 'into', 'is', 'isnull', 'join', 'lateral', 'leading',
+    'left', 'like', 'limit', 'localtime', 'localtimestamp', 'natural', 'not', 'notnull',
+    'null', 'offset', 'on', 'only', 'or', 'order', 'outer', 'overlaps', 'placing', 'primary',
+    'references', 'returning', 'right', 'select', 'session_user', 'similar', 'some', 'symmetric',
+    'table', 'tablesample', 'then', 'to', 'trailing', 'true', 'union', 'unique', 'user', 'using',
+    'variadic', 'verbose', 'when', 'where', 'window', 'with'
+];
 function quoteIfUppercase(word) {
-    if (/[A-Z]/.test(word))
+    if (/[A-Z]/.test(word) || reserved.includes(word.toLowerCase()))
         return `"${word}"`;
     return word;
 }
@@ -169,7 +183,7 @@ class Select {
     query(table, paginate) {
         const p = paginate ? this._count : '';
         const c = this._cols ? this._cols : '*';
-        return `SELECT ${c}${p} FROM "${table}"`;
+        return `SELECT ${c}${p} FROM ${quoteIfUppercase(table)}`;
     }
     execute(query, args, client) {
         return execute$1(query, args, client)
@@ -202,7 +216,7 @@ class Insert {
         this._nbProps++;
     }
     query(table, rows, consumerId, consumerName, rtn = "") {
-        let query = `INSERT INTO "${table}" (${this._cols}) VALUES `;
+        let query = `INSERT INTO ${quoteIfUppercase(table)} (${this._cols}) VALUES `;
         const args = [];
         let i = 0;
         for (const row of rows) {
@@ -247,7 +261,7 @@ class Update {
         rows = this.addConsumer(rows, consumerId, consumerName);
         const l = rows.length;
         const args = rows.map(row => row.id);
-        let query = `UPDATE "${table}" SET `;
+        let query = `UPDATE "${quoteIfUppercase(table)}" SET `;
         let i = args.length + 1;
         for (const p of this._props) {
             if (rows[0][p] === undefined)
@@ -284,7 +298,7 @@ var __awaiter$1 = (undefined && undefined.__awaiter) || function (thisArg, _argu
     });
 };
 function query(table) {
-    return `DELETE FROM "${table}" WHERE "archivedAt" < $1`;
+    return `DELETE FROM ${quoteIfUppercase(table)} WHERE "archivedAt" < $1`;
 }
 function execute(date, query, client) {
     return __awaiter$1(this, void 0, void 0, function* () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dwtechs/antity-pgsql",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Open source library for easy entity management",
   "keywords": [
     "entities"