Skip to content

Properly split SQL script; fixes #47 #48

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Properly split SQL script; fixes #47 #48

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b263a5b
Properly split SQL script; fixes #47
hrk Aug 29, 2014
53575a4
Handle multiple backslashes in splitSqlScript()
hrk Aug 29, 2014
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
20 changes: 18 additions & 2 deletions library/src/main/java/com/readystatesoftware/sqliteasset/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,19 @@ public static List<String> splitSqlScript(String script, char delim) {
StringBuilder sb = new StringBuilder();
boolean inLiteral = false;
char[] content = script.toCharArray();
int openDelimiter = -1, lastCharacter = -1;
for (int i = 0; i < script.length(); i++) {
if (content[i] == '"') {
inLiteral = !inLiteral;
if (content[i] == '"' || content[i] == '\'') {
if (openDelimiter == -1) {
// We were not inside a literal; store the delimiter's value.
openDelimiter = content[i];
inLiteral = true;
} else if (openDelimiter == content[i] && lastCharacter != '\\') {
// We exit from the literal only on the same character
// AND unless we're being escaped by a bachslash.
inLiteral = false;
openDelimiter = -1;
}
}
if (content[i] == delim && !inLiteral) {
if (sb.length() > 0) {
Expand All @@ -32,6 +42,12 @@ public static List<String> splitSqlScript(String script, char delim) {
} else {
sb.append(content[i]);
}
if (lastCharacter == '\\' && content[i] == '\\') {
// It was an escaped backslash, don't accumulate.
lastCharacter = -1;
} else {
lastCharacter = content[i];
}
}
if (sb.length() > 0) {
statements.add(sb.toString().trim());
Expand Down