Skip to content

Commit f4b2559

Browse files
committed
fixed some whitespace differences between deparser and toString regarding NOT expression
1 parent 1200960 commit f4b2559

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
*/
3939
public class ExpressionDeParser implements ExpressionVisitor, ItemsListVisitor {
4040

41-
private static final String NOT = " NOT ";
41+
private static final String NOT = "NOT ";
4242
private StringBuilder buffer;
4343
private SelectVisitor selectVisitor;
4444
private boolean useBracketsInExprList = true;

src/test/java/net/sf/jsqlparser/test/select/SelectASTTest.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*/
1919
package net.sf.jsqlparser.test.select;
2020

21-
import junit.framework.TestCase;
2221
import net.sf.jsqlparser.JSQLParserException;
2322
import net.sf.jsqlparser.parser.CCJSqlParserTreeConstants;
2423
import net.sf.jsqlparser.parser.CCJSqlParserUtil;
@@ -30,17 +29,17 @@
3029
import net.sf.jsqlparser.statement.select.Select;
3130
import net.sf.jsqlparser.statement.select.SelectExpressionItem;
3231
import net.sf.jsqlparser.statement.select.SelectItem;
32+
import static org.junit.Assert.assertEquals;
33+
import static org.junit.Assert.assertNotNull;
34+
import org.junit.Test;
3335

3436
/**
3537
*
3638
* @author toben
3739
*/
38-
public class SelectASTTest extends TestCase {
39-
40-
public SelectASTTest(String name) {
41-
super(name);
42-
}
40+
public class SelectASTTest {
4341

42+
@Test
4443
public void testSelectASTColumn() throws JSQLParserException {
4544
String sql = "SELECT a, b FROM mytable order by b, c";
4645
StringBuilder b = new StringBuilder(sql);
@@ -63,9 +62,9 @@ public void testSelectASTColumn() throws JSQLParserException {
6362
assertEquals("SELECT *, * FROM mytable order by #, #", b.toString());
6463
}
6564

65+
@Test
6666
public void testSelectASTNode() throws JSQLParserException {
6767
String sql = "SELECT a, b FROM mytable order by b, c";
68-
StringBuilder b = new StringBuilder(sql);
6968
SimpleNode node = (SimpleNode) CCJSqlParserUtil.parseAST(sql);
7069
node.dump("*");
7170
assertEquals(CCJSqlParserTreeConstants.JJTSTATEMENT, node.getId());

src/test/java/net/sf/jsqlparser/test/select/SelectTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,7 @@ public void testWhere() throws JSQLParserException {
782782
plainSelect = (PlainSelect) ((Select) parserManager.parse(new StringReader(statement + whereToString)))
783783
.getSelectBody();
784784

785-
assertExpressionCanBeDeparsedAs(plainSelect.getWhere(), whereToString);
785+
assertExpressionCanBeDeparsedAs(plainSelect.getWhere(), whereToString.trim());
786786
assertEquals(statement + whereToString, plainSelect.toString());
787787
}
788788

@@ -2119,4 +2119,8 @@ public void testBooleanValue() throws JSQLParserException {
21192119
public void testBooleanValue2() throws JSQLParserException {
21202120
assertSqlCanBeParsedAndDeparsed("SELECT col FROM t WHERE 3 < 5 AND a");
21212121
}
2122+
2123+
public void testNotWithoutParenthesisIssue234() throws JSQLParserException {
2124+
assertSqlCanBeParsedAndDeparsed("SELECT count(*) FROM \"Persons\" WHERE NOT \"F_NAME\" = 'John'");
2125+
}
21222126
}

0 commit comments

Comments
 (0)