From efbfee42d94fcdcc02fd8fbaec829890a988977e Mon Sep 17 00:00:00 2001 From: Oliver Kennedy Date: Mon, 25 May 2015 23:02:37 -0400 Subject: [PATCH] Removing docs from default commit. Bringing parser closer to SQLite syntax --- .gitignore | 1 + build.xml | 8 +- docs/allclasses-frame.html | 2 +- docs/allclasses-noframe.html | 2 +- docs/constant-values.html | 2 +- docs/deprecated-list.html | 2 +- docs/help-doc.html | 2 +- docs/index-files/index-1.html | 2 +- docs/index-files/index-10.html | 2 +- docs/index-files/index-11.html | 2 +- docs/index-files/index-12.html | 2 +- docs/index-files/index-13.html | 2 +- docs/index-files/index-14.html | 4 +- docs/index-files/index-15.html | 2 +- docs/index-files/index-16.html | 2 +- docs/index-files/index-17.html | 4 +- docs/index-files/index-18.html | 2 +- docs/index-files/index-19.html | 2 +- docs/index-files/index-2.html | 2 +- docs/index-files/index-20.html | 2 +- docs/index-files/index-21.html | 2 +- docs/index-files/index-3.html | 2 +- docs/index-files/index-4.html | 2 +- docs/index-files/index-5.html | 2 +- docs/index-files/index-6.html | 2 +- docs/index-files/index-7.html | 2 +- docs/index-files/index-8.html | 2 +- docs/index-files/index-9.html | 4 +- docs/index.html | 2 +- .../sf/jsqlparser/JSQLParserException.html | 2 +- .../class-use/JSQLParserException.html | 2 +- .../expression/AllComparisonExpression.html | 2 +- .../expression/AnyComparisonExpression.html | 2 +- .../expression/BinaryExpression.html | 2 +- .../jsqlparser/expression/BooleanValue.html | 2 +- .../jsqlparser/expression/CaseExpression.html | 2 +- .../sf/jsqlparser/expression/DateValue.html | 2 +- .../sf/jsqlparser/expression/DoubleValue.html | 2 +- .../sf/jsqlparser/expression/Expression.html | 2 +- .../expression/ExpressionVisitor.html | 2 +- .../sf/jsqlparser/expression/Function.html | 2 +- .../expression/InverseExpression.html | 2 +- .../jsqlparser/expression/JdbcParameter.html | 2 +- .../sf/jsqlparser/expression/LongValue.html | 2 +- .../sf/jsqlparser/expression/NullValue.html | 2 +- .../sf/jsqlparser/expression/Parenthesis.html | 2 +- .../PrimitiveValue.InvalidPrimitive.html | 2 +- .../jsqlparser/expression/PrimitiveValue.html | 2 +- .../sf/jsqlparser/expression/StringValue.html | 2 +- .../sf/jsqlparser/expression/TimeValue.html | 2 +- .../jsqlparser/expression/TimestampValue.html | 2 +- .../sf/jsqlparser/expression/WhenClause.html | 2 +- .../class-use/AllComparisonExpression.html | 2 +- .../class-use/AnyComparisonExpression.html | 2 +- .../class-use/BinaryExpression.html | 2 +- .../expression/class-use/BooleanValue.html | 2 +- .../expression/class-use/CaseExpression.html | 2 +- .../expression/class-use/DateValue.html | 2 +- .../expression/class-use/DoubleValue.html | 2 +- .../expression/class-use/Expression.html | 2 +- .../class-use/ExpressionVisitor.html | 2 +- .../expression/class-use/Function.html | 2 +- .../class-use/InverseExpression.html | 2 +- .../expression/class-use/JdbcParameter.html | 2 +- .../expression/class-use/LongValue.html | 2 +- .../expression/class-use/NullValue.html | 2 +- .../expression/class-use/Parenthesis.html | 2 +- .../PrimitiveValue.InvalidPrimitive.html | 2 +- .../expression/class-use/PrimitiveValue.html | 2 +- .../expression/class-use/StringValue.html | 2 +- .../expression/class-use/TimeValue.html | 2 +- .../expression/class-use/TimestampValue.html | 2 +- .../expression/class-use/WhenClause.html | 2 +- .../operators/arithmetic/Addition.html | 2 +- .../operators/arithmetic/BitwiseAnd.html | 2 +- .../operators/arithmetic/BitwiseOr.html | 2 +- .../operators/arithmetic/BitwiseXor.html | 2 +- .../operators/arithmetic/Concat.html | 2 +- .../operators/arithmetic/Division.html | 2 +- .../operators/arithmetic/Multiplication.html | 2 +- .../operators/arithmetic/Subtraction.html | 2 +- .../arithmetic/class-use/Addition.html | 2 +- .../arithmetic/class-use/BitwiseAnd.html | 2 +- .../arithmetic/class-use/BitwiseOr.html | 2 +- .../arithmetic/class-use/BitwiseXor.html | 2 +- .../arithmetic/class-use/Concat.html | 2 +- .../arithmetic/class-use/Division.html | 2 +- .../arithmetic/class-use/Multiplication.html | 2 +- .../arithmetic/class-use/Subtraction.html | 2 +- .../operators/arithmetic/package-frame.html | 2 +- .../operators/arithmetic/package-summary.html | 2 +- .../operators/arithmetic/package-tree.html | 2 +- .../operators/arithmetic/package-use.html | 2 +- .../operators/conditional/AndExpression.html | 2 +- .../operators/conditional/OrExpression.html | 2 +- .../conditional/class-use/AndExpression.html | 2 +- .../conditional/class-use/OrExpression.html | 2 +- .../operators/conditional/package-frame.html | 2 +- .../conditional/package-summary.html | 2 +- .../operators/conditional/package-tree.html | 2 +- .../operators/conditional/package-use.html | 2 +- .../operators/relational/Between.html | 2 +- .../operators/relational/EqualsTo.html | 2 +- .../relational/ExistsExpression.html | 2 +- .../operators/relational/ExpressionList.html | 2 +- .../operators/relational/GreaterThan.html | 2 +- .../relational/GreaterThanEquals.html | 2 +- .../operators/relational/InExpression.html | 2 +- .../relational/IsNullExpression.html | 2 +- .../operators/relational/ItemsList.html | 2 +- .../relational/ItemsListVisitor.html | 2 +- .../operators/relational/LikeExpression.html | 2 +- .../operators/relational/Matches.html | 2 +- .../operators/relational/MinorThan.html | 2 +- .../operators/relational/MinorThanEquals.html | 2 +- .../operators/relational/NotEqualsTo.html | 2 +- .../relational/class-use/Between.html | 2 +- .../relational/class-use/EqualsTo.html | 2 +- .../class-use/ExistsExpression.html | 2 +- .../relational/class-use/ExpressionList.html | 2 +- .../relational/class-use/GreaterThan.html | 2 +- .../class-use/GreaterThanEquals.html | 2 +- .../relational/class-use/InExpression.html | 2 +- .../class-use/IsNullExpression.html | 2 +- .../relational/class-use/ItemsList.html | 2 +- .../class-use/ItemsListVisitor.html | 2 +- .../relational/class-use/LikeExpression.html | 2 +- .../relational/class-use/Matches.html | 2 +- .../relational/class-use/MinorThan.html | 2 +- .../relational/class-use/MinorThanEquals.html | 2 +- .../relational/class-use/NotEqualsTo.html | 2 +- .../operators/relational/package-frame.html | 2 +- .../operators/relational/package-summary.html | 2 +- .../operators/relational/package-tree.html | 2 +- .../operators/relational/package-use.html | 2 +- .../jsqlparser/expression/package-frame.html | 2 +- .../expression/package-summary.html | 2 +- .../jsqlparser/expression/package-tree.html | 2 +- .../sf/jsqlparser/expression/package-use.html | 2 +- docs/net/sf/jsqlparser/package-frame.html | 2 +- docs/net/sf/jsqlparser/package-summary.html | 2 +- docs/net/sf/jsqlparser/package-tree.html | 2 +- docs/net/sf/jsqlparser/package-use.html | 2 +- docs/net/sf/jsqlparser/schema/Column.html | 2 +- docs/net/sf/jsqlparser/schema/Table.html | 2 +- .../jsqlparser/schema/class-use/Column.html | 2 +- .../sf/jsqlparser/schema/class-use/Table.html | 2 +- .../sf/jsqlparser/schema/package-frame.html | 2 +- .../sf/jsqlparser/schema/package-summary.html | 2 +- .../sf/jsqlparser/schema/package-tree.html | 2 +- .../net/sf/jsqlparser/schema/package-use.html | 2 +- .../sf/jsqlparser/statement/Statement.html | 2 +- .../statement/StatementVisitor.html | 2 +- .../statement/class-use/Statement.html | 2 +- .../statement/class-use/StatementVisitor.html | 2 +- .../statement/create/table/ColDataType.html | 2 +- .../create/table/ColumnDefinition.html | 2 +- .../statement/create/table/CreateTable.html | 2 +- .../statement/create/table/Index.html | 2 +- .../create/table/class-use/ColDataType.html | 2 +- .../table/class-use/ColumnDefinition.html | 2 +- .../create/table/class-use/CreateTable.html | 2 +- .../create/table/class-use/Index.html | 2 +- .../statement/create/table/package-frame.html | 2 +- .../create/table/package-summary.html | 2 +- .../statement/create/table/package-tree.html | 2 +- .../statement/create/table/package-use.html | 2 +- .../jsqlparser/statement/delete/Delete.html | 2 +- .../statement/delete/class-use/Delete.html | 2 +- .../statement/delete/package-frame.html | 2 +- .../statement/delete/package-summary.html | 2 +- .../statement/delete/package-tree.html | 2 +- .../statement/delete/package-use.html | 2 +- .../sf/jsqlparser/statement/drop/Drop.html | 2 +- .../statement/drop/class-use/Drop.html | 2 +- .../statement/drop/package-frame.html | 2 +- .../statement/drop/package-summary.html | 2 +- .../statement/drop/package-tree.html | 2 +- .../statement/drop/package-use.html | 2 +- .../jsqlparser/statement/insert/Insert.html | 59 +- .../statement/insert/class-use/Insert.html | 2 +- .../statement/insert/package-frame.html | 2 +- .../statement/insert/package-summary.html | 2 +- .../statement/insert/package-tree.html | 2 +- .../statement/insert/package-use.html | 2 +- .../jsqlparser/statement/package-frame.html | 2 +- .../jsqlparser/statement/package-summary.html | 2 +- .../sf/jsqlparser/statement/package-tree.html | 2 +- .../sf/jsqlparser/statement/package-use.html | 2 +- .../jsqlparser/statement/replace/Replace.html | 2 +- .../statement/replace/class-use/Replace.html | 2 +- .../statement/replace/package-frame.html | 2 +- .../statement/replace/package-summary.html | 2 +- .../statement/replace/package-tree.html | 2 +- .../statement/replace/package-use.html | 2 +- .../statement/select/AllColumns.html | 2 +- .../statement/select/AllTableColumns.html | 2 +- .../jsqlparser/statement/select/Distinct.html | 2 +- .../jsqlparser/statement/select/FromItem.html | 2 +- .../statement/select/FromItemVisitor.html | 2 +- .../statement/select/IntoTableVisitor.html | 2 +- .../sf/jsqlparser/statement/select/Join.html | 2 +- .../sf/jsqlparser/statement/select/Limit.html | 2 +- .../statement/select/OrderByElement.html | 2 +- .../statement/select/OrderByVisitor.html | 2 +- .../statement/select/PlainSelect.html | 2 +- .../jsqlparser/statement/select/Select.html | 2 +- .../statement/select/SelectBody.html | 2 +- .../select/SelectExpressionItem.html | 2 +- .../statement/select/SelectItem.html | 2 +- .../statement/select/SelectItemVisitor.html | 2 +- .../statement/select/SelectVisitor.html | 2 +- .../jsqlparser/statement/select/SubJoin.html | 2 +- .../statement/select/SubSelect.html | 2 +- .../sf/jsqlparser/statement/select/Top.html | 2 +- .../sf/jsqlparser/statement/select/Union.html | 2 +- .../jsqlparser/statement/select/WithItem.html | 2 +- .../select/class-use/AllColumns.html | 2 +- .../select/class-use/AllTableColumns.html | 2 +- .../statement/select/class-use/Distinct.html | 2 +- .../statement/select/class-use/FromItem.html | 2 +- .../select/class-use/FromItemVisitor.html | 2 +- .../select/class-use/IntoTableVisitor.html | 2 +- .../statement/select/class-use/Join.html | 2 +- .../statement/select/class-use/Limit.html | 2 +- .../select/class-use/OrderByElement.html | 2 +- .../select/class-use/OrderByVisitor.html | 2 +- .../select/class-use/PlainSelect.html | 2 +- .../statement/select/class-use/Select.html | 2 +- .../select/class-use/SelectBody.html | 2 +- .../class-use/SelectExpressionItem.html | 2 +- .../select/class-use/SelectItem.html | 2 +- .../select/class-use/SelectItemVisitor.html | 2 +- .../select/class-use/SelectVisitor.html | 2 +- .../statement/select/class-use/SubJoin.html | 2 +- .../statement/select/class-use/SubSelect.html | 2 +- .../statement/select/class-use/Top.html | 2 +- .../statement/select/class-use/Union.html | 2 +- .../statement/select/class-use/WithItem.html | 2 +- .../statement/select/package-frame.html | 2 +- .../statement/select/package-summary.html | 2 +- .../statement/select/package-tree.html | 2 +- .../statement/select/package-use.html | 2 +- .../statement/truncate/Truncate.html | 2 +- .../truncate/class-use/Truncate.html | 2 +- .../statement/truncate/package-frame.html | 2 +- .../statement/truncate/package-summary.html | 2 +- .../statement/truncate/package-tree.html | 2 +- .../statement/truncate/package-use.html | 2 +- .../jsqlparser/statement/update/Update.html | 2 +- .../statement/update/class-use/Update.html | 2 +- .../statement/update/package-frame.html | 2 +- .../statement/update/package-summary.html | 2 +- .../statement/update/package-tree.html | 2 +- .../statement/update/package-use.html | 2 +- .../util/deparser/CreateTableDeParser.html | 2 +- .../util/deparser/DeleteDeParser.html | 2 +- .../util/deparser/ExpressionDeParser.html | 2 +- .../util/deparser/InsertDeParser.html | 2 +- .../util/deparser/ReplaceDeParser.html | 2 +- .../util/deparser/SelectDeParser.html | 2 +- .../util/deparser/StatementDeParser.html | 2 +- .../util/deparser/UpdateDeParser.html | 2 +- .../class-use/CreateTableDeParser.html | 2 +- .../deparser/class-use/DeleteDeParser.html | 2 +- .../class-use/ExpressionDeParser.html | 2 +- .../deparser/class-use/InsertDeParser.html | 2 +- .../deparser/class-use/ReplaceDeParser.html | 2 +- .../deparser/class-use/SelectDeParser.html | 2 +- .../deparser/class-use/StatementDeParser.html | 2 +- .../deparser/class-use/UpdateDeParser.html | 2 +- .../util/deparser/package-frame.html | 2 +- .../util/deparser/package-summary.html | 2 +- .../util/deparser/package-tree.html | 2 +- .../jsqlparser/util/deparser/package-use.html | 2 +- docs/overview-frame.html | 2 +- docs/overview-summary.html | 2 +- docs/overview-tree.html | 2 +- docs/serialized-form.html | 2 +- .../sf/jsqlparser/parser/CCJSqlParser.java | 2516 +++++++++-------- .../parser/CCJSqlParserConstants.java | 1 + .../parser/CCJSqlParserManager.java | 45 - .../parser/CCJSqlParserTokenManager.java | 340 ++- src/net/sf/jsqlparser/parser/JSqlParserCC.jj | 15 +- .../jsqlparser/statement/insert/Insert.java | 7 + 285 files changed, 1828 insertions(+), 1722 deletions(-) delete mode 100644 src/net/sf/jsqlparser/parser/CCJSqlParserManager.java diff --git a/.gitignore b/.gitignore index c065e22..3ef0c04 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ +docs classes jsqlparser.jar \ No newline at end of file diff --git a/build.xml b/build.xml index fd153a9..d00b62e 100644 --- a/build.xml +++ b/build.xml @@ -52,8 +52,10 @@ javacchome="${javacchome}" /> - - + + @@ -76,7 +78,7 @@ - + diff --git a/docs/allclasses-frame.html b/docs/allclasses-frame.html index a0152f4..f8c7e56 100644 --- a/docs/allclasses-frame.html +++ b/docs/allclasses-frame.html @@ -2,7 +2,7 @@ - + All Classes diff --git a/docs/allclasses-noframe.html b/docs/allclasses-noframe.html index 1368574..5583bc3 100644 --- a/docs/allclasses-noframe.html +++ b/docs/allclasses-noframe.html @@ -2,7 +2,7 @@ - + All Classes diff --git a/docs/constant-values.html b/docs/constant-values.html index 255515c..375ffe4 100644 --- a/docs/constant-values.html +++ b/docs/constant-values.html @@ -2,7 +2,7 @@ - + Constant Field Values diff --git a/docs/deprecated-list.html b/docs/deprecated-list.html index 07d73cb..7b74b11 100644 --- a/docs/deprecated-list.html +++ b/docs/deprecated-list.html @@ -2,7 +2,7 @@ - + Deprecated List diff --git a/docs/help-doc.html b/docs/help-doc.html index ad4702c..a1f5bcd 100644 --- a/docs/help-doc.html +++ b/docs/help-doc.html @@ -2,7 +2,7 @@ - + API Help diff --git a/docs/index-files/index-1.html b/docs/index-files/index-1.html index f607bcf..c377f9e 100644 --- a/docs/index-files/index-1.html +++ b/docs/index-files/index-1.html @@ -2,7 +2,7 @@ - + A-Index diff --git a/docs/index-files/index-10.html b/docs/index-files/index-10.html index 1841c06..054841d 100644 --- a/docs/index-files/index-10.html +++ b/docs/index-files/index-10.html @@ -2,7 +2,7 @@ - + J-Index diff --git a/docs/index-files/index-11.html b/docs/index-files/index-11.html index 3217914..c821397 100644 --- a/docs/index-files/index-11.html +++ b/docs/index-files/index-11.html @@ -2,7 +2,7 @@ - + L-Index diff --git a/docs/index-files/index-12.html b/docs/index-files/index-12.html index 2049e84..bee9acd 100644 --- a/docs/index-files/index-12.html +++ b/docs/index-files/index-12.html @@ -2,7 +2,7 @@ - + M-Index diff --git a/docs/index-files/index-13.html b/docs/index-files/index-13.html index 667fb7d..2bfaab6 100644 --- a/docs/index-files/index-13.html +++ b/docs/index-files/index-13.html @@ -2,7 +2,7 @@ - + N-Index diff --git a/docs/index-files/index-14.html b/docs/index-files/index-14.html index 572f7b6..2ea248c 100644 --- a/docs/index-files/index-14.html +++ b/docs/index-files/index-14.html @@ -2,7 +2,7 @@ - + O-Index @@ -102,6 +102,8 @@
 
OrExpression(Expression, Expression) - Constructor for class net.sf.jsqlparser.expression.operators.conditional.OrExpression
 
+
orReplace - Variable in class net.sf.jsqlparser.statement.insert.Insert
+
 
outer - Variable in class net.sf.jsqlparser.statement.select.Join
 
diff --git a/docs/index-files/index-15.html b/docs/index-files/index-15.html index 93fcb17..a3049bc 100644 --- a/docs/index-files/index-15.html +++ b/docs/index-files/index-15.html @@ -2,7 +2,7 @@ - + P-Index diff --git a/docs/index-files/index-16.html b/docs/index-files/index-16.html index 3d4412e..5ceb616 100644 --- a/docs/index-files/index-16.html +++ b/docs/index-files/index-16.html @@ -2,7 +2,7 @@ - + R-Index diff --git a/docs/index-files/index-17.html b/docs/index-files/index-17.html index 145ab03..deb08fe 100644 --- a/docs/index-files/index-17.html +++ b/docs/index-files/index-17.html @@ -2,7 +2,7 @@ - + S-Index @@ -228,6 +228,8 @@
 
setInto(Table) - Method in class net.sf.jsqlparser.statement.select.PlainSelect
 
+
setIsOrReplace(boolean) - Method in class net.sf.jsqlparser.statement.insert.Insert
+
 
setItemsList(ItemsList) - Method in class net.sf.jsqlparser.expression.operators.relational.InExpression
 
setItemsList(ItemsList) - Method in class net.sf.jsqlparser.statement.insert.Insert
diff --git a/docs/index-files/index-18.html b/docs/index-files/index-18.html index ffc0ad2..430ae31 100644 --- a/docs/index-files/index-18.html +++ b/docs/index-files/index-18.html @@ -2,7 +2,7 @@ - + T-Index diff --git a/docs/index-files/index-19.html b/docs/index-files/index-19.html index 017b159..fe4f72c 100644 --- a/docs/index-files/index-19.html +++ b/docs/index-files/index-19.html @@ -2,7 +2,7 @@ - + U-Index diff --git a/docs/index-files/index-2.html b/docs/index-files/index-2.html index c8c35b1..790a1ef 100644 --- a/docs/index-files/index-2.html +++ b/docs/index-files/index-2.html @@ -2,7 +2,7 @@ - + B-Index diff --git a/docs/index-files/index-20.html b/docs/index-files/index-20.html index 6f18c46..ab3da84 100644 --- a/docs/index-files/index-20.html +++ b/docs/index-files/index-20.html @@ -2,7 +2,7 @@ - + V-Index diff --git a/docs/index-files/index-21.html b/docs/index-files/index-21.html index 9ff1e9c..a17378f 100644 --- a/docs/index-files/index-21.html +++ b/docs/index-files/index-21.html @@ -2,7 +2,7 @@ - + W-Index diff --git a/docs/index-files/index-3.html b/docs/index-files/index-3.html index e4920dc..7363468 100644 --- a/docs/index-files/index-3.html +++ b/docs/index-files/index-3.html @@ -2,7 +2,7 @@ - + C-Index diff --git a/docs/index-files/index-4.html b/docs/index-files/index-4.html index f509998..c877f4d 100644 --- a/docs/index-files/index-4.html +++ b/docs/index-files/index-4.html @@ -2,7 +2,7 @@ - + D-Index diff --git a/docs/index-files/index-5.html b/docs/index-files/index-5.html index 17fb417..0c61402 100644 --- a/docs/index-files/index-5.html +++ b/docs/index-files/index-5.html @@ -2,7 +2,7 @@ - + E-Index diff --git a/docs/index-files/index-6.html b/docs/index-files/index-6.html index 70c2fdf..8d6d569 100644 --- a/docs/index-files/index-6.html +++ b/docs/index-files/index-6.html @@ -2,7 +2,7 @@ - + F-Index diff --git a/docs/index-files/index-7.html b/docs/index-files/index-7.html index 3e6ba30..40b39a9 100644 --- a/docs/index-files/index-7.html +++ b/docs/index-files/index-7.html @@ -2,7 +2,7 @@ - + G-Index diff --git a/docs/index-files/index-8.html b/docs/index-files/index-8.html index 11367ef..627ee32 100644 --- a/docs/index-files/index-8.html +++ b/docs/index-files/index-8.html @@ -2,7 +2,7 @@ - + H-Index diff --git a/docs/index-files/index-9.html b/docs/index-files/index-9.html index 2512b82..f8dedcf 100644 --- a/docs/index-files/index-9.html +++ b/docs/index-files/index-9.html @@ -2,7 +2,7 @@ - + I-Index @@ -181,6 +181,8 @@
 
isOffsetJdbcParameter() - Method in class net.sf.jsqlparser.statement.select.Limit
 
+
isOrReplace() - Method in class net.sf.jsqlparser.statement.insert.Insert
+
 
isOuter() - Method in class net.sf.jsqlparser.statement.select.Join
Whether is a "OUTER" join
diff --git a/docs/index.html b/docs/index.html index 32ffbdc..97d9dd3 100644 --- a/docs/index.html +++ b/docs/index.html @@ -2,7 +2,7 @@ - + Generated Documentation (Untitled)