Merge MASTER

Refactor the appendTo() method in favour of the traditional toString()

Author: manticore-projects

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

@@ -294,8 +294,11 @@ public void setJoinWindow(KSQLJoinWindow joinWindow) {
         this.joinWindow = joinWindow;
     }
 
+    @Override
     @SuppressWarnings({"PMD.CyclomaticComplexity", "PMD.NPathComplexity"})
-    public StringBuilder appendTo(StringBuilder builder) {
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+
         if (isSimple() && isOuter()) {
             builder.append("OUTER ").append(rightItem);
         } else if (isSimple()) {
@@ -328,24 +331,18 @@ public StringBuilder appendTo(StringBuilder builder) {
             } else {
                 builder.append("JOIN ");
             }
-            
+
             builder.append(rightItem).append((joinWindow != null) ? " WITHIN " + joinWindow : "");
         }
-        
-        
+
         for (Expression onExpression: onExpressions) {
             builder.append(" ON ").append(onExpression);
         }
         if (usingColumns.size()>0) {
             builder.append(PlainSelect.getFormatedList(usingColumns, "USING", true, true));
         }
 
-        return builder;
-    }
-
-    @Override
-    public String toString() {
-        return appendTo(new StringBuilder()).toString();
+        return builder.toString();
     }
 
     public Join addUsingColumns(Column... usingColumns) {

src/test/java/net/sf/jsqlparser/statement/alter/AlterTest.java

@@ -36,6 +36,9 @@
 import net.sf.jsqlparser.statement.create.table.NamedConstraint;
 import net.sf.jsqlparser.statement.create.table.Index.ColumnParams;
 import net.sf.jsqlparser.statement.create.table.ForeignKeyIndex;
+import net.sf.jsqlparser.statement.select.Select;
+import net.sf.jsqlparser.util.validation.ValidationTestAsserts;
+import net.sf.jsqlparser.util.validation.feature.DatabaseType;
 import org.junit.Test;
 
 public class AlterTest {

src/test/java/net/sf/jsqlparser/statement/alter/RenameTableStatementTest.java

@@ -89,7 +89,7 @@ public void testTableNamesFinder() throws JSQLParserException {
   public void testValidator() throws JSQLParserException {
     String sqlStr = "RENAME oldTableName TO newTableName";
 
-    ValidationTestAsserts.validateNoErrors(sqlStr, 1, DatabaseType.ORACLE);
+    ValidationTestAsserts.validateNoErrors(sqlStr, 1, DatabaseType.POSTGRESQL);
   }
 
   @Test