You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ddlutils-dev@db.apache.org by to...@apache.org on 2011/05/05 06:41:17 UTC
svn commit: r1099678 - in /db/ddlutils/trunk/src:
main/java/org/apache/ddlutils/io/ColumnXmlWriter.java
test/java/org/apache/ddlutils/io/TestDataReaderAndWriter.java
Author: tomdz
Date: Thu May 5 04:41:17 2011
New Revision: 1099678
URL: http://svn.apache.org/viewvc?rev=1099678&view=rev
Log:
Removed restriction on column name being 'column' for DDLUTILS-245
Modified:
db/ddlutils/trunk/src/main/java/org/apache/ddlutils/io/ColumnXmlWriter.java
db/ddlutils/trunk/src/test/java/org/apache/ddlutils/io/TestDataReaderAndWriter.java
Modified: db/ddlutils/trunk/src/main/java/org/apache/ddlutils/io/ColumnXmlWriter.java
URL: http://svn.apache.org/viewvc/db/ddlutils/trunk/src/main/java/org/apache/ddlutils/io/ColumnXmlWriter.java?rev=1099678&r1=1099677&r2=1099678&view=diff
==============================================================================
--- db/ddlutils/trunk/src/main/java/org/apache/ddlutils/io/ColumnXmlWriter.java (original)
+++ db/ddlutils/trunk/src/main/java/org/apache/ddlutils/io/ColumnXmlWriter.java Thu May 5 04:41:17 2011
@@ -85,7 +85,6 @@ public class ColumnXmlWriter extends Mod
columnFormattingMethod = AS_VALUE;
}
else if ("table-name".equals(columnName) ||
- "column".equals(columnName) ||
DatabaseIO.BASE64_ATTR_NAME.equals(columnName) ||
!XMLUtils.isWellFormedXMLName(columnName))
{
Modified: db/ddlutils/trunk/src/test/java/org/apache/ddlutils/io/TestDataReaderAndWriter.java
URL: http://svn.apache.org/viewvc/db/ddlutils/trunk/src/test/java/org/apache/ddlutils/io/TestDataReaderAndWriter.java?rev=1099678&r1=1099677&r2=1099678&view=diff
==============================================================================
--- db/ddlutils/trunk/src/test/java/org/apache/ddlutils/io/TestDataReaderAndWriter.java (original)
+++ db/ddlutils/trunk/src/test/java/org/apache/ddlutils/io/TestDataReaderAndWriter.java Thu May 5 04:41:17 2011
@@ -1625,9 +1625,7 @@ public class TestDataReaderAndWriter ext
roundtripTest(model, bean, "UTF-8",
"<?xml version='1.0' encoding='UTF-8'?>\n" +
"<data>\n" +
- " <test id=\"1\">\n" +
- " <column column-name=\"column\">" + testedValue + "</column>\n" +
- " </test>\n" +
+ " <test id=\"1\" column=\"" + testedValue + "\" />\n" +
"</data>\n");
}