Implementation of DDLUTILS-117. Note that DdlUtils now either depends on Java 5 or JAXP 1.3 for compiling or when validation is turned on.
git-svn-id: https://svn.apache.org/repos/asf/db/ddlutils/trunk@650023 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/schema/database.xsd b/src/java/database.xsd
similarity index 96%
rename from src/schema/database.xsd
rename to src/java/database.xsd
index 08130ef..8205886 100644
--- a/src/schema/database.xsd
+++ b/src/java/database.xsd
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://db.apache.org/schemas"
- xmlns:db="http://db.apache.org/schemas"
+ targetNamespace="http://db.apache.org/ddlutils/schema/1.1"
+ xmlns:db="http://db.apache.org/ddlutils/schema/1.1"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
@@ -53,6 +53,7 @@
<xsd:enumeration value="BOOLEAN"/>
<xsd:enumeration value="CHAR"/>
<xsd:enumeration value="CLOB"/>
+ <xsd:enumeration value="DATALINK"/>
<xsd:enumeration value="DATE"/>
<xsd:enumeration value="DECIMAL"/>
<xsd:enumeration value="DISTINCT"/>
@@ -83,6 +84,7 @@
<xsd:simpleType name="foreign-key-constraint-type">
<xsd:restriction base="xsd:NMTOKEN">
<xsd:enumeration value="cascade"/>
+ <xsd:enumeration value="setdefault"/>
<xsd:enumeration value="setnull"/>
<xsd:enumeration value="restrict"/>
<xsd:enumeration value="none"/>
@@ -194,7 +196,7 @@
<xsd:attribute name="type"
type="db:jdbc-type"
- use="required"
+ use="optional"
default="VARCHAR" >
<xsd:annotation>
<xsd:documentation>
@@ -207,7 +209,7 @@
<xsd:complexType name="table-type">
<xsd:choice minOccurs="0" maxOccurs="unbounded">
<xsd:element name="column"
- type="column-type">
+ type="db:column-type">
<xsd:annotation>
<xsd:documentation>
TODO
@@ -327,6 +329,16 @@
</xsd:annotation>
</xsd:attribute>
+ <xsd:attribute name="javaName"
+ type="xsd:string"
+ use="optional">
+ <xsd:annotation>
+ <xsd:documentation>
+ TODO
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+
<xsd:attribute name="name"
type="xsd:string"
use="required">
@@ -383,7 +395,7 @@
<xsd:complexType name="foreign-key-type">
<xsd:sequence minOccurs="1" maxOccurs="unbounded">
<xsd:element name="reference"
- type="reference-type">
+ type="db:reference-type">
<xsd:annotation>
<xsd:documentation>
TODO
diff --git a/src/java/org/apache/ddlutils/io/DatabaseIO.java b/src/java/org/apache/ddlutils/io/DatabaseIO.java
index 9662a9d..662a901 100644
--- a/src/java/org/apache/ddlutils/io/DatabaseIO.java
+++ b/src/java/org/apache/ddlutils/io/DatabaseIO.java
@@ -27,12 +27,14 @@
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Reader;
+import java.io.StringReader;
import java.io.Writer;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import javax.xml.transform.stream.StreamSource;
import org.apache.commons.lang.StringUtils;
import org.apache.ddlutils.model.CascadeActionEnum;
@@ -59,7 +61,7 @@
public static final String BASE64_ATTR_NAME = "base64";
/** The namespace used by DdlUtils. */
- public static final String DDLUTILS_NAMESPACE = "http://db.apache.org/torque/";
+ public static final String DDLUTILS_NAMESPACE = "http://db.apache.org/ddlutils/schema/1.1";
/** Qualified name of the column element. */
public static final QName QNAME_ELEMENT_COLUMN = new QName(DDLUTILS_NAMESPACE, "column");
@@ -168,6 +170,10 @@
{
try
{
+ if (_validateXml)
+ {
+ new ModelValidator().validate(new StreamSource(new FileReader(filename)));
+ }
return read(new FileReader(filename));
}
catch (IOException ex)
@@ -186,6 +192,10 @@
{
try
{
+ if (_validateXml)
+ {
+ new ModelValidator().validate(new StreamSource(new FileReader(file)));
+ }
return read(new FileReader(file));
}
catch (IOException ex)
@@ -204,12 +214,36 @@
{
try
{
- return read(getXMLInputFactory().createXMLStreamReader(reader));
+ if (_validateXml)
+ {
+ StringBuffer tmpXml = new StringBuffer();
+ char[] buf = new char[4096];
+ int len;
+
+ while ((len = reader.read(buf)) >= 0)
+ {
+ if (tmpXml.length() > 0)
+ {
+ tmpXml.append("\n");
+ }
+ tmpXml.append(buf, 0, len);
+ }
+ new ModelValidator().validate(new StreamSource(new StringReader(tmpXml.toString())));
+ return read(getXMLInputFactory().createXMLStreamReader(new StringReader(tmpXml.toString())));
+ }
+ else
+ {
+ return read(getXMLInputFactory().createXMLStreamReader(reader));
+ }
}
catch (XMLStreamException ex)
{
throw new DdlUtilsXMLException(ex);
}
+ catch (IOException ex)
+ {
+ throw new DdlUtilsXMLException(ex);
+ }
}
/**
@@ -220,14 +254,7 @@
*/
public Database read(InputSource source) throws DdlUtilsXMLException
{
- try
- {
- return read(getXMLInputFactory().createXMLStreamReader(source.getCharacterStream()));
- }
- catch (XMLStreamException ex)
- {
- throw new DdlUtilsXMLException(ex);
- }
+ return read(source.getCharacterStream());
}
/**
@@ -872,6 +899,7 @@
private void writeDatabaseElement(Database model, PrettyPrintingXmlWriter xmlWriter) throws DdlUtilsXMLException
{
writeElementStart(xmlWriter, QNAME_ELEMENT_DATABASE);
+ xmlWriter.writeNamespace(null, DDLUTILS_NAMESPACE);
writeAttribute(xmlWriter, QNAME_ATTRIBUTE_NAME, model.getName());
writeAttribute(xmlWriter, QNAME_ATTRIBUTE_DEFAULT_ID_METHOD, model.getIdMethod());
writeAttribute(xmlWriter, QNAME_ATTRIBUTE_VERSION, model.getVersion());
@@ -1034,7 +1062,7 @@
*/
private void writeElementStart(PrettyPrintingXmlWriter xmlWriter, QName qName) throws DdlUtilsXMLException
{
- xmlWriter.writeElementStart(null, qName.getLocalPart());
+ xmlWriter.writeElementStart(qName.getNamespaceURI(), qName.getLocalPart());
}
/**
diff --git a/src/java/org/apache/ddlutils/io/ModelValidator.java b/src/java/org/apache/ddlutils/io/ModelValidator.java
new file mode 100644
index 0000000..b6916d5
--- /dev/null
+++ b/src/java/org/apache/ddlutils/io/ModelValidator.java
@@ -0,0 +1,55 @@
+package org.apache.ddlutils.io;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import javax.xml.transform.Source;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
+
+/**
+ * Helper class that validates a given document against the DdlUtils schema.
+ *
+ * @version $Revision: $
+ */
+public class ModelValidator
+{
+ /**
+ * Validates the given xml document using the Java XML validation framework.
+ *
+ * @param source The source object for the xml document
+ * @throws DdlUtilsXMLException If the document could not be validated
+ */
+ public void validate(Source source) throws DdlUtilsXMLException
+ {
+ try {
+ SchemaFactory factory = SchemaFactory.newInstance("http://www.w3.org/2001/XMLSchema");
+ Schema schema = factory.newSchema(new StreamSource(getClass().getResourceAsStream("/database.xsd")));
+ Validator validator = schema.newValidator();
+
+ validator.validate(source);
+ }
+ catch (Exception ex)
+ {
+ throw new DdlUtilsXMLException(ex);
+ }
+ }
+}
diff --git a/src/java/org/apache/ddlutils/io/PrettyPrintingXmlWriter.java b/src/java/org/apache/ddlutils/io/PrettyPrintingXmlWriter.java
index 145ba9e..2247e61 100644
--- a/src/java/org/apache/ddlutils/io/PrettyPrintingXmlWriter.java
+++ b/src/java/org/apache/ddlutils/io/PrettyPrintingXmlWriter.java
@@ -234,6 +234,31 @@
}
/**
+ * Writes a xmlns attribute to the stream.
+ *
+ * @param prefix The prefix for the namespace, use <code>null</code> or an empty string for the default namespace
+ * @param namespaceUri The namespace uri, can be <code>null</code>
+ */
+ public void writeNamespace(String prefix, String namespaceUri) throws DdlUtilsXMLException
+ {
+ try
+ {
+ if ((prefix == null) || (prefix.length() == 0))
+ {
+ _writer.writeDefaultNamespace(namespaceUri);
+ }
+ else
+ {
+ _writer.writeNamespace(prefix, namespaceUri);
+ }
+ }
+ catch (XMLStreamException ex)
+ {
+ throwException(ex);
+ }
+ }
+
+ /**
* Writes the start of the indicated XML element.
*
* @param namespaceUri The namespace uri, can be <code>null</code>
diff --git a/src/test/org/apache/ddlutils/TestBase.java b/src/test/org/apache/ddlutils/TestBase.java
index 12dc7a4..1d52682 100644
--- a/src/test/org/apache/ddlutils/TestBase.java
+++ b/src/test/org/apache/ddlutils/TestBase.java
@@ -59,7 +59,7 @@
DatabaseIO dbIO = new DatabaseIO();
dbIO.setUseInternalDtd(true);
- dbIO.setValidateXml(false);
+ dbIO.setValidateXml(true);
return dbIO.read(new StringReader(dbDef));
}
diff --git a/src/test/org/apache/ddlutils/TestPlatformBase.java b/src/test/org/apache/ddlutils/TestPlatformBase.java
index 48d4d24..a8faab6 100644
--- a/src/test/org/apache/ddlutils/TestPlatformBase.java
+++ b/src/test/org/apache/ddlutils/TestPlatformBase.java
@@ -22,6 +22,7 @@
import java.io.IOException;
import java.io.StringWriter;
+import org.apache.ddlutils.io.DatabaseIO;
import org.apache.ddlutils.model.Database;
import org.apache.ddlutils.platform.SqlBuilder;
@@ -132,7 +133,7 @@
{
final String schema =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='datatypetest'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='datatypetest'>\n" +
" <table name='coltype'>\n" +
" <column name='COL_ARRAY' type='ARRAY'/>\n" +
" <column name='COL_BIGINT' type='BIGINT'/>\n" +
@@ -180,7 +181,7 @@
{
final String schema =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='columnconstraintstest'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='columnconstraintstest'>\n" +
" <table name='constraints'>\n" +
" <column name='COL_PK' type='VARCHAR' size='32' primaryKey='true'/>\n" +
" <column name='COL_PK_AUTO_INCR' type='INTEGER' primaryKey='true' autoIncrement='true'/>\n" +
@@ -203,7 +204,7 @@
{
final String schema =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='tableconstraintstest'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='tableconstraintstest'>\n" +
" <table name='table1'>\n" +
" <column name='COL_PK_1' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n" +
" <column name='COL_PK_2' type='INTEGER' primaryKey='true'/>\n" +
@@ -248,7 +249,7 @@
{
final String schema =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='escapetest'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='escapetest'>\n" +
" <table name='escapedcharacters'>\n" +
" <column name='COL_PK' type='INTEGER' primaryKey='true'/>\n" +
" <column name='COL_TEXT' type='VARCHAR' size='128' default='''/>\n" +
diff --git a/src/test/org/apache/ddlutils/alteration/TestAlterationAlgorithm.java b/src/test/org/apache/ddlutils/alteration/TestAlterationAlgorithm.java
index 8da0679..ed78b7d 100644
--- a/src/test/org/apache/ddlutils/alteration/TestAlterationAlgorithm.java
+++ b/src/test/org/apache/ddlutils/alteration/TestAlterationAlgorithm.java
@@ -23,6 +23,7 @@
import org.apache.ddlutils.Platform;
import org.apache.ddlutils.TestBase;
+import org.apache.ddlutils.io.DatabaseIO;
import org.apache.ddlutils.model.Database;
import org.apache.ddlutils.platform.TestPlatform;
@@ -76,7 +77,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TABLEA'>\n" +
" <column name='COLPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -104,14 +105,14 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -136,14 +137,14 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -174,14 +175,14 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -212,14 +213,14 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -250,11 +251,11 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='ColFK' type='DOUBLE'/>\n" +
@@ -296,7 +297,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -306,7 +307,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TABLEB'>\n" +
" <column name='COLPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -324,7 +325,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='VARCHAR' size='64'/>\n" +
@@ -338,7 +339,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TABLEB'>\n" +
" <column name='COLPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -356,7 +357,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='ColFK' type='VARCHAR' size='64'/>\n" +
@@ -370,7 +371,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TABLEB'>\n" +
" <column name='COLPK' type='VARCHAR' size='64' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -389,7 +390,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='ColFK' type='VARCHAR' size='64'/>\n" +
@@ -403,7 +404,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='ColFK' type='VARCHAR' size='64'/>\n" +
@@ -423,7 +424,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='ColFK' type='DOUBLE'/>\n" +
@@ -441,7 +442,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
"</database>";
assertEqualsIgnoringWhitespaces(
@@ -459,7 +460,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='VARCHAR' size='64'/>\n" +
@@ -467,7 +468,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='VARCHAR' size='64'/>\n" +
@@ -489,7 +490,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='VARCHAR' size='64'/>\n" +
@@ -497,7 +498,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='VARCHAR' size='64'/>\n" +
@@ -519,7 +520,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='VARCHAR' size='64'/>\n" +
@@ -530,7 +531,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='VARCHAR' size='64'/>\n" +
@@ -549,7 +550,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='VARCHAR' size='64'/>\n" +
@@ -560,7 +561,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='VARCHAR' size='64'/>\n" +
@@ -579,7 +580,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK1' type='INTEGER' required='true'/>\n" +
" <column name='ColPK2' type='VARCHAR' size='64' required='true'/>\n" +
@@ -587,7 +588,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK1' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='ColPK2' type='VARCHAR' size='64' primaryKey='true' required='true'/>\n" +
@@ -606,7 +607,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK1' type='INTEGER' required='true'/>\n" +
" <column name='ColPK2' type='VARCHAR' size='64' required='true'/>\n" +
@@ -614,7 +615,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK1' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='ColPK2' type='VARCHAR' size='64' primaryKey='true' required='true'/>\n" +
@@ -635,7 +636,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK1' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='ColPK2' type='VARCHAR' size='64' primaryKey='true' required='true'/>\n" +
@@ -643,7 +644,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK1' type='INTEGER' required='true'/>\n" +
" <column name='ColPK2' type='VARCHAR' size='64' required='true'/>\n" +
@@ -675,14 +676,14 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='VARCHAR' size='64'/>\n" +
@@ -701,7 +702,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='VARCHAR' size='64'/>\n" +
@@ -709,7 +710,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -740,14 +741,14 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK1' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK1' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='ColPK2' type='VARCHAR' primaryKey='true' size='64'/>\n" +
@@ -781,7 +782,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK1' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='ColPK2' type='VARCHAR' primaryKey='true' size='64'/>\n" +
@@ -789,7 +790,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK1' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -821,7 +822,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK1' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -835,7 +836,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK1' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='ColPK2' type='DOUBLE' primaryKey='true'/>\n" +
@@ -882,7 +883,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK1' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='ColPK2' type='DOUBLE' primaryKey='true'/>\n" +
@@ -899,7 +900,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK1' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -955,7 +956,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col1' type='DOUBLE'/>\n" +
@@ -966,7 +967,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col1' type='DOUBLE'/>\n" +
@@ -992,7 +993,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col1' type='DOUBLE'/>\n" +
@@ -1005,7 +1006,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col1' type='DOUBLE'/>\n" +
@@ -1044,7 +1045,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col1' type='DOUBLE'/>\n" +
@@ -1055,7 +1056,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col1' type='DOUBLE'/>\n" +
@@ -1081,7 +1082,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col1' type='DOUBLE'/>\n" +
@@ -1094,7 +1095,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col1' type='DOUBLE'/>\n" +
@@ -1134,7 +1135,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col1' type='DOUBLE'/>\n" +
@@ -1145,7 +1146,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col1' type='DOUBLE'/>\n" +
@@ -1168,7 +1169,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -1182,7 +1183,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -1210,7 +1211,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -1224,7 +1225,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='DOUBLE'/>\n" +
@@ -1250,7 +1251,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -1264,7 +1265,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='Col' type='DOUBLE'/>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
@@ -1307,7 +1308,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK1' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='ColPK2' type='DOUBLE' required='true'/>\n" +
@@ -1315,7 +1316,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK1' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='ColPK2' type='DOUBLE' primaryKey='true' required='true'/>\n" +
@@ -1349,7 +1350,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK1' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='ColPK2' type='DOUBLE' primaryKey='true' required='true'/>\n" +
@@ -1357,7 +1358,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK1' type='INTEGER' required='true'/>\n" +
" <column name='ColPK2' type='DOUBLE' primaryKey='true' required='true'/>\n" +
@@ -1391,7 +1392,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK1' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='ColPK2' type='DOUBLE' required='true'/>\n" +
@@ -1407,7 +1408,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK1' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='ColPK2' type='DOUBLE' primaryKey='true' required='true'/>\n" +
@@ -1452,7 +1453,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK1' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='ColPK2' type='DOUBLE' primaryKey='true' required='true'/>\n" +
@@ -1469,7 +1470,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK1' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='ColPK2' type='DOUBLE' required='true'/>\n" +
@@ -1513,7 +1514,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col1' type='DOUBLE'/>\n" +
@@ -1525,7 +1526,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col1' type='DOUBLE'/>\n" +
@@ -1550,7 +1551,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col1' type='DOUBLE'/>\n" +
@@ -1563,7 +1564,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col1' type='DOUBLE'/>\n" +
@@ -1587,7 +1588,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='DOUBLE'/>\n" +
@@ -1602,7 +1603,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -1642,7 +1643,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='INTEGER' required='true'/>\n" +
@@ -1650,7 +1651,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='DOUBLE' required='true'/>\n" +
@@ -1684,7 +1685,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='INTEGER' required='true'/>\n" +
@@ -1692,7 +1693,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='DOUBLE' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='INTEGER' required='true'/>\n" +
@@ -1726,7 +1727,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='INTEGER' required='true'/>\n" +
@@ -1737,7 +1738,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='DOUBLE' required='true'/>\n" +
@@ -1775,7 +1776,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -1789,7 +1790,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='DOUBLE' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -1845,7 +1846,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='VARCHAR' size='32' required='true'/>\n" +
@@ -1853,7 +1854,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='VARCHAR' size='64' required='true'/>\n" +
@@ -1887,7 +1888,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='DECIMAL' size='15,2' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='INTEGER' required='true'/>\n" +
@@ -1895,7 +1896,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='DECIMAL' size='30,4' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='INTEGER' required='true'/>\n" +
@@ -1929,7 +1930,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='DECIMAL' size='10,4' required='true'/>\n" +
@@ -1940,7 +1941,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='DECIMAL' size='15,2' required='true'/>\n" +
@@ -1978,7 +1979,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -1992,7 +1993,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='VARCHAR' size='64' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -2048,7 +2049,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='VARCHAR' size='32' default='test 1' required='true'/>\n" +
@@ -2056,7 +2057,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='VARCHAR' size='32' default='test 2' required='true'/>\n" +
@@ -2090,7 +2091,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='DECIMAL' size='15,2' default='2.0' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='INTEGER' required='true'/>\n" +
@@ -2098,7 +2099,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='DECIMAL' size='15,2' default='4.0' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='INTEGER' required='true'/>\n" +
@@ -2132,7 +2133,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='DATE' default='2000-01-02' required='true'/>\n" +
@@ -2143,7 +2144,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='DATE' default='2001-02-03' required='true'/>\n" +
@@ -2181,7 +2182,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' default='0' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -2195,7 +2196,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' default='1' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -2251,7 +2252,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='INTEGER' autoIncrement='true' required='true'/>\n" +
@@ -2259,7 +2260,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='INTEGER' autoIncrement='false' required='true'/>\n" +
@@ -2293,7 +2294,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' autoIncrement='false' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='INTEGER' required='true'/>\n" +
@@ -2301,7 +2302,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' autoIncrement='true' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='INTEGER' required='true'/>\n" +
@@ -2335,7 +2336,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='INTEGER' autoIncrement='false' required='true'/>\n" +
@@ -2346,7 +2347,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='INTEGER' autoIncrement='true' required='true'/>\n" +
@@ -2385,7 +2386,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' autoIncrement='true' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -2399,7 +2400,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' autoIncrement='false' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -2439,7 +2440,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='INTEGER' required='true'/>\n" +
@@ -2447,7 +2448,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='INTEGER' required='false'/>\n" +
@@ -2481,7 +2482,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='INTEGER' required='true'/>\n" +
@@ -2489,7 +2490,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='false'/>\n" +
" <column name='Col' type='INTEGER' required='true'/>\n" +
@@ -2523,7 +2524,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='INTEGER' required='false'/>\n" +
@@ -2534,7 +2535,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='Col' type='INTEGER' required='true'/>\n" +
@@ -2573,7 +2574,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='false'/>\n" +
" </table>\n" +
@@ -2587,7 +2588,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
diff --git a/src/test/org/apache/ddlutils/alteration/TestModelComparison.java b/src/test/org/apache/ddlutils/alteration/TestModelComparison.java
index ab13744..10d914a 100644
--- a/src/test/org/apache/ddlutils/alteration/TestModelComparison.java
+++ b/src/test/org/apache/ddlutils/alteration/TestModelComparison.java
@@ -22,6 +22,7 @@
import java.sql.Types;
import java.util.List;
+import org.apache.ddlutils.io.DatabaseIO;
import org.apache.ddlutils.model.Database;
/**
@@ -38,14 +39,14 @@
{
final String MODEL1 =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
"</database>";
final String MODEL2 =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TABLEA'>\n" +
" <column name='COLPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -76,14 +77,14 @@
{
final String MODEL1 =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
"</database>";
final String MODEL2 =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TABLEA'>\n" +
" <column name='COLPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -122,7 +123,7 @@
{
final String MODEL1 =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TABLEA'>\n" +
" <column name='COLPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='COLFK' type='INTEGER'/>\n" +
@@ -130,7 +131,7 @@
"</database>";
final String MODEL2 =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TABLEA'>\n" +
" <column name='COLPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='COLFK' type='INTEGER'/>\n" +
@@ -171,11 +172,11 @@
{
final String MODEL1 =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
"</database>";
final String MODEL2 =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TABLEA'>\n" +
" <column name='COLPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='COLFK' type='INTEGER'/>\n" +
@@ -236,7 +237,7 @@
{
final String MODEL1 =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -246,7 +247,7 @@
"</database>";
final String MODEL2 =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TABLEB'>\n" +
" <column name='COLPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -272,7 +273,7 @@
{
final String MODEL1 =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='ColA' type='INTEGER'/>\n" +
@@ -286,7 +287,7 @@
"</database>";
final String MODEL2 =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TABLEB'>\n" +
" <column name='COLPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -312,7 +313,7 @@
{
final String MODEL1 =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='COLFK' type='INTEGER'/>\n" +
@@ -326,7 +327,7 @@
"</database>";
final String MODEL2 =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TABLEB'>\n" +
" <column name='COLPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -358,7 +359,7 @@
{
final String MODEL1 =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
@@ -372,7 +373,7 @@
"</database>";
final String MODEL2 =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TABLEB'>\n" +
" <column name='COLPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" <column name='COLFK' type='INTEGER'/>\n" +
@@ -405,14 +406,14 @@
{
final String MODEL1 =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableA'>\n" +
" <column name='ColPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
"</database>";
final String MODEL2 =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TABLEA'>\n" +
" <column name='COLPK' type='INTEGER' primaryKey='true' required='true'/>\n" +
" </table>\n" +
diff --git a/src/test/org/apache/ddlutils/dynabean/TestDynaSqlQueries.java b/src/test/org/apache/ddlutils/dynabean/TestDynaSqlQueries.java
index 23bf810..d48d75a 100644
--- a/src/test/org/apache/ddlutils/dynabean/TestDynaSqlQueries.java
+++ b/src/test/org/apache/ddlutils/dynabean/TestDynaSqlQueries.java
@@ -24,6 +24,7 @@
import org.apache.commons.beanutils.DynaBean;
import org.apache.ddlutils.TestDatabaseWriterBase;
+import org.apache.ddlutils.io.DatabaseIO;
import org.apache.ddlutils.model.Table;
import org.apache.ddlutils.platform.ModelBasedResultSetIterator;
import org.apache.ddlutils.platform.sybase.SybasePlatform;
@@ -51,7 +52,7 @@
{
createDatabase(
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='ddlutils'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='ddlutils'>\n"+
" <table name='TestTable'>\n"+
" <column name='TheId' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='TheText' type='VARCHAR' size='15'/>\n"+
@@ -110,7 +111,7 @@
{
createDatabase(
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='ddlutils'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='ddlutils'>\n"+
" <table name='TestTable'>\n"+
" <column name='TheId' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='TheText' type='VARCHAR' size='15'/>\n"+
@@ -165,7 +166,7 @@
if (SybasePlatform.DATABASENAME.equals(getPlatform().getName()))
{
modelXml = "<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='ddlutils'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='ddlutils'>\n"+
" <table name='TestTable'>\n"+
" <column name='TheId' type='NUMERIC' size='12,0' primaryKey='true' required='true' autoIncrement='true'/>\n"+
" <column name='TheText' type='VARCHAR' size='15'/>\n"+
@@ -175,7 +176,7 @@
else
{
modelXml = "<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='ddlutils'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='ddlutils'>\n"+
" <table name='TestTable'>\n"+
" <column name='TheId' type='INTEGER' primaryKey='true' required='true' autoIncrement='true'/>\n"+
" <column name='TheText' type='VARCHAR' size='15'/>\n"+
@@ -275,7 +276,7 @@
{
createDatabase(
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='ddlutils'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='ddlutils'>\n"+
" <table name='TestTable1'>\n"+
" <column name='Id1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='Id2' type='INTEGER'/>\n"+
@@ -320,7 +321,7 @@
{
createDatabase(
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='ddlutils'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='ddlutils'>\n"+
" <table name='TestTable'>\n"+
" <column name='TheId' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='TheText' type='VARCHAR' size='15'/>\n"+
@@ -357,7 +358,7 @@
{
createDatabase(
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='ddlutils'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='ddlutils'>\n"+
" <table name='TestTable'>\n"+
" <column name='TheId' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='TheText' type='VARCHAR' size='15'/>\n"+
@@ -420,7 +421,7 @@
{
createDatabase(
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='ddlutils'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='ddlutils'>\n"+
" <table name='TestTable'>\n"+
" <column name='TheId' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='TheText' type='VARCHAR' size='15'/>\n"+
@@ -463,7 +464,7 @@
{
createDatabase(
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='ddlutils'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='ddlutils'>\n"+
" <table name='TestTable'>\n"+
" <column name='TheId' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='TheText' type='VARCHAR' size='15'/>\n"+
@@ -502,7 +503,7 @@
{
createDatabase(
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='ddlutils'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='ddlutils'>\n"+
" <table name='TestTable'>\n"+
" <column name='TheId' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='TheText' type='VARCHAR' size='15'/>\n"+
@@ -539,7 +540,7 @@
{
createDatabase(
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='ddlutils'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='ddlutils'>\n"+
" <table name='TestTable'>\n"+
" <column name='TheId' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='TheText' type='VARCHAR' size='15'/>\n"+
diff --git a/src/test/org/apache/ddlutils/io/TestAddColumn.java b/src/test/org/apache/ddlutils/io/TestAddColumn.java
index a4d02e6..e338603 100644
--- a/src/test/org/apache/ddlutils/io/TestAddColumn.java
+++ b/src/test/org/apache/ddlutils/io/TestAddColumn.java
@@ -57,14 +57,14 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='32'/>\n"+
@@ -99,7 +99,7 @@
boolean isSybase = SybasePlatform.DATABASENAME.equals(getPlatform().getName());
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -109,7 +109,7 @@
if (isSybase)
{
model2Xml = "<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='NUMERIC' size='12,0' autoIncrement='true'/>\n"+
@@ -119,7 +119,7 @@
else
{
model2Xml = "<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER' autoIncrement='true'/>\n"+
@@ -162,14 +162,14 @@
}
final String model1Xml = "<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER' autoIncrement='true'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml = "<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER' autoIncrement='true'/>\n"+
@@ -201,14 +201,14 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='NUMERIC' size='12,0' default='2' required='true'/>\n"+
@@ -236,14 +236,14 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='DOUBLE' default='2'/>\n"+
@@ -279,7 +279,7 @@
boolean isSybase = SybasePlatform.DATABASENAME.equals(getPlatform().getName());
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -289,7 +289,7 @@
if (isSybase)
{
model2Xml = "<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='NUMERIC' size='12,0' autoIncrement='true' required='true'/>\n"+
@@ -299,7 +299,7 @@
else
{
model2Xml = "<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER' autoIncrement='true' required='true'/>\n"+
@@ -337,14 +337,14 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='CHAR' size='8' default='sometext' required='true'/>\n"+
@@ -373,7 +373,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='VARCHAR' size='32'/>\n"+
@@ -382,7 +382,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='VARCHAR' size='32'/>\n"+
@@ -417,14 +417,14 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
@@ -470,7 +470,7 @@
boolean isSybase = SybasePlatform.DATABASENAME.equals(getPlatform().getName());
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
" </table>\n"+
@@ -480,7 +480,7 @@
if (isSybase)
{
model2Xml = "<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
" <column name='pk' type='NUMERIC' size='12,0' primaryKey='true' required='true' autoIncrement='true'/>\n"+
@@ -490,7 +490,7 @@
else
{
model2Xml = "<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true' autoIncrement='true'/>\n"+
@@ -536,14 +536,14 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
@@ -591,14 +591,14 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
@@ -651,14 +651,14 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true' autoIncrement='true'/>\n"+
@@ -698,7 +698,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -706,7 +706,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -758,7 +758,7 @@
boolean isSybase = SybasePlatform.DATABASENAME.equals(getPlatform().getName());
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -769,7 +769,7 @@
if (isSybase)
{
model2Xml = "<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -780,7 +780,7 @@
else
{
model2Xml = "<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -819,7 +819,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -827,7 +827,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -880,7 +880,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true' autoIncrement='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -888,7 +888,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true' autoIncrement='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -933,7 +933,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
" <column name='pk2' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
@@ -941,7 +941,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true' autoIncrement='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -986,14 +986,14 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='32'/>\n"+
@@ -1030,14 +1030,14 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER' autoIncrement='true'/>\n"+
@@ -1074,14 +1074,14 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='NUMERIC' size='12,0' required='true'/>\n"+
@@ -1132,14 +1132,14 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='DOUBLE' default='2'/>\n"+
@@ -1177,14 +1177,14 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER' required='true' autoIncrement='true'/>\n"+
@@ -1230,14 +1230,14 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='CHAR' size='8' required='true' default='sometext'/>\n"+
@@ -1273,14 +1273,14 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER' default='1'/>\n"+
@@ -1338,14 +1338,14 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='32'/>\n"+
@@ -1382,14 +1382,14 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER' autoIncrement='true'/>\n"+
@@ -1426,14 +1426,14 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='NUMERIC' size='12,0' required='true'/>\n"+
@@ -1484,14 +1484,14 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='DOUBLE' default='2'/>\n"+
@@ -1529,14 +1529,14 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER' required='true' autoIncrement='true'/>\n"+
@@ -1580,14 +1580,14 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='CHAR' size='8' required='true' default='sometext'/>\n"+
@@ -1625,14 +1625,14 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER' default='1'/>\n"+
@@ -1686,14 +1686,14 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER' required='true' default='1'/>\n"+
@@ -1747,7 +1747,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -1758,7 +1758,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -1798,7 +1798,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -1809,7 +1809,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -1849,7 +1849,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -1860,7 +1860,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -1915,7 +1915,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -1926,7 +1926,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -1967,7 +1967,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -1978,7 +1978,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -2028,7 +2028,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -2039,7 +2039,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -2078,7 +2078,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -2089,7 +2089,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -2150,7 +2150,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER' required='true'/>\n"+
@@ -2161,7 +2161,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER' required='true'/>\n"+
@@ -2201,7 +2201,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER' required='true'/>\n"+
@@ -2212,7 +2212,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER' required='true'/>\n"+
@@ -2252,7 +2252,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER' required='true'/>\n"+
@@ -2263,7 +2263,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER' required='true'/>\n"+
@@ -2320,7 +2320,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER' required='true'/>\n"+
@@ -2331,7 +2331,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER' required='true'/>\n"+
@@ -2372,7 +2372,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER' required='true'/>\n"+
@@ -2383,7 +2383,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER' required='true'/>\n"+
@@ -2430,7 +2430,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER' required='true'/>\n"+
@@ -2441,7 +2441,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER' required='true'/>\n"+
@@ -2482,7 +2482,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER' required='true'/>\n"+
@@ -2493,7 +2493,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER' required='true'/>\n"+
@@ -2551,7 +2551,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER' required='true'/>\n"+
@@ -2562,7 +2562,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER' required='true'/>\n"+
@@ -2615,7 +2615,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -2625,7 +2625,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -2668,7 +2668,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -2678,7 +2678,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -2725,7 +2725,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='NUMERIC' size='12,0' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -2735,7 +2735,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='NUMERIC' size='12,0' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -2782,7 +2782,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='DOUBLE' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -2792,7 +2792,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='DOUBLE' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -2836,7 +2836,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -2846,7 +2846,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -2892,7 +2892,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='CHAR' size='8' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -2902,7 +2902,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='CHAR' size='8' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -2948,7 +2948,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='pk2' type='DOUBLE' primaryKey='true' required='true'/>\n"+
@@ -2959,7 +2959,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='pk2' type='DOUBLE' primaryKey='true' required='true'/>\n"+
@@ -3016,7 +3016,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
" </table>\n"+
@@ -3027,7 +3027,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
@@ -3061,7 +3061,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
" </table>\n"+
@@ -3072,7 +3072,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true' autoIncrement='true'/>\n"+
@@ -3112,7 +3112,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
" </table>\n"+
@@ -3123,7 +3123,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
" <column name='pk' type='DOUBLE' primaryKey='true' required='true' default='1'/>\n"+
@@ -3163,7 +3163,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
" </table>\n"+
@@ -3175,7 +3175,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
@@ -3207,7 +3207,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -3221,7 +3221,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='pk2' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
@@ -3257,7 +3257,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -3271,7 +3271,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='pk2' type='INTEGER' primaryKey='true' required='true' autoIncrement='true'/>\n"+
@@ -3315,7 +3315,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -3329,7 +3329,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='pk2' type='NUMERIC' size='12,0' primaryKey='true' required='true'/>\n"+
@@ -3360,7 +3360,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -3374,7 +3374,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='pk2' type='DOUBLE' primaryKey='true' required='true' default='2'/>\n"+
@@ -3420,7 +3420,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -3434,7 +3434,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='pk2' type='INTEGER' primaryKey='true' required='true' autoIncrement='true'/>\n"+
@@ -3485,7 +3485,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -3499,7 +3499,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='pk2' type='CHAR' size='8' primaryKey='true' required='true' default='sometext'/>\n"+
@@ -3539,7 +3539,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -3553,7 +3553,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='pk2' type='INTEGER' primaryKey='true' required='true' default='1'/>\n"+
diff --git a/src/test/org/apache/ddlutils/io/TestAlteration.java b/src/test/org/apache/ddlutils/io/TestAlteration.java
index a2af82f..fc9b786 100644
--- a/src/test/org/apache/ddlutils/io/TestAlteration.java
+++ b/src/test/org/apache/ddlutils/io/TestAlteration.java
@@ -61,7 +61,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='VARCHAR' size='32'/>\n"+
@@ -72,7 +72,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='VARCHAR' size='32'/>\n"+
@@ -106,7 +106,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='50'/>\n"+
@@ -114,7 +114,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -148,7 +148,7 @@
final String model1Xml;
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -157,7 +157,7 @@
if (isSybase)
{
model1Xml = "<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='NUMERIC' size='12,0' required='true' autoIncrement='true'/>\n"+
@@ -167,7 +167,7 @@
else
{
model1Xml = "<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER' autoIncrement='true'/>\n"+
@@ -196,7 +196,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='50' required='true'/>\n"+
@@ -204,7 +204,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='50' primaryKey='true' required='true'/>\n"+
@@ -232,7 +232,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='50' primaryKey='true' required='true'/>\n"+
@@ -240,7 +240,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='50' primaryKey='false' required='true'/>\n"+
@@ -268,7 +268,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='50' primaryKey='true' required='true'/>\n"+
@@ -276,7 +276,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -308,7 +308,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='VARCHAR' size='50'/>\n"+
@@ -317,7 +317,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='VARCHAR' size='50'/>\n"+
@@ -356,7 +356,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -364,7 +364,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -395,7 +395,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='DOUBLE'/>\n"+
@@ -408,7 +408,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='DOUBLE'/>\n"+
@@ -439,7 +439,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -464,7 +464,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -513,7 +513,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='50'/>\n"+
@@ -532,7 +532,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='50'/>\n"+
@@ -577,7 +577,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='DOUBLE'/>\n"+
@@ -590,7 +590,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='DOUBLE'/>\n"+
@@ -623,7 +623,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -634,7 +634,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -672,7 +672,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='pk2' type='DOUBLE' primaryKey='true' required='true'/>\n"+
@@ -689,7 +689,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='pk2' type='DOUBLE' primaryKey='true' required='true'/>\n"+
@@ -735,7 +735,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='pk2' type='DOUBLE' primaryKey='true' required='true'/>\n"+
@@ -756,7 +756,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='pk2' type='DOUBLE' primaryKey='true' required='true'/>\n"+
@@ -802,7 +802,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='pk2' type='DOUBLE' primaryKey='true' required='true'/>\n"+
@@ -823,19 +823,19 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='pk2' type='DOUBLE' primaryKey='true' required='true'/>\n"+
" </table>\n"+
- " <index name='test'>\n"+
- " <index-column name='avalue2'/>\n"+
- " <index-column name='avalue1'/>\n"+
- " </index>\n"+
" <table name='roundtrip2'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='DOUBLE' required='true'/>\n"+
" <column name='avalue2' type='INTEGER' required='true'/>\n"+
+ " <index name='test'>\n"+
+ " <index-column name='avalue2'/>\n"+
+ " <index-column name='avalue1'/>\n"+
+ " </index>\n"+
" </table>\n"+
"</database>";
@@ -877,7 +877,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='pk2' type='DOUBLE' primaryKey='true' required='true'/>\n"+
@@ -897,7 +897,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='pk2' type='DOUBLE' primaryKey='true' required='true'/>\n"+
@@ -947,7 +947,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='pk2' type='DOUBLE' primaryKey='true' required='true'/>\n"+
@@ -967,7 +967,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='pk2' type='DOUBLE' primaryKey='true' required='true'/>\n"+
@@ -1009,7 +1009,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -1041,7 +1041,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -1094,7 +1094,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -1108,7 +1108,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='pk2' type='DOUBLE' default='0.0' primaryKey='true' required='true'/>\n"+
@@ -1151,7 +1151,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='pk2' type='VARCHAR' size='12' primaryKey='true' required='true'/>\n"+
@@ -1168,7 +1168,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -1206,14 +1206,14 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -1247,7 +1247,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='32' required='true'/>\n"+
@@ -1255,7 +1255,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='32' required='true'/>\n"+
@@ -1267,7 +1267,7 @@
"</database>";
final String model3Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='32' required='true'/>\n"+
@@ -1312,7 +1312,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='20' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -1324,7 +1324,7 @@
{
model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='20' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -1337,7 +1337,7 @@
{
model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='20' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -1367,7 +1367,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -1378,7 +1378,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -1406,7 +1406,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='20' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -1420,7 +1420,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip2'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='20' required='true'/>\n"+
@@ -1451,7 +1451,7 @@
final String model1Xml;
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
"</database>";
// Sybase does not like INTEGER auto-increment columns
@@ -1459,7 +1459,7 @@
{
model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='NUMERIC' size='12,0' primaryKey='true' required='true' autoIncrement='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='20' required='true'/>\n"+
@@ -1470,7 +1470,7 @@
{
model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true' autoIncrement='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='20' required='true'/>\n"+
@@ -1495,7 +1495,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='coltype'>\n" +
" <column name='COL_FLOAT' primaryKey='false' required='false' type='FLOAT'/>\n" +
" <column name='COL_BOOLEAN' primaryKey='false' required='false' type='BOOLEAN'/>\n" +
@@ -1523,7 +1523,7 @@
{
final String model1Xml =
"<?xml version='1.0'?>\n" +
- "<database name='roundtriptest'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n" +
" <table name='roundtrip'>\n" +
" <column name='id' primaryKey='true' required='true' type='INTEGER'/>\n" +
" <column name='avalue' primaryKey='false' required='false' type='VARCHAR' size='40'/>\n" +
@@ -1531,7 +1531,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0'?>\n" +
- "<database name='roundtriptest'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n" +
" <table name='roundtrip'>\n" +
" <column name='pk' primaryKey='true' required='true' type='INTEGER'/>\n" +
" <column name='avalue' primaryKey='false' required='false' type='VARCHAR' size='40'/>\n" +
diff --git a/src/test/org/apache/ddlutils/io/TestChangeColumn.java b/src/test/org/apache/ddlutils/io/TestChangeColumn.java
index 0a2e68a..02295d6 100644
--- a/src/test/org/apache/ddlutils/io/TestChangeColumn.java
+++ b/src/test/org/apache/ddlutils/io/TestChangeColumn.java
@@ -67,7 +67,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -75,7 +75,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='DOUBLE'/>\n"+
@@ -104,7 +104,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='SMALLINT'/>\n"+
@@ -112,7 +112,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='20'/>\n"+
@@ -147,14 +147,14 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='DOUBLE' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -181,14 +181,14 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='VARCHAR' size='20' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -221,7 +221,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -235,7 +235,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='128' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -285,7 +285,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -299,7 +299,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' primaryKey='false' required='true'/>\n"+
" </table>\n"+
@@ -350,7 +350,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -363,7 +363,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='DOUBLE'/>\n"+
@@ -403,7 +403,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='SMALLINT'/>\n"+
@@ -416,7 +416,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='VARCHAR' size='20'/>\n"+
@@ -463,7 +463,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='NUMERIC' size='8' required='false'/>\n"+
@@ -474,7 +474,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER' required='false'/>\n"+
@@ -511,7 +511,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -524,7 +524,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='DOUBLE'/>\n"+
@@ -564,7 +564,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='SMALLINT'/>\n"+
@@ -577,7 +577,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='VARCHAR' size='20'/>\n"+
@@ -618,7 +618,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='20' required='true'/>\n"+
@@ -626,7 +626,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='32' required='true'/>\n"+
@@ -655,7 +655,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='32' required='true'/>\n"+
@@ -663,7 +663,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='16' required='true'/>\n"+
@@ -693,14 +693,14 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='CHAR' size='20' primaryKey='true' required='true'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='CHAR' size='32' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -728,14 +728,14 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='CHAR' size='32' primaryKey='true' required='true'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='CHAR' size='16' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -763,7 +763,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -777,7 +777,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='128' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -815,7 +815,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='CHAR' size='32' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -829,7 +829,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='CHAR' size='16' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -874,7 +874,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -887,7 +887,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -927,7 +927,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -940,7 +940,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -981,7 +981,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -994,7 +994,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -1035,7 +1035,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -1048,7 +1048,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -1083,7 +1083,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='NUMERIC' size='10,5' required='true'/>\n"+
@@ -1091,7 +1091,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='NUMERIC' size='16,5' required='true'/>\n"+
@@ -1120,7 +1120,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='DECIMAL' size='12,5' required='true'/>\n"+
@@ -1128,7 +1128,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='DECIMAL' size='10,5' required='true'/>\n"+
@@ -1157,14 +1157,14 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='DECIMAL' size='10,5' primaryKey='true' required='true'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='DECIMAL' size='16,5' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -1191,14 +1191,14 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='DECIMAL' size='12,5' primaryKey='true' required='true'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='DECIMAL' size='10,5' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -1225,7 +1225,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='NUMERIC' size='8,2' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -1239,7 +1239,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='NUMERIC' size='11,2' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -1277,7 +1277,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='NUMERIC' size='10,2' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -1291,7 +1291,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='NUMERIC' size='8,2' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -1334,7 +1334,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='DECIMAL' size='8,2'/>\n"+
@@ -1347,7 +1347,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='DECIMAL' size='12,2'/>\n"+
@@ -1387,7 +1387,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='DECIMAL' size='10,2'/>\n"+
@@ -1400,7 +1400,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='DECIMAL' size='8,2'/>\n"+
@@ -1440,7 +1440,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -1453,7 +1453,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -1493,7 +1493,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -1506,7 +1506,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -1541,7 +1541,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='DECIMAL' size='10,4' required='true'/>\n"+
@@ -1549,7 +1549,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='DECIMAL' size='10,5' required='true'/>\n"+
@@ -1581,7 +1581,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='DECIMAL' size='10,5' required='true'/>\n"+
@@ -1589,7 +1589,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='DECIMAL' size='10,3' required='true'/>\n"+
@@ -1618,14 +1618,14 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='NUMERIC' size='10,3' primaryKey='true' required='true'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='NUMERIC' size='10,5' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -1655,14 +1655,14 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='NUMERIC' size='10,5' primaryKey='true' required='true'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='NUMERIC' size='10,3' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -1689,7 +1689,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='DECIMAL' size='11,2' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -1703,7 +1703,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='DECIMAL' size='11,5' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -1746,7 +1746,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='NUMERIC' size='11,5' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -1760,7 +1760,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='NUMERIC' size='11,2' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -1803,7 +1803,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='NUMERIC' size='11,2'/>\n"+
@@ -1816,7 +1816,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='NUMERIC' size='11,5'/>\n"+
@@ -1857,7 +1857,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='DECIMAL' size='11,5'/>\n"+
@@ -1870,7 +1870,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='DECIMAL' size='11,2'/>\n"+
@@ -1910,7 +1910,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -1923,7 +1923,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -1964,7 +1964,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -1977,7 +1977,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -2012,7 +2012,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='20'/>\n"+
@@ -2020,7 +2020,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='20' required='true'/>\n"+
@@ -2049,7 +2049,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER' required='true'/>\n"+
@@ -2057,7 +2057,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -2092,14 +2092,14 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='NUMERIC' size='10,2' primaryKey='true'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='NUMERIC' size='10,2' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -2132,14 +2132,14 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='NUMERIC' size='10,2' primaryKey='true' required='true'/>\n"+
" </table>\n"+
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='NUMERIC' size='10,2' primaryKey='true'/>\n"+
" </table>\n"+
@@ -2166,7 +2166,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='DOUBLE' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -2180,7 +2180,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='DOUBLE' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -2218,7 +2218,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='DOUBLE' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -2232,7 +2232,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='DOUBLE' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -2276,7 +2276,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='CHAR' size='10' primaryKey='true'/>\n"+
" </table>\n"+
@@ -2290,7 +2290,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='CHAR' size='10' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -2334,7 +2334,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='DOUBLE' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -2348,7 +2348,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='DOUBLE' primaryKey='true'/>\n"+
" </table>\n"+
@@ -2391,7 +2391,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -2404,7 +2404,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -2449,7 +2449,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='SMALLINT' required='true'/>\n"+
@@ -2462,7 +2462,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='SMALLINT'/>\n"+
@@ -2507,7 +2507,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -2520,7 +2520,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -2561,7 +2561,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER' required='true'/>\n"+
@@ -2574,7 +2574,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -2616,7 +2616,7 @@
boolean isSybase = SybasePlatform.DATABASENAME.equals(getPlatform().getName());
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
(isSybase ?
@@ -2626,7 +2626,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
(isSybase ?
@@ -2665,7 +2665,7 @@
boolean isSybase = SybasePlatform.DATABASENAME.equals(getPlatform().getName());
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
(isSybase ?
@@ -2675,7 +2675,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
(isSybase ?
@@ -2708,7 +2708,7 @@
boolean isSybase = SybasePlatform.DATABASENAME.equals(getPlatform().getName());
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
(isSybase ?
" <column name='pk' type='NUMERIC' size='12,0' primaryKey='true' required='true'/>\n"
@@ -2717,7 +2717,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
(isSybase ?
" <column name='pk' type='NUMERIC' size='12,0' primaryKey='true' required='true' autoIncrement='true'/>\n"
@@ -2749,7 +2749,7 @@
boolean isSybase = SybasePlatform.DATABASENAME.equals(getPlatform().getName());
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
(isSybase ?
" <column name='pk' type='NUMERIC' size='12,0' primaryKey='true' required='true' autoIncrement='true'/>\n"
@@ -2759,7 +2759,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
(isSybase ?
" <column name='pk' type='NUMERIC' size='12,0' primaryKey='true' required='true'/>\n"
@@ -2797,7 +2797,7 @@
boolean isSybase = SybasePlatform.DATABASENAME.equals(getPlatform().getName());
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
(isSybase ?
" <column name='pk' type='NUMERIC' size='12,0' primaryKey='true' required='true'/>\n"
@@ -2815,7 +2815,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
(isSybase ?
" <column name='pk' type='NUMERIC' size='12,0' primaryKey='true' required='true'/>\n"
@@ -2865,7 +2865,7 @@
boolean isSybase = SybasePlatform.DATABASENAME.equals(getPlatform().getName());
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
(isSybase ?
" <column name='pk' type='NUMERIC' size='12,0' primaryKey='true' required='true'/>\n"
@@ -2883,7 +2883,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
(isSybase ?
" <column name='pk' type='NUMERIC' size='12,0' primaryKey='true' required='true'/>\n"
@@ -2933,7 +2933,7 @@
boolean isSybase = SybasePlatform.DATABASENAME.equals(getPlatform().getName());
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
(isSybase ?
" <column name='pk' type='NUMERIC' size='12,0' primaryKey='true' required='true'/>\n"
@@ -2951,7 +2951,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
(isSybase ?
" <column name='pk' type='NUMERIC' size='12,0' primaryKey='true' required='true' autoIncrement='true'/>\n"
@@ -3001,7 +3001,7 @@
boolean isSybase = SybasePlatform.DATABASENAME.equals(getPlatform().getName());
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
(isSybase ?
" <column name='pk' type='NUMERIC' size='12,0' primaryKey='true' required='true' autoIncrement='true'/>\n"
@@ -3020,7 +3020,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
(isSybase ?
" <column name='pk' type='NUMERIC' size='12,0' primaryKey='true' required='true'/>\n"
@@ -3072,7 +3072,7 @@
boolean isSybase = SybasePlatform.DATABASENAME.equals(getPlatform().getName());
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
(isSybase ?
@@ -3087,7 +3087,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
(isSybase ?
@@ -3137,7 +3137,7 @@
boolean isSybase = SybasePlatform.DATABASENAME.equals(getPlatform().getName());
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='VARCHAR' size='16'/>\n"+
@@ -3152,7 +3152,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='VARCHAR' size='16'/>\n"+
@@ -3197,7 +3197,7 @@
boolean isSybase = SybasePlatform.DATABASENAME.equals(getPlatform().getName());
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='VARCHAR' size='16'/>\n"+
@@ -3212,7 +3212,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='VARCHAR' size='16'/>\n"+
@@ -3258,7 +3258,7 @@
boolean isSybase = SybasePlatform.DATABASENAME.equals(getPlatform().getName());
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
(isSybase ?
@@ -3273,7 +3273,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
(isSybase ?
@@ -3316,7 +3316,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='DOUBLE'/>\n"+
@@ -3324,7 +3324,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='DOUBLE' default='2.0'/>\n"+
@@ -3353,7 +3353,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER' default='1'/>\n"+
@@ -3361,7 +3361,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER' default='20'/>\n"+
@@ -3390,7 +3390,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='20' default='test'/>\n"+
@@ -3398,7 +3398,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='20'/>\n"+
@@ -3427,7 +3427,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='TIMESTAMP' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -3435,7 +3435,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='TIMESTAMP' primaryKey='true' required='true' default='2000-01-01 00:00:00'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -3474,7 +3474,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='VARCHAR' size='20' primaryKey='true' required='true' default='old'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -3482,7 +3482,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='VARCHAR' size='20' primaryKey='true' required='true' default='new'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -3515,7 +3515,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='NUMERIC' size='12,2' primaryKey='true' required='true' default='2'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -3523,7 +3523,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='NUMERIC' size='12,2' primaryKey='true' required='true' default='2.20'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -3554,7 +3554,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='12' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -3568,7 +3568,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='12' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -3612,7 +3612,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='DOUBLE' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -3626,7 +3626,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='DOUBLE' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -3670,7 +3670,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -3684,7 +3684,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -3722,7 +3722,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='NUMERIC' size='12' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -3737,7 +3737,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='NUMERIC' size='12' primaryKey='true' required='true' default='1'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -3784,7 +3784,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true' default='2'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -3799,7 +3799,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true' default='3'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -3846,7 +3846,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='16' primaryKey='true' required='true' default='text'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -3861,7 +3861,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='16' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -3906,7 +3906,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -3919,7 +3919,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER' default='3'/>\n"+
@@ -3969,7 +3969,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -3982,7 +3982,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -4027,7 +4027,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='VARCHAR' size='16' default='text'/>\n"+
@@ -4040,7 +4040,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='VARCHAR' size='16'/>\n"+
@@ -4085,7 +4085,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -4098,7 +4098,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -4149,7 +4149,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER' default='3'/>\n"+
@@ -4162,7 +4162,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER' default='4'/>\n"+
@@ -4207,7 +4207,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -4220,7 +4220,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -4260,7 +4260,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='CHAR' size='4' required='true'/>\n"+
@@ -4268,7 +4268,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='32' required='true'/>\n"+
@@ -4296,7 +4296,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='NUMERIC' size='10,2' required='true'/>\n"+
@@ -4304,7 +4304,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='8' required='true'/>\n"+
diff --git a/src/test/org/apache/ddlutils/io/TestConstraints.java b/src/test/org/apache/ddlutils/io/TestConstraints.java
index 083e69d..ba1fb40 100644
--- a/src/test/org/apache/ddlutils/io/TestConstraints.java
+++ b/src/test/org/apache/ddlutils/io/TestConstraints.java
@@ -87,7 +87,7 @@
String tableName = StringUtils.repeat("Test", (getSqlBuilder().getMaxTableNameLength() / 4) + 3);
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='" + tableName + "'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER' required='false'/>\n"+
@@ -110,7 +110,7 @@
String columnName = StringUtils.repeat("Test", (getSqlBuilder().getMaxColumnNameLength() / 4) + 3);
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='lengthtest'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='" + columnName + "' type='INTEGER' required='false'/>\n"+
@@ -133,7 +133,7 @@
String constraintName = StringUtils.repeat("Test", (getSqlBuilder().getMaxConstraintNameLength() / 4) + 3);
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='DOUBLE'/>\n"+
@@ -159,7 +159,7 @@
String fkName = StringUtils.repeat("Test", (getSqlBuilder().getMaxForeignKeyNameLength() / 4) + 3);
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip_1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -182,7 +182,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER' required='false'/>\n"+
@@ -199,7 +199,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' required='true'/>\n"+
@@ -226,7 +226,7 @@
if (SybasePlatform.DATABASENAME.equals(getPlatform().getName()))
{
modelXml = "<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='NUMERIC' size='12,0' required='true' autoIncrement='true'/>\n"+
@@ -236,7 +236,7 @@
else
{
modelXml = "<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER' required='true' autoIncrement='true'/>\n"+
@@ -259,7 +259,7 @@
if (SybasePlatform.DATABASENAME.equals(getPlatform().getName()))
{
modelXml = "<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='NUMERIC' size='12,0' primaryKey='true' required='true' autoIncrement='true'/>\n"+
" </table>\n"+
@@ -268,7 +268,7 @@
else
{
modelXml = "<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true' autoIncrement='true'/>\n"+
" </table>\n"+
@@ -291,7 +291,7 @@
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='DOUBLE'/>\n"+
@@ -316,7 +316,7 @@
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='value_1' type='DOUBLE'/>\n"+
@@ -343,7 +343,7 @@
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk_1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='pk_2' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
@@ -365,7 +365,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip_1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -388,7 +388,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip_1'>\n"+
" <column name='pk_1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='pk_2' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
@@ -419,7 +419,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip_1'>\n"+
" <column name='pk_1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='pk_2' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
@@ -452,7 +452,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip_1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -495,7 +495,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip_1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -538,7 +538,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip_1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -585,7 +585,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip_1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -634,7 +634,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip_1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -679,7 +679,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip_1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -728,7 +728,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip_1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -777,7 +777,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip_1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
diff --git a/src/test/org/apache/ddlutils/io/TestDatabaseIO.java b/src/test/org/apache/ddlutils/io/TestDatabaseIO.java
index a35c7db..8db69a7 100644
--- a/src/test/org/apache/ddlutils/io/TestDatabaseIO.java
+++ b/src/test/org/apache/ddlutils/io/TestDatabaseIO.java
@@ -56,7 +56,7 @@
DatabaseIO dbIO = new DatabaseIO();
dbIO.setUseInternalDtd(true);
- dbIO.setValidateXml(false);
+ dbIO.setValidateXml(true);
return dbIO.read(new StringReader(modelAsXml));
}
@@ -240,7 +240,29 @@
*/
public void testNoDatabaseElement()
{
- assertNull(readModel("<data-base></data-base>"));
+ try
+ {
+ readModel("<data-base xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "'></data-base>");
+
+ fail();
+ }
+ catch (DdlUtilsXMLException ex)
+ {}
+ }
+
+ /**
+ * Tests that an exception is generated by the validation when the database element has no namespace attribute.
+ */
+ public void testDatabaseWithoutNamespace()
+ {
+ try
+ {
+ readModel("<database></database>");
+
+ fail();
+ }
+ catch (DdlUtilsXMLException ex)
+ {}
}
/**
@@ -251,7 +273,7 @@
try
{
readModel(
- "<database>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "'>\n" +
" <table name='TestTable'>\n" +
" <column name='id'\n" +
" type='INTEGER'\n" +
@@ -262,7 +284,7 @@
fail();
}
- catch (ModelException ex)
+ catch (DdlUtilsXMLException ex)
{}
}
@@ -272,7 +294,7 @@
public void testNoTables() throws Exception
{
Database model = readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
"</database>");
assertEquals("test",
@@ -282,7 +304,7 @@
assertEquals(
"<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<database name=\"test\" />\n",
+ "<database xmlns=\"" + DatabaseIO.DDLUTILS_NAMESPACE + "\" name=\"test\" />\n",
model);
}
@@ -292,7 +314,7 @@
public void testTableWithoutColumns() throws Exception
{
Database model = readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='SomeTable'\n" +
" description='Some table'>\n" +
" </table>\n" +
@@ -305,7 +327,7 @@
assertEquals(
"<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<database name=\"test\">\n" +
+ "<database xmlns=\"" + DatabaseIO.DDLUTILS_NAMESPACE + "\" name=\"test\">\n" +
" <table name=\"SomeTable\" description=\"Some table\" />\n" +
"</database>\n",
model);
@@ -319,7 +341,7 @@
try
{
readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table>\n" +
" <column name='id'\n" +
" type='INTEGER'\n" +
@@ -330,7 +352,7 @@
fail();
}
- catch (ModelException ex)
+ catch (DdlUtilsXMLException ex)
{}
}
@@ -340,7 +362,7 @@
public void testSingleColumn() throws Exception
{
Database model = readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='SomeTable'\n" +
" description='Some table'>\n" +
" <column name='ID'\n" +
@@ -360,7 +382,7 @@
assertEquals(
"<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<database name=\"test\">\n" +
+ "<database xmlns=\"" + DatabaseIO.DDLUTILS_NAMESPACE + "\" name=\"test\">\n" +
" <table name=\"SomeTable\" description=\"Some table\">\n" +
" <column name=\"ID\" primaryKey=\"false\" required=\"false\" type=\"INTEGER\" autoIncrement=\"false\" />\n" +
" </table>\n" +
@@ -376,7 +398,7 @@
try
{
readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TestTable'>\n" +
" <column type='INTEGER'\n" +
" primaryKey='true'\n" +
@@ -386,7 +408,7 @@
fail();
}
- catch (ModelException ex)
+ catch (DdlUtilsXMLException ex)
{}
}
@@ -398,7 +420,7 @@
try
{
readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TestTable'>\n" +
" <column name='id'\n" +
" primaryKey='true'\n" +
@@ -408,7 +430,7 @@
fail();
}
- catch (ModelException ex)
+ catch (DdlUtilsXMLException ex)
{}
}
@@ -420,7 +442,7 @@
StringBuffer modelXml = new StringBuffer();
int[] types = TypeMap.getSuportedJdbcTypes();
- modelXml.append("<database name='test'>\n");
+ modelXml.append("<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n");
modelXml.append(" <table name='SomeTable'\n");
modelXml.append(" description='Some table'>\n");
for (int idx = 0; idx < types.length; idx++)
@@ -452,7 +474,7 @@
modelXml.setLength(0);
modelXml.append("<?xml version='1.0' encoding='UTF-8'?>\n");
- modelXml.append("<database name=\"test\">\n");
+ modelXml.append("<database xmlns=\"" + DatabaseIO.DDLUTILS_NAMESPACE + "\" name=\"test\">\n");
modelXml.append(" <table name=\"SomeTable\" description=\"Some table\">\n");
for (int idx = 0; idx < types.length; idx++)
{
@@ -476,7 +498,7 @@
try
{
readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TestTable'>\n" +
" <column name='id'\n" +
" type='illegal'\n" +
@@ -487,7 +509,7 @@
fail();
}
- catch (ModelException ex)
+ catch (DdlUtilsXMLException ex)
{}
}
@@ -497,7 +519,7 @@
public void testPrimaryKeyColumn() throws Exception
{
Database model = readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='SomeTable'\n" +
" description='Some table'>\n" +
" <column name='ID'\n" +
@@ -523,7 +545,7 @@
assertEquals(
"<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<database name=\"test\">\n" +
+ "<database xmlns=\"" + DatabaseIO.DDLUTILS_NAMESPACE + "\" name=\"test\">\n" +
" <table name=\"SomeTable\" description=\"Some table\">\n" +
" <column name=\"ID\" primaryKey=\"true\" required=\"false\" type=\"INTEGER\" autoIncrement=\"false\" />\n" +
" </table>\n" +
@@ -537,7 +559,7 @@
public void testRequiredColumn() throws Exception
{
Database model = readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='SomeTable'\n" +
" description='Some table'>\n" +
" <column name='ID'\n" +
@@ -558,7 +580,7 @@
assertEquals(
"<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<database name=\"test\">\n" +
+ "<database xmlns=\"" + DatabaseIO.DDLUTILS_NAMESPACE + "\" name=\"test\">\n" +
" <table name=\"SomeTable\" description=\"Some table\">\n" +
" <column name=\"ID\" primaryKey=\"false\" required=\"true\" type=\"INTEGER\" autoIncrement=\"false\" />\n" +
" </table>\n" +
@@ -572,7 +594,7 @@
public void testAutoIncrementColumn() throws Exception
{
Database model = readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='SomeTable'\n" +
" description='Some table'>\n" +
" <column name='ID'\n" +
@@ -598,7 +620,7 @@
assertEquals(
"<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<database name=\"test\">\n" +
+ "<database xmlns=\"" + DatabaseIO.DDLUTILS_NAMESPACE + "\" name=\"test\">\n" +
" <table name=\"SomeTable\" description=\"Some table\">\n" +
" <column name=\"ID\" primaryKey=\"false\" required=\"false\" type=\"INTEGER\" autoIncrement=\"true\" />\n" +
" </table>\n" +
@@ -612,7 +634,7 @@
public void testColumnWithSize1() throws Exception
{
Database model = readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='SomeTable'\n" +
" description='Some table'>\n" +
" <column name='ID'\n" +
@@ -633,7 +655,7 @@
assertEquals(
"<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<database name=\"test\">\n" +
+ "<database xmlns=\"" + DatabaseIO.DDLUTILS_NAMESPACE + "\" name=\"test\">\n" +
" <table name=\"SomeTable\" description=\"Some table\">\n" +
" <column name=\"ID\" primaryKey=\"false\" required=\"false\" type=\"VARCHAR\" size=\"20\" autoIncrement=\"false\" />\n" +
" </table>\n" +
@@ -647,7 +669,7 @@
public void testColumnWithSize2() throws Exception
{
Database model = readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='SomeTable'\n" +
" description='Some table'>\n" +
" <column name='ID'\n" +
@@ -668,7 +690,7 @@
assertEquals(
"<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<database name=\"test\">\n" +
+ "<database xmlns=\"" + DatabaseIO.DDLUTILS_NAMESPACE + "\" name=\"test\">\n" +
" <table name=\"SomeTable\" description=\"Some table\">\n" +
" <column name=\"ID\" primaryKey=\"false\" required=\"false\" type=\"DECIMAL\" size=\"10,3\" autoIncrement=\"false\" />\n" +
" </table>\n" +
@@ -682,7 +704,7 @@
public void testColumnWithDescription() throws Exception
{
Database model = readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='SomeTable'\n" +
" description='Some table'>\n" +
" <column name='ID'\n" +
@@ -703,7 +725,7 @@
assertEquals(
"<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<database name=\"test\">\n" +
+ "<database xmlns=\"" + DatabaseIO.DDLUTILS_NAMESPACE + "\" name=\"test\">\n" +
" <table name=\"SomeTable\" description=\"Some table\">\n" +
" <column name=\"ID\" primaryKey=\"false\" required=\"false\" type=\"INTEGER\" autoIncrement=\"false\" description=\"Foo\" />\n" +
" </table>\n" +
@@ -717,7 +739,7 @@
public void testColumnWithDefault() throws Exception
{
Database model = readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='SomeTable'\n" +
" description='Some table'>\n" +
" <column name='ID'\n" +
@@ -739,7 +761,7 @@
assertEquals(
"<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<database name=\"test\">\n" +
+ "<database xmlns=\"" + DatabaseIO.DDLUTILS_NAMESPACE + "\" name=\"test\">\n" +
" <table name=\"SomeTable\" description=\"Some table\">\n" +
" <column name=\"ID\" primaryKey=\"false\" required=\"false\" type=\"VARCHAR\" size=\"32\" default=\"Test string\" autoIncrement=\"false\" />\n" +
" </table>\n" +
@@ -753,7 +775,7 @@
public void testColumnWithJavaName() throws Exception
{
Database model = readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='SomeTable'\n" +
" description='Some table'>\n" +
" <column name='ID'\n" +
@@ -774,7 +796,7 @@
assertEquals(
"<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<database name=\"test\">\n" +
+ "<database xmlns=\"" + DatabaseIO.DDLUTILS_NAMESPACE + "\" name=\"test\">\n" +
" <table name=\"SomeTable\" description=\"Some table\">\n" +
" <column name=\"ID\" primaryKey=\"false\" required=\"false\" type=\"DOUBLE\" autoIncrement=\"false\" javaName=\"testString\" />\n" +
" </table>\n" +
@@ -788,7 +810,7 @@
public void testSingleForeignkey() throws Exception
{
Database model = readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='SomeTable'\n" +
" description='Some table'>\n" +
" <column name='ID'\n" +
@@ -840,7 +862,7 @@
assertEquals(
"<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<database name=\"test\">\n" +
+ "<database xmlns=\"" + DatabaseIO.DDLUTILS_NAMESPACE + "\" name=\"test\">\n" +
" <table name=\"SomeTable\" description=\"Some table\">\n" +
" <column name=\"ID\" primaryKey=\"true\" required=\"true\" type=\"VARCHAR\" size=\"16\" autoIncrement=\"false\" description=\"The primary key\" />\n" +
" </table>\n" +
@@ -860,7 +882,7 @@
public void testForeignkeyWithTwoReferences() throws Exception
{
Database model = readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='SomeTable'\n" +
" description='Some table'>\n" +
" <column name='ID'\n" +
@@ -918,7 +940,7 @@
assertEquals(
"<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<database name=\"test\">\n" +
+ "<database xmlns=\"" + DatabaseIO.DDLUTILS_NAMESPACE + "\" name=\"test\">\n" +
" <table name=\"SomeTable\" description=\"Some table\">\n" +
" <column name=\"ID\" primaryKey=\"true\" required=\"true\" type=\"VARCHAR\" size=\"16\" autoIncrement=\"false\" description=\"The primary key\" />\n" +
" <column name=\"VALUE1\" primaryKey=\"false\" required=\"false\" type=\"INTEGER\" autoIncrement=\"false\" description=\"A value\" />\n" +
@@ -944,7 +966,7 @@
try
{
readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='SomeTable'\n" +
" description='Some table'>\n" +
" <column name='ID'\n" +
@@ -967,7 +989,7 @@
fail();
}
- catch (ModelException ex)
+ catch (DdlUtilsXMLException ex)
{}
}
@@ -977,7 +999,7 @@
public void testNamedForeignkey() throws Exception
{
Database model = readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='SomeTable'\n" +
" description='Some table'>\n" +
" <column name='ID'\n" +
@@ -1023,7 +1045,7 @@
assertEquals(
"<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<database name=\"test\">\n" +
+ "<database xmlns=\"" + DatabaseIO.DDLUTILS_NAMESPACE + "\" name=\"test\">\n" +
" <table name=\"SomeTable\" description=\"Some table\">\n" +
" <column name=\"ID\" primaryKey=\"true\" required=\"true\" type=\"VARCHAR\" size=\"16\" autoIncrement=\"false\" description=\"The primary key\" />\n" +
" </table>\n" +
@@ -1044,7 +1066,7 @@
{
StringBuffer modelXml = new StringBuffer();
- modelXml.append("<database name='test'>\n");
+ modelXml.append("<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n");
modelXml.append(" <table name='SomeTable'\n");
modelXml.append(" description='Some table'>\n");
modelXml.append(" <column name='ID'\n");
@@ -1107,7 +1129,7 @@
modelXml.setLength(0);
modelXml.append("<?xml version='1.0' encoding='UTF-8'?>\n");
- modelXml.append("<database name=\"test\">\n");
+ modelXml.append("<database xmlns=\"" + DatabaseIO.DDLUTILS_NAMESPACE + "\" name=\"test\">\n");
modelXml.append(" <table name=\"SomeTable\" description=\"Some table\">\n");
modelXml.append(" <column name=\"ID\" primaryKey=\"true\" required=\"true\" type=\"VARCHAR\" size=\"16\" autoIncrement=\"false\" description=\"The primary key\" />\n");
modelXml.append(" </table>\n");
@@ -1141,7 +1163,7 @@
{
StringBuffer modelXml = new StringBuffer();
- modelXml.append("<database name='test'>\n");
+ modelXml.append("<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n");
modelXml.append(" <table name='SomeTable'\n");
modelXml.append(" description='Some table'>\n");
modelXml.append(" <column name='ID'\n");
@@ -1204,7 +1226,7 @@
modelXml.setLength(0);
modelXml.append("<?xml version='1.0' encoding='UTF-8'?>\n");
- modelXml.append("<database name=\"test\">\n");
+ modelXml.append("<database xmlns=\"" + DatabaseIO.DDLUTILS_NAMESPACE + "\" name=\"test\">\n");
modelXml.append(" <table name=\"SomeTable\" description=\"Some table\">\n");
modelXml.append(" <column name=\"ID\" primaryKey=\"true\" required=\"true\" type=\"VARCHAR\" size=\"16\" autoIncrement=\"false\" description=\"The primary key\" />\n");
modelXml.append(" </table>\n");
@@ -1239,7 +1261,7 @@
try
{
readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='SomeTable'\n" +
" description='Some table'>\n" +
" <column name='ID'\n" +
@@ -1275,7 +1297,7 @@
try
{
readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='SomeTable'\n" +
" description='Some table'>\n" +
" <column name='ID'\n" +
@@ -1311,7 +1333,7 @@
try
{
readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='SomeTable'\n" +
" description='Some table'>\n" +
" <column name='ID'\n" +
@@ -1347,7 +1369,7 @@
try
{
readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='SomeTable'\n" +
" description='Some table'>\n" +
" <column name='ID'\n" +
@@ -1383,7 +1405,7 @@
try
{
readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='SomeTable'\n" +
" description='Some table'>\n" +
" <column name='ID'\n" +
@@ -1419,7 +1441,7 @@
try
{
readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='SomeTable'\n" +
" description='Some table'>\n" +
" <column name='ID'\n" +
@@ -1455,7 +1477,7 @@
try
{
readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='SomeTable'\n" +
" description='Some table'>\n" +
" <column name='ID'\n" +
@@ -1491,7 +1513,7 @@
try
{
readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='SomeTable'\n" +
" description='Some table'>\n" +
" <column name='ID'\n" +
@@ -1515,7 +1537,7 @@
fail();
}
- catch (ModelException ex)
+ catch (DdlUtilsXMLException ex)
{}
}
@@ -1527,7 +1549,7 @@
try
{
readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='SomeTable'\n" +
" description='Some table'>\n" +
" <column name='ID'\n" +
@@ -1551,7 +1573,7 @@
fail();
}
- catch (ModelException ex)
+ catch (DdlUtilsXMLException ex)
{}
}
@@ -1561,7 +1583,7 @@
public void testTwoForeignkeys() throws Exception
{
Database model = readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='SomeTable'\n" +
" description='Some table'>\n" +
" <column name='ID'\n" +
@@ -1625,7 +1647,7 @@
assertEquals(
"<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<database name=\"test\">\n" +
+ "<database xmlns=\"" + DatabaseIO.DDLUTILS_NAMESPACE + "\" name=\"test\">\n" +
" <table name=\"SomeTable\" description=\"Some table\">\n" +
" <column name=\"ID\" primaryKey=\"true\" required=\"true\" type=\"VARCHAR\" size=\"16\" autoIncrement=\"false\" description=\"The primary key\" />\n" +
" <column name=\"VALUE1\" primaryKey=\"false\" required=\"false\" type=\"INTEGER\" autoIncrement=\"false\" description=\"A value\" />\n" +
@@ -1653,7 +1675,7 @@
try
{
readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='SomeTable'\n" +
" description='Some table'>\n" +
" <column name='ID'\n" +
@@ -1700,7 +1722,7 @@
public void testSingleIndex() throws Exception
{
Database model = readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableWithIndex'>\n" +
" <column name='id'\n" +
" type='DOUBLE'\n" +
@@ -1734,7 +1756,7 @@
assertEquals(
"<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<database name=\"test\">\n" +
+ "<database xmlns=\"" + DatabaseIO.DDLUTILS_NAMESPACE + "\" name=\"test\">\n" +
" <table name=\"TableWithIndex\">\n" +
" <column name=\"id\" primaryKey=\"true\" required=\"true\" type=\"DOUBLE\" autoIncrement=\"false\" />\n" +
" <column name=\"value\" primaryKey=\"false\" required=\"false\" type=\"SMALLINT\" default=\"1\" autoIncrement=\"false\" />\n" +
@@ -1752,7 +1774,7 @@
public void testIndexWithTwoColumns() throws Exception
{
Database model = readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableWithIndex'>\n" +
" <column name='id'\n" +
" type='DOUBLE'\n" +
@@ -1793,7 +1815,7 @@
assertEquals(
"<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<database name=\"test\">\n" +
+ "<database xmlns=\"" + DatabaseIO.DDLUTILS_NAMESPACE + "\" name=\"test\">\n" +
" <table name=\"TableWithIndex\">\n" +
" <column name=\"id\" primaryKey=\"true\" required=\"true\" type=\"DOUBLE\" autoIncrement=\"false\" />\n" +
" <column name=\"when\" primaryKey=\"false\" required=\"true\" type=\"TIMESTAMP\" autoIncrement=\"false\" />\n" +
@@ -1813,7 +1835,7 @@
public void testIndexWithName() throws Exception
{
Database model = readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableWithIndex'>\n" +
" <column name='id'\n" +
" type='DOUBLE'\n" +
@@ -1847,7 +1869,7 @@
assertEquals(
"<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<database name=\"test\">\n" +
+ "<database xmlns=\"" + DatabaseIO.DDLUTILS_NAMESPACE + "\" name=\"test\">\n" +
" <table name=\"TableWithIndex\">\n" +
" <column name=\"id\" primaryKey=\"true\" required=\"true\" type=\"DOUBLE\" autoIncrement=\"false\" />\n" +
" <column name=\"value\" primaryKey=\"false\" required=\"false\" type=\"SMALLINT\" default=\"1\" autoIncrement=\"false\" />\n" +
@@ -1867,7 +1889,7 @@
try
{
readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableWithIndex'>\n" +
" <column name='id'\n" +
" type='DOUBLE'\n" +
@@ -1883,7 +1905,7 @@
fail();
}
- catch (ModelException ex)
+ catch (DdlUtilsXMLException ex)
{}
}
@@ -1895,7 +1917,7 @@
try
{
readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableWithIndex'>\n" +
" <column name='id'\n" +
" type='DOUBLE'\n" +
@@ -1924,7 +1946,7 @@
try
{
readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableWithIndex'>\n" +
" <column name='id'\n" +
" type='DOUBLE'\n" +
@@ -1941,7 +1963,7 @@
fail();
}
- catch (ModelException ex)
+ catch (DdlUtilsXMLException ex)
{}
}
@@ -1952,7 +1974,7 @@
public void testSingleUniqueIndex() throws Exception
{
Database model = readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableWithIndex'>\n" +
" <column name='id'\n" +
" type='DOUBLE'\n" +
@@ -1986,7 +2008,7 @@
assertEquals(
"<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<database name=\"test\">\n" +
+ "<database xmlns=\"" + DatabaseIO.DDLUTILS_NAMESPACE + "\" name=\"test\">\n" +
" <table name=\"TableWithIndex\">\n" +
" <column name=\"id\" primaryKey=\"true\" required=\"true\" type=\"DOUBLE\" autoIncrement=\"false\" />\n" +
" <column name=\"value\" primaryKey=\"false\" required=\"false\" type=\"SMALLINT\" default=\"1\" autoIncrement=\"false\" />\n" +
@@ -2004,7 +2026,7 @@
public void testUniqueIndexWithTwoColumns() throws Exception
{
Database model = readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableWithIndex'>\n" +
" <column name='id'\n" +
" type='DOUBLE'\n" +
@@ -2045,7 +2067,7 @@
assertEquals(
"<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<database name=\"test\">\n" +
+ "<database xmlns=\"" + DatabaseIO.DDLUTILS_NAMESPACE + "\" name=\"test\">\n" +
" <table name=\"TableWithIndex\">\n" +
" <column name=\"id\" primaryKey=\"true\" required=\"true\" type=\"DOUBLE\" autoIncrement=\"false\" />\n" +
" <column name=\"when\" primaryKey=\"false\" required=\"true\" type=\"TIMESTAMP\" autoIncrement=\"false\" />\n" +
@@ -2065,7 +2087,7 @@
public void testUniqueIndexWithName() throws Exception
{
Database model = readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableWithIndex'>\n" +
" <column name='id'\n" +
" type='DOUBLE'\n" +
@@ -2099,7 +2121,7 @@
assertEquals(
"<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<database name=\"test\">\n" +
+ "<database xmlns=\"" + DatabaseIO.DDLUTILS_NAMESPACE + "\" name=\"test\">\n" +
" <table name=\"TableWithIndex\">\n" +
" <column name=\"id\" primaryKey=\"true\" required=\"true\" type=\"DOUBLE\" autoIncrement=\"false\" />\n" +
" <column name=\"value\" primaryKey=\"false\" required=\"false\" type=\"SMALLINT\" default=\"1\" autoIncrement=\"false\" />\n" +
@@ -2119,7 +2141,7 @@
try
{
readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableWithIndex'>\n" +
" <column name='id'\n" +
" type='DOUBLE'\n" +
@@ -2135,7 +2157,7 @@
fail();
}
- catch (ModelException ex)
+ catch (DdlUtilsXMLException ex)
{}
}
@@ -2147,7 +2169,7 @@
try
{
readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableWithIndex'>\n" +
" <column name='id'\n" +
" type='DOUBLE'\n" +
@@ -2176,7 +2198,7 @@
try
{
readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableWithIndex'>\n" +
" <column name='id'\n" +
" type='DOUBLE'\n" +
@@ -2193,7 +2215,7 @@
fail();
}
- catch (ModelException ex)
+ catch (DdlUtilsXMLException ex)
{}
}
@@ -2203,7 +2225,7 @@
public void testMixedIndexes() throws Exception
{
Database model = readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableWithIndexes'>\n" +
" <column name='id'\n" +
" type='SMALLINT'\n" +
@@ -2246,7 +2268,7 @@
assertEquals(
"<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<database name=\"test\">\n" +
+ "<database xmlns=\"" + DatabaseIO.DDLUTILS_NAMESPACE + "\" name=\"test\">\n" +
" <table name=\"TableWithIndexes\">\n" +
" <column name=\"id\" primaryKey=\"false\" required=\"true\" type=\"SMALLINT\" autoIncrement=\"true\" />\n" +
" <column name=\"when\" primaryKey=\"false\" required=\"false\" type=\"DATE\" autoIncrement=\"false\" />\n" +
@@ -2271,7 +2293,7 @@
// C = id:CHAR(32), text:LONGVARCHAR; index 'byText' (text)
Database model = readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='A'\n" +
" description='Table A'>\n" +
" <column name='id'\n" +
@@ -2411,7 +2433,7 @@
assertEquals(
"<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<database name=\"test\">\n" +
+ "<database xmlns=\"" + DatabaseIO.DDLUTILS_NAMESPACE + "\" name=\"test\">\n" +
" <table name=\"A\" description=\"Table A\">\n" +
" <column name=\"id\" primaryKey=\"true\" required=\"true\" type=\"INTEGER\" autoIncrement=\"true\" description=\"The primary key of table A\" />\n" +
" <column name=\"parentId\" primaryKey=\"false\" required=\"false\" type=\"INTEGER\" autoIncrement=\"false\" description=\"The field for the foreign key parent\" />\n" +
@@ -2457,7 +2479,7 @@
try
{
readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableWidthIndex'>\n" +
" <column name='id'\n" +
" type='INTEGER'\n" +
@@ -2484,7 +2506,7 @@
try
{
readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TestTable'>\n" +
" <column name='id1'\n" +
" type='INTEGER'\n" +
@@ -2514,7 +2536,7 @@
try
{
readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TestTable'>\n" +
" <column name='id'\n" +
" type='INTEGER'\n" +
@@ -2539,7 +2561,7 @@
try
{
readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableWidthUnique'>\n" +
" <column name='id'\n" +
" type='INTEGER'\n" +
@@ -2565,7 +2587,7 @@
try
{
readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableWidthIndex'>\n" +
" <column name='id'\n" +
" type='INTEGER'\n" +
@@ -2601,7 +2623,7 @@
try
{
readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableWidthUnique'>\n" +
" <column name='id'\n" +
" type='INTEGER'\n" +
@@ -2637,7 +2659,7 @@
try
{
readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='TableWidthUnique'>\n" +
" <column name='id'\n" +
" type='INTEGER'\n" +
@@ -2669,12 +2691,17 @@
*/
public void testFaultReadOfTable()
{
- Database database = readModel(
- "<database name='db' >\n" +
+ try
+ {
+ readModel(
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='db' >\n" +
" <index name='NotATable'/>\n" +
"</database>");
- assertEquals(0, database.getTableCount());
+ fail();
+ }
+ catch (DdlUtilsXMLException ex)
+ {}
}
/**
@@ -2683,7 +2710,7 @@
public void testTurbineExtension() throws Exception
{
Database model = readModel(
- "<database name='test'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='test'>\n" +
" <table name='SomeTable'>\n" +
" <column name='intField'\n" +
" type='BOOLEANINT'/>\n" +
@@ -2706,7 +2733,7 @@
assertEquals(
"<?xml version='1.0' encoding='UTF-8'?>\n" +
- "<database name=\"test\">\n" +
+ "<database xmlns=\"" + DatabaseIO.DDLUTILS_NAMESPACE + "\" name=\"test\">\n" +
" <table name=\"SomeTable\">\n" +
" <column name=\"intField\" primaryKey=\"false\" required=\"false\" type=\"TINYINT\" autoIncrement=\"false\" />\n" +
" <column name=\"charField\" primaryKey=\"false\" required=\"false\" type=\"CHAR\" autoIncrement=\"false\" />\n" +
diff --git a/src/test/org/apache/ddlutils/io/TestDatatypes.java b/src/test/org/apache/ddlutils/io/TestDatatypes.java
index 42acf8e..1fb0846 100644
--- a/src/test/org/apache/ddlutils/io/TestDatatypes.java
+++ b/src/test/org/apache/ddlutils/io/TestDatatypes.java
@@ -147,7 +147,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='BIT'/>\n"+
@@ -164,7 +164,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='BIT' required='true' default='FALSE'/>\n"+
@@ -181,7 +181,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='BOOLEAN'/>\n"+
@@ -198,7 +198,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='BOOLEAN' required='true' default='true'/>\n"+
@@ -215,7 +215,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='TINYINT'/>\n"+
@@ -232,7 +232,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='TINYINT' required='true' default='-200'/>\n"+
@@ -249,7 +249,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='SMALLINT'/>\n"+
@@ -266,7 +266,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='SMALLINT' required='true' default='-30000'/>\n"+
@@ -283,7 +283,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -300,7 +300,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER' required='true' default='2147483647'/>\n"+
@@ -317,7 +317,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='BIGINT'/>\n"+
@@ -334,7 +334,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='BIGINT' required='true' default='-9000000000000000000'/>\n"+
@@ -351,7 +351,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='REAL'/>\n"+
@@ -368,7 +368,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='REAL' required='true' default='-1.01234'/>\n"+
@@ -385,7 +385,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='FLOAT'/>\n"+
@@ -402,7 +402,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='FLOAT' required='true' default='12345678.9012345'/>\n"+
@@ -419,7 +419,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='DOUBLE'/>\n"+
@@ -436,7 +436,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='DOUBLE' required='true' default='-987654321.098765'/>\n"+
@@ -453,7 +453,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='DECIMAL' size='13'/>\n"+
@@ -470,7 +470,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='DECIMAL' size='15' required='true' default='123456789012345'/>\n"+
@@ -487,7 +487,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='DECIMAL' size='15,7'/>\n"+
@@ -504,7 +504,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='DECIMAL' size='15,7' required='true' default='12345678.7654321'/>\n"+
@@ -521,7 +521,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='NUMERIC' size='12'/>\n"+
@@ -538,7 +538,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='NUMERIC' size='15' required='true' default='-123456789012345'/>\n"+
@@ -555,7 +555,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='NUMERIC' size='15,8'/>\n"+
@@ -572,7 +572,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='NUMERIC' size='15,8' required='true' default='-1234567.87654321'/>\n"+
@@ -589,7 +589,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='CHAR' size='10'/>\n"+
@@ -606,7 +606,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='CHAR' size='15' required='true' default='543210987654321'/>\n"+
@@ -623,7 +623,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='20'/>\n"+
@@ -640,7 +640,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='254' required='true' default='some value'/>\n"+
@@ -662,7 +662,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='12' required='true' default='someone's'/>\n"+
@@ -679,7 +679,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='12' required='true' default='''/>\n"+
@@ -696,7 +696,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='LONGVARCHAR'/>\n"+
@@ -720,7 +720,7 @@
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='LONGVARCHAR' required='true' default='some value'/>\n"+
@@ -742,7 +742,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='DATE'/>\n"+
@@ -760,7 +760,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='DATE' required='true' default='2000-01-01'/>\n"+
@@ -778,7 +778,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='TIME'/>\n"+
@@ -796,7 +796,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='TIME' required='true' default='11:27:03'/>\n"+
@@ -814,7 +814,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='TIMESTAMP'/>\n"+
@@ -834,7 +834,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='TIMESTAMP' required='true' default='1985-06-17 16:17:18'/>\n"+
@@ -854,7 +854,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='BINARY'/>\n"+
@@ -881,7 +881,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARBINARY'/>\n"+
@@ -907,7 +907,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='LONGVARBINARY'/>\n"+
@@ -933,7 +933,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='BLOB'/>\n"+
@@ -959,7 +959,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='CLOB'/>\n"+
diff --git a/src/test/org/apache/ddlutils/io/TestDropColumn.java b/src/test/org/apache/ddlutils/io/TestDropColumn.java
index 2570b04..09458a1 100644
--- a/src/test/org/apache/ddlutils/io/TestDropColumn.java
+++ b/src/test/org/apache/ddlutils/io/TestDropColumn.java
@@ -49,7 +49,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='TIMESTAMP'/>\n"+
@@ -57,7 +57,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -89,7 +89,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER' autoIncrement='true'/>\n"+
@@ -97,7 +97,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -124,7 +124,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='NUMERIC' size='12,0' required='true'/>\n"+
@@ -132,7 +132,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -159,7 +159,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='DOUBLE' default='3.1'/>\n"+
@@ -167,7 +167,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -194,7 +194,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='CHAR' size='8' required='true' default='text'/>\n"+
@@ -202,7 +202,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -229,7 +229,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='CHAR' size='8' default='text'/>\n"+
@@ -239,7 +239,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue2' type='INTEGER'/>\n"+
@@ -273,7 +273,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='CHAR' size='8' default='text'/>\n"+
@@ -283,7 +283,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue2' type='DOUBLE' required='true'/>\n"+
@@ -312,7 +312,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='pk2' type='INTEGER' primaryKey='true' required='true'/>\n"+
@@ -321,7 +321,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk2' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -350,7 +350,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -358,7 +358,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
" </table>\n"+
@@ -385,7 +385,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='pk2' type='INTEGER' primaryKey='true' required='true'/>\n"+
@@ -395,7 +395,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk2' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -424,7 +424,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk1' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='pk2' type='INTEGER' primaryKey='true' required='true'/>\n"+
@@ -434,7 +434,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
" </table>\n"+
@@ -466,7 +466,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -479,7 +479,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue2' type='VARCHAR' size='32'/>\n"+
@@ -516,7 +516,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -527,7 +527,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -559,7 +559,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER'/>\n"+
@@ -574,7 +574,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue2' type='VARCHAR' size='32'/>\n"+
@@ -611,7 +611,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue1' type='INTEGER' required='true'/>\n"+
@@ -626,7 +626,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -653,7 +653,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -667,7 +667,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" </table>\n"+
@@ -700,7 +700,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -715,7 +715,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
" </table>\n"+
@@ -750,7 +750,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='pk2' type='INTEGER' primaryKey='true' required='true'/>\n"+
@@ -767,7 +767,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='pk2' type='INTEGER' primaryKey='true' required='true'/>\n"+
@@ -802,7 +802,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='pk2' type='INTEGER' primaryKey='true' required='true'/>\n"+
@@ -820,7 +820,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
" </table>\n"+
@@ -857,7 +857,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='pk2' type='INTEGER' primaryKey='true' required='true'/>\n"+
@@ -875,7 +875,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk2' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -915,7 +915,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='pk2' type='INTEGER' primaryKey='true' required='true'/>\n"+
@@ -936,7 +936,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk2' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -976,7 +976,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk1' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='pk2' type='INTEGER' primaryKey='true' required='true'/>\n"+
@@ -997,7 +997,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
" </table>\n"+
diff --git a/src/test/org/apache/ddlutils/io/TestMisc.java b/src/test/org/apache/ddlutils/io/TestMisc.java
index de72aa8..0de8c0c 100644
--- a/src/test/org/apache/ddlutils/io/TestMisc.java
+++ b/src/test/org/apache/ddlutils/io/TestMisc.java
@@ -77,7 +77,7 @@
{
modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='misc1'>\n"+
" <column name='pk' type='NUMERIC' size='12,0' primaryKey='true' required='true' autoIncrement='true'/>\n"+
" <column name='avalue' type='INTEGER' required='false'/>\n"+
@@ -95,7 +95,7 @@
{
modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='misc1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true' autoIncrement='true'/>\n"+
" <column name='avalue' type='INTEGER' required='false'/>\n"+
@@ -229,7 +229,7 @@
{
modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='misc1'>\n"+
" <column name='pk' type='NUMERIC' size='12,0' primaryKey='true' required='true' autoIncrement='true'/>\n"+
" <column name='avalue' type='INTEGER' required='false'/>\n"+
@@ -247,7 +247,7 @@
{
modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='misc1'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true' autoIncrement='true'/>\n"+
" <column name='avalue' type='INTEGER' required='false'/>\n"+
@@ -383,7 +383,7 @@
{
modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='misc'>\n"+
" <column name='pk' type='NUMERIC' size='12,0' primaryKey='true' required='true' autoIncrement='true'/>\n"+
" <column name='fk' type='NUMERIC' size='12,0' required='false'/>\n"+
@@ -397,7 +397,7 @@
{
modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='misc'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true' autoIncrement='true'/>\n"+
" <column name='fk' type='INTEGER' required='false'/>\n"+
@@ -510,7 +510,7 @@
{
modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='misc'>\n"+
" <column name='pk' type='NUMERIC' size='12,0' primaryKey='true' required='true' autoIncrement='true'/>\n"+
" <column name='fk' type='NUMERIC' size='12,0' required='false'/>\n"+
@@ -524,7 +524,7 @@
{
modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='misc'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true' autoIncrement='true'/>\n"+
" <column name='fk' type='INTEGER' required='false'/>\n"+
@@ -636,7 +636,7 @@
{
modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='misc'>\n"+
" <column name='id' primaryKey='true' required='true' type='NUMERIC' size='10,0' autoIncrement='true'/>\n"+
" <column name='parent_id' primaryKey='false' required='false' type='NUMERIC' size='10,0' autoIncrement='false'/>\n"+
@@ -650,7 +650,7 @@
{
modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='misc'>\n"+
" <column name='id' primaryKey='true' required='true' type='SMALLINT' size='2' autoIncrement='true'/>\n"+
" <column name='parent_id' primaryKey='false' required='false' type='SMALLINT' size='2' autoIncrement='false'/>\n"+
@@ -767,7 +767,7 @@
{
modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='misc'>\n"+
" <column name='id' primaryKey='true' required='true' type='NUMERIC' size='6,0' autoIncrement='true'/>\n"+
" <column name='left_id' primaryKey='false' required='false' type='NUMERIC' size='6,0' autoIncrement='false'/>\n"+
@@ -785,7 +785,7 @@
{
modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='misc'>\n"+
" <column name='id' primaryKey='true' required='true' type='SMALLINT' size='2' autoIncrement='true'/>\n"+
" <column name='left_id' primaryKey='false' required='false' type='SMALLINT' size='2' autoIncrement='false'/>\n"+
@@ -883,7 +883,7 @@
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='A'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='fk' type='INTEGER' required='false'/>\n"+
@@ -1054,7 +1054,7 @@
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- " <database name='roundtriptest'>\n"+
+ " <database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='ad_sequence_no'>\n"+
" <column name='ad_sequence_id' required='true' type='NUMERIC' size='10'/>\n"+
" <column name='year' required='true' type='VARCHAR' size='4' default='0000'/>\n"+
@@ -1079,7 +1079,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='A'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='fk' type='INTEGER' required='false'/>\n"+
diff --git a/src/test/org/apache/ddlutils/platform/TestHsqlDbPlatform.java b/src/test/org/apache/ddlutils/platform/TestHsqlDbPlatform.java
index a13a4af..fde6f73 100644
--- a/src/test/org/apache/ddlutils/platform/TestHsqlDbPlatform.java
+++ b/src/test/org/apache/ddlutils/platform/TestHsqlDbPlatform.java
@@ -20,6 +20,7 @@
*/
import org.apache.ddlutils.TestPlatformBase;
+import org.apache.ddlutils.io.DatabaseIO;
import org.apache.ddlutils.platform.hsqldb.HsqlDbPlatform;
/**
@@ -89,7 +90,7 @@
// adapted version for HsqlDb of the schema used for getColumnTestDatabaseCreationSql
final String schema =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='columnconstraintstest'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='columnconstraintstest'>\n" +
" <table name='constraints'>\n" +
" <column name='COL_PK' type='VARCHAR' size='32' primaryKey='true'/>\n" +
" <column name='COL_PK_AUTO_INCR' type='INTEGER' primaryKey='true' autoIncrement='true'/>\n" +
diff --git a/src/test/org/apache/ddlutils/platform/TestMcKoiPlatform.java b/src/test/org/apache/ddlutils/platform/TestMcKoiPlatform.java
index 4eeefad..f075945 100644
--- a/src/test/org/apache/ddlutils/platform/TestMcKoiPlatform.java
+++ b/src/test/org/apache/ddlutils/platform/TestMcKoiPlatform.java
@@ -20,6 +20,7 @@
*/
import org.apache.ddlutils.TestPlatformBase;
+import org.apache.ddlutils.io.DatabaseIO;
import org.apache.ddlutils.platform.mckoi.MckoiPlatform;
/**
@@ -116,7 +117,7 @@
// This schema is adapted for McKoi which does not support non-unique indices
final String schema =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='tableconstraintstest'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='tableconstraintstest'>\n" +
" <table name='table1'>\n" +
" <column name='COL_PK_1' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n" +
" <column name='COL_PK_2' type='INTEGER' primaryKey='true'/>\n" +
@@ -190,7 +191,7 @@
// McKoi-specific schema
final String schema =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='escapetest'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='escapetest'>\n" +
" <table name='escapedcharacters'>\n" +
" <column name='COL_PK' type='INTEGER' primaryKey='true'/>\n" +
" <column name='COL_TEXT' type='VARCHAR' size='128' default='' \\'/>\n" +
diff --git a/src/test/org/apache/ddlutils/platform/TestMySql50Platform.java b/src/test/org/apache/ddlutils/platform/TestMySql50Platform.java
index 2c09f80..9fccc4a 100644
--- a/src/test/org/apache/ddlutils/platform/TestMySql50Platform.java
+++ b/src/test/org/apache/ddlutils/platform/TestMySql50Platform.java
@@ -20,6 +20,7 @@
*/
import org.apache.ddlutils.TestPlatformBase;
+import org.apache.ddlutils.io.DatabaseIO;
import org.apache.ddlutils.model.Database;
import org.apache.ddlutils.platform.mysql.MySql50Platform;
@@ -89,7 +90,7 @@
// MySql-specfic schema
final String schema =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='columnconstraintstest'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='columnconstraintstest'>\n" +
" <table name='constraints'>\n" +
" <column name='COL_PK' type='VARCHAR' size='32' primaryKey='true'/>\n" +
" <column name='COL_PK_AUTO_INCR' type='INTEGER' primaryKey='true'/>\n" +
@@ -163,7 +164,7 @@
// MySql-specfic schema
final String schema =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='columnconstraintstest'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='columnconstraintstest'>\n" +
" <table name='constraints'>\n" +
" <column name='COL_PK' type='VARCHAR' size='32' primaryKey='true'/>\n" +
" <column name='COL_PK_AUTO_INCR' type='INTEGER' primaryKey='true'/>\n" +
@@ -210,7 +211,7 @@
// MySql-specific schema
final String schema =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='escapetest'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='escapetest'>\n" +
" <table name='escapedcharacters'>\n" +
" <column name='COL_PK' type='INTEGER' primaryKey='true'/>\n" +
" <column name='COL_TEXT' type='VARCHAR' size='128' default='_ ' \" 	 \\ %'/>\n" +
diff --git a/src/test/org/apache/ddlutils/platform/TestMySqlPlatform.java b/src/test/org/apache/ddlutils/platform/TestMySqlPlatform.java
index 8e3648e..b243108 100644
--- a/src/test/org/apache/ddlutils/platform/TestMySqlPlatform.java
+++ b/src/test/org/apache/ddlutils/platform/TestMySqlPlatform.java
@@ -20,6 +20,7 @@
*/
import org.apache.ddlutils.TestPlatformBase;
+import org.apache.ddlutils.io.DatabaseIO;
import org.apache.ddlutils.model.Database;
import org.apache.ddlutils.platform.mysql.MySqlPlatform;
@@ -90,7 +91,7 @@
// MySql-specfic schema
final String schema =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='columnconstraintstest'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='columnconstraintstest'>\n" +
" <table name='constraints'>\n" +
" <column name='COL_PK' type='VARCHAR' size='32' primaryKey='true'/>\n" +
" <column name='COL_PK_AUTO_INCR' type='INTEGER' primaryKey='true'/>\n" +
@@ -165,7 +166,7 @@
// MySql-specfic schema
final String schema =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='columnconstraintstest'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='columnconstraintstest'>\n" +
" <table name='constraints'>\n" +
" <column name='COL_PK' type='VARCHAR' size='32' primaryKey='true'/>\n" +
" <column name='COL_PK_AUTO_INCR' type='INTEGER' primaryKey='true'/>\n" +
@@ -212,7 +213,7 @@
// MySql-specific schema
final String schema =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='escapetest'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='escapetest'>\n" +
" <table name='escapedcharacters'>\n" +
" <column name='COL_PK' type='INTEGER' primaryKey='true'/>\n" +
" <column name='COL_TEXT' type='VARCHAR' size='128' default='_ ' \" 	 \\ %'/>\n" +
diff --git a/src/test/org/apache/ddlutils/platform/TestPostgresqlPlatform.java b/src/test/org/apache/ddlutils/platform/TestPostgresqlPlatform.java
index 42514be..d43a620 100644
--- a/src/test/org/apache/ddlutils/platform/TestPostgresqlPlatform.java
+++ b/src/test/org/apache/ddlutils/platform/TestPostgresqlPlatform.java
@@ -20,6 +20,7 @@
*/
import org.apache.ddlutils.TestPlatformBase;
+import org.apache.ddlutils.io.DatabaseIO;
import org.apache.ddlutils.platform.postgresql.PostgreSqlPlatform;
/**
@@ -153,7 +154,7 @@
// PostgreSql specific database schema for testing escaping of character sequences
final String schema =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n" +
- "<database name='escapetest'>\n" +
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='escapetest'>\n" +
" <table name='escapedcharacters'>\n" +
" <column name='COL_PK' type='INTEGER' primaryKey='true'/>\n" +
" <column name='COL_TEXT' type='VARCHAR' size='128' default='' 	 \\'/>\n" +
diff --git a/src/test/org/apache/ddlutils/platform/TestSqlBuilder.java b/src/test/org/apache/ddlutils/platform/TestSqlBuilder.java
index b51a3e6..479ca06 100644
--- a/src/test/org/apache/ddlutils/platform/TestSqlBuilder.java
+++ b/src/test/org/apache/ddlutils/platform/TestSqlBuilder.java
@@ -23,6 +23,7 @@
import java.util.Map;
import org.apache.ddlutils.TestBase;
+import org.apache.ddlutils.io.DatabaseIO;
import org.apache.ddlutils.model.Database;
import org.apache.ddlutils.model.Table;
@@ -40,7 +41,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='ddlutils'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='ddlutils'>\n"+
" <table name='TestTable'>\n"+
" <column name='id' autoIncrement='true' type='INTEGER' primaryKey='true'/>\n"+
" <column name='name' type='VARCHAR' size='15'/>\n"+
@@ -70,7 +71,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='ddlutils'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='ddlutils'>\n"+
" <table name='TestTable'>\n"+
" <column name='id' autoIncrement='true' type='INTEGER' primaryKey='true'/>\n"+
" <column name='name' type='VARCHAR' size='15'/>\n"+
diff --git a/src/test/org/apache/ddlutils/task/TestDropTablesCommand.java b/src/test/org/apache/ddlutils/task/TestDropTablesCommand.java
index ef053e2..56f84fb 100644
--- a/src/test/org/apache/ddlutils/task/TestDropTablesCommand.java
+++ b/src/test/org/apache/ddlutils/task/TestDropTablesCommand.java
@@ -19,6 +19,7 @@
* under the License.
*/
+import org.apache.ddlutils.io.DatabaseIO;
import org.apache.ddlutils.model.Database;
/**
@@ -50,7 +51,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -76,7 +77,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true' autoIncrement='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -107,7 +108,7 @@
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true' autoIncrement='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -141,7 +142,7 @@
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true' autoIncrement='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -170,7 +171,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -199,7 +200,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -232,7 +233,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -268,7 +269,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -286,7 +287,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip2'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='32'/>\n"+
@@ -314,7 +315,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -357,7 +358,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='Roundtrip 1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -375,7 +376,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='Roundtrip 2'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='32'/>\n"+
@@ -410,7 +411,7 @@
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='Roundtrip 1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -455,7 +456,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='Roundtrip, 1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -473,7 +474,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='Roundtrip, 1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -508,7 +509,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='Roundtrip 1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -526,7 +527,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='Roundtrip 1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -561,7 +562,7 @@
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='Roundtrip, 1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -601,7 +602,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -639,7 +640,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -657,7 +658,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -690,7 +691,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='Roundtrip 1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -708,7 +709,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='Roundtrip 1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -738,7 +739,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -763,7 +764,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrap3'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='32'/>\n"+
@@ -798,7 +799,7 @@
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='Roundtrip 1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -823,7 +824,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='Roundtrip A'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='32'/>\n"+
@@ -853,7 +854,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -891,7 +892,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
diff --git a/src/test/org/apache/ddlutils/task/TestWriteSchemaToFileCommand.java b/src/test/org/apache/ddlutils/task/TestWriteSchemaToFileCommand.java
index 58eadbc..80a7b8b 100644
--- a/src/test/org/apache/ddlutils/task/TestWriteSchemaToFileCommand.java
+++ b/src/test/org/apache/ddlutils/task/TestWriteSchemaToFileCommand.java
@@ -81,7 +81,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -109,7 +109,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='Roundtrip 1'>\n"+
" <column name='A PK' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='A Value' type='INTEGER'/>\n"+
@@ -138,7 +138,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -153,7 +153,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -175,7 +175,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -215,7 +215,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='Roundtrip 1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -230,7 +230,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='Roundtrip 1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -253,7 +253,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='Roundtrip 1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -294,7 +294,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -316,7 +316,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -348,7 +348,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -395,7 +395,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='Roundtrip 1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -420,7 +420,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='Roundtrip 1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -453,7 +453,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='Roundtrip 1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -501,7 +501,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -516,7 +516,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -538,7 +538,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -578,7 +578,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='Roundtrip 1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -593,7 +593,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='Roundtrip 1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -616,7 +616,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='Roundtrip 1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -657,7 +657,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -679,7 +679,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip2'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='32'/>\n"+
@@ -701,7 +701,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -748,7 +748,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='Roundtrip 1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -773,7 +773,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='Roundtrip 2'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -799,7 +799,7 @@
{
final String modelXml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='Roundtrip 1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -847,7 +847,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='Roundtrip 1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -876,7 +876,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='Roundtrip 4'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -900,7 +900,7 @@
{
final String model1Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip1'>\n"+
" <column name='pk' type='VARCHAR' size='32' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='INTEGER'/>\n"+
@@ -926,7 +926,7 @@
"</database>";
final String model2Xml =
"<?xml version='1.0' encoding='ISO-8859-1'?>\n"+
- "<database name='roundtriptest'>\n"+
+ "<database xmlns='" + DatabaseIO.DDLUTILS_NAMESPACE + "' name='roundtriptest'>\n"+
" <table name='roundtrip2'>\n"+
" <column name='pk' type='INTEGER' primaryKey='true' required='true'/>\n"+
" <column name='avalue' type='VARCHAR' size='32'/>\n"+
