Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

Merge pull request #943 from wenshao/master

Browse Source 
improved sql formatter
This commit is contained in:
高铁
2015-08-31 23:48:38 +08:00
parent 2aff049506 961ae42433
commit 7a2f364af3
3 changed files with 78 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/sql/dialect/odps/visitor/OdpsOutputVisitor.java
+21 -21
View File
@@ -51,9 +51,9 @@ import com.alibaba.druid.sql.dialect.odps.ast.OdpsUDTFSQLSelectItem;
import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor;
public class OdpsOutputVisitor extends SQLASTOutputVisitor implements OdpsASTVisitor {
private Set<String> builtInFunctions = new HashSet<String>();
{
builtInFunctions.add("IF");
builtInFunctions.add("COALESCE");
@@ -68,7 +68,7 @@ public class OdpsOutputVisitor extends SQLASTOutputVisitor implements OdpsASTVis
builtInFunctions.add("LEAST");
builtInFunctions.add("GREATEST");
}
public OdpsOutputVisitor(Appendable appender){
super(appender);
}
@@ -95,7 +95,7 @@ public class OdpsOutputVisitor extends SQLASTOutputVisitor implements OdpsASTVis
for (int i = 0; i < size; ++i) {
SQLTableElement element = x.getTableElementList().get(i);
element.accept(this);
if (i != size - 1) {
print(",");
}
@@ -103,7 +103,7 @@ public class OdpsOutputVisitor extends SQLASTOutputVisitor implements OdpsASTVis
print(' ');
printComment(element.getAfterCommentsDirect(), "\n");
}
if (i != size - 1) {
println();
}
@@ -128,7 +128,7 @@ public class OdpsOutputVisitor extends SQLASTOutputVisitor implements OdpsASTVis
for (int i = 0; i < partitionSize; ++i) {
SQLColumnDefinition column = x.getPartitionColumns().get(i);
column.accept(this);
if (i != partitionSize - 1) {
print(',');
}
@@ -136,7 +136,7 @@ public class OdpsOutputVisitor extends SQLASTOutputVisitor implements OdpsASTVis
print(' ');
printComment(column.getAfterCommentsDirect(), "\n");
}
if (i != partitionSize - 1) {
println();
}
@@ -266,7 +266,7 @@ public class OdpsOutputVisitor extends SQLASTOutputVisitor implements OdpsASTVis
decrementIndent();
println();
print("END");
return false;
}
@@ -303,7 +303,7 @@ public class OdpsOutputVisitor extends SQLASTOutputVisitor implements OdpsASTVis
print(' ');
printComment(preSelectItem.getAfterCommentsDirect(), "\n");
}
println();
print(", ");
}
@@ -382,7 +382,7 @@ public class OdpsOutputVisitor extends SQLASTOutputVisitor implements OdpsASTVis
println();
print("AS (");
int aliasSize = x.getAliasList().size();
if (aliasSize > 5) {
incrementIndent();
@@ -394,12 +394,12 @@ public class OdpsOutputVisitor extends SQLASTOutputVisitor implements OdpsASTVis
if (aliasSize > 5) {
println(",");
} else {
print(", ");
print(", ");
}
}
print(x.getAliasList().get(i));
}
if (aliasSize > 5) {
decrementIndent();
println();
@@ -502,7 +502,7 @@ public class OdpsOutputVisitor extends SQLASTOutputVisitor implements OdpsASTVis
if (x.getWhere().hasBeforeComment() && isPrettyFormat()) {
printlnComments(x.getWhere().getBeforeCommentsDirect());
}
x.getWhere().setParent(x);
x.getWhere().accept(this);
if (x.getWhere().hasAfterComment() && isPrettyFormat()) {
@@ -520,12 +520,12 @@ public class OdpsOutputVisitor extends SQLASTOutputVisitor implements OdpsASTVis
println();
x.getOrderBy().accept(this);
}
if (x.getDistributeBy() != null) {
println();
print("DISTRIBUTE BY ");
x.getDistributeBy().accept(this);
if (x.getSortBy() != null) {
print(" SORT BY ");
x.getSortBy().accept(this);
@@ -689,7 +689,7 @@ public class OdpsOutputVisitor extends SQLASTOutputVisitor implements OdpsASTVis
public boolean visit(OdpsReadStatement x) {
print("READ ");
x.getTable().accept(this);
if (x.getColumns().size() > 0) {
print(" (");
printAndAccept(x.getColumns(), ", ");
@@ -701,7 +701,7 @@ public class OdpsOutputVisitor extends SQLASTOutputVisitor implements OdpsASTVis
printAndAccept(x.getPartition(), ", ");
print(")");
}
if (x.getRowCount() != null) {
print(' ');
x.getRowCount().accept(this);
@@ -709,7 +709,7 @@ public class OdpsOutputVisitor extends SQLASTOutputVisitor implements OdpsASTVis
return false;
}
public boolean visit(SQLMethodInvokeExpr x) {
if (x.getOwner() != null) {
x.getOwner().accept(this);
@@ -721,7 +721,7 @@ public class OdpsOutputVisitor extends SQLASTOutputVisitor implements OdpsASTVis
print(")");
return false;
}
protected void printJoinType(JoinType joinType) {
if (joinType.equals(JoinType.LEFT_OUTER_JOIN)) {
print("LEFT OUTER JOIN");
@@ -733,7 +733,7 @@ public class OdpsOutputVisitor extends SQLASTOutputVisitor implements OdpsASTVis
print(JoinType.toString(joinType));
}
}
public boolean visit(SQLDataType x) {
print(x.getName().toUpperCase());
if (x.getArguments().size() > 0) {
@@ -744,7 +744,7 @@ public class OdpsOutputVisitor extends SQLASTOutputVisitor implements OdpsASTVis
return false;
}
protected void printFunctionName(String name) {
String upperName = name.toUpperCase();
if (builtInFunctions.contains(upperName)) {
src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java
+29 -1
View File
@@ -549,7 +549,35 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab
print(" IN (");
}
printAndAccept(x.getTargetList(), ", ");
final List<SQLExpr> list = x.getTargetList();
boolean printLn = false;
if (list.size() > 5) {
printLn = true;
for (int i = 0, size = list.size(); i < size; ++i) {
if (!(list.get(i) instanceof SQLCharExpr)) {
printLn = false;
break;
}
}
}
if (printLn) {
incrementIndent();
println();
for (int i = 0, size = list.size(); i < size; ++i) {
if (i != 0) {
print(", ");
println();
}
list.get(i).accept(this);
}
decrementIndent();
println();
} else {
printAndAccept(x.getTargetList(), ", ");
}
print(')');
return false;
}
src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatInTest.java
+28
View File
@@ -0,0 +1,28 @@
package com.alibaba.druid.bvt.sql.odps;
import org.junit.Assert;
import com.alibaba.druid.sql.SQLUtils;
import junit.framework.TestCase;
public class OdpsFormatInTest extends TestCase {
public void test_drop_function() throws Exception {
String sql = "select * from t1 where f1 in ('1', '2', '3', '4', '5', '6', '7', '8', '9', '10')";
Assert.assertEquals("SELECT *"
+ "\nFROM t1"
+ "\nWHERE f1 IN ("
+ "\n\t'1', "
+ "\n\t'2', "
+ "\n\t'3', "
+ "\n\t'4', "
+ "\n\t'5', "
+ "\n\t'6', "
+ "\n\t'7', "
+ "\n\t'8', "
+ "\n\t'9', "
+ "\n\t'10'"
+ "\n)"
+ "", SQLUtils.formatOdps(sql));
}
}