diff --git a/deparser/api/pom.xml b/deparser/api/pom.xml index 890b733..e48bb33 100644 --- a/deparser/api/pom.xml +++ b/deparser/api/pom.xml @@ -33,7 +33,7 @@ com.manticore-projects.jsqlformatter jsqlparser - 5.4.15 + 5.4.162 diff --git a/deparser/jsqlparser/pom.xml b/deparser/jsqlparser/pom.xml index 568e63e..24b2e83 100644 --- a/deparser/jsqlparser/pom.xml +++ b/deparser/jsqlparser/pom.xml @@ -43,7 +43,7 @@ com.manticore-projects.jsqlformatter jsqlparser - 5.4.15 + 5.4.162 org.osgi diff --git a/guard/jsqltranspiler/pom.xml b/guard/jsqltranspiler/pom.xml index 2d0b100..f609f99 100644 --- a/guard/jsqltranspiler/pom.xml +++ b/guard/jsqltranspiler/pom.xml @@ -34,12 +34,12 @@ com.manticore-projects.jsqlformatter jsqlparser - 5.4.15 + 5.4.162 ai.starlake.jsqltranspiler jsqltranspiler - 1.13 + 1.16 org.eclipse.daanse diff --git a/guard/jsqltranspiler/src/main/java/org/eclipse/daanse/sql/guard/jsqltranspiler/DeparserColumResolver.java b/guard/jsqltranspiler/src/main/java/org/eclipse/daanse/sql/guard/jsqltranspiler/DeparserColumResolver.java index a89e1a5..3e8ea19 100644 --- a/guard/jsqltranspiler/src/main/java/org/eclipse/daanse/sql/guard/jsqltranspiler/DeparserColumResolver.java +++ b/guard/jsqltranspiler/src/main/java/org/eclipse/daanse/sql/guard/jsqltranspiler/DeparserColumResolver.java @@ -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)); diff --git a/guard/jsqltranspiler/test.bndrun b/guard/jsqltranspiler/test.bndrun index 8d67daf..53cc27e 100644 --- a/guard/jsqltranspiler/test.bndrun +++ b/guard/jsqltranspiler/test.bndrun @@ -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)',\ @@ -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)',\