Skip to content

Commit 5396b2e

Browse files
committed
Merge origin/master
2 parents ec6cef2 + 320f64a commit 5396b2e

31 files changed

+415
-347
lines changed

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# JSqlParser
22

33
[![Build Status](https://travis-ci.org/JSQLParser/JSqlParser.svg?branch=master)](https://travis-ci.org/JSQLParser/JSqlParser) [![Coverage Status](https://coveralls.io/repos/JSQLParser/JSqlParser/badge.svg?branch=master)](https://coveralls.io/r/JSQLParser/JSqlParser?branch=master)
4+
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/00b2d91995764ae4805b55627aca8d39)](https://www.codacy.com/app/wumpz/JSqlParser?utm_source=github.com&utm_medium=referral&utm_content=JSQLParser/JSqlParser&utm_campaign=Badge_Grade)
45

56
[![PayPal donate button](http://img.shields.io/paypal/donate.png?color=yellow)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=64CCN9JJANZXA "Help this JSqlParser version using Paypal")
67

@@ -43,6 +44,7 @@ Also I would like to know about needed examples or documentation stuff.
4344

4445
## Extensions in the latest SNAPSHOT version 0.9.7
4546

47+
* Removed limitation of LongValue to accept only java.util.Long parsable values.
4648
* introduced NOT without parenthesis for column only conditions
4749
* introduced more complex expressions within CASE - statements
4850
* improved Postgresql JSON - support

src/main/java/net/sf/jsqlparser/expression/KeepExpression.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
import net.sf.jsqlparser.statement.select.OrderByElement;
2525

2626
import java.util.List;
27-
import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
28-
import net.sf.jsqlparser.statement.select.PlainSelect;
2927

3028
/**
3129
* Analytic function. The name of the function is variable but the parameters

src/main/java/net/sf/jsqlparser/expression/LongValue.java

Lines changed: 39 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -21,55 +21,54 @@
2121
*/
2222
package net.sf.jsqlparser.expression;
2323

24+
import java.math.BigInteger;
25+
2426
/**
25-
* Every number without a point or an exponential format is a LongValue
27+
* Every number without a point or an exponential format is a LongValue.
2628
*/
2729
public class LongValue implements Expression {
2830

29-
private long value;
30-
private String stringValue;
31+
private String stringValue;
32+
33+
public LongValue(final String value) {
34+
String val = value;
35+
if (val.charAt(0) == '+') {
36+
val = val.substring(1);
37+
}
38+
this.stringValue = val;
39+
}
3140

32-
public LongValue(final String value) {
33-
String val = value;
34-
if (val.charAt(0) == '+') {
35-
val = val.substring(1);
36-
}
37-
try {
38-
this.value = Long.parseLong(val);
39-
} catch (NumberFormatException e) {
40-
throw new NumberFormatException("Passed value does not contain a parsable long value");
41-
}
42-
this.stringValue = val;
43-
}
44-
45-
public LongValue(long value) {
46-
this.value=value;
47-
stringValue = String.valueOf(value);
48-
}
41+
public LongValue(long value) {
42+
stringValue = String.valueOf(value);
43+
}
4944

50-
@Override
51-
public void accept(ExpressionVisitor expressionVisitor) {
52-
expressionVisitor.visit(this);
53-
}
45+
@Override
46+
public void accept(ExpressionVisitor expressionVisitor) {
47+
expressionVisitor.visit(this);
48+
}
5449

55-
public long getValue() {
56-
return value;
57-
}
50+
public long getValue() {
51+
return Long.valueOf(stringValue);
52+
}
53+
54+
public BigInteger getBigIntegerValue() {
55+
return new BigInteger(stringValue);
56+
}
5857

59-
public void setValue(long d) {
60-
value = d;
61-
}
58+
public void setValue(long d) {
59+
stringValue = String.valueOf(d);
60+
}
6261

63-
public String getStringValue() {
64-
return stringValue;
65-
}
62+
public String getStringValue() {
63+
return stringValue;
64+
}
6665

67-
public void setStringValue(String string) {
68-
stringValue = string;
69-
}
66+
public void setStringValue(String string) {
67+
stringValue = string;
68+
}
7069

71-
@Override
72-
public String toString() {
73-
return getStringValue();
74-
}
70+
@Override
71+
public String toString() {
72+
return getStringValue();
73+
}
7574
}

src/main/java/net/sf/jsqlparser/statement/create/table/CreateTable.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import net.sf.jsqlparser.statement.StatementVisitor;
2929
import net.sf.jsqlparser.statement.select.PlainSelect;
3030
import net.sf.jsqlparser.statement.select.Select;
31-
import net.sf.jsqlparser.statement.select.SelectBody;
3231

3332
/**
3433
* A "CREATE TABLE" statement

src/main/java/net/sf/jsqlparser/statement/create/table/ExcludeConstraint.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,9 @@
2121
*/
2222
package net.sf.jsqlparser.statement.create.table;
2323

24-
import java.util.ArrayList;
25-
import java.util.List;
2624

2725

2826
import net.sf.jsqlparser.expression.Expression;
29-
import net.sf.jsqlparser.statement.select.PlainSelect;
3027

3128
/**
3229
* Table Exclusion Constraint

src/main/java/net/sf/jsqlparser/statement/delete/Delete.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import net.sf.jsqlparser.schema.Table;
2626
import net.sf.jsqlparser.statement.Statement;
2727
import net.sf.jsqlparser.statement.StatementVisitor;
28-
import net.sf.jsqlparser.statement.select.FromItem;
2928
import net.sf.jsqlparser.statement.select.Join;
3029
import net.sf.jsqlparser.statement.select.Limit;
3130
import net.sf.jsqlparser.statement.select.OrderByElement;

src/main/java/net/sf/jsqlparser/statement/select/AllColumns.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
*/
2222
package net.sf.jsqlparser.statement.select;
2323

24-
import net.sf.jsqlparser.schema.*;
25-
2624
/**
2725
* All the columns (as in "SELECT * FROM ...")
2826
*/

src/main/java/net/sf/jsqlparser/util/AddAliasesVisitor.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
package net.sf.jsqlparser.util;
2323

2424
import net.sf.jsqlparser.expression.*;
25-
import net.sf.jsqlparser.schema.*;
2625
import net.sf.jsqlparser.statement.select.*;
2726

2827
import java.util.*;

src/main/java/net/sf/jsqlparser/util/SelectUtils.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,11 @@
2222
package net.sf.jsqlparser.util;
2323

2424
import java.util.ArrayList;
25-
import java.util.Arrays;
2625
import java.util.List;
2726

2827
import net.sf.jsqlparser.JSQLParserException;
2928
import net.sf.jsqlparser.expression.Expression;
3029
import net.sf.jsqlparser.parser.CCJSqlParserUtil;
31-
import net.sf.jsqlparser.schema.Column;
3230
import net.sf.jsqlparser.schema.Table;
3331
import net.sf.jsqlparser.statement.select.AllColumns;
3432
import net.sf.jsqlparser.statement.select.Join;

src/main/java/net/sf/jsqlparser/util/deparser/InsertDeParser.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import net.sf.jsqlparser.expression.operators.relational.MultiExpressionList;
3131
import net.sf.jsqlparser.schema.Column;
3232
import net.sf.jsqlparser.statement.insert.Insert;
33-
import net.sf.jsqlparser.statement.insert.InsertModifierPriority;
3433
import net.sf.jsqlparser.statement.select.SelectExpressionItem;
3534
import net.sf.jsqlparser.statement.select.SelectVisitor;
3635
import net.sf.jsqlparser.statement.select.SubSelect;

0 commit comments

Comments
 (0)