Skip to content

Fix ClickHouse quoting in UI filters #425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicosuave merged 3 commits into from
Oct 19, 2026
Merged

Fix ClickHouse quoting in UI filters #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36e6a4c
Fix ClickHouse quoting in UI filters
nicosuave Oct 19, 2026
6f68daa
Sync WASM demo filter quoting bundle
nicosuave Oct 19, 2026
a9a4605
Merge main and verify integrated filter quoting
nicosuave Oct 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 19 additions & 14 deletions examples/sidemantic_wasm_demo/src/components/sidemantic/sidemantic-ui-static.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7963,7 +7963,9 @@ function displayDimValue(value) {
function formatValue(value, hint = {}) {
return formatUiValue(value, hint);
}
function sqlLiteral(value) {
function sqlLiteral(value, dialect) {
if (dialect === "clickhouse")
value = value.replaceAll("\\", "\\\\");
return `'${value.replaceAll("'", "''")}'`;
}
function filterSummary(filter) {
Expand Down Expand Up @@ -8103,7 +8105,7 @@ function dimTypes(dimensions) {
function catalogDimTypes(catalog) {
return dimTypes(catalog.models.flatMap((model) => model.dimensions));
}
function filterLiteral(value, type) {
function filterLiteral(value, type, dialect) {
if ((type === "numeric" || type === "number") && value.trim() !== "" && Number.isFinite(Number(value))) {
return value;
}
Expand All @@ -8112,20 +8114,25 @@ function filterLiteral(value, type) {
if (lower === "true" || lower === "false")
return lower;
}
return sqlLiteral(value);
return sqlLiteral(value, dialect);
}
function likeEscape(pattern) {
return pattern.replaceAll("\\", "\\\\").replaceAll("%", "\\%").replaceAll("_", "\\_");
}
function membershipExpr(dimRef, filter, type) {
function containsExpr(dimRef, text, dialect) {
const pattern = sqlLiteral(`%${likeEscape(text)}%`, dialect);
const escape2 = dialect === "clickhouse" ? "" : " ESCAPE '\\'";
return `CAST(${dimRef} AS VARCHAR) ILIKE ${pattern}${escape2}`;
}
function membershipExpr(dimRef, filter, type, dialect) {
const negate = filter.mode === "exclude";
const hasNull = filter.values.includes(NULL_TOKEN);
const present = filter.values.filter((value) => value !== NULL_TOKEN);
let presentExpr = null;
if (present.length === 1) {
presentExpr = `${dimRef} ${negate ? "!=" : "="} ${filterLiteral(present[0], type)}`;
presentExpr = `${dimRef} ${negate ? "!=" : "="} ${filterLiteral(present[0], type, dialect)}`;
} else if (present.length > 1) {
const list = present.map((v3) => filterLiteral(v3, type)).join(", ");
const list = present.map((v3) => filterLiteral(v3, type, dialect)).join(", ");
presentExpr = `${dimRef} ${negate ? "NOT IN" : "IN"} (${list})`;
}
if (!negate) {
Expand Down Expand Up @@ -8156,18 +8163,17 @@ function filterExprs(filters, opts = {}) {
continue;
const type = opts.types?.[dimRef];
if (filter.mode === "contains") {
const pat = sqlLiteral(`%${likeEscape(filter.pattern ?? "")}%`);
out.push(`CAST(${dimRef} AS VARCHAR) ILIKE ${pat} ESCAPE '\\'`);
out.push(containsExpr(dimRef, filter.pattern ?? "", opts.dialect));
continue;
}
const expr = membershipExpr(dimRef, filter, type);
const expr = membershipExpr(dimRef, filter, type, opts.dialect);
if (expr)
out.push(expr);
}
return out;
}
function composeFilters(filters, opts = {}) {
const base = filterExprs(filters, { types: opts.types, excludeDim: opts.excludeDim });
const base = filterExprs(filters, { types: opts.types, excludeDim: opts.excludeDim, dialect: opts.dialect });
if (opts.timeRef && opts.range)
base.push(...timeFilters(opts.timeRef, opts.range));
return base;
Expand Down Expand Up @@ -8319,14 +8325,13 @@ function FilterEditor({
const valueFilters = import_react5.useMemo(() => {
const base = [
...configured?.filters ?? [],
...composeFilters(state.filters, { timeRef, range: state.dateRange, excludeDim: dim.ref, types })
...composeFilters(state.filters, { timeRef, range: state.dateRange, excludeDim: dim.ref, types, dialect: catalog.dialect })
];
if (debouncedSearch.trim()) {
const pat = sqlLiteral(`%${likeEscape(debouncedSearch.trim())}%`);
base.push(`CAST(${dim.ref} AS VARCHAR) ILIKE ${pat} ESCAPE '\\'`);
base.push(containsExpr(dim.ref, debouncedSearch.trim(), catalog.dialect));
}
return base;
}, [configured, state.filters, timeRef, state.dateRange, dim.ref, debouncedSearch, types]);
}, [configured, state.filters, timeRef, state.dateRange, dim.ref, debouncedSearch, types, catalog.dialect]);
const listMode = mode !== "contains";
const { result, loading, error } = useQueryResult(backend, listMode ? distinctValues(dim.ref, valueFilters, VALUE_LIMIT, configured?.segments, configured?.usePreaggregations) : null);
const dimAlias = aliasOf(dim.ref);
Expand Down
33 changes: 19 additions & 14 deletions plugins/sidemantic/skills/webapp-builder/assets/ui-dist/sidemantic-ui-static.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7963,7 +7963,9 @@ function displayDimValue(value) {
function formatValue(value, hint = {}) {
return formatUiValue(value, hint);
}
function sqlLiteral(value) {
function sqlLiteral(value, dialect) {
if (dialect === "clickhouse")
value = value.replaceAll("\\", "\\\\");
return `'${value.replaceAll("'", "''")}'`;
}
function filterSummary(filter) {
Expand Down Expand Up @@ -8103,7 +8105,7 @@ function dimTypes(dimensions) {
function catalogDimTypes(catalog) {
return dimTypes(catalog.models.flatMap((model) => model.dimensions));
}
function filterLiteral(value, type) {
function filterLiteral(value, type, dialect) {
if ((type === "numeric" || type === "number") && value.trim() !== "" && Number.isFinite(Number(value))) {
return value;
}
Expand All @@ -8112,20 +8114,25 @@ function filterLiteral(value, type) {
if (lower === "true" || lower === "false")
return lower;
}
return sqlLiteral(value);
return sqlLiteral(value, dialect);
}
function likeEscape(pattern) {
return pattern.replaceAll("\\", "\\\\").replaceAll("%", "\\%").replaceAll("_", "\\_");
}
function membershipExpr(dimRef, filter, type) {
function containsExpr(dimRef, text, dialect) {
const pattern = sqlLiteral(`%${likeEscape(text)}%`, dialect);
const escape2 = dialect === "clickhouse" ? "" : " ESCAPE '\\'";
return `CAST(${dimRef} AS VARCHAR) ILIKE ${pattern}${escape2}`;
}
function membershipExpr(dimRef, filter, type, dialect) {
const negate = filter.mode === "exclude";
const hasNull = filter.values.includes(NULL_TOKEN);
const present = filter.values.filter((value) => value !== NULL_TOKEN);
let presentExpr = null;
if (present.length === 1) {
presentExpr = `${dimRef} ${negate ? "!=" : "="} ${filterLiteral(present[0], type)}`;
presentExpr = `${dimRef} ${negate ? "!=" : "="} ${filterLiteral(present[0], type, dialect)}`;
} else if (present.length > 1) {
const list = present.map((v3) => filterLiteral(v3, type)).join(", ");
const list = present.map((v3) => filterLiteral(v3, type, dialect)).join(", ");
presentExpr = `${dimRef} ${negate ? "NOT IN" : "IN"} (${list})`;
}
if (!negate) {
Expand Down Expand Up @@ -8156,18 +8163,17 @@ function filterExprs(filters, opts = {}) {
continue;
const type = opts.types?.[dimRef];
if (filter.mode === "contains") {
const pat = sqlLiteral(`%${likeEscape(filter.pattern ?? "")}%`);
out.push(`CAST(${dimRef} AS VARCHAR) ILIKE ${pat} ESCAPE '\\'`);
out.push(containsExpr(dimRef, filter.pattern ?? "", opts.dialect));
continue;
}
const expr = membershipExpr(dimRef, filter, type);
const expr = membershipExpr(dimRef, filter, type, opts.dialect);
if (expr)
out.push(expr);
}
return out;
}
function composeFilters(filters, opts = {}) {
const base = filterExprs(filters, { types: opts.types, excludeDim: opts.excludeDim });
const base = filterExprs(filters, { types: opts.types, excludeDim: opts.excludeDim, dialect: opts.dialect });
if (opts.timeRef && opts.range)
base.push(...timeFilters(opts.timeRef, opts.range));
return base;
Expand Down Expand Up @@ -8319,14 +8325,13 @@ function FilterEditor({
const valueFilters = import_react5.useMemo(() => {
const base = [
...configured?.filters ?? [],
...composeFilters(state.filters, { timeRef, range: state.dateRange, excludeDim: dim.ref, types })
...composeFilters(state.filters, { timeRef, range: state.dateRange, excludeDim: dim.ref, types, dialect: catalog.dialect })
];
if (debouncedSearch.trim()) {
const pat = sqlLiteral(`%${likeEscape(debouncedSearch.trim())}%`);
base.push(`CAST(${dim.ref} AS VARCHAR) ILIKE ${pat} ESCAPE '\\'`);
base.push(containsExpr(dim.ref, debouncedSearch.trim(), catalog.dialect));
}
return base;
}, [configured, state.filters, timeRef, state.dateRange, dim.ref, debouncedSearch, types]);
}, [configured, state.filters, timeRef, state.dateRange, dim.ref, debouncedSearch, types, catalog.dialect]);
const listMode = mode !== "contains";
const { result, loading, error } = useQueryResult(backend, listMode ? distinctValues(dim.ref, valueFilters, VALUE_LIMIT, configured?.segments, configured?.usePreaggregations) : null);
const dimAlias = aliasOf(dim.ref);
Expand Down
33 changes: 19 additions & 14 deletions plugins/sidemantic/skills/webapp-builder/assets/ui-dist/sidemantic-ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,9 @@ function formatValue(value, hint = {}) {
function formatCompact(value, hint = {}) {
return formatUiCompact(value, hint);
}
function sqlLiteral(value) {
function sqlLiteral(value, dialect) {
if (dialect === "clickhouse")
value = value.replaceAll("\\", "\\\\");
return `'${value.replaceAll("'", "''")}'`;
}
function filterSummary(filter) {
Expand Down Expand Up @@ -1398,7 +1400,7 @@ function dimTypes(dimensions) {
function catalogDimTypes(catalog) {
return dimTypes(catalog.models.flatMap((model) => model.dimensions));
}
function filterLiteral(value, type) {
function filterLiteral(value, type, dialect) {
if ((type === "numeric" || type === "number") && value.trim() !== "" && Number.isFinite(Number(value))) {
return value;
}
Expand All @@ -1407,20 +1409,25 @@ function filterLiteral(value, type) {
if (lower === "true" || lower === "false")
return lower;
}
return sqlLiteral(value);
return sqlLiteral(value, dialect);
}
function likeEscape(pattern) {
return pattern.replaceAll("\\", "\\\\").replaceAll("%", "\\%").replaceAll("_", "\\_");
}
function membershipExpr(dimRef, filter, type) {
function containsExpr(dimRef, text, dialect) {
const pattern = sqlLiteral(`%${likeEscape(text)}%`, dialect);
const escape = dialect === "clickhouse" ? "" : " ESCAPE '\\'";
return `CAST(${dimRef} AS VARCHAR) ILIKE ${pattern}${escape}`;
}
function membershipExpr(dimRef, filter, type, dialect) {
const negate = filter.mode === "exclude";
const hasNull = filter.values.includes(NULL_TOKEN);
const present = filter.values.filter((value) => value !== NULL_TOKEN);
let presentExpr = null;
if (present.length === 1) {
presentExpr = `${dimRef} ${negate ? "!=" : "="} ${filterLiteral(present[0], type)}`;
presentExpr = `${dimRef} ${negate ? "!=" : "="} ${filterLiteral(present[0], type, dialect)}`;
} else if (present.length > 1) {
const list = present.map((v) => filterLiteral(v, type)).join(", ");
const list = present.map((v) => filterLiteral(v, type, dialect)).join(", ");
presentExpr = `${dimRef} ${negate ? "NOT IN" : "IN"} (${list})`;
}
if (!negate) {
Expand Down Expand Up @@ -1451,18 +1458,17 @@ function filterExprs(filters, opts = {}) {
continue;
const type = opts.types?.[dimRef];
if (filter.mode === "contains") {
const pat = sqlLiteral(`%${likeEscape(filter.pattern ?? "")}%`);
out.push(`CAST(${dimRef} AS VARCHAR) ILIKE ${pat} ESCAPE '\\'`);
out.push(containsExpr(dimRef, filter.pattern ?? "", opts.dialect));
continue;
}
const expr = membershipExpr(dimRef, filter, type);
const expr = membershipExpr(dimRef, filter, type, opts.dialect);
if (expr)
out.push(expr);
}
return out;
}
function composeFilters(filters, opts = {}) {
const base = filterExprs(filters, { types: opts.types, excludeDim: opts.excludeDim });
const base = filterExprs(filters, { types: opts.types, excludeDim: opts.excludeDim, dialect: opts.dialect });
if (opts.timeRef && opts.range)
base.push(...timeFilters(opts.timeRef, opts.range));
return base;
Expand Down Expand Up @@ -1614,14 +1620,13 @@ function FilterEditor({
const valueFilters = useMemo3(() => {
const base = [
...configured?.filters ?? [],
...composeFilters(state.filters, { timeRef, range: state.dateRange, excludeDim: dim.ref, types })
...composeFilters(state.filters, { timeRef, range: state.dateRange, excludeDim: dim.ref, types, dialect: catalog.dialect })
];
if (debouncedSearch.trim()) {
const pat = sqlLiteral(`%${likeEscape(debouncedSearch.trim())}%`);
base.push(`CAST(${dim.ref} AS VARCHAR) ILIKE ${pat} ESCAPE '\\'`);
base.push(containsExpr(dim.ref, debouncedSearch.trim(), catalog.dialect));
}
return base;
}, [configured, state.filters, timeRef, state.dateRange, dim.ref, debouncedSearch, types]);
}, [configured, state.filters, timeRef, state.dateRange, dim.ref, debouncedSearch, types, catalog.dialect]);
const listMode = mode !== "contains";
const { result, loading, error } = useQueryResult(backend, listMode ? distinctValues(dim.ref, valueFilters, VALUE_LIMIT, configured?.segments, configured?.usePreaggregations) : null);
const dimAlias = aliasOf(dim.ref);
Expand Down
Loading
Loading