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

perf: keep comments when searching for params #2951

Merged
merged 7 commits into from
Mar 19, 2024
Merged

perf: keep comments when searching for params #2951

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4ab6017
refactor: move skip methods to abstract parser
olavloite Mar 13, 2024
2d30e03
refactor: generalize skip methods
olavloite Mar 13, 2024
51ce470
perf: keep comments when searching for params
olavloite Mar 14, 2024
2a10a12
Merge branch 'main' into convert-params-with-comments
olavloite Mar 19, 2024
c073dd8
chore: run formatter
olavloite Mar 19, 2024
f3d5ec0
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Mar 19, 2024
1397671
Merge branch 'convert-params-with-comments' of https://github.com/goo…
gcf-owl-bot[bot] Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
🦉 Updates from OwlBot post-processor 
See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md
  • Loading branch information
@gcf-owl-bot
gcf-owl-bot[bot] committed Mar 19, 2024
commit f3d5ec0a32371052e10ab762c9b60314e850432e
7 changes: 2 additions & 5 deletions ...ud-spanner/src/main/java/com/google/cloud/spanner/connection/AbstractStatementParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,11 +697,8 @@ public boolean checkReturningClause(String sql) {
}

/**
<<<<<<< HEAD
* Returns true if this dialect supports nested comments.
=======
* <<<<<<< HEAD Returns true if this dialect supports nested comments.
>>>>>>> main
* <<<<<<< HEAD Returns true if this dialect supports nested comments. ======= <<<<<<< HEAD
* Returns true if this dialect supports nested comments. >>>>>>> main
*
* <ul>
* <li>This method should return false for dialects that consider this to be a valid comment:
Expand Down
3 changes: 0 additions & 3 deletions ...spanner/src/test/java/com/google/cloud/spanner/connection/SpannerStatementParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@

import com.google.cloud.spanner.Dialect;
import com.google.cloud.spanner.connection.StatementParserTest.CommentInjector;
import static org.junit.Assert.assertEquals;

import com.google.cloud.spanner.Dialect;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
Expand Down