Merge branch '3.10' of https://github.com/JumpMind/symmetric-ds.git i…

…nto 3.10
JumpMind · Apr 26, 2019 · 1915baa · 1915baa
2 parents 85a80d6 + d95f5ff
commit 1915baa
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/symmetric-db/src/main/java/org/jumpmind/db/io/DatabaseXmlUtil.java b/symmetric-db/src/main/java/org/jumpmind/db/io/DatabaseXmlUtil.java
@@ -258,6 +258,10 @@ public static Table nextTable(XmlPullParser parser, String catalog, String schem
                                     if (isNotBlank(attributeValue)) {
                                         platformColumn.setDecimalDigits(Integer.parseInt(attributeValue));
                                     }
+                                } else if (attributeName.equalsIgnoreCase("enumValues")) {
+                                    if(isNotBlank(attributeValue)) {
+                                        platformColumn.setEnumValues(attributeValue.split(","));
+                                    }
                                 }
                             }
                             if (table != null && table.getColumnCount() > 0) {
@@ -513,6 +517,18 @@ public static void write(Table table, Writer output) {
                             if (platformColumn.getDefaultValue() != null) {
                                 output.write(" default=\"" + StringEscapeUtils.escapeXml(platformColumn.getDefaultValue()) + "\"");
                             }
+                            if(platformColumn.getEnumValues() != null && platformColumn.getEnumValues().length > 0) {
+                                output.write(" enumValues=\"");
+                                boolean writeComma = false;
+                                for(String enumValue : platformColumn.getEnumValues()) {
+                                    if(writeComma) {
+                                        output.write(",");
+                                    }
+                                    output.write(enumValue);
+                                    writeComma = true;
+                                }
+                                output.write("\"");
+                            }
 
                             output.write("/>\n");
                         }