JAVA-2941: Cannot add a single static column with the alter table API (#1549)

Author: adutra

changelog/README.md

@@ -4,6 +4,7 @@
 
 ### 4.11.2 (in progress)
 
+- [bug] JAVA-2941: Cannot add a single static column with the alter table API
 - [bug] JAVA-2943: Prevent session leak with wrong keyspace name
 - [bug] JAVA-2938: OverloadedException message is misleading
 

query-builder/src/main/java/com/datastax/oss/driver/internal/querybuilder/schema/DefaultAlterTable.java

@@ -46,8 +46,8 @@ public class DefaultAlterTable
   private final CqlIdentifier keyspace;
   private final CqlIdentifier tableName;
 
-  private final ImmutableMap<CqlIdentifier, DataType> columnsToAddInOrder;
-  private final ImmutableSet<CqlIdentifier> columnsToAdd;
+  private final ImmutableMap<CqlIdentifier, DataType> allColumnsToAddInOrder;
+  private final ImmutableSet<CqlIdentifier> columnsToAddRegular;
   private final ImmutableSet<CqlIdentifier> columnsToAddStatic;
   private final ImmutableSet<CqlIdentifier> columnsToDrop;
   private final ImmutableMap<CqlIdentifier, CqlIdentifier> columnsToRename;
@@ -79,8 +79,8 @@ public DefaultAlterTable(
       @Nullable CqlIdentifier keyspace,
       @NonNull CqlIdentifier tableName,
       boolean dropCompactStorage,
-      @NonNull ImmutableMap<CqlIdentifier, DataType> columnsToAddInOrder,
-      @NonNull ImmutableSet<CqlIdentifier> columnsToAdd,
+      @NonNull ImmutableMap<CqlIdentifier, DataType> allColumnsToAddInOrder,
+      @NonNull ImmutableSet<CqlIdentifier> columnsToAddRegular,
       @NonNull ImmutableSet<CqlIdentifier> columnsToAddStatic,
       @NonNull ImmutableSet<CqlIdentifier> columnsToDrop,
       @NonNull ImmutableMap<CqlIdentifier, CqlIdentifier> columnsToRename,
@@ -90,8 +90,8 @@ public DefaultAlterTable(
     this.keyspace = keyspace;
     this.tableName = tableName;
     this.dropCompactStorage = dropCompactStorage;
-    this.columnsToAddInOrder = columnsToAddInOrder;
-    this.columnsToAdd = columnsToAdd;
+    this.allColumnsToAddInOrder = allColumnsToAddInOrder;
+    this.columnsToAddRegular = columnsToAddRegular;
     this.columnsToAddStatic = columnsToAddStatic;
     this.columnsToDrop = columnsToDrop;
     this.columnsToRename = columnsToRename;
@@ -108,8 +108,8 @@ public AlterTableAddColumnEnd addColumn(
         keyspace,
         tableName,
         dropCompactStorage,
-        ImmutableCollections.append(columnsToAddInOrder, columnName, dataType),
-        appendSet(columnsToAdd, columnName),
+        ImmutableCollections.append(allColumnsToAddInOrder, columnName, dataType),
+        appendSet(columnsToAddRegular, columnName),
         columnsToAddStatic,
         columnsToDrop,
         columnsToRename,
@@ -126,8 +126,8 @@ public AlterTableAddColumnEnd addStaticColumn(
         keyspace,
         tableName,
         dropCompactStorage,
-        ImmutableCollections.append(columnsToAddInOrder, columnName, dataType),
-        columnsToAdd,
+        ImmutableCollections.append(allColumnsToAddInOrder, columnName, dataType),
+        columnsToAddRegular,
         appendSet(columnsToAddStatic, columnName),
         columnsToDrop,
         columnsToRename,
@@ -143,8 +143,8 @@ public BuildableQuery dropCompactStorage() {
         keyspace,
         tableName,
         true,
-        columnsToAddInOrder,
-        columnsToAdd,
+        allColumnsToAddInOrder,
+        columnsToAddRegular,
         columnsToAddStatic,
         columnsToDrop,
         columnsToRename,
@@ -166,8 +166,8 @@ public AlterTableDropColumnEnd dropColumns(@NonNull CqlIdentifier... columnNames
         keyspace,
         tableName,
         dropCompactStorage,
-        columnsToAddInOrder,
-        columnsToAdd,
+        allColumnsToAddInOrder,
+        columnsToAddRegular,
         columnsToAddStatic,
         builder.build(),
         columnsToRename,
@@ -184,8 +184,8 @@ public AlterTableRenameColumnEnd renameColumn(
         keyspace,
         tableName,
         dropCompactStorage,
-        columnsToAddInOrder,
-        columnsToAdd,
+        allColumnsToAddInOrder,
+        columnsToAddRegular,
         columnsToAddStatic,
         columnsToDrop,
         ImmutableCollections.append(columnsToRename, from, to),
@@ -201,8 +201,8 @@ public BuildableQuery alterColumn(@NonNull CqlIdentifier columnName, @NonNull Da
         keyspace,
         tableName,
         dropCompactStorage,
-        columnsToAddInOrder,
-        columnsToAdd,
+        allColumnsToAddInOrder,
+        columnsToAddRegular,
         columnsToAddStatic,
         columnsToDrop,
         columnsToRename,
@@ -218,8 +218,8 @@ public AlterTableWithOptionsEnd withOption(@NonNull String name, @NonNull Object
         keyspace,
         tableName,
         dropCompactStorage,
-        columnsToAddInOrder,
-        columnsToAdd,
+        allColumnsToAddInOrder,
+        columnsToAddRegular,
         columnsToAddStatic,
         columnsToDrop,
         columnsToRename,
@@ -242,13 +242,13 @@ public String asCql() {
           .append(" TYPE ")
           .append(columnToAlterType.asCql(true, true))
           .toString();
-    } else if (!columnsToAdd.isEmpty()) {
+    } else if (!allColumnsToAddInOrder.isEmpty()) {
       builder.append(" ADD ");
-      if (columnsToAdd.size() > 1) {
+      if (allColumnsToAddInOrder.size() > 1) {
         builder.append('(');
       }
       boolean first = true;
-      for (Map.Entry<CqlIdentifier, DataType> column : columnsToAddInOrder.entrySet()) {
+      for (Map.Entry<CqlIdentifier, DataType> column : allColumnsToAddInOrder.entrySet()) {
         if (first) {
           first = false;
         } else {
@@ -263,7 +263,7 @@ public String asCql() {
           builder.append(" STATIC");
         }
       }
-      if (columnsToAdd.size() > 1) {
+      if (allColumnsToAddInOrder.size() > 1) {
         builder.append(')');
       }
       return builder.toString();
@@ -324,13 +324,13 @@ public CqlIdentifier getTable() {
   }
 
   @NonNull
-  public ImmutableMap<CqlIdentifier, DataType> getColumnsToAddInOrder() {
-    return columnsToAddInOrder;
+  public ImmutableMap<CqlIdentifier, DataType> getAllColumnsToAddInOrder() {
+    return allColumnsToAddInOrder;
   }
 
   @NonNull
   public ImmutableSet<CqlIdentifier> getColumnsToAddRegular() {
-    return columnsToAdd;
+    return columnsToAddRegular;
   }
 
   @NonNull

query-builder/src/test/java/com/datastax/oss/driver/api/querybuilder/schema/AlterTableTest.java

@@ -40,6 +40,12 @@ public void should_generate_alter_table_with_add_single_column() {
         .hasCql("ALTER TABLE foo.bar ADD x text");
   }
 
+  @Test
+  public void should_generate_alter_table_with_add_single_column_static() {
+    assertThat(alterTable("foo", "bar").addStaticColumn("x", DataTypes.TEXT))
+        .hasCql("ALTER TABLE foo.bar ADD x text STATIC");
+  }
+
   @Test
   public void should_generate_alter_table_with_add_three_columns() {
     assertThat(