rez_core 5.0.161 → 5.0.163

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "5.0.161",
+  "version": "5.0.163",
   "description": "",
   "author": "",
   "private": false,

package/src/module/filter/service/filter.service.ts

@@ -26,7 +26,10 @@ export class FilterService {
     @Inject() protected readonly loggingService: LoggingService,
     private readonly configService: ConfigService,
     private readonly reflectionHelper: ReflectionHelper,
-  ) {}
+  ) {
+  }
+
+  schema = this.configService.get('DB_SCHEMA');
 
   private async gettab_value_counts(
     tableName: string,
@@ -74,11 +77,10 @@ export class FilterService {
     }
 
     const rawSQL = `
-    SELECT ${column} AS tab_value, COUNT(*) AS tab_value_count
-    FROM ${tableName}
-    ${whereSQL}
-    GROUP BY ${column}
-  `;
+        SELECT ${column} AS tab_value, COUNT(*) AS tab_value_count
+        FROM ${tableName} ${whereSQL}
+        GROUP BY ${column}
+    `;
 
     const rows = await this.queryWithSchema(rawSQL, values);
 
@@ -479,7 +481,7 @@ export class FilterService {
     let qb = this.entityManager
       .createQueryBuilder()
       .select('e.*')
-      .from(tableName, 'e');
+      .from(`${this.schema}.${tableName}`, 'e');
     dataWhere.forEach((clause) => qb.andWhere(clause.query, clause.params));
 
     // Apply sorting
@@ -549,7 +551,7 @@ export class FilterService {
     const countQb = this.entityManager
       .createQueryBuilder()
       .select('COUNT(*)', 'count')
-      .from(tableName, 'e');
+      .from(`${this.schema}.${tableName}`, 'e');
     dataWhere.forEach((clause) =>
       countQb.andWhere(clause.query, clause.params),
     );