Skip to content

Revert "fix: unknown lucene field falls through in search" #2447

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
kodiakhq merged 3 commits into from
Jun 12, 2026
Merged

Revert "fix: unknown lucene field falls through in search" #2447

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
3a72ed6
Revert "fix: unknown lucene field falls through in search (#2422)"
karl-power Jun 11, 2026
caeca0f
Merge branch 'main' into revert-2422-lucene-unknown-field-falls-throu…
karl-power Jun 12, 2026
f2dc0b7
Merge branch 'main' into revert-2422-lucene-unknown-field-falls-throu…
kodiakhq[bot] Jun 12, 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
5 changes: 0 additions & 5 deletions .changeset/healthy-pans-grab.md
View file
Open in desktop

This file was deleted.

45 changes: 0 additions & 45 deletions packages/common-utils/src/__tests__/queryParser.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ describe('CustomSchemaSQLSerializerV2 - json', () => {
return { name: 'SeverityNumber', type: 'UInt8' };
} else if (column === 'foo') {
return { name: 'foo', type: 'String' };
} else if (column === 'bar') {
return { name: 'bar', type: 'String' };
} else if (column === 'MaterializedExample') {
return { name: 'MaterializedExample', type: 'String' };
} else {
Expand Down Expand Up @@ -496,49 +494,6 @@ describe('CustomSchemaSQLSerializerV2 - json', () => {
expect(actualSql).toBe(expectedSql);
});

describe('CustomSchemaSQLSerializerV2: select alias resolution', () => {
// ClickHouse resolves SELECT aliases in WHERE, so a Lucene field matching a
// known alias must resolve to a bare identifier. A field that is neither a
// column nor an alias is genuinely unknown and must not be injected as raw
// SQL (which ClickHouse would reject as an unknown identifier).
const aliasSerializer = new CustomSchemaSQLSerializerV2({
metadata,
databaseName,
tableName,
connectionId,
implicitColumnExpression: 'Body',
selectAliases: new Set(['Content']),
});

it('resolves a known select alias as a column reference', async () => {
const res = await aliasSerializer.getColumnForField('Content', {});
expect(res).toEqual(
expect.objectContaining({ found: true, column: 'Content' }),
);
});

it('renders a select alias reference as a bare identifier', async () => {
const sql = await new SearchQueryBuilder(
'Content:foo',
aliasSerializer,
).build();
expect(sql).toBe("((Content ILIKE '%foo%'))");
});

it('returns not-found for an unknown, non-alias field', async () => {
const res = await serializer.getColumnForField('NotAColumn', {});
expect(res).toEqual(expect.objectContaining({ found: false }));
});

it('renders an unknown, non-alias field as the no-match predicate', async () => {
const sql = await new SearchQueryBuilder(
'NotAColumn:foo',
serializer,
).build();
expect(sql).toBe('((1 = 0))');
});
});

describe('CustomSchemaSQLSerializerV2: implicit column falls back to bodyExpression', () => {
// Symmetric counterpart to the one-way fallback in
// `getEventBody` (packages/app/src/source.ts): a log source admin who
Expand Down
Loading
Loading