From d6c8f3aa18bdcfe6a46c2397819ddb45424cb03c Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Wed, 16 Aug 2023 13:47:43 -0700
Subject: [PATCH] fix mapfilter / rawquery for relational

---
 lib/clickhouse.ts | 2 +-
 lib/prisma.ts     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/clickhouse.ts b/lib/clickhouse.ts
index aa2f21ed..8ce7bc98 100644
--- a/lib/clickhouse.ts
+++ b/lib/clickhouse.ts
@@ -66,7 +66,7 @@ function getDateFormat(date) {
 function mapFilter(column, operator, name, type = 'String') {
   switch (operator) {
     case OPERATORS.equals:
-      return `${column} = {${name}:${type}`;
+      return `${column} = {${name}:${type}}`;
     case OPERATORS.notEquals:
       return `${column} != {${name}:${type}}`;
     default:
diff --git a/lib/prisma.ts b/lib/prisma.ts
index cebd7193..12bafa51 100644
--- a/lib/prisma.ts
+++ b/lib/prisma.ts
@@ -92,12 +92,12 @@ function getTimestampIntervalQuery(field: string): string {
   }
 }
 
-function mapFilter(column, operator, name, type = 'String') {
+function mapFilter(column, operator, name, type = 'varchar') {
   switch (operator) {
     case OPERATORS.equals:
-      return `${column} = {${name}:${type}`;
+      return `${column} = {{${name}::${type}}}`;
     case OPERATORS.notEquals:
-      return `${column} != {${name}:${type}}`;
+      return `${column} != {{${name}::${type}}}`;
     default:
       return '';
   }
@@ -161,7 +161,7 @@ async function rawQuery(sql: string, data: object): Promise<any> {
     return Promise.reject(new Error('Unknown database.'));
   }
 
-  const query = sql?.replaceAll(/\{\{\s*(\w+)(::\w+)?\s*}}/g, (...args) => {
+  const query = sql?.replaceAll(/\{\{\s*(\w+)(::\w+)?\s*\}\}/g, (...args) => {
     const [, name, type] = args;
     params.push(data[name]);