rez_core 5.0.162 → 5.0.164

package/package.json

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

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

@@ -551,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),
     );

package/src/module/listmaster/entity/list-master.entity.ts

@@ -27,7 +27,4 @@ export class ListMasterData extends BaseEntity {
 
   @Column({ nullable: true })
   custom_source_id: number;
-
-  @Column({ nullable: true, default: '' })
-  description: string;
 }

package/src/module/meta/service/entity-dynamic.service.ts

@@ -595,19 +595,19 @@ export class EntityDynamicService {
 
     const entityRepo = this.reflectionHelper.getRepoService(entityMaster?.entity_data_class);
 
-    const columns = validAttributes.map(attr => `${attr.attribute_key}`);
-
-    const result = await entityRepo.find({
-      where: {
-        id: id
-      },
-      select: columns
-    });
-    // const selectQuery = `SELECT ${columns}
-    //                      FROM ${tableName} t
-    //                      WHERE id = $1`;
+    const columns = validAttributes.map(attr => `t.${attr.attribute_key}`);
+
+    // const result = await entityRepo.find({
+    //   where: {
+    //     id: id
+    //   },
+    //   select: columns
+    // });
+    const selectQuery = `SELECT ${columns}
+                         FROM ${this.schema}.${entityMaster.db_table_name} t
+                         WHERE id = $1`;
 
-    // const result = await this.entityManager.query(selectQuery, [id]);
+    const result = await this.entityManager.query(selectQuery, [id]);
     if (!result.length) return null;
 
     const row = result[0];