rez_core 4.0.147 → 4.0.151

package/package.json

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

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

@@ -37,6 +37,7 @@ export class FilterService {
 
     let whereSQL = '';
     const values: any[] = [];
+    let paramIndex = 1; // PostgreSQL placeholders start at $1
 
     if (whereClauses.length > 0) {
       const clauseParts = whereClauses.map((clause) => {
@@ -44,15 +45,26 @@ export class FilterService {
 
         Object.entries(clause.params).forEach(([key, val]) => {
           if (Array.isArray(val)) {
-            // if it's an array → expand placeholders (?, ?, ?)
-            const placeholders = val.map(() => '?').join(', ');
+            // Create ($1,$2,$3)
+            const placeholders = val
+              .map(() => `$${paramIndex++}`)
+              .join(', ');
+
             parsedQuery = parsedQuery.replace(
               new RegExp(`:${key}`, 'g'),
               `(${placeholders})`,
             );
-            values.push(...val); // flatten values
+
+            values.push(...val);
           } else {
-            parsedQuery = parsedQuery.replace(new RegExp(`:${key}`, 'g'), '?');
+            // Create $1
+            const placeholder = `$${paramIndex++}`;
+
+            parsedQuery = parsedQuery.replace(
+              new RegExp(`:${key}`, 'g'),
+              placeholder,
+            );
+
             values.push(val);
           }
         });
@@ -64,11 +76,11 @@ 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.dataSource.query(rawSQL, values);
 
@@ -466,6 +478,11 @@ export class FilterService {
     const size = dto.size && dto.size > 0 ? dto.size : 10;
     qb.skip((page - 1) * size).take(size);
 
+    let query = await qb.getQuery();
+
+    console.log('------------------------------------------------------\n')
+    console.log(query);
+    console.log('\n------------------------------------------------------')
     const entity_list = await qb.getRawMany();
 
     console.log(`📦 [FilterService] Fetched ${entity_list.length} records`);