Merge origin/master

Author: wumpz

src/main/java/net/sf/jsqlparser/expression/operators/relational/ExistsExpression.java

@@ -51,7 +51,7 @@ public void accept(ExpressionVisitor expressionVisitor) {
 	}
 
 	public String getStringExpression() {
-		return ((not) ? "NOT " : "") + "EXISTS";
+		return (not ? "NOT " : "") + "EXISTS";
 	}
 
 	@Override

src/main/java/net/sf/jsqlparser/expression/operators/relational/InExpression.java

@@ -97,7 +97,7 @@ private String getLeftExpressionString() {
 
 	@Override
 	public String toString() {
-		return (leftExpression == null ? leftItemsList : getLeftExpressionString()) + " " + ((not) ? "NOT " : "") + "IN " + rightItemsList + "";
+		return (leftExpression == null ? leftItemsList : getLeftExpressionString()) + " " + (not ? "NOT " : "") + "IN " + rightItemsList + "";
 	}
 
 	@Override

src/main/java/net/sf/jsqlparser/expression/operators/relational/IsNullExpression.java

@@ -52,6 +52,6 @@ public void accept(ExpressionVisitor expressionVisitor) {
 
 	@Override
 	public String toString() {
-		return leftExpression + " IS " + ((not) ? "NOT " : "") + "NULL";
+		return leftExpression + " IS " + (not ? "NOT " : "") + "NULL";
 	}
 }

src/main/java/net/sf/jsqlparser/expression/operators/relational/LikeExpression.java

@@ -46,7 +46,7 @@ public void accept(ExpressionVisitor expressionVisitor) {
 
 	@Override
 	public String getStringExpression() {
-		return ((not) ? "NOT " : "") + (caseInsensitive?"ILIKE":"LIKE");
+		return (not ? "NOT " : "") + (caseInsensitive?"ILIKE":"LIKE");
 	}
 
 	@Override

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

@@ -65,6 +65,6 @@ public void setFetchParamFirst(boolean b) {
 
 	@Override
 	public String toString() {
-		return " FETCH " + (isFetchParamFirst ? "FIRST" : "NEXT") + " " + (fetchJdbcParameter ? "?" : rowCount + "") + " "+ fetchParam + " ONLY";
+		return " FETCH " + (isFetchParamFirst ? "FIRST" : "NEXT") + " " + (fetchJdbcParameter ? "?" : Long.toString(rowCount)) + " " + fetchParam + " ONLY";
 	}
 }

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

@@ -90,10 +90,10 @@ public String toString() {
 		if (limitNull) {
             retVal += " LIMIT NULL";
         } else if (rowCount >= 0 || rowCountJdbcParameter) {
-			retVal += " LIMIT " + (rowCountJdbcParameter ? "?" : rowCount + "");
+			retVal += " LIMIT " + (rowCountJdbcParameter ? "?" : Long.toString(rowCount));
 		}
 		if (offset > 0 || offsetJdbcParameter) {
-			retVal += " OFFSET " + (offsetJdbcParameter ? "?" : offset + "");
+			retVal += " OFFSET " + (offsetJdbcParameter ? "?" : Long.toString(offset));
 		}
 		return retVal;
 	}