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

Jump to bottom

filter empty sql to avoid IndexOutOfBoundException #246

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

filter empty sql to avoid IndexOutOfBoundException #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/main/java/io/r2dbc/h2/H2Statement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ public Flux<H2Result> execute() {
Assert.requireTrue(!this.bindings.open, "No unfinished bindings!");

return Flux.fromArray(this.sql.split(";"))
.filter(sql -> !sql.trim().isEmpty())
Copy link

Choose a reason for hiding this comment

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

I think there is a bigger problem.

split(";") cannot be used to break SQL into separate statements properly. This character may be used in comments, various types of character string literals, and quoted identifiers.

Copy link
Author

Choose a reason for hiding this comment

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

You are right. If we remove the split, would it there be any serious implication? Mainly backward compatibility IMO.

Or we need to have a more sophisticated split than just string split.

Copy link
Member

Choose a reason for hiding this comment

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

It would be so great to be able to make use of H2's internal parsing utils instead of us having to make a dance around H2 externally. Too bad, I wasn't able to convince @katzyn to bring this project closer to H2.

Copy link
Author

Choose a reason for hiding this comment

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

Can we consider this fix as an interim patch while having much more careful changes to deal with ; parsing?

.flatMap(sql -> {
if (this.generatedColumns == null) {
return execute(this.client, sql.trim(), this.bindings, this.codecs, this.allGeneratedColumns);
Expand Down
30 changes: 30 additions & 0 deletions src/test/java/io/r2dbc/h2/H2StatementTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,36 @@ void executeWithoutAdd() {
.verifyComplete();
}

@Test
void executeMultipleCommands() {
CommandInterface insertCommand1 = mock(CommandInterface.class);
when(this.client.prepareCommand("insert test-query-1", Collections.emptyList())).thenReturn(Collections.singleton(insertCommand1).iterator());
when(this.client.update(insertCommand1, false)).thenReturn(new ResultWithGeneratedKeys.WithKeys(0, new LocalResult()));

CommandInterface insertCommand2 = mock(CommandInterface.class);
when(this.client.prepareCommand("insert test-query-2", Collections.emptyList())).thenReturn(Collections.singleton(insertCommand2).iterator());
when(this.client.update(insertCommand2, false)).thenReturn(new ResultWithGeneratedKeys.WithKeys(0, new LocalResult()));

new H2Statement(this.client, this.codecs, "insert test-query-1;insert test-query-2")
.execute()
.as(StepVerifier::create)
.expectNextCount(2)
.verifyComplete();
}

@Test
void executeMultipleCommandsIgnoringEmptyOne() {
CommandInterface command = mock(CommandInterface.class);
when(this.client.prepareCommand("insert test-query-1", Collections.emptyList())).thenReturn(Collections.singleton(command).iterator());
when(this.client.update(command, false)).thenReturn(new ResultWithGeneratedKeys.WithKeys(0, new LocalResult()));

new H2Statement(this.client, this.codecs, "insert test-query-1;\n ")
.execute()
.as(StepVerifier::create)
.expectNextCount(1)
.verifyComplete();
}

@Test
void returnGeneratedValues() {
CommandInterface command = mock(CommandInterface.class);
Expand Down