|
From: <mla...@us...> - 2002-08-04 01:07:16
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset
In directory usw-pr-cvs1:/tmp/cvs-serv24183/dbunit/src/test/org/dbunit/dataset
Modified Files:
AbstractDataSetTest.java DataSetUtilsTest.java
Log Message:
I added a system property that allows schema, table and column names escaping.
The property value is an escape pattern where the ? is replaced by the name.
For example, the pattern "[?]" is expanded as "[MY_NAME]" for a table named
"MY_TABLE".
Attention this feature is not compatible with the qualified names name feature!
Index: AbstractDataSetTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/AbstractDataSetTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** AbstractDataSetTest.java 3 Aug 2002 02:26:41 -0000 1.13
--- AbstractDataSetTest.java 4 Aug 2002 01:07:13 -0000 1.14
***************
*** 90,93 ****
--- 90,94 ----
nameList.remove("DBUNIT.BLOB_TABLE");
nameList.remove("DBUNIT.CLOB_TABLE");
+ // nameList.remove("ESCAPED TABLE");
names = (String[])nameList.toArray(new String[0]);
Index: DataSetUtilsTest.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/dataset/DataSetUtilsTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** DataSetUtilsTest.java 13 Jun 2002 17:25:00 -0000 1.11
--- DataSetUtilsTest.java 4 Aug 2002 01:07:13 -0000 1.12
***************
*** 55,59 ****
--- 55,82 ----
assertEquals("existing prefix", "prefix.name",
DataSetUtils.getQualifiedName("wrongPrefix", "prefix.name"));
+
+ assertEquals("escaped prefix + name", "prefix.name",
+ DataSetUtils.getQualifiedName("prefix", "name"));
+
+ System.setProperty("dbunit.name.escapePattern", "[?]");
+ assertEquals("escaped prefix + name", "[prefix].[name]",
+ DataSetUtils.getQualifiedName("prefix", "name", true));
+ System.getProperties().remove("dbunit.name.escapePattern");
+
}
+
+ public void testGetEscapedName() throws Exception
+ {
+ assertEquals("'name'", DataSetUtils.getEscapedName("name", "'?'"));
+
+ assertEquals("[name]", DataSetUtils.getEscapedName("name", "[?]"));
+
+ assertEquals(null, DataSetUtils.getEscapedName(null, "[?]"));
+
+ assertEquals("name", DataSetUtils.getEscapedName("name", null));
+
+ assertEquals("name", DataSetUtils.getEscapedName("name", "invalid pattern!"));
+ }
+
public void testGetColumn() throws Exception
|