fix(projcets.ts): fixed greptile issues

Author: 0xanshu

src/storage/adapter/clickhouse/handlers/queryEvents.ts

@@ -263,7 +263,7 @@ async function handleListQuery(
     );
     let q = `SELECT ${buildSelectColumns(t)} FROM ${t}`;
     q += ` WHERE project_id = {projectId:String}`;
-    if (whereClause) q += ` AND ${whereClause}`;
+    if (whereClause) q += ` AND (${whereClause})`;
     return q;
   });
 
@@ -344,7 +344,7 @@ async function handleAggregationQuery(
     );
     let q = `SELECT ${cols.join(", ")} FROM ${t}`;
     q += ` WHERE project_id = {projectId:String}`;
-    if (whereClause) q += ` AND ${whereClause}`;
+    if (whereClause) q += ` AND (${whereClause})`;
     return q;
   });
 
@@ -399,7 +399,7 @@ async function getTotalCount(
     );
     let q = `SELECT count() as cnt FROM ${t}`;
     q += ` WHERE project_id = {projectId:String}`;
-    if (whereClause) q += ` AND ${whereClause}`;
+    if (whereClause) q += ` AND (${whereClause})`;
     return q;
   });
 

src/storage/adapter/postgres/handlers/queryEvents.ts

@@ -304,7 +304,7 @@ async function handleListQuery(
   const subqueries = tables.map((t, i) => {
     const base = sql`SELECT ${selectExpr[i]} FROM ${sql.raw(t)}`;
     const fullWhere = whereExpr[i]
-      ? sql`${whereExpr[i]} AND ${projectFilter}`
+      ? sql`(${whereExpr[i]}) AND ${projectFilter}`
       : projectFilter;
     return sql`${base} WHERE ${fullWhere}`;
   });
@@ -373,7 +373,7 @@ async function handleAggregationQuery(
     const whereClause = buildWhereClause(request.where, t);
     const base = sql`SELECT ${sql.join(cols, sql`, `)} FROM ${sql.raw(t)}`;
     const fullWhere = whereClause
-      ? sql`${whereClause} AND ${projectFilter}`
+      ? sql`(${whereClause}) AND ${projectFilter}`
       : projectFilter;
     return sql`${base} WHERE ${fullWhere}`;
   });
@@ -431,7 +431,7 @@ async function getTotalCount(
     const whereClause = buildWhereClause(request.where, t);
     const base = sql`SELECT count(*)::int as cnt FROM ${sql.raw(t)}`;
     const fullWhere = whereClause
-      ? sql`${whereClause} AND ${projectFilter}`
+      ? sql`(${whereClause}) AND ${projectFilter}`
       : projectFilter;
     return sql`${base} WHERE ${fullWhere}`;
   });