[Hibernate-commits] Hibernate2/src/net/sf/hibernate/sql Delete.java,1.1,1.2 Update.java,1.1,1.2

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/sql
In directory sc8-pr-cvs1:/tmp/cvs-serv16387/hibernate/sql

Modified Files:
	Delete.java Update.java 
Log Message:
* code cleanups
* collection where attribute now used for collection removal

Index: Delete.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/sql/Delete.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Delete.java	20 Jan 2003 18:45:18 -0000	1.1
--- Delete.java	18 Apr 2003 05:09:51 -0000	1.2
***************
*** 12,15 ****
--- 12,16 ----
  	private String[] primaryKeyColumnNames;
  	private String versionColumnName;
+ 	private String where;
  	
  	public Delete setTableName(String tableName) {
***************
*** 25,28 ****
--- 26,33 ----
  			.append( StringHelper.join("=? and ", primaryKeyColumnNames) )
  			.append("=?");
+ 		if (where!=null) {
+ 			buf.append(" and ")
+ 				.append(where);
+ 		}
  		if (versionColumnName!=null) {
  			buf.append(" and ")
***************
*** 32,36 ****
  		return buf.toString(); 
  	}
! 
  	public Delete setPrimaryKeyColumnNames(String[] primaryKeyColumnNames) {
  		this.primaryKeyColumnNames = primaryKeyColumnNames;
--- 37,46 ----
  		return buf.toString(); 
  	}
! 	
! 	public Delete setWhere(String where) {
! 		this.where=where;
! 		return this;
! 	}
! 	
  	public Delete setPrimaryKeyColumnNames(String[] primaryKeyColumnNames) {
  		this.primaryKeyColumnNames = primaryKeyColumnNames;

Index: Update.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/sql/Update.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Update.java	20 Jan 2003 18:45:18 -0000	1.1
--- Update.java	18 Apr 2003 05:09:51 -0000	1.2
***************
*** 18,21 ****
--- 18,22 ----
  	private String primaryKeyColumnNames[];
  	private String versionColumnName;
+ 	private String where;
  	
  	private Map columns = new SequencedHashMap();
***************
*** 53,56 ****
--- 54,62 ----
  	}
  	
+ 	public Update setWhere(String where) {
+ 		this.where=where;
+ 		return this;
+ 	}
+ 	
  	public String toStatementString() {
  		StringBuffer buf = new StringBuffer( columns.size()*15 + tableName.length() + 10 );
***************
*** 69,72 ****
--- 75,82 ----
  			.append( StringHelper.join("=? and ", primaryKeyColumnNames) )
  			.append("=?");
+ 		if (where!=null) {
+ 			buf.append(" and ")
+ 				.append(where);
+ 		}
  		if (versionColumnName!=null) {
  			buf.append(" and ")