Skip to content
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

[Obs AI assistant] Replace with double quotes #187327

Merged
merged 8 commits into from
Jul 5, 2024
Merged

[Obs AI assistant] Replace with double quotes #187327

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3c2fe19
[Obs AI assistant] Replace with double quotes
stratoula Jul 2, 2024
39068df
Update x-pack/plugins/observability_solution/observability_ai_assista…
stratoula Jul 4, 2024
ffe4d57
Addresses multiple escaped indices
stratoula Jul 4, 2024
9998024
Merge branch 'main' into integrate-double-quotes
stratoula Jul 4, 2024
6cc8894
small nit
stratoula Jul 4, 2024
ee6f302
Make Soren happy
stratoula Jul 4, 2024
10d3818
Escape backticks
stratoula Jul 4, 2024
c8c27c6
Change the implementation
stratoula Jul 4, 2024
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
8 changes: 4 additions & 4 deletions ...bservability_ai_assistant_app/server/functions/query/correct_common_esql_mistakes.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ describe('correctCommonEsqlMistakes', () => {
);
});

it(`replaces " or ' escaping in FROM statements with backticks`, () => {
expectQuery(`FROM "logs-*" | LIMIT 10`, 'FROM logs-*\n| LIMIT 10');
expectQuery(`FROM 'logs-*' | LIMIT 10`, 'FROM logs-*\n| LIMIT 10');
it("replaces ` or ' escaping in FROM statements with double quotes", () => {
expectQuery(`FROM "logs-*" | LIMIT 10`, 'FROM "logs-*"\n| LIMIT 10');
stratoula marked this conversation as resolved.
Show resolved Hide resolved
expectQuery(`FROM 'logs-*' | LIMIT 10`, 'FROM "logs-*"\n| LIMIT 10');
expectQuery(`FROM logs-* | LIMIT 10`, 'FROM logs-*\n| LIMIT 10');
});

Expand Down Expand Up @@ -143,7 +143,7 @@ describe('correctCommonEsqlMistakes', () => {
| EVAL "@timestamp" = TO_DATETIME(timestamp)
| WHERE statement LIKE 'SELECT%'
| STATS avg_duration = AVG(duration)`,
`FROM postgres-logs*
`FROM "postgres-logs*"
| GROK message "%{TIMESTAMP_ISO8601:timestamp} %{TZ} \[%{NUMBER:process_id}\]: \[%{NUMBER:log_line}\] user=%{USER:user},db=%{USER:database},app=\[%{DATA:application}\],client=%{IP:client_ip} LOG: duration: %{NUMBER:duration:float} ms statement: %{GREEDYDATA:statement}"
| EVAL @timestamp = TO_DATETIME(timestamp)
| WHERE statement LIKE "SELECT%"
Expand Down
5 changes: 2 additions & 3 deletions ...ion/observability_ai_assistant_app/server/functions/query/correct_common_esql_mistakes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,9 +238,8 @@ export function correctCommonEsqlMistakes(query: string): {
switch (name) {
case 'FROM':
formattedCommand = formattedCommand
.replaceAll(/FROM "(.*)"/g, 'FROM $1')
.replaceAll(/FROM '(.*)'/g, 'FROM $1')
.replaceAll(/FROM `(.*)`/g, 'FROM $1');
.replaceAll(/FROM '(.*)'/g, 'FROM "$1"')
.replaceAll(/FROM `(.*)`/g, 'FROM "$1"');
break;

case 'WHERE':
Expand Down