Skip to content

common-java:DuplicatedBlocks - Source files should not have any duplicated blocks #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

common-java:DuplicatedBlocks - Source files should not have any duplicated blocks #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 16 additions & 26 deletions src/main/java/org/springframework/data/crate/core/sql/AlterTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down Expand Up @@ -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);
Expand Down