From e6c5401cc0ae1cdba8e13e8ff377f06868247bf4 Mon Sep 17 00:00:00 2001
From: lukaseder <lukas.eder@gmail.com>
Date: Wed, 8 Aug 2018 16:02:49 +0200
Subject: [PATCH] [#7735] XJC generated classes should generate
 XmlElementWrapper element for Lists

---
 .../java/org/jooq/codegen/GenerationTool.java | 13 ++-
 .../java/org/jooq/codegen/XMLGenerator.java   |  5 +-
 .../main/java/org/jooq/meta/jaxb/Catalog.java |  6 +-
 .../java/org/jooq/meta/jaxb/Database.java     | 42 +++++++--
 .../main/java/org/jooq/meta/jaxb/Jdbc.java    |  6 +-
 .../java/org/jooq/meta/jaxb/Matchers.java     | 36 ++++++--
 .../java/org/jooq/meta/xml/XMLDatabase.java   | 21 ++++-
 .../main/java/org/jooq/conf/MappedSchema.java |  8 +-
 .../main/java/org/jooq/conf/MappedTable.java  |  2 +-
 .../java/org/jooq/conf/RenderMapping.java     |  6 +-
 .../java/org/jooq/conf/SettingsTools.java     |  8 +-
 .../exception/ConfigurationException.java     | 10 +++
 .../java/org/jooq/util/xml/jaxb/Catalog.java  |  4 +-
 .../java/org/jooq/util/xml/jaxb/Column.java   | 48 +++++-----
 .../java/org/jooq/util/xml/jaxb/Index.java    | 28 +++---
 .../jooq/util/xml/jaxb/IndexColumnUsage.java  | 36 ++++----
 .../jooq/util/xml/jaxb/InformationSchema.java | 88 ++++++++++++++-----
 .../jooq/util/xml/jaxb/KeyColumnUsage.java    | 32 +++----
 .../org/jooq/util/xml/jaxb/Parameter.java     | 48 +++++-----
 .../util/xml/jaxb/ReferentialConstraint.java  | 24 ++---
 .../java/org/jooq/util/xml/jaxb/Routine.java  | 52 +++++------
 .../java/org/jooq/util/xml/jaxb/Schema.java   |  8 +-
 .../java/org/jooq/util/xml/jaxb/Sequence.java | 28 +++---
 .../java/org/jooq/util/xml/jaxb/Table.java    | 12 +--
 .../jooq/util/xml/jaxb/TableConstraint.java   | 28 +++---
 25 files changed, 372 insertions(+), 227 deletions(-)

diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/GenerationTool.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/GenerationTool.java
index 5ee9c27705..b3a861c5c2 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/codegen/GenerationTool.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/GenerationTool.java
@@ -69,6 +69,8 @@ import javax.xml.validation.SchemaFactory;
 
 import org.jooq.Constants;
 import org.jooq.Log.Level;
+import org.jooq.conf.MiniJAXB;
+import org.jooq.exception.ExceptionTools;
 import org.jooq.meta.CatalogVersionProvider;
 import org.jooq.meta.Database;
 import org.jooq.meta.Databases;
@@ -923,8 +925,15 @@ public class GenerationTool {
             });
             return (Configuration) unmarshaller.unmarshal(new StringReader(xml));
         }
-        catch (Exception e) {
-            throw new GeneratorException("Error while reading XML configuration", e);
+        catch (Throwable t) {
+
+            // [#7734] If JAXB cannot be loaded, try using our own
+            if (ExceptionTools.getCause(t, ClassNotFoundException.class) != null ||
+                ExceptionTools.getCause(t, Error.class) != null) {
+                return MiniJAXB.unmarshal(xml, Configuration.class);
+            }
+
+            throw new GeneratorException("Error while reading XML configuration", t);
         }
     }
 }
diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/XMLGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/XMLGenerator.java
index 2f6b57ba8e..5650107772 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/codegen/XMLGenerator.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/XMLGenerator.java
@@ -46,9 +46,8 @@ import static org.jooq.util.xml.jaxb.TableConstraintType.UNIQUE;
 import java.io.StringWriter;
 import java.util.List;
 
-import javax.xml.bind.JAXB;
-
 import org.jooq.SortOrder;
+import org.jooq.conf.MiniJAXB;
 import org.jooq.meta.CatalogDefinition;
 import org.jooq.meta.CheckConstraintDefinition;
 import org.jooq.meta.ColumnDefinition;
@@ -352,7 +351,7 @@ public class XMLGenerator extends AbstractGenerator {
         }
 
         StringWriter writer = new StringWriter();
-        JAXB.marshal(is, writer);
+        MiniJAXB.marshal(is, writer);
         out.print(writer.toString());
         out.close();
     }
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Catalog.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Catalog.java
index 997f48841e..df869c69fe 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Catalog.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Catalog.java
@@ -188,7 +188,11 @@ public class Catalog implements Serializable
         }
         if (schemata!= null) {
             sb.append("<schemata>");
-            sb.append(schemata);
+            for (int i = 0; (i<schemata.size()); i ++) {
+                sb.append("<schema>");
+                sb.append(schemata.get(i));
+                sb.append("</schema>");
+            }
             sb.append("</schemata>");
         }
         return sb.toString();
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Database.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Database.java
index 7ab7d95451..4dacc65488 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Database.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Database.java
@@ -1617,7 +1617,11 @@ public class Database implements Serializable
         }
         if (regexFlags!= null) {
             sb.append("<regexFlags>");
-            sb.append(regexFlags);
+            for (int i = 0; (i<regexFlags.size()); i ++) {
+                sb.append("<regexFlags>");
+                sb.append(regexFlags.get(i));
+                sb.append("</regexFlags>");
+            }
             sb.append("</regexFlags>");
         }
         if (includes!= null) {
@@ -1802,32 +1806,56 @@ public class Database implements Serializable
         }
         if (properties!= null) {
             sb.append("<properties>");
-            sb.append(properties);
+            for (int i = 0; (i<properties.size()); i ++) {
+                sb.append("<property>");
+                sb.append(properties.get(i));
+                sb.append("</property>");
+            }
             sb.append("</properties>");
         }
         if (catalogs!= null) {
             sb.append("<catalogs>");
-            sb.append(catalogs);
+            for (int i = 0; (i<catalogs.size()); i ++) {
+                sb.append("<catalog>");
+                sb.append(catalogs.get(i));
+                sb.append("</catalog>");
+            }
             sb.append("</catalogs>");
         }
         if (schemata!= null) {
             sb.append("<schemata>");
-            sb.append(schemata);
+            for (int i = 0; (i<schemata.size()); i ++) {
+                sb.append("<schema>");
+                sb.append(schemata.get(i));
+                sb.append("</schema>");
+            }
             sb.append("</schemata>");
         }
         if (customTypes!= null) {
             sb.append("<customTypes>");
-            sb.append(customTypes);
+            for (int i = 0; (i<customTypes.size()); i ++) {
+                sb.append("<customType>");
+                sb.append(customTypes.get(i));
+                sb.append("</customType>");
+            }
             sb.append("</customTypes>");
         }
         if (enumTypes!= null) {
             sb.append("<enumTypes>");
-            sb.append(enumTypes);
+            for (int i = 0; (i<enumTypes.size()); i ++) {
+                sb.append("<enumType>");
+                sb.append(enumTypes.get(i));
+                sb.append("</enumType>");
+            }
             sb.append("</enumTypes>");
         }
         if (forcedTypes!= null) {
             sb.append("<forcedTypes>");
-            sb.append(forcedTypes);
+            for (int i = 0; (i<forcedTypes.size()); i ++) {
+                sb.append("<forcedType>");
+                sb.append(forcedTypes.get(i));
+                sb.append("</forcedType>");
+            }
             sb.append("</forcedTypes>");
         }
         return sb.toString();
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Jdbc.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Jdbc.java
index 91c4b0ba7b..5ce4581390 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Jdbc.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Jdbc.java
@@ -296,7 +296,11 @@ public class Jdbc implements Serializable
         }
         if (properties!= null) {
             sb.append("<properties>");
-            sb.append(properties);
+            for (int i = 0; (i<properties.size()); i ++) {
+                sb.append("<property>");
+                sb.append(properties.get(i));
+                sb.append("</property>");
+            }
             sb.append("</properties>");
         }
         return sb.toString();
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Matchers.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Matchers.java
index 25ba62a6be..02b5697290 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Matchers.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Matchers.java
@@ -257,32 +257,56 @@ public class Matchers implements Serializable
         StringBuilder sb = new StringBuilder();
         if (schemas!= null) {
             sb.append("<schemas>");
-            sb.append(schemas);
+            for (int i = 0; (i<schemas.size()); i ++) {
+                sb.append("<schema>");
+                sb.append(schemas.get(i));
+                sb.append("</schema>");
+            }
             sb.append("</schemas>");
         }
         if (tables!= null) {
             sb.append("<tables>");
-            sb.append(tables);
+            for (int i = 0; (i<tables.size()); i ++) {
+                sb.append("<table>");
+                sb.append(tables.get(i));
+                sb.append("</table>");
+            }
             sb.append("</tables>");
         }
         if (fields!= null) {
             sb.append("<fields>");
-            sb.append(fields);
+            for (int i = 0; (i<fields.size()); i ++) {
+                sb.append("<field>");
+                sb.append(fields.get(i));
+                sb.append("</field>");
+            }
             sb.append("</fields>");
         }
         if (routines!= null) {
             sb.append("<routines>");
-            sb.append(routines);
+            for (int i = 0; (i<routines.size()); i ++) {
+                sb.append("<routine>");
+                sb.append(routines.get(i));
+                sb.append("</routine>");
+            }
             sb.append("</routines>");
         }
         if (sequences!= null) {
             sb.append("<sequences>");
-            sb.append(sequences);
+            for (int i = 0; (i<sequences.size()); i ++) {
+                sb.append("<sequence>");
+                sb.append(sequences.get(i));
+                sb.append("</sequence>");
+            }
             sb.append("</sequences>");
         }
         if (enums!= null) {
             sb.append("<enums>");
-            sb.append(enums);
+            for (int i = 0; (i<enums.size()); i ++) {
+                sb.append("<enum>");
+                sb.append(enums.get(i));
+                sb.append("</enum>");
+            }
             sb.append("</enums>");
         }
         return sb.toString();
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/xml/XMLDatabase.java b/jOOQ-meta/src/main/java/org/jooq/meta/xml/XMLDatabase.java
index 009dcdd080..e96e57165e 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/xml/XMLDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/xml/XMLDatabase.java
@@ -80,6 +80,8 @@ import org.jooq.DSLContext;
 import org.jooq.Name;
 import org.jooq.SQLDialect;
 import org.jooq.SortOrder;
+import org.jooq.conf.MiniJAXB;
+import org.jooq.exception.ExceptionTools;
 import org.jooq.impl.DSL;
 import org.jooq.meta.AbstractDatabase;
 import org.jooq.meta.AbstractIndexDefinition;
@@ -247,12 +249,23 @@ public class XMLDatabase extends AbstractDatabase {
                 //         The following quick fix tests the presence of the xmlns when marshalling, and if absent
                 //         removes it prior to unmarshalling.
                 StringWriter test = new StringWriter();
-                JAXB.marshal(new InformationSchema(), test);
+                try {
+                    JAXB.marshal(new InformationSchema(), test);
 
-                if (!test.toString().contains("xmlns"))
-                    content = content.replaceAll("xmlns=\"[^\"]*\"", "");
+                    if (!test.toString().contains("xmlns"))
+                        content = content.replaceAll("xmlns=\"[^\"]*\"", "");
 
-                info = JAXB.unmarshal(new StringReader(content), InformationSchema.class);
+                    info = JAXB.unmarshal(new StringReader(content), InformationSchema.class);
+                }
+                catch (Throwable t) {
+                    if (ExceptionTools.getCause(t, ClassNotFoundException.class) != null ||
+                        ExceptionTools.getCause(t, Error.class) != null) {
+
+                        info = MiniJAXB.unmarshal(content, InformationSchema.class);
+                    }
+                    else
+                        throw t;
+                }
             }
             catch (Exception e) {
                 throw new RuntimeException("Error while opening files " + xml + " or " + xsl, e);
diff --git a/jOOQ/src/main/java/org/jooq/conf/MappedSchema.java b/jOOQ/src/main/java/org/jooq/conf/MappedSchema.java
index 2173d42e81..41093a30c0 100644
--- a/jOOQ/src/main/java/org/jooq/conf/MappedSchema.java
+++ b/jOOQ/src/main/java/org/jooq/conf/MappedSchema.java
@@ -186,7 +186,7 @@ public class MappedSchema
         }
         if (inputExpression!= null) {
             sb.append("<inputExpression>");
-            sb.append(inputExpression);
+            sb.append(inputExpression.pattern());
             sb.append("</inputExpression>");
         }
         if (output!= null) {
@@ -196,7 +196,11 @@ public class MappedSchema
         }
         if (tables!= null) {
             sb.append("<tables>");
-            sb.append(tables);
+            for (int i = 0; (i<tables.size()); i ++) {
+                sb.append("<table>");
+                sb.append(tables.get(i));
+                sb.append("</table>");
+            }
             sb.append("</tables>");
         }
         return sb.toString();
diff --git a/jOOQ/src/main/java/org/jooq/conf/MappedTable.java b/jOOQ/src/main/java/org/jooq/conf/MappedTable.java
index 7577fb2818..fb0ffe5d00 100644
--- a/jOOQ/src/main/java/org/jooq/conf/MappedTable.java
+++ b/jOOQ/src/main/java/org/jooq/conf/MappedTable.java
@@ -146,7 +146,7 @@ public class MappedTable
         }
         if (inputExpression!= null) {
             sb.append("<inputExpression>");
-            sb.append(inputExpression);
+            sb.append(inputExpression.pattern());
             sb.append("</inputExpression>");
         }
         if (output!= null) {
diff --git a/jOOQ/src/main/java/org/jooq/conf/RenderMapping.java b/jOOQ/src/main/java/org/jooq/conf/RenderMapping.java
index d8e14781c3..7f87508e24 100644
--- a/jOOQ/src/main/java/org/jooq/conf/RenderMapping.java
+++ b/jOOQ/src/main/java/org/jooq/conf/RenderMapping.java
@@ -116,7 +116,11 @@ public class RenderMapping
         }
         if (schemata!= null) {
             sb.append("<schemata>");
-            sb.append(schemata);
+            for (int i = 0; (i<schemata.size()); i ++) {
+                sb.append("<schema>");
+                sb.append(schemata.get(i));
+                sb.append("</schema>");
+            }
             sb.append("</schemata>");
         }
         return sb.toString();
diff --git a/jOOQ/src/main/java/org/jooq/conf/SettingsTools.java b/jOOQ/src/main/java/org/jooq/conf/SettingsTools.java
index 9cf3dd75bb..349774247b 100644
--- a/jOOQ/src/main/java/org/jooq/conf/SettingsTools.java
+++ b/jOOQ/src/main/java/org/jooq/conf/SettingsTools.java
@@ -48,8 +48,6 @@ import java.io.InputStream;
 import java.sql.PreparedStatement;
 import java.sql.Statement;
 
-import javax.xml.bind.JAXB;
-
 /**
  * Convenience methods for jOOQ runtime settings.
  *
@@ -68,16 +66,16 @@ public final class SettingsTools {
             // Check classpath first
             InputStream in = SettingsTools.class.getResourceAsStream(property);
             if (in != null)
-                settings = JAXB.unmarshal(in, Settings.class);
+                settings = MiniJAXB.unmarshal(in, Settings.class);
             else
-                settings = JAXB.unmarshal(new File(property), Settings.class);
+                settings = MiniJAXB.unmarshal(new File(property), Settings.class);
         }
 
         if (settings == null) {
             InputStream in = SettingsTools.class.getResourceAsStream("/jooq-settings.xml");
 
             if (in != null)
-                settings = JAXB.unmarshal(in, Settings.class);
+                settings = MiniJAXB.unmarshal(in, Settings.class);
         }
 
         if (settings == null)
diff --git a/jOOQ/src/main/java/org/jooq/exception/ConfigurationException.java b/jOOQ/src/main/java/org/jooq/exception/ConfigurationException.java
index 3978db1aa2..830465534f 100644
--- a/jOOQ/src/main/java/org/jooq/exception/ConfigurationException.java
+++ b/jOOQ/src/main/java/org/jooq/exception/ConfigurationException.java
@@ -60,4 +60,14 @@ public class ConfigurationException extends DataAccessException {
     public ConfigurationException(String message) {
         super(message);
     }
+
+    /**
+     * Constructor for ConfigurationException.
+     *
+     * @param message the detail message
+     * @param cause the cause
+     */
+    public ConfigurationException(String message, Throwable cause) {
+        super(message, cause);
+    }
 }
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Catalog.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Catalog.java
index a2dc282d7a..710a2c5443 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Catalog.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Catalog.java
@@ -116,9 +116,9 @@ public class Catalog implements Serializable
     public String toString() {
         StringBuilder sb = new StringBuilder();
         if (catalogName!= null) {
-            sb.append("<catalogName>");
+            sb.append("<catalog_name>");
             sb.append(catalogName);
-            sb.append("</catalogName>");
+            sb.append("</catalog_name>");
         }
         if (comment!= null) {
             sb.append("<comment>");
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Column.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Column.java
index dc8f6b4f47..e678bdb946 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Column.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Column.java
@@ -474,64 +474,64 @@ public class Column implements Serializable
     public String toString() {
         StringBuilder sb = new StringBuilder();
         if (tableCatalog!= null) {
-            sb.append("<tableCatalog>");
+            sb.append("<table_catalog>");
             sb.append(tableCatalog);
-            sb.append("</tableCatalog>");
+            sb.append("</table_catalog>");
         }
         if (tableSchema!= null) {
-            sb.append("<tableSchema>");
+            sb.append("<table_schema>");
             sb.append(tableSchema);
-            sb.append("</tableSchema>");
+            sb.append("</table_schema>");
         }
         if (tableName!= null) {
-            sb.append("<tableName>");
+            sb.append("<table_name>");
             sb.append(tableName);
-            sb.append("</tableName>");
+            sb.append("</table_name>");
         }
         if (columnName!= null) {
-            sb.append("<columnName>");
+            sb.append("<column_name>");
             sb.append(columnName);
-            sb.append("</columnName>");
+            sb.append("</column_name>");
         }
         if (dataType!= null) {
-            sb.append("<dataType>");
+            sb.append("<data_type>");
             sb.append(dataType);
-            sb.append("</dataType>");
+            sb.append("</data_type>");
         }
         if (characterMaximumLength!= null) {
-            sb.append("<characterMaximumLength>");
+            sb.append("<character_maximum_length>");
             sb.append(characterMaximumLength);
-            sb.append("</characterMaximumLength>");
+            sb.append("</character_maximum_length>");
         }
         if (numericPrecision!= null) {
-            sb.append("<numericPrecision>");
+            sb.append("<numeric_precision>");
             sb.append(numericPrecision);
-            sb.append("</numericPrecision>");
+            sb.append("</numeric_precision>");
         }
         if (numericScale!= null) {
-            sb.append("<numericScale>");
+            sb.append("<numeric_scale>");
             sb.append(numericScale);
-            sb.append("</numericScale>");
+            sb.append("</numeric_scale>");
         }
         if (ordinalPosition!= null) {
-            sb.append("<ordinalPosition>");
+            sb.append("<ordinal_position>");
             sb.append(ordinalPosition);
-            sb.append("</ordinalPosition>");
+            sb.append("</ordinal_position>");
         }
         if (identityGeneration!= null) {
-            sb.append("<identityGeneration>");
+            sb.append("<identity_generation>");
             sb.append(identityGeneration);
-            sb.append("</identityGeneration>");
+            sb.append("</identity_generation>");
         }
         if (isNullable!= null) {
-            sb.append("<isNullable>");
+            sb.append("<is_nullable>");
             sb.append(isNullable);
-            sb.append("</isNullable>");
+            sb.append("</is_nullable>");
         }
         if (columnDefault!= null) {
-            sb.append("<columnDefault>");
+            sb.append("<column_default>");
             sb.append(columnDefault);
-            sb.append("</columnDefault>");
+            sb.append("</column_default>");
         }
         if (comment!= null) {
             sb.append("<comment>");
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Index.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Index.java
index b0e2250dcc..3e40e04b45 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Index.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Index.java
@@ -313,39 +313,39 @@ public class Index implements Serializable
     public String toString() {
         StringBuilder sb = new StringBuilder();
         if (indexCatalog!= null) {
-            sb.append("<indexCatalog>");
+            sb.append("<index_catalog>");
             sb.append(indexCatalog);
-            sb.append("</indexCatalog>");
+            sb.append("</index_catalog>");
         }
         if (indexSchema!= null) {
-            sb.append("<indexSchema>");
+            sb.append("<index_schema>");
             sb.append(indexSchema);
-            sb.append("</indexSchema>");
+            sb.append("</index_schema>");
         }
         if (indexName!= null) {
-            sb.append("<indexName>");
+            sb.append("<index_name>");
             sb.append(indexName);
-            sb.append("</indexName>");
+            sb.append("</index_name>");
         }
         if (tableCatalog!= null) {
-            sb.append("<tableCatalog>");
+            sb.append("<table_catalog>");
             sb.append(tableCatalog);
-            sb.append("</tableCatalog>");
+            sb.append("</table_catalog>");
         }
         if (tableSchema!= null) {
-            sb.append("<tableSchema>");
+            sb.append("<table_schema>");
             sb.append(tableSchema);
-            sb.append("</tableSchema>");
+            sb.append("</table_schema>");
         }
         if (tableName!= null) {
-            sb.append("<tableName>");
+            sb.append("<table_name>");
             sb.append(tableName);
-            sb.append("</tableName>");
+            sb.append("</table_name>");
         }
         if (isUnique!= null) {
-            sb.append("<isUnique>");
+            sb.append("<is_unique>");
             sb.append(isUnique);
-            sb.append("</isUnique>");
+            sb.append("</is_unique>");
         }
         if (comment!= null) {
             sb.append("<comment>");
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/IndexColumnUsage.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/IndexColumnUsage.java
index bffbecb3fe..4fde30bee2 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/IndexColumnUsage.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/IndexColumnUsage.java
@@ -338,47 +338,47 @@ public class IndexColumnUsage implements Serializable
     public String toString() {
         StringBuilder sb = new StringBuilder();
         if (indexCatalog!= null) {
-            sb.append("<indexCatalog>");
+            sb.append("<index_catalog>");
             sb.append(indexCatalog);
-            sb.append("</indexCatalog>");
+            sb.append("</index_catalog>");
         }
         if (indexSchema!= null) {
-            sb.append("<indexSchema>");
+            sb.append("<index_schema>");
             sb.append(indexSchema);
-            sb.append("</indexSchema>");
+            sb.append("</index_schema>");
         }
         if (indexName!= null) {
-            sb.append("<indexName>");
+            sb.append("<index_name>");
             sb.append(indexName);
-            sb.append("</indexName>");
+            sb.append("</index_name>");
         }
         if (tableCatalog!= null) {
-            sb.append("<tableCatalog>");
+            sb.append("<table_catalog>");
             sb.append(tableCatalog);
-            sb.append("</tableCatalog>");
+            sb.append("</table_catalog>");
         }
         if (tableSchema!= null) {
-            sb.append("<tableSchema>");
+            sb.append("<table_schema>");
             sb.append(tableSchema);
-            sb.append("</tableSchema>");
+            sb.append("</table_schema>");
         }
         if (tableName!= null) {
-            sb.append("<tableName>");
+            sb.append("<table_name>");
             sb.append(tableName);
-            sb.append("</tableName>");
+            sb.append("</table_name>");
         }
         if (columnName!= null) {
-            sb.append("<columnName>");
+            sb.append("<column_name>");
             sb.append(columnName);
-            sb.append("</columnName>");
+            sb.append("</column_name>");
         }
-        sb.append("<ordinalPosition>");
+        sb.append("<ordinal_position>");
         sb.append(ordinalPosition);
-        sb.append("</ordinalPosition>");
+        sb.append("</ordinal_position>");
         if (isDescending!= null) {
-            sb.append("<isDescending>");
+            sb.append("<is_descending>");
             sb.append(isDescending);
-            sb.append("</isDescending>");
+            sb.append("</is_descending>");
         }
         return sb.toString();
     }
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/InformationSchema.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/InformationSchema.java
index 3873ba8c3b..e5bedb1ffe 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/InformationSchema.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/InformationSchema.java
@@ -488,62 +488,110 @@ public class InformationSchema implements Serializable
         StringBuilder sb = new StringBuilder();
         if (catalogs!= null) {
             sb.append("<catalogs>");
-            sb.append(catalogs);
+            for (int i = 0; (i<catalogs.size()); i ++) {
+                sb.append("<catalog>");
+                sb.append(catalogs.get(i));
+                sb.append("</catalog>");
+            }
             sb.append("</catalogs>");
         }
         if (schemata!= null) {
             sb.append("<schemata>");
-            sb.append(schemata);
+            for (int i = 0; (i<schemata.size()); i ++) {
+                sb.append("<schema>");
+                sb.append(schemata.get(i));
+                sb.append("</schema>");
+            }
             sb.append("</schemata>");
         }
         if (sequences!= null) {
             sb.append("<sequences>");
-            sb.append(sequences);
+            for (int i = 0; (i<sequences.size()); i ++) {
+                sb.append("<sequence>");
+                sb.append(sequences.get(i));
+                sb.append("</sequence>");
+            }
             sb.append("</sequences>");
         }
         if (tables!= null) {
             sb.append("<tables>");
-            sb.append(tables);
+            for (int i = 0; (i<tables.size()); i ++) {
+                sb.append("<table>");
+                sb.append(tables.get(i));
+                sb.append("</table>");
+            }
             sb.append("</tables>");
         }
         if (columns!= null) {
             sb.append("<columns>");
-            sb.append(columns);
+            for (int i = 0; (i<columns.size()); i ++) {
+                sb.append("<column>");
+                sb.append(columns.get(i));
+                sb.append("</column>");
+            }
             sb.append("</columns>");
         }
         if (tableConstraints!= null) {
-            sb.append("<tableConstraints>");
-            sb.append(tableConstraints);
-            sb.append("</tableConstraints>");
+            sb.append("<table_constraints>");
+            for (int i = 0; (i<tableConstraints.size()); i ++) {
+                sb.append("<table_constraint>");
+                sb.append(tableConstraints.get(i));
+                sb.append("</table_constraint>");
+            }
+            sb.append("</table_constraints>");
         }
         if (keyColumnUsages!= null) {
-            sb.append("<keyColumnUsages>");
-            sb.append(keyColumnUsages);
-            sb.append("</keyColumnUsages>");
+            sb.append("<key_column_usages>");
+            for (int i = 0; (i<keyColumnUsages.size()); i ++) {
+                sb.append("<key_column_usage>");
+                sb.append(keyColumnUsages.get(i));
+                sb.append("</key_column_usage>");
+            }
+            sb.append("</key_column_usages>");
         }
         if (referentialConstraints!= null) {
-            sb.append("<referentialConstraints>");
-            sb.append(referentialConstraints);
-            sb.append("</referentialConstraints>");
+            sb.append("<referential_constraints>");
+            for (int i = 0; (i<referentialConstraints.size()); i ++) {
+                sb.append("<referential_constraint>");
+                sb.append(referentialConstraints.get(i));
+                sb.append("</referential_constraint>");
+            }
+            sb.append("</referential_constraints>");
         }
         if (indexes!= null) {
             sb.append("<indexes>");
-            sb.append(indexes);
+            for (int i = 0; (i<indexes.size()); i ++) {
+                sb.append("<index>");
+                sb.append(indexes.get(i));
+                sb.append("</index>");
+            }
             sb.append("</indexes>");
         }
         if (indexColumnUsages!= null) {
-            sb.append("<indexColumnUsages>");
-            sb.append(indexColumnUsages);
-            sb.append("</indexColumnUsages>");
+            sb.append("<index_column_usages>");
+            for (int i = 0; (i<indexColumnUsages.size()); i ++) {
+                sb.append("<index_column_usage>");
+                sb.append(indexColumnUsages.get(i));
+                sb.append("</index_column_usage>");
+            }
+            sb.append("</index_column_usages>");
         }
         if (routines!= null) {
             sb.append("<routines>");
-            sb.append(routines);
+            for (int i = 0; (i<routines.size()); i ++) {
+                sb.append("<routine>");
+                sb.append(routines.get(i));
+                sb.append("</routine>");
+            }
             sb.append("</routines>");
         }
         if (parameters!= null) {
             sb.append("<parameters>");
-            sb.append(parameters);
+            for (int i = 0; (i<parameters.size()); i ++) {
+                sb.append("<parameter>");
+                sb.append(parameters.get(i));
+                sb.append("</parameter>");
+            }
             sb.append("</parameters>");
         }
         return sb.toString();
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/KeyColumnUsage.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/KeyColumnUsage.java
index edc4af4cdc..28f2a912d2 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/KeyColumnUsage.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/KeyColumnUsage.java
@@ -306,42 +306,42 @@ public class KeyColumnUsage implements Serializable
     public String toString() {
         StringBuilder sb = new StringBuilder();
         if (columnName!= null) {
-            sb.append("<columnName>");
+            sb.append("<column_name>");
             sb.append(columnName);
-            sb.append("</columnName>");
+            sb.append("</column_name>");
         }
         if (constraintCatalog!= null) {
-            sb.append("<constraintCatalog>");
+            sb.append("<constraint_catalog>");
             sb.append(constraintCatalog);
-            sb.append("</constraintCatalog>");
+            sb.append("</constraint_catalog>");
         }
         if (constraintSchema!= null) {
-            sb.append("<constraintSchema>");
+            sb.append("<constraint_schema>");
             sb.append(constraintSchema);
-            sb.append("</constraintSchema>");
+            sb.append("</constraint_schema>");
         }
         if (constraintName!= null) {
-            sb.append("<constraintName>");
+            sb.append("<constraint_name>");
             sb.append(constraintName);
-            sb.append("</constraintName>");
+            sb.append("</constraint_name>");
         }
-        sb.append("<ordinalPosition>");
+        sb.append("<ordinal_position>");
         sb.append(ordinalPosition);
-        sb.append("</ordinalPosition>");
+        sb.append("</ordinal_position>");
         if (tableCatalog!= null) {
-            sb.append("<tableCatalog>");
+            sb.append("<table_catalog>");
             sb.append(tableCatalog);
-            sb.append("</tableCatalog>");
+            sb.append("</table_catalog>");
         }
         if (tableSchema!= null) {
-            sb.append("<tableSchema>");
+            sb.append("<table_schema>");
             sb.append(tableSchema);
-            sb.append("</tableSchema>");
+            sb.append("</table_schema>");
         }
         if (tableName!= null) {
-            sb.append("<tableName>");
+            sb.append("<table_name>");
             sb.append(tableName);
-            sb.append("</tableName>");
+            sb.append("</table_name>");
         }
         return sb.toString();
     }
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Parameter.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Parameter.java
index 0750f20ca3..ea56a78244 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Parameter.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Parameter.java
@@ -468,62 +468,62 @@ public class Parameter implements Serializable
     public String toString() {
         StringBuilder sb = new StringBuilder();
         if (specificCatalog!= null) {
-            sb.append("<specificCatalog>");
+            sb.append("<specific_catalog>");
             sb.append(specificCatalog);
-            sb.append("</specificCatalog>");
+            sb.append("</specific_catalog>");
         }
         if (specificSchema!= null) {
-            sb.append("<specificSchema>");
+            sb.append("<specific_schema>");
             sb.append(specificSchema);
-            sb.append("</specificSchema>");
+            sb.append("</specific_schema>");
         }
         if (specificPackage!= null) {
-            sb.append("<specificPackage>");
+            sb.append("<specific_package>");
             sb.append(specificPackage);
-            sb.append("</specificPackage>");
+            sb.append("</specific_package>");
         }
         if (specificName!= null) {
-            sb.append("<specificName>");
+            sb.append("<specific_name>");
             sb.append(specificName);
-            sb.append("</specificName>");
+            sb.append("</specific_name>");
         }
-        sb.append("<ordinalPosition>");
+        sb.append("<ordinal_position>");
         sb.append(ordinalPosition);
-        sb.append("</ordinalPosition>");
+        sb.append("</ordinal_position>");
         if (parameterMode!= null) {
-            sb.append("<parameterMode>");
+            sb.append("<parameter_mode>");
             sb.append(parameterMode);
-            sb.append("</parameterMode>");
+            sb.append("</parameter_mode>");
         }
         if (parameterName!= null) {
-            sb.append("<parameterName>");
+            sb.append("<parameter_name>");
             sb.append(parameterName);
-            sb.append("</parameterName>");
+            sb.append("</parameter_name>");
         }
         if (dataType!= null) {
-            sb.append("<dataType>");
+            sb.append("<data_type>");
             sb.append(dataType);
-            sb.append("</dataType>");
+            sb.append("</data_type>");
         }
         if (characterMaximumLength!= null) {
-            sb.append("<characterMaximumLength>");
+            sb.append("<character_maximum_length>");
             sb.append(characterMaximumLength);
-            sb.append("</characterMaximumLength>");
+            sb.append("</character_maximum_length>");
         }
         if (numericPrecision!= null) {
-            sb.append("<numericPrecision>");
+            sb.append("<numeric_precision>");
             sb.append(numericPrecision);
-            sb.append("</numericPrecision>");
+            sb.append("</numeric_precision>");
         }
         if (numericScale!= null) {
-            sb.append("<numericScale>");
+            sb.append("<numeric_scale>");
             sb.append(numericScale);
-            sb.append("</numericScale>");
+            sb.append("</numeric_scale>");
         }
         if (parameterDefault!= null) {
-            sb.append("<parameterDefault>");
+            sb.append("<parameter_default>");
             sb.append(parameterDefault);
-            sb.append("</parameterDefault>");
+            sb.append("</parameter_default>");
         }
         if (comment!= null) {
             sb.append("<comment>");
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ReferentialConstraint.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ReferentialConstraint.java
index 5cd45b3693..fd90616c45 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ReferentialConstraint.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ReferentialConstraint.java
@@ -249,34 +249,34 @@ public class ReferentialConstraint implements Serializable
     public String toString() {
         StringBuilder sb = new StringBuilder();
         if (constraintCatalog!= null) {
-            sb.append("<constraintCatalog>");
+            sb.append("<constraint_catalog>");
             sb.append(constraintCatalog);
-            sb.append("</constraintCatalog>");
+            sb.append("</constraint_catalog>");
         }
         if (constraintSchema!= null) {
-            sb.append("<constraintSchema>");
+            sb.append("<constraint_schema>");
             sb.append(constraintSchema);
-            sb.append("</constraintSchema>");
+            sb.append("</constraint_schema>");
         }
         if (constraintName!= null) {
-            sb.append("<constraintName>");
+            sb.append("<constraint_name>");
             sb.append(constraintName);
-            sb.append("</constraintName>");
+            sb.append("</constraint_name>");
         }
         if (uniqueConstraintCatalog!= null) {
-            sb.append("<uniqueConstraintCatalog>");
+            sb.append("<unique_constraint_catalog>");
             sb.append(uniqueConstraintCatalog);
-            sb.append("</uniqueConstraintCatalog>");
+            sb.append("</unique_constraint_catalog>");
         }
         if (uniqueConstraintSchema!= null) {
-            sb.append("<uniqueConstraintSchema>");
+            sb.append("<unique_constraint_schema>");
             sb.append(uniqueConstraintSchema);
-            sb.append("</uniqueConstraintSchema>");
+            sb.append("</unique_constraint_schema>");
         }
         if (uniqueConstraintName!= null) {
-            sb.append("<uniqueConstraintName>");
+            sb.append("<unique_constraint_name>");
             sb.append(uniqueConstraintName);
-            sb.append("</uniqueConstraintName>");
+            sb.append("</unique_constraint_name>");
         }
         return sb.toString();
     }
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Routine.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Routine.java
index 9837d3732b..aaeafc1eba 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Routine.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Routine.java
@@ -510,69 +510,69 @@ public class Routine implements Serializable
     public String toString() {
         StringBuilder sb = new StringBuilder();
         if (specificCatalog!= null) {
-            sb.append("<specificCatalog>");
+            sb.append("<specific_catalog>");
             sb.append(specificCatalog);
-            sb.append("</specificCatalog>");
+            sb.append("</specific_catalog>");
         }
         if (specificSchema!= null) {
-            sb.append("<specificSchema>");
+            sb.append("<specific_schema>");
             sb.append(specificSchema);
-            sb.append("</specificSchema>");
+            sb.append("</specific_schema>");
         }
         if (specificPackage!= null) {
-            sb.append("<specificPackage>");
+            sb.append("<specific_package>");
             sb.append(specificPackage);
-            sb.append("</specificPackage>");
+            sb.append("</specific_package>");
         }
         if (specificName!= null) {
-            sb.append("<specificName>");
+            sb.append("<specific_name>");
             sb.append(specificName);
-            sb.append("</specificName>");
+            sb.append("</specific_name>");
         }
         if (routineCatalog!= null) {
-            sb.append("<routineCatalog>");
+            sb.append("<routine_catalog>");
             sb.append(routineCatalog);
-            sb.append("</routineCatalog>");
+            sb.append("</routine_catalog>");
         }
         if (routineSchema!= null) {
-            sb.append("<routineSchema>");
+            sb.append("<routine_schema>");
             sb.append(routineSchema);
-            sb.append("</routineSchema>");
+            sb.append("</routine_schema>");
         }
         if (routinePackage!= null) {
-            sb.append("<routinePackage>");
+            sb.append("<routine_package>");
             sb.append(routinePackage);
-            sb.append("</routinePackage>");
+            sb.append("</routine_package>");
         }
         if (routineName!= null) {
-            sb.append("<routineName>");
+            sb.append("<routine_name>");
             sb.append(routineName);
-            sb.append("</routineName>");
+            sb.append("</routine_name>");
         }
         if (routineType!= null) {
-            sb.append("<routineType>");
+            sb.append("<routine_type>");
             sb.append(routineType);
-            sb.append("</routineType>");
+            sb.append("</routine_type>");
         }
         if (dataType!= null) {
-            sb.append("<dataType>");
+            sb.append("<data_type>");
             sb.append(dataType);
-            sb.append("</dataType>");
+            sb.append("</data_type>");
         }
         if (characterMaximumLength!= null) {
-            sb.append("<characterMaximumLength>");
+            sb.append("<character_maximum_length>");
             sb.append(characterMaximumLength);
-            sb.append("</characterMaximumLength>");
+            sb.append("</character_maximum_length>");
         }
         if (numericPrecision!= null) {
-            sb.append("<numericPrecision>");
+            sb.append("<numeric_precision>");
             sb.append(numericPrecision);
-            sb.append("</numericPrecision>");
+            sb.append("</numeric_precision>");
         }
         if (numericScale!= null) {
-            sb.append("<numericScale>");
+            sb.append("<numeric_scale>");
             sb.append(numericScale);
-            sb.append("</numericScale>");
+            sb.append("</numeric_scale>");
         }
         if (comment!= null) {
             sb.append("<comment>");
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Schema.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Schema.java
index 3d9d52f85f..33507b8f55 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Schema.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Schema.java
@@ -149,14 +149,14 @@ public class Schema implements Serializable
     public String toString() {
         StringBuilder sb = new StringBuilder();
         if (catalogName!= null) {
-            sb.append("<catalogName>");
+            sb.append("<catalog_name>");
             sb.append(catalogName);
-            sb.append("</catalogName>");
+            sb.append("</catalog_name>");
         }
         if (schemaName!= null) {
-            sb.append("<schemaName>");
+            sb.append("<schema_name>");
             sb.append(schemaName);
-            sb.append("</schemaName>");
+            sb.append("</schema_name>");
         }
         if (comment!= null) {
             sb.append("<comment>");
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Sequence.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Sequence.java
index 461aba8377..afad352312 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Sequence.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Sequence.java
@@ -311,39 +311,39 @@ public class Sequence implements Serializable
     public String toString() {
         StringBuilder sb = new StringBuilder();
         if (sequenceCatalog!= null) {
-            sb.append("<sequenceCatalog>");
+            sb.append("<sequence_catalog>");
             sb.append(sequenceCatalog);
-            sb.append("</sequenceCatalog>");
+            sb.append("</sequence_catalog>");
         }
         if (sequenceSchema!= null) {
-            sb.append("<sequenceSchema>");
+            sb.append("<sequence_schema>");
             sb.append(sequenceSchema);
-            sb.append("</sequenceSchema>");
+            sb.append("</sequence_schema>");
         }
         if (sequenceName!= null) {
-            sb.append("<sequenceName>");
+            sb.append("<sequence_name>");
             sb.append(sequenceName);
-            sb.append("</sequenceName>");
+            sb.append("</sequence_name>");
         }
         if (dataType!= null) {
-            sb.append("<dataType>");
+            sb.append("<data_type>");
             sb.append(dataType);
-            sb.append("</dataType>");
+            sb.append("</data_type>");
         }
         if (characterMaximumLength!= null) {
-            sb.append("<characterMaximumLength>");
+            sb.append("<character_maximum_length>");
             sb.append(characterMaximumLength);
-            sb.append("</characterMaximumLength>");
+            sb.append("</character_maximum_length>");
         }
         if (numericPrecision!= null) {
-            sb.append("<numericPrecision>");
+            sb.append("<numeric_precision>");
             sb.append(numericPrecision);
-            sb.append("</numericPrecision>");
+            sb.append("</numeric_precision>");
         }
         if (numericScale!= null) {
-            sb.append("<numericScale>");
+            sb.append("<numeric_scale>");
             sb.append(numericScale);
-            sb.append("</numericScale>");
+            sb.append("</numeric_scale>");
         }
         if (comment!= null) {
             sb.append("<comment>");
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Table.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Table.java
index 3b2bd78af2..dbd14192ad 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Table.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Table.java
@@ -182,19 +182,19 @@ public class Table implements Serializable
     public String toString() {
         StringBuilder sb = new StringBuilder();
         if (tableCatalog!= null) {
-            sb.append("<tableCatalog>");
+            sb.append("<table_catalog>");
             sb.append(tableCatalog);
-            sb.append("</tableCatalog>");
+            sb.append("</table_catalog>");
         }
         if (tableSchema!= null) {
-            sb.append("<tableSchema>");
+            sb.append("<table_schema>");
             sb.append(tableSchema);
-            sb.append("</tableSchema>");
+            sb.append("</table_schema>");
         }
         if (tableName!= null) {
-            sb.append("<tableName>");
+            sb.append("<table_name>");
             sb.append(tableName);
-            sb.append("</tableName>");
+            sb.append("</table_name>");
         }
         if (comment!= null) {
             sb.append("<comment>");
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/TableConstraint.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/TableConstraint.java
index 0f819a4b8b..0fbb8596b4 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/TableConstraint.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/TableConstraint.java
@@ -315,39 +315,39 @@ public class TableConstraint implements Serializable
     public String toString() {
         StringBuilder sb = new StringBuilder();
         if (constraintCatalog!= null) {
-            sb.append("<constraintCatalog>");
+            sb.append("<constraint_catalog>");
             sb.append(constraintCatalog);
-            sb.append("</constraintCatalog>");
+            sb.append("</constraint_catalog>");
         }
         if (constraintSchema!= null) {
-            sb.append("<constraintSchema>");
+            sb.append("<constraint_schema>");
             sb.append(constraintSchema);
-            sb.append("</constraintSchema>");
+            sb.append("</constraint_schema>");
         }
         if (constraintName!= null) {
-            sb.append("<constraintName>");
+            sb.append("<constraint_name>");
             sb.append(constraintName);
-            sb.append("</constraintName>");
+            sb.append("</constraint_name>");
         }
         if (constraintType!= null) {
-            sb.append("<constraintType>");
+            sb.append("<constraint_type>");
             sb.append(constraintType);
-            sb.append("</constraintType>");
+            sb.append("</constraint_type>");
         }
         if (tableCatalog!= null) {
-            sb.append("<tableCatalog>");
+            sb.append("<table_catalog>");
             sb.append(tableCatalog);
-            sb.append("</tableCatalog>");
+            sb.append("</table_catalog>");
         }
         if (tableSchema!= null) {
-            sb.append("<tableSchema>");
+            sb.append("<table_schema>");
             sb.append(tableSchema);
-            sb.append("</tableSchema>");
+            sb.append("</table_schema>");
         }
         if (tableName!= null) {
-            sb.append("<tableName>");
+            sb.append("<table_name>");
             sb.append(tableName);
-            sb.append("</tableName>");
+            sb.append("</table_name>");
         }
         if (comment!= null) {
             sb.append("<comment>");