[dbunit-commit] dbunit/src/java/org/dbunit/operation DeleteAllOperation.java,1.11,1.12 DeleteOperation.java,1.10,1.11 InsertOperation.java,1.11,1.12 RefreshOperation.java,1.19,1.20 UpdateOperation.java,1.8,1.9

[<mla...@us...>]

Update of /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation
In directory usw-pr-cvs1:/tmp/cvs-serv24183/dbunit/src/java/org/dbunit/operation

Modified Files:
	DeleteAllOperation.java DeleteOperation.java 
	InsertOperation.java RefreshOperation.java 
	UpdateOperation.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: DeleteAllOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/DeleteAllOperation.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** DeleteAllOperation.java	3 Aug 2002 02:26:41 -0000	1.11
--- DeleteAllOperation.java	4 Aug 2002 01:07:13 -0000	1.12
***************
*** 64,68 ****
                      sqlBuffer.append("delete from ");
                      sqlBuffer.append(DataSetUtils.getQualifiedName(
!                             connection.getSchema(), tableNames[i]));
                      statement.addBatch(sqlBuffer.toString());
                  }
--- 64,68 ----
                      sqlBuffer.append("delete from ");
                      sqlBuffer.append(DataSetUtils.getQualifiedName(
!                             connection.getSchema(), tableNames[i], true));
                      statement.addBatch(sqlBuffer.toString());
                  }

Index: DeleteOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/DeleteOperation.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** DeleteOperation.java	13 Jun 2002 17:24:58 -0000	1.10
--- DeleteOperation.java	4 Aug 2002 01:07:13 -0000	1.11
***************
*** 63,67 ****
          sqlBuffer.append("delete from ");
          sqlBuffer.append(DataSetUtils.getQualifiedName(
!                 schemaName, metaData.getTableName()));
  
          // where
--- 63,67 ----
          sqlBuffer.append("delete from ");
          sqlBuffer.append(DataSetUtils.getQualifiedName(
!                 schemaName, metaData.getTableName(), true));
  
          // where
***************
*** 69,73 ****
          for (int i = 0; i < primaryKeys.length; i++)
          {
!             sqlBuffer.append(primaryKeys[i].getColumnName());
              sqlBuffer.append(" = ?");
              if (i + 1 < primaryKeys.length)
--- 69,77 ----
          for (int i = 0; i < primaryKeys.length; i++)
          {
!             // escape column name
!             String columnName = DataSetUtils.getQualifiedName(null,
!                     primaryKeys[i].getColumnName(), true);
!             sqlBuffer.append(columnName);
! 
              sqlBuffer.append(" = ?");
              if (i + 1 < primaryKeys.length)

Index: InsertOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/InsertOperation.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** InsertOperation.java	13 Jun 2002 17:24:58 -0000	1.11
--- InsertOperation.java	4 Aug 2002 01:07:13 -0000	1.12
***************
*** 52,56 ****
          sqlBuffer.append("insert into ");
          sqlBuffer.append(DataSetUtils.getQualifiedName(schemaName,
!                 metaData.getTableName()));
  
          // columns
--- 52,56 ----
          sqlBuffer.append("insert into ");
          sqlBuffer.append(DataSetUtils.getQualifiedName(schemaName,
!                 metaData.getTableName(), true));
  
          // columns
***************
*** 62,66 ****
                  sqlBuffer.append(", ");
              }
!             sqlBuffer.append(columns[i].getColumnName());
          }
  
--- 62,70 ----
                  sqlBuffer.append(", ");
              }
! 
!             // escape column name
!             String columnName = DataSetUtils.getQualifiedName(null,
!                     columns[i].getColumnName(), true);
!              sqlBuffer.append(columnName);
          }
  

Index: RefreshOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/RefreshOperation.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** RefreshOperation.java	3 Aug 2002 02:26:41 -0000	1.19
--- RefreshOperation.java	4 Aug 2002 01:07:13 -0000	1.20
***************
*** 91,95 ****
          sqlBuffer.append("select COUNT(*) from ");
          sqlBuffer.append(DataSetUtils.getQualifiedName(schemaName,
!                 metaData.getTableName()));
  
          // where
--- 91,95 ----
          sqlBuffer.append("select COUNT(*) from ");
          sqlBuffer.append(DataSetUtils.getQualifiedName(schemaName,
!                 metaData.getTableName(), true));
  
          // where

Index: UpdateOperation.java
===================================================================
RCS file: /cvsroot/dbunit/dbunit/src/java/org/dbunit/operation/UpdateOperation.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** UpdateOperation.java	13 Jun 2002 17:24:58 -0000	1.8
--- UpdateOperation.java	4 Aug 2002 01:07:13 -0000	1.9
***************
*** 60,64 ****
          sqlBuffer.append("update ");
          sqlBuffer.append(DataSetUtils.getQualifiedName(schemaName,
!                 metaData.getTableName()));
  
          // set
--- 60,64 ----
          sqlBuffer.append("update ");
          sqlBuffer.append(DataSetUtils.getQualifiedName(schemaName,
!                 metaData.getTableName(), true));
  
          // set
***************
*** 79,83 ****
                  firstSet = false;
  
!                 sqlBuffer.append(column.getColumnName());
                  sqlBuffer.append(" = ?");
                  columnList.add(column);
--- 79,86 ----
                  firstSet = false;
  
!                 // escape column name
!                 String columnName = DataSetUtils.getQualifiedName(null,
!                         column.getColumnName(), true);
!                 sqlBuffer.append(columnName);
                  sqlBuffer.append(" = ?");
                  columnList.add(column);
***************
*** 95,99 ****
                  sqlBuffer.append(" and ");
              }
!             sqlBuffer.append(column.getColumnName());
              sqlBuffer.append(" = ?");
              columnList.add(column);
--- 98,106 ----
                  sqlBuffer.append(" and ");
              }
! 
!             // escape column name
!             String columnName = DataSetUtils.getQualifiedName(null,
!                     column.getColumnName(), true);
!             sqlBuffer.append(columnName);
              sqlBuffer.append(" = ?");
              columnList.add(column);