fixes #999

Author: wumpz

nb-configuration.xml

@@ -13,7 +13,7 @@
 		That way multiple projects can share the same settings (useful for formatting rules for example).
 		Any value defined here will override the pom.xml file value but is only applicable to the current project.
 		-->
-        <netbeans.compile.on.save>none</netbeans.compile.on.save>
+        <netbeans.compile.on.save>all</netbeans.compile.on.save>
         <com-junichi11-netbeans-changelf.enable>false</com-junichi11-netbeans-changelf.enable>
         <com-junichi11-netbeans-changelf.use-project>true</com-junichi11-netbeans-changelf.use-project>
         <com-junichi11-netbeans-changelf.lf-kind>LF</com-junichi11-netbeans-changelf.lf-kind>

pom.xml

@@ -91,6 +91,7 @@
                     <target>1.8</target>
                     <showWarnings>true</showWarnings>
                     <encoding>${project.build.sourceEncoding}</encoding>
+                    <showDeprecation>true</showDeprecation>
                 </configuration>
             </plugin>
             <plugin>

src/main/java/net/sf/jsqlparser/expression/operators/conditional/AndExpression.java

@@ -14,11 +14,20 @@
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 
 public class AndExpression extends BinaryExpression {
-
+    private boolean useOperator = false;
+    
     public AndExpression(Expression leftExpression, Expression rightExpression) {
         setLeftExpression(leftExpression);
         setRightExpression(rightExpression);
     }
+    
+    public void setUseOperator(boolean useOperator) {
+        this.useOperator = useOperator;
+    }
+    
+    public boolean isUseOperator() {
+        return useOperator;
+    }
 
     @Override
     public void accept(ExpressionVisitor expressionVisitor) {
@@ -27,6 +36,6 @@ public void accept(ExpressionVisitor expressionVisitor) {
 
     @Override
     public String getStringExpression() {
-        return "AND";
+        return useOperator?"&&":"AND";
     }
 }

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

@@ -98,7 +98,7 @@ public void visit(Addition addition) {
 
     @Override
     public void visit(AndExpression andExpression) {
-        visitBinaryExpression(andExpression, " AND ");
+        visitBinaryExpression(andExpression, andExpression.isUseOperator()?" && ":" AND ");
     }
 
     @Override

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

@@ -2415,7 +2415,8 @@ Expression AndExpression() :
     { result = left; }
 
     (
-         (<K_AND> | <K_AND_OPERATOR>)
+        { boolean useOperator = false; }
+         (<K_AND> | <K_AND_OPERATOR> {useOperator=true;} )
         (
         LOOKAHEAD(Condition())
             right=Condition()
@@ -2425,6 +2426,7 @@ Expression AndExpression() :
         )
         {
             result = new AndExpression(left, right);
+            ((AndExpression)result).setUseOperator(useOperator);
             left = result;
         }
     )*

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

@@ -3434,7 +3434,7 @@ public void testNestedCast() throws JSQLParserException {
     public void testAndOperator() throws JSQLParserException {
         String stmt = "SELECT name from customers where name = 'John' && lastname = 'Doh'";
         Statement parsed = parserManager.parse(new StringReader(stmt));
-        assertStatementCanBeDeparsedAs(parsed, "SELECT name FROM customers WHERE name = 'John' AND lastname = 'Doh'");
+        assertStatementCanBeDeparsedAs(parsed, "SELECT name FROM customers WHERE name = 'John' && lastname = 'Doh'");
     }
 
     @Test
@@ -4119,4 +4119,9 @@ public void testCurrentIssue940() throws JSQLParserException {
     public void testKeyWordView() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT ma.m_a_id, ma.anounsment, ma.max_view, ma.end_date, ma.view FROM member_anounsment as ma WHERE ( ( (ma.end_date > now() ) AND (ma.max_view >= ma.view) ) AND ( (ma.member_id='xxx') ) )", true);
     }
+    
+    @Test
+    public void testPreserveAndOperator() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT * FROM mytable WHERE 1 = 2 && 2 = 3");
+    }
 }