m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2025-02-14 21:10:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix mapfilter / rawquery for relational

Browse Source
This commit is contained in:
Francis Cao 2023-08-16 13:47:43 -07:00
parent 7df142b02b
commit d6c8f3aa18
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/clickhouse.ts
View File

@ -66,7 +66,7 @@ function getDateFormat(date) {
function mapFilter(column, operator, name, type = 'String') { function mapFilter(column, operator, name, type = 'String') {
switch (operator) { switch (operator) {
case OPERATORS.equals: case OPERATORS.equals:
return `${column} = {${name}:${type}`; return `${column} = {${name}:${type}}`;
case OPERATORS.notEquals: case OPERATORS.notEquals:
return `${column} != {${name}:${type}}`; return `${column} != {${name}:${type}}`;
default: default:

8
lib/prisma.ts
View File

@ -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) { switch (operator) {
case OPERATORS.equals: case OPERATORS.equals:
return `${column} = {${name}:${type}`; return `${column} = {{${name}::${type}}}`;
case OPERATORS.notEquals: case OPERATORS.notEquals:
return `${column} != {${name}:${type}}`; return `${column} != {{${name}::${type}}}`;
default: default:
return ''; return '';
} }
@ -161,7 +161,7 @@ async function rawQuery(sql: string, data: object): Promise<any> {
return Promise.reject(new Error('Unknown database.')); 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; const [, name, type] = args;
params.push(data[name]); params.push(data[name]);