Skip to content

jsqlparser 5.4.162, guard reads blank lines as whitespace #66

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

Merged
stbischof merged 1 commit into from
Oct 27, 2026
Merged

jsqlparser 5.4.162, guard reads blank lines as whitespace #66

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
2 changes: 1 addition & 1 deletion deparser/api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<dependency>
<groupId>com.manticore-projects.jsqlformatter</groupId>
<artifactId>jsqlparser</artifactId>
<version>5.4.15</version>
<version>5.4.162</version>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion deparser/jsqlparser/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<dependency>
<groupId>com.manticore-projects.jsqlformatter</groupId>
<artifactId>jsqlparser</artifactId>
<version>5.4.15</version>
<version>5.4.162</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Expand Down
4 changes: 2 additions & 2 deletions guard/jsqltranspiler/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@
<dependency>
<groupId>com.manticore-projects.jsqlformatter</groupId>
<artifactId>jsqlparser</artifactId>
<version>5.4.15</version>
<version>5.4.162</version>
</dependency>
<dependency>
<groupId>ai.starlake.jsqltranspiler</groupId>
<artifactId>jsqltranspiler</artifactId>
<version>1.13</version>
<version>1.16</version>
</dependency>
<dependency>
<groupId>org.eclipse.daanse</groupId>
Expand Down
9 changes: 5 additions & 4 deletions ...iler/src/main/java/org/eclipse/daanse/sql/guard/jsqltranspiler/DeparserColumResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,13 @@ public DeparserColumResolver(JdbcMetaData metaData, Dialect dialect, DialectDepa
this.dialectDeparser = dialectDeparser;
}

@Override
/**
* Parses the text as a script and resolves its one statement. {@code CCJSqlParserUtil.parse} stops after the first
* statement and would resolve "SELECT ...; DROP ..." as if the rest were not there; a text of more than one
* statement is refused instead, as the guard refuses it.
* Parses the text as a script and resolves its one statement; a text of more than one statement is refused by
* name, as the guard refuses it. {@code CCJSqlParserUtil.parse} stopped after the first statement before JSqlParser
* 5.4.162 and resolved "SELECT ...; DROP ..." as if the rest were not there; it refuses the rest now, but only with
* a parser message.
*/
@Override
public String getResolvedStatementText(String sqlStr) throws JSQLParserException {
net.sf.jsqlparser.statement.Statements statements =
CCJSqlParserUtil.parseStatements(BlankLines.collapse(sqlStr));
Expand Down
4 changes: 2 additions & 2 deletions guard/jsqltranspiler/test.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@

# -runbundles is calculated by the bnd-resolver-maven-plugin
-runbundles: \
ai.starlake.transpiler;version='[1.13.0,1.13.1)',\
ai.starlake.transpiler;version='[1.16.0,1.16.1)',\
assertj-core;version='[3.24.2,3.24.3)',\
junit-jupiter-api;version='[5.12.2,5.12.3)',\
junit-jupiter-engine;version='[5.12.2,5.12.3)',\
Expand All @@ -62,7 +62,7 @@
junit-platform-launcher;version='[1.12.2,1.12.3)',\
net.bytebuddy.byte-buddy;version='[1.17.5,1.17.6)',\
net.bytebuddy.byte-buddy-agent;version='[1.17.5,1.17.6)',\
net.sf.jsqlparser;version='[5.4.15,5.4.16)',\
net.sf.jsqlparser;version='[5.4.162,5.4.163)',\
org.apache.felix.scr;version='[2.2.10,2.2.11)',\
org.eclipse.daanse.sql.deparser.api;version='[0.0.1,0.0.2)',\
org.eclipse.daanse.sql.deparser.jsqlparser;version='[0.0.1,0.0.2)',\
Expand Down
Loading