fix: use ColumnPolicy mapping value instead of enum name

crate · Nov 11, 2014 · 28f4b58 · 28f4b58
1 parent 23bedf3
commit 28f4b58
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/sql/src/main/java/io/crate/action/sql/DDLAnalysisDispatcher.java b/sql/src/main/java/io/crate/action/sql/DDLAnalysisDispatcher.java
@@ -402,7 +402,7 @@ public void onResponse(GetIndexTemplatesResponse response) {
                     Map<String, Object> mapping = new HashMap<>();
                     IndexTemplateMetaData template = response.getIndexTemplates().get(0);
                     if(analysis.columnPolicy().isPresent()){
-                        mapping.put("dynamic", analysis.columnPolicy().get());
+                        mapping.put("dynamic", analysis.columnPolicy().get().mappingValue());
                     }
                     mapping = mergeMapping(template, mapping);
 
@@ -465,7 +465,7 @@ public void onFailure(Throwable e) {
             PutMappingRequest request = new PutMappingRequest(indices);
             request.type(Constants.DEFAULT_MAPPING_TYPE);
             Map<String, Object> mapping = new HashMap<>();
-            mapping.put("dynamic", analysis.columnPolicy().get());
+            mapping.put("dynamic", analysis.columnPolicy().get().mappingValue());
             request.source(mapping);
             final SettableFuture<?> future = SettableFuture.create();
             results.add(future);

diff --git a/sql/src/test/java/io/crate/integrationtests/ColumnPolicyIntegrationTest.java b/sql/src/test/java/io/crate/integrationtests/ColumnPolicyIntegrationTest.java
@@ -350,6 +350,19 @@ public void testAlterDynamicTable() throws Exception {
         execute("insert into dynamic_table (id, score, new_col) values (1, 4656234.345, 'hello')");
     }
 
+    @Test
+    public void testAlterTable() throws Exception {
+        execute("create table dynamic_table (" +
+                "  id integer primary key, " +
+                "  score double" +
+                ") with (number_of_replicas=0, column_policy='strict')");
+        ensureGreen();
+        execute("insert into dynamic_table (id, score) values (1, 42)");
+        execute("alter table dynamic_table set (column_policy = 'dynamic')");
+        waitNoPendingTasksOnAll();
+        execute("insert into dynamic_table (id, score, new_col) values (2, 4656234.345, 'hello')");
+    }
+
     @Test
     public void testResetColumnPolicy() throws Exception {
         execute("create table dynamic_table (" +