ismx-nexo-node-app 0.4.153 → 0.4.155

package/dist/js/repository/RepositoryDatabasePostgres.js

@@ -225,9 +225,12 @@ class RepositoryDatabasePostgres extends RepositoryDatabase_1.default {
         return __awaiter(this, arguments, void 0, function* (tableName, select, filters = {}) {
             if (!this.tables[tableName])
                 throw new Error(`table ${tableName} does not exist`);
-            let schema = this.tables[tableName][0].schema;
+            let [table, schema, column] = [this.tables[tableName], this.tables[tableName][0].schema, PostgresUtils_1.default.camelToSnake(select)];
+            if (PostgresUtils_1.default.isReservedWord(column))
+                column = `"${column}"`;
+            if (!PostgresUtils_1.default.columns(table).includes(column))
+                throw new Error(`column ${column} does not exist in table ${tableName}`);
             let { where, values } = this.toWhere(tableName, filters);
-            let column = PostgresUtils_1.default.snakeToCamel(select);
             let query = `SELECT json_agg(u.${column}) as list FROM ${schema}.${tableName} u WHERE ${where}`;
             return this.query(query, values).then((result) => { var _a, _b; return (_b = (_a = result[0]) === null || _a === void 0 ? void 0 : _a.list) !== null && _b !== void 0 ? _b : []; });
         });
@@ -236,9 +239,12 @@ class RepositoryDatabasePostgres extends RepositoryDatabase_1.default {
         return __awaiter(this, arguments, void 0, function* (tableName, select, filters = {}) {
             if (!this.tables[tableName])
                 throw new Error(`table ${tableName} does not exist`);
-            let schema = this.tables[tableName][0].schema;
+            let [table, schema, column] = [this.tables[tableName], this.tables[tableName][0].schema, PostgresUtils_1.default.camelToSnake(select)];
+            if (PostgresUtils_1.default.isReservedWord(column))
+                column = `"${column}"`;
+            if (!PostgresUtils_1.default.columns(table).includes(column))
+                throw new Error(`column ${column} does not exist in table ${tableName}`);
             let { where, values } = this.toWhere(tableName, filters);
-            let column = PostgresUtils_1.default.snakeToCamel(select);
             let query = `
             SELECT json_object_agg(t.${column}, NULL) as list
             FROM ( SELECT DISTINCT u.${column} FROM ${schema}.${tableName} u WHERE ${where} ) t`;

package/dist/types/repository/RepositoryDatabasePostgres.d.ts

@@ -56,7 +56,9 @@ export default class RepositoryDatabasePostgres extends RepositoryDatabase {
     select(tableName: string, select: string, filters?: {
         [key: string]: Valuable | Array<Valuable>;
     }): Promise<string[]>;
-    selectHash<T>(tableName: string, select: string, filters?: Partial<T>): Promise<Hash<Primitive>>;
+    selectHash<T>(tableName: string, select: string, filters?: {
+        [key: string]: Valuable | Array<Valuable>;
+    }): Promise<Hash<Primitive>>;
     run<T>(name: string, params?: Valuable[], filters?: Partial<T>): Promise<T[]>;
     runTable<T>(name: string, params?: Valuable[], filters?: Partial<T>): Promise<T[]>;
     runValue<T>(name: string, params?: Valuable[], filters?: Partial<T>): Promise<Valuable | undefined>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ismx-nexo-node-app",
-  "version": "0.4.153",
+  "version": "0.4.155",
   "description": "",
   "scripts": {
     "build": "rm -rf ./dist && npx tsc",

package/src/main/node/repository/RepositoryDatabasePostgres.ts

@@ -197,19 +197,25 @@ export default class RepositoryDatabasePostgres extends RepositoryDatabase
     async select(tableName: string, select: string, filters: { [key: string]: Valuable | Array<Valuable> }={}): Promise<string[]>
     {
         if (!this.tables[tableName]) throw new Error(`table ${tableName} does not exist`);
-        let schema = this.tables[tableName][0].schema;
+        let [ table, schema, column ] = [ this.tables[tableName], this.tables[tableName][0].schema, PostgresUtils.camelToSnake(select) ];
+        if (PostgresUtils.isReservedWord(column)) column = `"${column}"`;
+
+        if (!PostgresUtils.columns(table).includes(column)) throw new Error(`column ${column} does not exist in table ${tableName}`);
         let { where, values } = this.toWhere(tableName, filters);
-        let column = PostgresUtils.snakeToCamel(select);
+
         let query = `SELECT json_agg(u.${column}) as list FROM ${schema}.${tableName} u WHERE ${where}`
         return this.query<{list:string[]}>(query, values).then((result) => result[0]?.list ?? []);
     }
 
-    async selectHash<T>(tableName: string, select: string, filters: Partial<T> = {}): Promise<Hash<Primitive>>
+    async selectHash<T>(tableName: string, select: string, filters: { [key: string]: Valuable | Array<Valuable> }={}): Promise<Hash<Primitive>>
     {
         if (!this.tables[tableName]) throw new Error(`table ${tableName} does not exist`);
-        let schema = this.tables[tableName][0].schema;
-        let { where, values } = this.toWhere(tableName, filters as any);
-        let column = PostgresUtils.snakeToCamel(select);
+        let [ table, schema, column ] = [ this.tables[tableName], this.tables[tableName][0].schema, PostgresUtils.camelToSnake(select) ];
+        if (PostgresUtils.isReservedWord(column)) column = `"${column}"`;
+
+        if (!PostgresUtils.columns(table).includes(column)) throw new Error(`column ${column} does not exist in table ${tableName}`);
+        let { where, values } = this.toWhere(tableName, filters);
+
         let query = `
             SELECT json_object_agg(t.${column}, NULL) as list
             FROM ( SELECT DISTINCT u.${column} FROM ${schema}.${tableName} u WHERE ${where} ) t`;