Fixup in SqlFormatter.

crate · Jul 6, 2015 · e1e4b04 · e1e4b04
1 parent 2a3b17d
commit e1e4b04
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/sql-parser/src/main/java/io/crate/sql/SqlFormatter.java b/sql-parser/src/main/java/io/crate/sql/SqlFormatter.java
@@ -31,8 +31,7 @@
 import static io.crate.sql.ExpressionFormatter.expressionFormatterFunction;
 import static io.crate.sql.ExpressionFormatter.formatExpression;
 
-public final class SqlFormatter
-{
+public final class SqlFormatter {
     private static final String INDENT = "   ";
 
     private SqlFormatter() {}
@@ -247,7 +246,7 @@ public Void visitCreateTable(CreateTable node, Integer indent) {
                 }
             }
 
-            if (node.properties().isPresent()) {
+            if (node.properties().isPresent() && !node.properties().get().isEmpty()) {
                 builder.append("\n");
                 node.properties().get().accept(this, indent);
             }
@@ -323,7 +322,7 @@ public Void visitColumnType(ColumnType node, Integer indent) {
         public Void visitObjectColumnType(ObjectColumnType node, Integer indent) {
             builder.append("OBJECT");
             if (node.objectType().isPresent()) {
-                builder.append(String.format(" (%s)", node.objectType().get()));
+                builder.append(String.format(" (%s)", node.objectType().get().toUpperCase(Locale.ENGLISH)));
             }
             if (!node.nestedColumns().isEmpty()) {
                 builder.append(" AS ");
@@ -378,6 +377,10 @@ public Void visitIndexDefinition(IndexDefinition node, Integer indent) {
                     .append(node.method().toUpperCase(Locale.ENGLISH))
                     .append(" ");
             appendFlatNodeList(node.columns(), indent);
+            if (!node.properties().isEmpty()) {
+                builder.append(" ");
+                process(node.properties(), indent);
+            }
             return null;
         }