Skip to content

[ES|QL] Deep check if CHANGE_POINT ON option has any contents #216093

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
vadimkibana merged 2 commits into from
Mar 27, 2025
Merged

[ES|QL] Deep check if CHANGE_POINT ON option has any contents #216093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b476d2e
deep check if change point on option has value
vadimkibana Mar 26, 2025
34f54e5
Merge branch 'main' into esql-change-point-empty-on
vadimkibana Mar 26, 2025
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
29 changes: 29 additions & 0 deletions src/platform/packages/shared/kbn-esql-ast/src/parser/__tests__/change_point.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,4 +220,33 @@ describe('CHANGE_POINT command', () => {
});
});
});

describe('incorrectly formatted', () => {
it('throws on missing ON arguments', () => {
const text = `FROM index | CHANGE_POINT value ON`;
const { errors, ast } = EsqlQuery.fromSrc(text);
const option = Walker.match(ast, { type: 'option', name: 'on' });

expect(errors.length).toBe(1);
expect(option).toBe(undefined);
});

it('throws on missing AS arguments', () => {
const text = `FROM index | CHANGE_POINT value AS`;
const { errors, ast } = EsqlQuery.fromSrc(text);
const option = Walker.match(ast, { type: 'option', name: 'as' });

expect(errors.length).toBe(1);
expect(option).toBe(undefined);
});

it('throws on missing AS arguments (ON present)', () => {
const text = `FROM index | CHANGE_POINT value ON a AS`;
const { errors, ast } = EsqlQuery.fromSrc(text);
const option = Walker.match(ast, { type: 'option', name: 'as' });

expect(errors.length).toBe(1);
expect(option).toBe(undefined);
});
});
});
2 changes: 1 addition & 1 deletion src/platform/packages/shared/kbn-esql-ast/src/parser/factories/change_point.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const createChangePointCommand = (

command.args.push(value);

if (ctx._key) {
if (ctx._key && ctx._key.getText()) {
Copy link
Copy Markdown
Contributor

@darnautov darnautov Mar 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❓ do we need the same check with getText for ctx._targetType && ctx._targetPvalue?

Copy link
Copy Markdown
Contributor Author

@vadimkibana vadimkibana Apr 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. If it was only ctx._targetType we would need the check but because it is ctx._targetType && ctx._targetPvalue we don't need it. ANTLR does not generate an empty identifier for pvalue, only for target.

const key = createColumn(ctx._key);
const option = Builder.option(
{
Expand Down