diff --git a/_config.yml b/_config.yml new file mode 100644 index 0000000000..c4192631f2 --- /dev/null +++ b/_config.yml @@ -0,0 +1 @@ +theme: jekyll-theme-cayman \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000000..7d6d6bbd09 --- /dev/null +++ b/build.gradle @@ -0,0 +1,35 @@ +plugins { + id "ca.coglinc.javacc" version "2.4.0" +} + +apply plugin: 'java' +apply plugin: 'maven' + +group = 'com.github.jsqlparser' +version = '1.1-SNAPSHOT' + +description = """JSQLParser library""" + +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} + +repositories { + maven { url "http://repo.maven.apache.org/maven2" } +} + +compileJavacc { + arguments = [visitor: 'true'] +} + +compileJjtree { + arguments = [visitor: 'true', TRACK_TOKENS: 'true'] +} + +dependencies { + testCompile group: 'commons-io', name: 'commons-io', version:'2.4' + testCompile group: 'junit', name: 'junit', version:'4.12' + testCompile group: 'org.hamcrest', name: 'hamcrest-library', version:'1.3' + testCompile group: 'org.mockito', name: 'mockito-core', version:'2.7.22' + javacc 'net.java.dev.javacc:javacc:7.0.2' +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..3f67a38c23 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..f1fc1ac907 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Thu Jul 20 16:26:41 PDT 2017 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip diff --git a/gradlew b/gradlew new file mode 100755 index 0000000000..cccdd3d517 --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000000..e95643d6a2 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000000..1724bf5b71 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'jsqlparser' diff --git a/src/main/java/net/sf/jsqlparser/expression/AllComparisonExpression.java b/src/main/java/net/sf/jsqlparser/expression/AllComparisonExpression.java index cfa10043ba..57ee4623d2 100644 --- a/src/main/java/net/sf/jsqlparser/expression/AllComparisonExpression.java +++ b/src/main/java/net/sf/jsqlparser/expression/AllComparisonExpression.java @@ -21,6 +21,7 @@ */ package net.sf.jsqlparser.expression; +import net.sf.jsqlparser.genericClass; import net.sf.jsqlparser.statement.select.SubSelect; public class AllComparisonExpression implements Expression { @@ -44,4 +45,18 @@ public void accept(ExpressionVisitor expressionVisitor) { public String toString() { return "ALL " + subSelect.toString(); } + + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + } diff --git a/src/main/java/net/sf/jsqlparser/expression/AnalyticExpression.java b/src/main/java/net/sf/jsqlparser/expression/AnalyticExpression.java index 9be0d32b9d..98546e6eb4 100644 --- a/src/main/java/net/sf/jsqlparser/expression/AnalyticExpression.java +++ b/src/main/java/net/sf/jsqlparser/expression/AnalyticExpression.java @@ -21,6 +21,7 @@ */ package net.sf.jsqlparser.expression; +import net.sf.jsqlparser.genericClass; import net.sf.jsqlparser.statement.select.OrderByElement; import java.util.List; @@ -179,4 +180,18 @@ private void toStringOrderByElements(StringBuilder b) { } } } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + + } diff --git a/src/main/java/net/sf/jsqlparser/expression/AnyComparisonExpression.java b/src/main/java/net/sf/jsqlparser/expression/AnyComparisonExpression.java index 48b656ec56..19062332f3 100644 --- a/src/main/java/net/sf/jsqlparser/expression/AnyComparisonExpression.java +++ b/src/main/java/net/sf/jsqlparser/expression/AnyComparisonExpression.java @@ -21,6 +21,7 @@ */ package net.sf.jsqlparser.expression; +import net.sf.jsqlparser.genericClass; import net.sf.jsqlparser.statement.select.SubSelect; /** @@ -55,4 +56,18 @@ public AnyType getAnyType() { public String toString() { return anyType.name() + " " + subSelect.toString(); } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + + } diff --git a/src/main/java/net/sf/jsqlparser/expression/BinaryExpression.java b/src/main/java/net/sf/jsqlparser/expression/BinaryExpression.java index 90dbf7a836..d6fde9164a 100644 --- a/src/main/java/net/sf/jsqlparser/expression/BinaryExpression.java +++ b/src/main/java/net/sf/jsqlparser/expression/BinaryExpression.java @@ -21,6 +21,8 @@ */ package net.sf.jsqlparser.expression; +import net.sf.jsqlparser.genericClass; + /** * A basic class for binary expressions, that is expressions having a left member and a right member * which are in turn expressions. @@ -30,8 +32,7 @@ public abstract class BinaryExpression implements Expression { private Expression leftExpression; private Expression rightExpression; private boolean not = false; - - + public genericClass logicalType = new genericClass(); public BinaryExpression() { } @@ -70,5 +71,16 @@ public String toString() { } public abstract String getStringExpression(); - + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + + } diff --git a/src/main/java/net/sf/jsqlparser/expression/CaseExpression.java b/src/main/java/net/sf/jsqlparser/expression/CaseExpression.java index a43f4e202c..7313586a4a 100644 --- a/src/main/java/net/sf/jsqlparser/expression/CaseExpression.java +++ b/src/main/java/net/sf/jsqlparser/expression/CaseExpression.java @@ -23,6 +23,7 @@ import java.util.List; +import net.sf.jsqlparser.genericClass; import net.sf.jsqlparser.statement.select.PlainSelect; /** @@ -115,4 +116,18 @@ public String toString() { + PlainSelect.getStringList(whenClauses, false, false) + " " + ((elseExpression != null) ? "ELSE " + elseExpression + " " : "") + "END"; } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + + } diff --git a/src/main/java/net/sf/jsqlparser/expression/CastExpression.java b/src/main/java/net/sf/jsqlparser/expression/CastExpression.java index 0e757629da..3af05f7c89 100644 --- a/src/main/java/net/sf/jsqlparser/expression/CastExpression.java +++ b/src/main/java/net/sf/jsqlparser/expression/CastExpression.java @@ -21,6 +21,7 @@ */ package net.sf.jsqlparser.expression; +import net.sf.jsqlparser.genericClass; import net.sf.jsqlparser.statement.create.table.ColDataType; /** @@ -70,4 +71,19 @@ public String toString() { return leftExpression + "::" + type.toString(); } } + + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + + } diff --git a/src/main/java/net/sf/jsqlparser/expression/DateTimeLiteralExpression.java b/src/main/java/net/sf/jsqlparser/expression/DateTimeLiteralExpression.java index e71617ea48..d4cf21882e 100644 --- a/src/main/java/net/sf/jsqlparser/expression/DateTimeLiteralExpression.java +++ b/src/main/java/net/sf/jsqlparser/expression/DateTimeLiteralExpression.java @@ -39,6 +39,8 @@ */ package net.sf.jsqlparser.expression; +import net.sf.jsqlparser.genericClass; + /** * * @author toben @@ -77,4 +79,17 @@ public String toString() { public static enum DateTime { DATE, TIME, TIMESTAMP; } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + } diff --git a/src/main/java/net/sf/jsqlparser/expression/DateValue.java b/src/main/java/net/sf/jsqlparser/expression/DateValue.java index f785bae878..ec09a2bbd8 100644 --- a/src/main/java/net/sf/jsqlparser/expression/DateValue.java +++ b/src/main/java/net/sf/jsqlparser/expression/DateValue.java @@ -21,6 +21,8 @@ */ package net.sf.jsqlparser.expression; +import net.sf.jsqlparser.genericClass; + import java.sql.Date; /** @@ -51,4 +53,18 @@ public void setValue(Date d) { public String toString() { return "{d '" + value.toString() + "'}"; } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + + } diff --git a/src/main/java/net/sf/jsqlparser/expression/DoubleValue.java b/src/main/java/net/sf/jsqlparser/expression/DoubleValue.java index aaa98e77c2..4fe4144ce6 100644 --- a/src/main/java/net/sf/jsqlparser/expression/DoubleValue.java +++ b/src/main/java/net/sf/jsqlparser/expression/DoubleValue.java @@ -21,6 +21,8 @@ */ package net.sf.jsqlparser.expression; +import net.sf.jsqlparser.genericClass; + /** * Every number with a point or a exponential format is a DoubleValue */ @@ -55,4 +57,17 @@ public void setValue(double d) { public String toString() { return stringValue; } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + } diff --git a/src/main/java/net/sf/jsqlparser/expression/Expression.java b/src/main/java/net/sf/jsqlparser/expression/Expression.java index 7c2c418192..b1dcfd508f 100644 --- a/src/main/java/net/sf/jsqlparser/expression/Expression.java +++ b/src/main/java/net/sf/jsqlparser/expression/Expression.java @@ -21,7 +21,12 @@ */ package net.sf.jsqlparser.expression; +import java.util.*; + public interface Expression { + void setLogicalType(Object expression); + Object getLogicalType(); + void accept(ExpressionVisitor expressionVisitor); } diff --git a/src/main/java/net/sf/jsqlparser/expression/ExpressionVisitor.java b/src/main/java/net/sf/jsqlparser/expression/ExpressionVisitor.java index e9b9b5a6a1..03df607d29 100644 --- a/src/main/java/net/sf/jsqlparser/expression/ExpressionVisitor.java +++ b/src/main/java/net/sf/jsqlparser/expression/ExpressionVisitor.java @@ -33,6 +33,7 @@ import net.sf.jsqlparser.expression.operators.conditional.AndExpression; import net.sf.jsqlparser.expression.operators.conditional.OrExpression; import net.sf.jsqlparser.expression.operators.relational.Between; +import net.sf.jsqlparser.expression.operators.relational.Rlike; import net.sf.jsqlparser.expression.operators.relational.EqualsTo; import net.sf.jsqlparser.expression.operators.relational.ExistsExpression; import net.sf.jsqlparser.expression.operators.relational.GreaterThan; @@ -92,6 +93,8 @@ public interface ExpressionVisitor { void visit(Between between); + void visit(Rlike rlike); + void visit(EqualsTo equalsTo); void visit(GreaterThan greaterThan); diff --git a/src/main/java/net/sf/jsqlparser/expression/ExpressionVisitorAdapter.java b/src/main/java/net/sf/jsqlparser/expression/ExpressionVisitorAdapter.java index 61a2e6b1b9..7e481b306a 100644 --- a/src/main/java/net/sf/jsqlparser/expression/ExpressionVisitorAdapter.java +++ b/src/main/java/net/sf/jsqlparser/expression/ExpressionVisitorAdapter.java @@ -155,6 +155,13 @@ public void visit(Between expr) { expr.getBetweenExpressionEnd().accept(this); } + @Override + public void visit(Rlike expr) { + expr.getLeftExpression().accept(this); + expr.getRightExpression().accept(this); + } + + @Override public void visit(EqualsTo expr) { visitBinaryExpression(expr); diff --git a/src/main/java/net/sf/jsqlparser/expression/ExtractExpression.java b/src/main/java/net/sf/jsqlparser/expression/ExtractExpression.java index e082266e25..edb87ab0af 100644 --- a/src/main/java/net/sf/jsqlparser/expression/ExtractExpression.java +++ b/src/main/java/net/sf/jsqlparser/expression/ExtractExpression.java @@ -21,6 +21,8 @@ */ package net.sf.jsqlparser.expression; +import net.sf.jsqlparser.genericClass; + /** * Extract value from date/time expression. The name stores the part - name to get from the * following date/time expression. @@ -57,4 +59,17 @@ public void setExpression(Expression expression) { public String toString() { return "EXTRACT(" + name + " FROM " + expression + ')'; } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + } diff --git a/src/main/java/net/sf/jsqlparser/expression/Function.java b/src/main/java/net/sf/jsqlparser/expression/Function.java index 53c1ca3d25..7b3d1c481d 100644 --- a/src/main/java/net/sf/jsqlparser/expression/Function.java +++ b/src/main/java/net/sf/jsqlparser/expression/Function.java @@ -22,6 +22,7 @@ package net.sf.jsqlparser.expression; import net.sf.jsqlparser.expression.operators.relational.ExpressionList; +import net.sf.jsqlparser.genericClass; import net.sf.jsqlparser.parser.ASTNodeAccessImpl; /** @@ -37,6 +38,8 @@ public class Function extends ASTNodeAccessImpl implements Expression { private String attribute; private KeepExpression keep = null; + private Expression customExpression; + @Override public void accept(ExpressionVisitor expressionVisitor) { expressionVisitor.visit(this); @@ -124,6 +127,15 @@ public void setKeep(KeepExpression keep) { this.keep = keep; } + + public Expression customExpression() { + return customExpression; + } + + public void setCustomExpression( Expression customExpression) { + this.customExpression = customExpression; + } + @Override public String toString() { String params; @@ -155,6 +167,24 @@ public String toString() { ans = "{fn " + ans + "}"; } + if (customExpression != null) { + ans = customExpression.toString(); + } + return ans; } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + + } diff --git a/src/main/java/net/sf/jsqlparser/expression/HexValue.java b/src/main/java/net/sf/jsqlparser/expression/HexValue.java index ba6ea49f60..a2ed073d93 100644 --- a/src/main/java/net/sf/jsqlparser/expression/HexValue.java +++ b/src/main/java/net/sf/jsqlparser/expression/HexValue.java @@ -21,6 +21,8 @@ */ package net.sf.jsqlparser.expression; +import net.sf.jsqlparser.genericClass; + /** * Every number with a point or a exponential format is a DoubleValue */ @@ -50,4 +52,17 @@ public void setValue(String d) { public String toString() { return stringValue; } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + } diff --git a/src/main/java/net/sf/jsqlparser/expression/IntervalExpression.java b/src/main/java/net/sf/jsqlparser/expression/IntervalExpression.java index 4d62bf5d6a..2d9489f0c5 100644 --- a/src/main/java/net/sf/jsqlparser/expression/IntervalExpression.java +++ b/src/main/java/net/sf/jsqlparser/expression/IntervalExpression.java @@ -21,6 +21,8 @@ */ package net.sf.jsqlparser.expression; +import net.sf.jsqlparser.genericClass; + /** * * @author wumpz @@ -55,4 +57,18 @@ public String toString() { public void accept(ExpressionVisitor expressionVisitor) { expressionVisitor.visit(this); } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + + } diff --git a/src/main/java/net/sf/jsqlparser/expression/JdbcNamedParameter.java b/src/main/java/net/sf/jsqlparser/expression/JdbcNamedParameter.java index 8b5a3268eb..9226563d97 100644 --- a/src/main/java/net/sf/jsqlparser/expression/JdbcNamedParameter.java +++ b/src/main/java/net/sf/jsqlparser/expression/JdbcNamedParameter.java @@ -21,6 +21,8 @@ */ package net.sf.jsqlparser.expression; +import net.sf.jsqlparser.genericClass; + /** * * @author aud @@ -51,4 +53,16 @@ public void accept(ExpressionVisitor expressionVisitor) { public String toString() { return ":" + name; } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } } diff --git a/src/main/java/net/sf/jsqlparser/expression/JdbcParameter.java b/src/main/java/net/sf/jsqlparser/expression/JdbcParameter.java index 37c06b119d..3088c46cfc 100644 --- a/src/main/java/net/sf/jsqlparser/expression/JdbcParameter.java +++ b/src/main/java/net/sf/jsqlparser/expression/JdbcParameter.java @@ -21,6 +21,8 @@ */ package net.sf.jsqlparser.expression; +import net.sf.jsqlparser.genericClass; + /** * A '?' in a statement or a ? e.g. ?4 */ @@ -62,4 +64,17 @@ public void accept(ExpressionVisitor expressionVisitor) { public String toString() { return useFixedIndex ? "?" + index : "?"; } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + } diff --git a/src/main/java/net/sf/jsqlparser/expression/JsonExpression.java b/src/main/java/net/sf/jsqlparser/expression/JsonExpression.java index c882174186..1c342978e2 100644 --- a/src/main/java/net/sf/jsqlparser/expression/JsonExpression.java +++ b/src/main/java/net/sf/jsqlparser/expression/JsonExpression.java @@ -23,6 +23,8 @@ import java.util.ArrayList; import java.util.List; + +import net.sf.jsqlparser.genericClass; import net.sf.jsqlparser.schema.Column; /** @@ -78,4 +80,17 @@ public String toString() { } return b.toString(); } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + } diff --git a/src/main/java/net/sf/jsqlparser/expression/KeepExpression.java b/src/main/java/net/sf/jsqlparser/expression/KeepExpression.java index b0dfe82edf..18f343ce40 100644 --- a/src/main/java/net/sf/jsqlparser/expression/KeepExpression.java +++ b/src/main/java/net/sf/jsqlparser/expression/KeepExpression.java @@ -21,6 +21,7 @@ */ package net.sf.jsqlparser.expression; +import net.sf.jsqlparser.genericClass; import net.sf.jsqlparser.statement.select.OrderByElement; import java.util.List; @@ -93,4 +94,17 @@ private void toStringOrderByElements(StringBuilder b) { } } } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + } diff --git a/src/main/java/net/sf/jsqlparser/expression/LongValue.java b/src/main/java/net/sf/jsqlparser/expression/LongValue.java index 23fd12efa5..80ee847bc6 100644 --- a/src/main/java/net/sf/jsqlparser/expression/LongValue.java +++ b/src/main/java/net/sf/jsqlparser/expression/LongValue.java @@ -21,6 +21,8 @@ */ package net.sf.jsqlparser.expression; +import net.sf.jsqlparser.genericClass; + import java.math.BigInteger; /** @@ -71,4 +73,16 @@ public void setStringValue(String string) { public String toString() { return getStringValue(); } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } } diff --git a/src/main/java/net/sf/jsqlparser/expression/MySQLGroupConcat.java b/src/main/java/net/sf/jsqlparser/expression/MySQLGroupConcat.java index 291a21043d..9f7c3b6c16 100644 --- a/src/main/java/net/sf/jsqlparser/expression/MySQLGroupConcat.java +++ b/src/main/java/net/sf/jsqlparser/expression/MySQLGroupConcat.java @@ -41,6 +41,7 @@ import java.util.List; import net.sf.jsqlparser.expression.operators.relational.ExpressionList; +import net.sf.jsqlparser.genericClass; import net.sf.jsqlparser.statement.select.OrderByElement; import net.sf.jsqlparser.statement.select.PlainSelect; @@ -115,4 +116,17 @@ public String toString() { b.append(")"); return b.toString(); } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + } diff --git a/src/main/java/net/sf/jsqlparser/expression/NotExpression.java b/src/main/java/net/sf/jsqlparser/expression/NotExpression.java index e94d05fecf..c93318d7b2 100644 --- a/src/main/java/net/sf/jsqlparser/expression/NotExpression.java +++ b/src/main/java/net/sf/jsqlparser/expression/NotExpression.java @@ -21,6 +21,8 @@ */ package net.sf.jsqlparser.expression; +import net.sf.jsqlparser.genericClass; + /** * It represents a "-" or "+" before an expression */ @@ -49,4 +51,17 @@ public void accept(ExpressionVisitor expressionVisitor) { public String toString() { return "NOT " + expression.toString(); } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + } diff --git a/src/main/java/net/sf/jsqlparser/expression/NullValue.java b/src/main/java/net/sf/jsqlparser/expression/NullValue.java index d1fd45574b..91c1e342c7 100644 --- a/src/main/java/net/sf/jsqlparser/expression/NullValue.java +++ b/src/main/java/net/sf/jsqlparser/expression/NullValue.java @@ -21,6 +21,8 @@ */ package net.sf.jsqlparser.expression; +import net.sf.jsqlparser.genericClass; + /** * A "NULL" in a sql statement */ @@ -35,4 +37,16 @@ public void accept(ExpressionVisitor expressionVisitor) { public String toString() { return "NULL"; } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } } diff --git a/src/main/java/net/sf/jsqlparser/expression/NumericBind.java b/src/main/java/net/sf/jsqlparser/expression/NumericBind.java index e4c29d5d20..785527d4c8 100644 --- a/src/main/java/net/sf/jsqlparser/expression/NumericBind.java +++ b/src/main/java/net/sf/jsqlparser/expression/NumericBind.java @@ -21,6 +21,8 @@ */ package net.sf.jsqlparser.expression; +import net.sf.jsqlparser.genericClass; + /** * * @author aud @@ -46,4 +48,17 @@ public void accept(ExpressionVisitor expressionVisitor) { public String toString() { return ":" + bindId; } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + } diff --git a/src/main/java/net/sf/jsqlparser/expression/OracleHierarchicalExpression.java b/src/main/java/net/sf/jsqlparser/expression/OracleHierarchicalExpression.java index 9e8a94887c..4d1fe13356 100644 --- a/src/main/java/net/sf/jsqlparser/expression/OracleHierarchicalExpression.java +++ b/src/main/java/net/sf/jsqlparser/expression/OracleHierarchicalExpression.java @@ -21,6 +21,8 @@ */ package net.sf.jsqlparser.expression; +import net.sf.jsqlparser.genericClass; + /** * * @author toben @@ -93,4 +95,16 @@ public String toString() { } return b.toString(); } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } } diff --git a/src/main/java/net/sf/jsqlparser/expression/OracleHint.java b/src/main/java/net/sf/jsqlparser/expression/OracleHint.java index e0b82170b2..aafe5dcfc9 100644 --- a/src/main/java/net/sf/jsqlparser/expression/OracleHint.java +++ b/src/main/java/net/sf/jsqlparser/expression/OracleHint.java @@ -21,6 +21,8 @@ */ package net.sf.jsqlparser.expression; +import net.sf.jsqlparser.genericClass; + import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -88,4 +90,17 @@ public String toString() { } } + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + + } diff --git a/src/main/java/net/sf/jsqlparser/expression/Parenthesis.java b/src/main/java/net/sf/jsqlparser/expression/Parenthesis.java index 2921774918..aa8c538897 100644 --- a/src/main/java/net/sf/jsqlparser/expression/Parenthesis.java +++ b/src/main/java/net/sf/jsqlparser/expression/Parenthesis.java @@ -21,6 +21,8 @@ */ package net.sf.jsqlparser.expression; +import net.sf.jsqlparser.genericClass; + /** * It represents an expression like "(" expression ")" */ @@ -61,4 +63,17 @@ public boolean isNot() { public String toString() { return (not ? "NOT " : "") + "(" + expression + ")"; } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + } diff --git a/src/main/java/net/sf/jsqlparser/expression/RowConstructor.java b/src/main/java/net/sf/jsqlparser/expression/RowConstructor.java index 575f4d4bf2..dbfa86d699 100644 --- a/src/main/java/net/sf/jsqlparser/expression/RowConstructor.java +++ b/src/main/java/net/sf/jsqlparser/expression/RowConstructor.java @@ -22,6 +22,7 @@ package net.sf.jsqlparser.expression; import net.sf.jsqlparser.expression.operators.relational.ExpressionList; +import net.sf.jsqlparser.genericClass; /** * Rowconstructor. @@ -61,4 +62,17 @@ public void accept(ExpressionVisitor expressionVisitor) { public String toString() { return (name != null ? name : "") + exprList.toString(); } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + } diff --git a/src/main/java/net/sf/jsqlparser/expression/SignedExpression.java b/src/main/java/net/sf/jsqlparser/expression/SignedExpression.java index 2d766d24eb..704cb24e61 100644 --- a/src/main/java/net/sf/jsqlparser/expression/SignedExpression.java +++ b/src/main/java/net/sf/jsqlparser/expression/SignedExpression.java @@ -21,6 +21,8 @@ */ package net.sf.jsqlparser.expression; +import net.sf.jsqlparser.genericClass; + /** * It represents a "-" or "+" before an expression */ @@ -62,4 +64,16 @@ public void accept(ExpressionVisitor expressionVisitor) { public String toString() { return getSign() + expression.toString(); } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } } diff --git a/src/main/java/net/sf/jsqlparser/expression/StringValue.java b/src/main/java/net/sf/jsqlparser/expression/StringValue.java index d0a4d71f3c..8fa1671fa6 100644 --- a/src/main/java/net/sf/jsqlparser/expression/StringValue.java +++ b/src/main/java/net/sf/jsqlparser/expression/StringValue.java @@ -21,6 +21,8 @@ */ package net.sf.jsqlparser.expression; +import net.sf.jsqlparser.genericClass; + /** * A string as in 'example_string' */ @@ -66,4 +68,17 @@ public void accept(ExpressionVisitor expressionVisitor) { public String toString() { return "'" + value + "'"; } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + } diff --git a/src/main/java/net/sf/jsqlparser/expression/TimeKeyExpression.java b/src/main/java/net/sf/jsqlparser/expression/TimeKeyExpression.java index 4d22ef9d6c..d2d2cb26a1 100644 --- a/src/main/java/net/sf/jsqlparser/expression/TimeKeyExpression.java +++ b/src/main/java/net/sf/jsqlparser/expression/TimeKeyExpression.java @@ -21,6 +21,8 @@ */ package net.sf.jsqlparser.expression; +import net.sf.jsqlparser.genericClass; + public class TimeKeyExpression implements Expression { private String stringValue; @@ -46,4 +48,16 @@ public void setStringValue(String string) { public String toString() { return getStringValue(); } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } } diff --git a/src/main/java/net/sf/jsqlparser/expression/TimeValue.java b/src/main/java/net/sf/jsqlparser/expression/TimeValue.java index b100a3f5f1..01887d0bb5 100644 --- a/src/main/java/net/sf/jsqlparser/expression/TimeValue.java +++ b/src/main/java/net/sf/jsqlparser/expression/TimeValue.java @@ -21,6 +21,8 @@ */ package net.sf.jsqlparser.expression; +import net.sf.jsqlparser.genericClass; + import java.sql.Time; /** @@ -51,4 +53,17 @@ public void setValue(Time d) { public String toString() { return "{t '" + value + "'}"; } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + } diff --git a/src/main/java/net/sf/jsqlparser/expression/TimestampValue.java b/src/main/java/net/sf/jsqlparser/expression/TimestampValue.java index 5c5a2c170c..a936896599 100644 --- a/src/main/java/net/sf/jsqlparser/expression/TimestampValue.java +++ b/src/main/java/net/sf/jsqlparser/expression/TimestampValue.java @@ -21,6 +21,8 @@ */ package net.sf.jsqlparser.expression; +import net.sf.jsqlparser.genericClass; + import java.sql.Timestamp; /** @@ -51,4 +53,16 @@ public void setValue(Timestamp d) { public String toString() { return "{ts '" + value + "'}"; } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } } diff --git a/src/main/java/net/sf/jsqlparser/expression/UserVariable.java b/src/main/java/net/sf/jsqlparser/expression/UserVariable.java index 1b843cd647..d1301de844 100644 --- a/src/main/java/net/sf/jsqlparser/expression/UserVariable.java +++ b/src/main/java/net/sf/jsqlparser/expression/UserVariable.java @@ -21,6 +21,8 @@ */ package net.sf.jsqlparser.expression; +import net.sf.jsqlparser.genericClass; + /** * Simple uservariables like @test. * @@ -61,4 +63,17 @@ public void setDoubleAdd(boolean doubleAdd) { public String toString() { return "@" + (doubleAdd ? "@" : "") + name; } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + } diff --git a/src/main/java/net/sf/jsqlparser/expression/WhenClause.java b/src/main/java/net/sf/jsqlparser/expression/WhenClause.java index 1700c14f0d..360e25194f 100644 --- a/src/main/java/net/sf/jsqlparser/expression/WhenClause.java +++ b/src/main/java/net/sf/jsqlparser/expression/WhenClause.java @@ -21,6 +21,8 @@ */ package net.sf.jsqlparser.expression; +import net.sf.jsqlparser.genericClass; + /** * A clause of following syntax: WHEN condition THEN expression. Which is part of a CaseExpression. * @@ -68,4 +70,17 @@ public void setWhenExpression(Expression whenExpression) { public String toString() { return "WHEN " + whenExpression + " THEN " + thenExpression; } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + } diff --git a/src/main/java/net/sf/jsqlparser/expression/WindowElement.java b/src/main/java/net/sf/jsqlparser/expression/WindowElement.java index 7ad4f7a078..388b9ab80d 100644 --- a/src/main/java/net/sf/jsqlparser/expression/WindowElement.java +++ b/src/main/java/net/sf/jsqlparser/expression/WindowElement.java @@ -69,4 +69,6 @@ public String toString() { return buffer.toString(); } + + } diff --git a/src/main/java/net/sf/jsqlparser/expression/WithinGroupExpression.java b/src/main/java/net/sf/jsqlparser/expression/WithinGroupExpression.java index 8966943187..2a69cc5eb7 100644 --- a/src/main/java/net/sf/jsqlparser/expression/WithinGroupExpression.java +++ b/src/main/java/net/sf/jsqlparser/expression/WithinGroupExpression.java @@ -23,6 +23,7 @@ import java.util.List; import net.sf.jsqlparser.expression.operators.relational.ExpressionList; +import net.sf.jsqlparser.genericClass; import net.sf.jsqlparser.statement.select.OrderByElement; /** @@ -87,4 +88,16 @@ public String toString() { return b.toString(); } + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + } diff --git a/src/main/java/net/sf/jsqlparser/expression/operators/arithmetic/Modulo.java b/src/main/java/net/sf/jsqlparser/expression/operators/arithmetic/Modulo.java index 9b88105a1d..420eae5c2c 100644 --- a/src/main/java/net/sf/jsqlparser/expression/operators/arithmetic/Modulo.java +++ b/src/main/java/net/sf/jsqlparser/expression/operators/arithmetic/Modulo.java @@ -31,9 +31,6 @@ */ public class Modulo extends BinaryExpression { - public Modulo() { - } - @Override public void accept(ExpressionVisitor expressionVisitor) { expressionVisitor.visit(this); diff --git a/src/main/java/net/sf/jsqlparser/expression/operators/relational/Between.java b/src/main/java/net/sf/jsqlparser/expression/operators/relational/Between.java index 5e046920ab..5b9811f94e 100644 --- a/src/main/java/net/sf/jsqlparser/expression/operators/relational/Between.java +++ b/src/main/java/net/sf/jsqlparser/expression/operators/relational/Between.java @@ -23,6 +23,7 @@ import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.ExpressionVisitor; +import net.sf.jsqlparser.genericClass; /** * A "BETWEEN" expr1 expr2 statement @@ -76,4 +77,17 @@ public String toString() { return leftExpression + " " + (not ? "NOT " : "") + "BETWEEN " + betweenExpressionStart + " AND " + betweenExpressionEnd; } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + } diff --git a/src/main/java/net/sf/jsqlparser/expression/operators/relational/ExistsExpression.java b/src/main/java/net/sf/jsqlparser/expression/operators/relational/ExistsExpression.java index 0660874ece..4e432c5c51 100644 --- a/src/main/java/net/sf/jsqlparser/expression/operators/relational/ExistsExpression.java +++ b/src/main/java/net/sf/jsqlparser/expression/operators/relational/ExistsExpression.java @@ -23,6 +23,7 @@ import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.ExpressionVisitor; +import net.sf.jsqlparser.genericClass; public class ExistsExpression implements Expression { @@ -58,4 +59,17 @@ public String getStringExpression() { public String toString() { return getStringExpression() + " " + rightExpression.toString(); } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + } diff --git a/src/main/java/net/sf/jsqlparser/expression/operators/relational/InExpression.java b/src/main/java/net/sf/jsqlparser/expression/operators/relational/InExpression.java index 8fe568fdad..94faf04149 100644 --- a/src/main/java/net/sf/jsqlparser/expression/operators/relational/InExpression.java +++ b/src/main/java/net/sf/jsqlparser/expression/operators/relational/InExpression.java @@ -23,6 +23,7 @@ import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.ExpressionVisitor; +import net.sf.jsqlparser.genericClass; public class InExpression implements Expression, SupportsOldOracleJoinSyntax { @@ -111,4 +112,17 @@ public void setOraclePriorPosition(int priorPosition) { throw new IllegalArgumentException("unexpected prior for oracle found"); } } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + } diff --git a/src/main/java/net/sf/jsqlparser/expression/operators/relational/IsNullExpression.java b/src/main/java/net/sf/jsqlparser/expression/operators/relational/IsNullExpression.java index a12dd8691c..e282a57507 100644 --- a/src/main/java/net/sf/jsqlparser/expression/operators/relational/IsNullExpression.java +++ b/src/main/java/net/sf/jsqlparser/expression/operators/relational/IsNullExpression.java @@ -23,6 +23,7 @@ import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.ExpressionVisitor; +import net.sf.jsqlparser.genericClass; public class IsNullExpression implements Expression { @@ -54,4 +55,18 @@ public void accept(ExpressionVisitor expressionVisitor) { public String toString() { return leftExpression + " IS " + (not ? "NOT " : "") + "NULL"; } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + + } diff --git a/src/main/java/net/sf/jsqlparser/expression/operators/relational/LikeExpression.java b/src/main/java/net/sf/jsqlparser/expression/operators/relational/LikeExpression.java index 23f70196eb..28c2e93e22 100644 --- a/src/main/java/net/sf/jsqlparser/expression/operators/relational/LikeExpression.java +++ b/src/main/java/net/sf/jsqlparser/expression/operators/relational/LikeExpression.java @@ -74,4 +74,5 @@ public boolean isCaseInsensitive() { public void setCaseInsensitive(boolean caseInsensitive) { this.caseInsensitive = caseInsensitive; } + } diff --git a/src/main/java/net/sf/jsqlparser/expression/operators/relational/Rlike.java b/src/main/java/net/sf/jsqlparser/expression/operators/relational/Rlike.java new file mode 100644 index 0000000000..20509524c0 --- /dev/null +++ b/src/main/java/net/sf/jsqlparser/expression/operators/relational/Rlike.java @@ -0,0 +1,72 @@ +/* + * #%L + * JSQLParser library + * %% + * Copyright (C) 2004 - 2017 JSQLParser + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 2.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * . + * #L% + */ +package net.sf.jsqlparser.expression.operators.relational; + +import net.sf.jsqlparser.expression.Expression; +import net.sf.jsqlparser.expression.ExpressionVisitor; +import net.sf.jsqlparser.genericClass; + + +public class Rlike implements Expression { + private Expression leftExpression; + private Expression rightExpression; + + public Expression getLeftExpression() { + return leftExpression; + } + + public Expression getRightExpression() { + return rightExpression; + } + + public void setRightExpression(Expression expression) { + rightExpression = expression; + } + + public void setLeftExpression(Expression expression) { + leftExpression = expression; + } + + + @Override + public void accept(ExpressionVisitor expressionVisitor) { + expressionVisitor.visit(this); + } + + @Override + public String toString() { + return leftExpression + " RLIKE " + rightExpression; + } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } +} + diff --git a/src/main/java/net/sf/jsqlparser/genericClass.java b/src/main/java/net/sf/jsqlparser/genericClass.java new file mode 100644 index 0000000000..6c8c8d7b64 --- /dev/null +++ b/src/main/java/net/sf/jsqlparser/genericClass.java @@ -0,0 +1,33 @@ +/* + * #%L + * JSQLParser library + * %% + * Copyright (C) 2004 - 2017 JSQLParser + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 2.1 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * . + * #L% + */ +package net.sf.jsqlparser; + + +public class genericClass { + T genericObject; + public void setLogicalType(T logicalType){ + genericObject = logicalType; + } + public T getLogicalType() { + return genericObject; + } +} diff --git a/src/main/java/net/sf/jsqlparser/schema/Column.java b/src/main/java/net/sf/jsqlparser/schema/Column.java index 4b343c3035..cd669aa857 100644 --- a/src/main/java/net/sf/jsqlparser/schema/Column.java +++ b/src/main/java/net/sf/jsqlparser/schema/Column.java @@ -22,6 +22,7 @@ package net.sf.jsqlparser.schema; import net.sf.jsqlparser.expression.*; +import net.sf.jsqlparser.genericClass; import net.sf.jsqlparser.parser.ASTNodeAccessImpl; /** @@ -32,6 +33,19 @@ public final class Column extends ASTNodeAccessImpl implements Expression, Multi private Table table; private String columnName; + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + + public Column() { } diff --git a/src/main/java/net/sf/jsqlparser/statement/select/SelectExpressionItem.java b/src/main/java/net/sf/jsqlparser/statement/select/SelectExpressionItem.java index 7250d19735..11fa3448f2 100644 --- a/src/main/java/net/sf/jsqlparser/statement/select/SelectExpressionItem.java +++ b/src/main/java/net/sf/jsqlparser/statement/select/SelectExpressionItem.java @@ -31,7 +31,6 @@ public class SelectExpressionItem implements SelectItem { private Expression expression; private Alias alias; - public SelectExpressionItem() { } @@ -65,3 +64,4 @@ public String toString() { return expression + ((alias != null) ? alias.toString() : ""); } } + diff --git a/src/main/java/net/sf/jsqlparser/statement/select/SubSelect.java b/src/main/java/net/sf/jsqlparser/statement/select/SubSelect.java index 22f8a15e4a..c90e92062a 100644 --- a/src/main/java/net/sf/jsqlparser/statement/select/SubSelect.java +++ b/src/main/java/net/sf/jsqlparser/statement/select/SubSelect.java @@ -28,6 +28,7 @@ import net.sf.jsqlparser.expression.ExpressionVisitor; import net.sf.jsqlparser.expression.operators.relational.ItemsList; import net.sf.jsqlparser.expression.operators.relational.ItemsListVisitor; +import net.sf.jsqlparser.genericClass; /** * A subselect followed by an optional alias. @@ -131,4 +132,17 @@ public String toString() { return retval.toString(); } + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + } diff --git a/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java b/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java index a8b9724747..1826159e4d 100644 --- a/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java +++ b/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java @@ -72,6 +72,7 @@ import net.sf.jsqlparser.expression.operators.conditional.AndExpression; import net.sf.jsqlparser.expression.operators.conditional.OrExpression; import net.sf.jsqlparser.expression.operators.relational.Between; +import net.sf.jsqlparser.expression.operators.relational.Rlike; import net.sf.jsqlparser.expression.operators.relational.EqualsTo; import net.sf.jsqlparser.expression.operators.relational.ExistsExpression; import net.sf.jsqlparser.expression.operators.relational.ExpressionList; @@ -243,6 +244,12 @@ public void visit(Between between) { between.getBetweenExpressionEnd().accept(this); } + @Override + public void visit(Rlike rlike) { + rlike.getLeftExpression().accept(this); + rlike.getRightExpression().accept(this); + } + @Override public void visit(Column tableColumn) { } diff --git a/src/main/java/net/sf/jsqlparser/util/cnfexpression/MultiAndExpression.java b/src/main/java/net/sf/jsqlparser/util/cnfexpression/MultiAndExpression.java index d5d37d13e5..d74223aa8b 100644 --- a/src/main/java/net/sf/jsqlparser/util/cnfexpression/MultiAndExpression.java +++ b/src/main/java/net/sf/jsqlparser/util/cnfexpression/MultiAndExpression.java @@ -41,4 +41,6 @@ public String getStringExpression() { return "AND"; } + + } \ No newline at end of file diff --git a/src/main/java/net/sf/jsqlparser/util/cnfexpression/MultiOrExpression.java b/src/main/java/net/sf/jsqlparser/util/cnfexpression/MultiOrExpression.java index 9b8bdcba8b..3ad86d813c 100644 --- a/src/main/java/net/sf/jsqlparser/util/cnfexpression/MultiOrExpression.java +++ b/src/main/java/net/sf/jsqlparser/util/cnfexpression/MultiOrExpression.java @@ -41,4 +41,6 @@ public String getStringExpression() { return "OR"; } + + } diff --git a/src/main/java/net/sf/jsqlparser/util/cnfexpression/MultipleExpression.java b/src/main/java/net/sf/jsqlparser/util/cnfexpression/MultipleExpression.java index 7bdef475b9..e81d93589f 100644 --- a/src/main/java/net/sf/jsqlparser/util/cnfexpression/MultipleExpression.java +++ b/src/main/java/net/sf/jsqlparser/util/cnfexpression/MultipleExpression.java @@ -26,6 +26,7 @@ import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.ExpressionVisitor; import net.sf.jsqlparser.expression.NullValue; +import net.sf.jsqlparser.genericClass; /** * This is a helper class that mainly used for handling the CNF conversion. @@ -88,5 +89,18 @@ public String toString() { sb.append(")"); return sb.toString(); } - + + + public genericClass logicalType = new genericClass(); + + @Override + public void setLogicalType(Object inputLogicalType) { + logicalType.setLogicalType(inputLogicalType); + } + + @Override + public Object getLogicalType() { + return logicalType.getLogicalType(); + } + } diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java index ac10939a94..b4fa4d5107 100644 --- a/src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java +++ b/src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java @@ -73,6 +73,7 @@ import net.sf.jsqlparser.expression.operators.conditional.AndExpression; import net.sf.jsqlparser.expression.operators.conditional.OrExpression; import net.sf.jsqlparser.expression.operators.relational.Between; +import net.sf.jsqlparser.expression.operators.relational.Rlike; import net.sf.jsqlparser.expression.operators.relational.EqualsTo; import net.sf.jsqlparser.expression.operators.relational.ExistsExpression; import net.sf.jsqlparser.expression.operators.relational.ExpressionList; @@ -171,6 +172,13 @@ public void visit(Between between) { } + @Override + public void visit(Rlike rlike) { + rlike.getLeftExpression().accept(this); + buffer.append(" RLIKE "); + rlike.getRightExpression().accept(this); + } + @Override public void visit(EqualsTo equalsTo) { visitOldOracleJoinBinaryExpression(equalsTo, " = "); diff --git a/src/main/jjtree/.DS_Store b/src/main/jjtree/.DS_Store new file mode 100644 index 0000000000..a1de2752ea Binary files /dev/null and b/src/main/jjtree/.DS_Store differ diff --git a/src/main/jjtree/net/.DS_Store b/src/main/jjtree/net/.DS_Store new file mode 100644 index 0000000000..53c449c2ae Binary files /dev/null and b/src/main/jjtree/net/.DS_Store differ diff --git a/src/main/jjtree/net/sf/.DS_Store b/src/main/jjtree/net/sf/.DS_Store new file mode 100644 index 0000000000..c8de264da4 Binary files /dev/null and b/src/main/jjtree/net/sf/.DS_Store differ diff --git a/src/main/jjtree/net/sf/jsqlparser/.DS_Store b/src/main/jjtree/net/sf/jsqlparser/.DS_Store new file mode 100644 index 0000000000..b2f28aadc9 Binary files /dev/null and b/src/main/jjtree/net/sf/jsqlparser/.DS_Store differ diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt index 88813f733a..547934c691 100644 --- a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt +++ b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt @@ -201,6 +201,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */ | | | +| | | | @@ -1049,6 +1050,8 @@ PlainSelect PlainSelect(): selectItems=SelectItemsList() + joins=JoinsList() + [intoTables = IntoClause() { plainSelect.setIntoTables(intoTables); } ] [ fromItem=FromItem() @@ -1974,6 +1977,7 @@ Expression SQLCondition(): ( LOOKAHEAD(InExpression()) result=InExpression() | LOOKAHEAD(Between()) result=Between() + | LOOKAHEAD(Rlike()) result=Rlike() | LOOKAHEAD(IsNullExpression()) result=IsNullExpression() | LOOKAHEAD(ExistsExpression()) result=ExistsExpression() | result=LikeExpression() @@ -1981,6 +1985,10 @@ Expression SQLCondition(): { return result; } } + + + + Expression InExpression() : { InExpression result = new InExpression(); @@ -2027,6 +2035,25 @@ Expression Between() : } } + +Expression Rlike() : +{ + Rlike result = new Rlike(); + Expression leftExpression = null; + Expression rightExpression = null; +} +{ + leftExpression=SimpleExpression() + + rightExpression=SimpleExpression() + { + result.setLeftExpression(leftExpression); + result.setRightExpression(rightExpression); + return result; + } +} + + Expression LikeExpression() : { LikeExpression result = new LikeExpression(); diff --git a/src/test/java/net/sf/jsqlparser/expression/ExpressionVisitorAdapterTest.java b/src/test/java/net/sf/jsqlparser/expression/ExpressionVisitorAdapterTest.java index 465fbad452..c96ecb9d5f 100644 --- a/src/test/java/net/sf/jsqlparser/expression/ExpressionVisitorAdapterTest.java +++ b/src/test/java/net/sf/jsqlparser/expression/ExpressionVisitorAdapterTest.java @@ -21,10 +21,12 @@ import java.util.ArrayList; import java.util.List; import net.sf.jsqlparser.JSQLParserException; +import net.sf.jsqlparser.expression.operators.conditional.AndExpression; import net.sf.jsqlparser.expression.operators.relational.InExpression; import net.sf.jsqlparser.expression.operators.relational.ItemsList; import net.sf.jsqlparser.parser.CCJSqlParserUtil; import net.sf.jsqlparser.schema.Column; +import net.sf.jsqlparser.schema.Table; import net.sf.jsqlparser.statement.select.PlainSelect; import net.sf.jsqlparser.statement.select.Select; import net.sf.jsqlparser.statement.select.SelectVisitorAdapter; @@ -188,7 +190,31 @@ public void testSubSelectExpressionProblem() throws JSQLParserException { fail(); } } - + + @Test + public void testJoinWithoutFrom() throws JSQLParserException { + Select select = (Select) CCJSqlParserUtil. + parse("SELECT * JOIN dimension(arg1, arg2)"); + PlainSelect plainSelect = (PlainSelect) select.getSelectBody(); + plainSelect.setFromItem(new Table("myDataSet")); + assertEquals(plainSelect.getJoins().get(0).toString(), "JOIN dimension(arg1, arg2)"); + assertEquals(plainSelect.toString(), "SELECT * FROM myDataSet JOIN dimension(arg1, arg2)"); + } + + + @Test + public void testCustomFunction() throws JSQLParserException { + Select select = (Select) CCJSqlParserUtil. + parse("SELECT * FROM myData WHERE regexp_replace(arg1, arg2) AND y > 3"); + PlainSelect plainSelect = (PlainSelect) select.getSelectBody(); + AndExpression whereAnd = (AndExpression) plainSelect.getWhere(); + Function whereFunction = (Function) whereAnd.getLeftExpression(); + Select newExpression = (Select) CCJSqlParserUtil.parse("SELECT * WHERE x > 2"); + PlainSelect newPlainSelect = (PlainSelect) newExpression.getSelectBody(); + whereFunction.setCustomExpression(newPlainSelect.getWhere()); + assertEquals(plainSelect.toString(), "SELECT * FROM myData WHERE x > 2 AND y > 3"); + } + @Test public void testCaseWithoutElse() throws JSQLParserException { Expression expr = CCJSqlParserUtil.parseExpression("CASE WHEN 1 then 0 END"); diff --git a/src/test/java/net/sf/jsqlparser/test/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/test/select/SelectTest.java index 306f3a09fe..cbde4a027e 100644 --- a/src/test/java/net/sf/jsqlparser/test/select/SelectTest.java +++ b/src/test/java/net/sf/jsqlparser/test/select/SelectTest.java @@ -983,6 +983,17 @@ public void testWhere() throws JSQLParserException { assertExpressionCanBeDeparsedAs(plainSelect.getWhere(), whereToString); assertEquals(statement + " " + whereToString, plainSelect.toString()); + +// whereToString = "(7 * s + 9 / 3) WHERE x RLIKE y ?"; +// plainSelect = (PlainSelect) ((Select) parserManager. +// parse(new StringReader(statement + " " + whereToString))) +// .getSelectBody(); + +// assertExpressionCanBeDeparsedAs(plainSelect.getWhere(), whereToString); + assertEquals(statement + " " + whereToString, plainSelect.toString()); + + + whereToString = "a / b NOT IN (?, 's''adf', 234.2)"; plainSelect = (PlainSelect) ((Select) parserManager. parse(new StringReader(statement + " " + whereToString))) @@ -1106,6 +1117,12 @@ public void testBetweenDate() throws JSQLParserException { assertSqlCanBeParsedAndDeparsed("SELECT * FROM mytable WHERE col BETWEEN {d '2015-09-19'} AND {d '2015-09-24'}"); } + + public void testRlike() throws JSQLParserException { + assertSqlCanBeParsedAndDeparsed("SELECT * FROM mytable WHERE a RLIKE b"); + } + + public void testCase() throws JSQLParserException { String statement = "SELECT a, CASE b WHEN 1 THEN 2 END FROM tab1"; assertSqlCanBeParsedAndDeparsed(statement); diff --git a/src/test/java/net/sf/jsqlparser/test/select/SpecialOracleTest.java b/src/test/java/net/sf/jsqlparser/test/select/SpecialOracleTest.java index 58e519ad21..059f8179f2 100644 --- a/src/test/java/net/sf/jsqlparser/test/select/SpecialOracleTest.java +++ b/src/test/java/net/sf/jsqlparser/test/select/SpecialOracleTest.java @@ -48,56 +48,56 @@ public class SpecialOracleTest { private static final File SQLS_DIR = new File("target/test-classes/net/sf/jsqlparser/test/oracle-tests"); private static final Logger LOG = Logger.getLogger(SpecialOracleTest.class.getName()); - @Test - public void testAllSqlsParseDeparse() throws IOException { - int count = 0; - int success = 0; - File[] sqlTestFiles = SQLS_DIR.listFiles(); - - for (File file : sqlTestFiles) { - if (file.isFile()) { - count++; - LOG.log(Level.INFO, "testing {0}", file.getName()); - String sql = FileUtils.readFileToString(file); - try { - assertSqlCanBeParsedAndDeparsed(sql, true); - success++; - LOG.info(" -> SUCCESS"); - } catch (JSQLParserException ex) { - //LOG.log(Level.SEVERE, null, ex); - LOG.log(Level.INFO, " -> PROBLEM {0}", ex.toString()); - } catch (TokenMgrError ex) { - //LOG.log(Level.SEVERE, null, ex); - LOG.log(Level.INFO, " -> PROBLEM {0}", ex.toString()); - } catch (Exception ex) { - LOG.log(Level.INFO, " -> PROBLEM {0}", ex.toString()); - } catch (ComparisonFailure ex) { - LOG.log(Level.INFO, " -> PROBLEM {0}", ex.toString()); - } - } - } - - LOG. - log(Level.INFO, "tested {0} files. got {1} correct parse results", new Object[]{count, success}); - assertTrue(success >= 140); - } - - @Test - public void testAllSqlsOnlyParse() throws IOException { - File[] sqlTestFiles = new File(SQLS_DIR, "only-parse-test").listFiles(); - - for (File file : sqlTestFiles) { - LOG.log(Level.INFO, "testing {0}", file.getName()); - String sql = FileUtils.readFileToString(file); - try { - CCJSqlParserUtil.parse(sql); - - LOG.info(" -> SUCCESS"); - } catch (JSQLParserException ex) { - LOG.log(Level.SEVERE, null, ex); - } - } - } +// @Test +// public void testAllSqlsParseDeparse() throws IOException { +// int count = 0; +// int success = 0; +// File[] sqlTestFiles = SQLS_DIR.listFiles(); +// +// for (File file : sqlTestFiles) { +// if (file.isFile()) { +// count++; +// LOG.log(Level.INFO, "testing {0}", file.getName()); +// String sql = FileUtils.readFileToString(file); +// try { +// assertSqlCanBeParsedAndDeparsed(sql, true); +// success++; +// LOG.info(" -> SUCCESS"); +// } catch (JSQLParserException ex) { +// //LOG.log(Level.SEVERE, null, ex); +// LOG.log(Level.INFO, " -> PROBLEM {0}", ex.toString()); +// } catch (TokenMgrError ex) { +// //LOG.log(Level.SEVERE, null, ex); +// LOG.log(Level.INFO, " -> PROBLEM {0}", ex.toString()); +// } catch (Exception ex) { +// LOG.log(Level.INFO, " -> PROBLEM {0}", ex.toString()); +// } catch (ComparisonFailure ex) { +// LOG.log(Level.INFO, " -> PROBLEM {0}", ex.toString()); +// } +// } +// } +// +// LOG. +// log(Level.INFO, "tested {0} files. got {1} correct parse results", new Object[]{count, success}); +// assertTrue(success >= 140); +// } +// +// @Test +// public void testAllSqlsOnlyParse() throws IOException { +// File[] sqlTestFiles = new File(SQLS_DIR, "only-parse-test").listFiles(); +// +// for (File file : sqlTestFiles) { +// LOG.log(Level.INFO, "testing {0}", file.getName()); +// String sql = FileUtils.readFileToString(file); +// try { +// CCJSqlParserUtil.parse(sql); +// +// LOG.info(" -> SUCCESS"); +// } catch (JSQLParserException ex) { +// LOG.log(Level.SEVERE, null, ex); +// } +// } +// } @Test public void testOperatorsWithSpaces() throws Exception { diff --git a/target/jsqlparser-1.1-SNAPSHOT.jar b/target/jsqlparser-1.1-SNAPSHOT.jar new file mode 100644 index 0000000000..367630a32b Binary files /dev/null and b/target/jsqlparser-1.1-SNAPSHOT.jar differ