From 86c313c3098597e9fa5503b6bd3f9a4e527e1165 Mon Sep 17 00:00:00 2001
From: George Kankava <george.kankava@devfactory.com>
Date: Wed, 20 Apr 2016 19:07:23 +0400
Subject: [PATCH] common-java:DuplicatedBlocks - Source files should not have
 any duplicated blocks

---
 .../data/crate/core/sql/AlterTable.java       | 42 +++++++------------
 1 file changed, 16 insertions(+), 26 deletions(-)

diff --git a/src/main/java/org/springframework/data/crate/core/sql/AlterTable.java b/src/main/java/org/springframework/data/crate/core/sql/AlterTable.java
index d8fac76..5de64d6 100644
--- a/src/main/java/org/springframework/data/crate/core/sql/AlterTable.java
+++ b/src/main/java/org/springframework/data/crate/core/sql/AlterTable.java
@@ -64,7 +64,18 @@ public String createStatement() {
 	private String createColumnDefinition(Column column) {
 		
 		StringBuilder builder = new StringBuilder();
+
+		createArrayColumn(column, builder);
+
+		if(column.isPrimaryKey()) {
+			builder.append(SPACE)
+				   .append(PRIMARY_KEY);
+		}
 		
+		return builder.toString();
+	}
+
+	private void createArrayColumn(Column column, StringBuilder builder) {
 		if(column.isArrayColumn()) {
 			builder.append(column.getCrateType());
 			builder.append(OPEN_BRACE);
@@ -73,22 +84,15 @@ private String createColumnDefinition(Column column) {
 			}else {
 				createObjectColumnStatement(column, builder);
 			}
-			
+
 			builder.append(CLOSE_BRACE);
 		}else if(column.isObjectColumn()) {
 			createObjectColumnStatement(column, builder);
 		}else {
 			builder.append(column.getCrateType());
 		}
-		
-		if(column.isPrimaryKey()) {
-			builder.append(SPACE)
-				   .append(PRIMARY_KEY);
-		}
-		
-		return builder.toString();
 	}
-	
+
 	private void createObjectColumnStatement(Column column, StringBuilder builder) {
 		
 		builder.append(OBJECT);
@@ -119,23 +123,9 @@ private void createColumnStatement(Column column, StringBuilder builder) {
 		// double quotes to preserve case in crate db
 		builder.append(doubleQuote(column.getName()));
 		builder.append(SPACE);
-		
-		if(column.isArrayColumn()) {
-			builder.append(column.getCrateType());
-			builder.append(OPEN_BRACE);
-			if(column.isPrimitiveElementType(column.getElementCrateType())) {
-				builder.append(column.getElementCrateType());
-			}else {
-				createObjectColumnStatement(column, builder);
-			}
-			
-			builder.append(CLOSE_BRACE);
-		}else if(column.isObjectColumn()) {
-			createObjectColumnStatement(column, builder);
-		}else {
-			builder.append(column.getCrateType());
-		}
-		
+
+		createArrayColumn(column, builder);
+
 		if(column.isPrimaryKey()) {
 			builder.append(SPACE)
 				   .append(PRIMARY_KEY);