Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 34 additions & 0 deletions public/utils/utils.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*/

import {
getQueries
} from './utils';

describe('getQueries', () => {
it('should return a simple query without issues.', () => {
expect(getQueries("select 1")).toEqual(["select 1"]);
});
it('should split queries by semicolons', () => {
expect(getQueries("select 1;select 2;select 3"))
.toEqual(["select 1", "select 2", "select 3"]);
});
it('should not choke on opening or closing semicolons', () => {
expect(getQueries(";;;select 1;;")).toEqual(["select 1"]);
});
it('should not split on quoted semi-colons', () => {
expect(getQueries("select * from x where y = '1;2' or y = '3;4'")).toEqual(
["select * from x where y = '1;2' or y = '3;4'"]);
});
it('should not split on quoted escaped semi-colons', () => {
expect(getQueries("select * from x where y = '1\\;2\\;';select * from x where y = '3'")).toEqual(
["select * from x where y = '1;2;'", "select * from x where y = '3'"]);
});
it('should not get tripped up by nested quotes and escaped semicolons in quotes, either', () => {
expect(getQueries("select * from x where y = '1\\\\'\\\\';\\;2';select * from x where y = '\\\"3;\\;\\\\'\\\\'4;'")).toEqual(
["select * from x where y = '1\\'\\';;2'", "select * from x where y = '\"3;;\\'\\'4;'"]);
});
});

65 changes: 63 additions & 2 deletions public/utils/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,75 @@
import {ItemIdToExpandedRowMap, QueryMessage, ResponseDetail} from '../components/Main/main';
import {MESSAGE_TAB_LABEL} from "./constants";

enum QueryParserState {
NORMAL,
ESCAPED,
ESCAPED_IN_SINGLE_QUOTES,
IN_SINGLE_QUOTES,
}

// It returns an array of queries
export const getQueries = (queriesString: string): string[] => {
if (queriesString == '') {
return [];
}
const splitQueries: string[] = [];
let index = 0;
let nextString: string = "";
let queryParserState: QueryParserState = QueryParserState.NORMAL;
while (index < queriesString.length) {
let c = queriesString.charAt(index);
if (c === '\\') {
if (queryParserState == QueryParserState.ESCAPED) {
nextString += c;
queryParserState = QueryParserState.NORMAL;
} else if (queryParserState == QueryParserState.ESCAPED_IN_SINGLE_QUOTES) {
nextString += c;
queryParserState = QueryParserState.IN_SINGLE_QUOTES;
} else if (queryParserState == QueryParserState.IN_SINGLE_QUOTES) {
queryParserState = QueryParserState.ESCAPED_IN_SINGLE_QUOTES;
} else /* queryParserState == QueryParserState.NORMAL */ {
queryParserState = QueryParserState.ESCAPED;
}
} else if (c === ';') {
if (queryParserState == QueryParserState.ESCAPED) {
nextString += c;
queryParserState = QueryParserState.NORMAL;
} else if (queryParserState == QueryParserState.ESCAPED_IN_SINGLE_QUOTES) {
nextString += c;
queryParserState = QueryParserState.IN_SINGLE_QUOTES;
} else if (queryParserState == QueryParserState.IN_SINGLE_QUOTES) {
nextString += c;
} else /* queryParserState == QueryParserState.NORMAL */ {
splitQueries.push(nextString);
nextString = "";
}
} else if (c === "'") {
nextString += c;
if (queryParserState == QueryParserState.ESCAPED ||
queryParserState == QueryParserState.IN_SINGLE_QUOTES) {
queryParserState = QueryParserState.NORMAL;
} else if (queryParserState == QueryParserState.ESCAPED_IN_SINGLE_QUOTES) {
queryParserState = QueryParserState.IN_SINGLE_QUOTES;
} else /* queryParserState == QueryParserState.NORMAL */ {
queryParserState = QueryParserState.IN_SINGLE_QUOTES;
}
} else if (queryParserState == QueryParserState.ESCAPED) {
nextString += c;
queryParserState = QueryParserState.NORMAL;
} else if (queryParserState == QueryParserState.ESCAPED_IN_SINGLE_QUOTES) {
nextString += c;
queryParserState = QueryParserState.IN_SINGLE_QUOTES;
} else /* ((queryParserState == QueryParserState.IN_SINGLE_QUOTES
|| queryParserState == QueryParserState.NORMAL) &&
(c != '\\' && c != '\'' && c != ';')) */ {
nextString += c;
}
index++;
}
splitQueries.push(nextString); // if it's empty, it gets filtered immediately anyway

return queriesString
.split(';')
return splitQueries
.map((query: string) => query.trim().replace(/[\r\n]+/g, ' '))
.filter((query: string) => query != '');
};
Expand Down