[Hibernate-commits] Hibernate2/src/net/sf/hibernate/sql ANSICaseFragment.java,1.2,1.3 DecodeCaseFragment.java,1.2,1.3

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

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

Modified Files:
	ANSICaseFragment.java DecodeCaseFragment.java 
Log Message:
* reworked CompositeUserType
* improved some exception handling

Index: ANSICaseFragment.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/sql/ANSICaseFragment.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ANSICaseFragment.java	15 Mar 2003 04:38:17 -0000	1.2
--- ANSICaseFragment.java	6 Apr 2003 10:11:11 -0000	1.3
***************
*** 1 ****
! //$Id$
package net.sf.hibernate.sql;

import java.util.Iterator;
import java.util.Map;
import net.sf.hibernate.util.StringHelper;
import org.apache.commons.collections.SequencedHashMap;

/**
 * Represents an SQL <tt>case when .... then .... end as ...</tt>
 */
public class ANSICaseFragment extends CaseFragment {

	private String returnColumnName;

	private Map cases = new SequencedHashMap();

	public CaseFragment setReturnColumnName(String returnColumnName) {
		this.returnColumnName = returnColumnName;
		return this;
	}

	public CaseFragment setReturnColumnName(String returnColumnName, String suffix) {
		return setReturnColumnName( new Alias(suffix).toAliasString(returnColumnName) );
	}

	public CaseFragment addWhenColumnNotNull(String alias, String columnName, String value) {
		cases.put( alias + StringHelper.DOT + columnName + " is not null", value );
		return this;
	}

	public String toFragmentString() {
		StringBuffer buf = new StringBuffer( cases.size() * 15 + 10 );

		buf.append("case");

		Iterator iter = cases.entrySet().iterator();
		while ( iter.hasNext() ) {
			Map.Entry me = (Map.Entry) iter.next();
			buf.append(" when ")
				.append( me.getKey() )
				.append(" then ")
				.append( me.getValue() );
		}

		return buf.append(" end as ")
			.append(returnColumnName)
			.toString();
	}
}
\ No newline at end of file
--- 1 ----
! //$Id$
package net.sf.hibernate.sql;

import java.util.Iterator;
import java.util.Map;
import net.sf.hibernate.util.StringHelper;
import org.apache.commons.collections.SequencedHashMap;

/**
 * Represents an SQL <tt>case when .... then .... end as ...</tt>
 */
public class ANSICaseFragment extends CaseFragment {

	private String returnColumnName;

	private Map cases = new SequencedHashMap();

	public CaseFragment setReturnColumnName(String returnColumnName) {
		this.returnColumnName = returnColumnName;
		return this;
	}

	public CaseFragment setReturnColumnName(String returnColumnName, String suffix) {
		return setReturnColumnName( new Alias(suffix).toAliasString(returnColumnName) );
	}

	public CaseFragment addWhenColumnNotNull(String alias, String columnName, String value) {
		cases.put( alias + StringHelper.DOT + columnName + " is not null", value );
		return this;
	}

	public String toFragmentString() {
		StringBuffer buf = new StringBuffer( cases.size() * 15 + 10 );

		buf.append("case");

		Iterator iter = cases.entrySet().iterator();
		while ( iter.hasNext() ) {
			Map.Entry me = (Map.Entry) iter.next();
			buf.append(" when ")
				.append( me.getKey() )
				.append(" then ")
				.append( me.getValue() );
		}
		buf.append(" end");
		
		if (returnColumnName!=null) {
			buf.append(" as ")
				.append(returnColumnName);
		}
		
		return buf.toString();
	}
}
\ No newline at end of file

Index: DecodeCaseFragment.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/sql/DecodeCaseFragment.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DecodeCaseFragment.java	15 Mar 2003 04:38:17 -0000	1.2
--- DecodeCaseFragment.java	6 Apr 2003 10:11:11 -0000	1.3
***************
*** 1 ****
! //$Id$
package net.sf.hibernate.sql;

import java.util.Iterator;
import java.util.Map;
import net.sf.hibernate.util.StringHelper;
import org.apache.commons.collections.SequencedHashMap;

/**
 * Represents an SQL <tt>decode( pkvalue, key1, 1, key2, 2, ..., 0)</tt>
 */
public class DecodeCaseFragment extends CaseFragment {

	private String returnColumnName;

	private Map cases = new SequencedHashMap();

	public CaseFragment setReturnColumnName(String returnColumnName) {
		this.returnColumnName = returnColumnName;
		return this;
	}

	public CaseFragment setReturnColumnName(String returnColumnName, String suffix) {
		return setReturnColumnName( new Alias(suffix).toAliasString(returnColumnName) );
	}

	public CaseFragment addWhenColumnNotNull(String alias, String columnName, String value) {
		cases.put( alias + StringHelper.DOT + columnName, value );
		return this;
	}

	public String toFragmentString() {
		StringBuffer buf = new StringBuffer( cases.size() * 15 + 10 );

		Iterator iter = cases.entrySet().iterator();
		while ( iter.hasNext() ) {
			Map.Entry me = (Map.Entry) iter.next();

            if (me.getValue().equals("0")) {
                buf.insert(0, me.getKey());
            } else {
                buf.append(", ")
                    .append( me.getKey() )
                    .append(", ")
                    .append( me.getValue() );
            }
		}

		return buf.insert(0, "decode (").append(",0 ) as ")
			.append(returnColumnName)
			.toString();
	}
}
\ No newline at end of file
--- 1 ----
! //$Id$
package net.sf.hibernate.sql;

import java.util.Iterator;
import java.util.Map;
import net.sf.hibernate.util.StringHelper;
import org.apache.commons.collections.SequencedHashMap;

/**
 * Represents an SQL <tt>decode( pkvalue, key1, 1, key2, 2, ..., 0)</tt>
 */
public class DecodeCaseFragment extends CaseFragment {

	private String returnColumnName;

	private Map cases = new SequencedHashMap();

	public CaseFragment setReturnColumnName(String returnColumnName) {
		this.returnColumnName = returnColumnName;
		return this;
	}

	public CaseFragment setReturnColumnName(String returnColumnName, String suffix) {
		return setReturnColumnName( new Alias(suffix).toAliasString(returnColumnName) );
	}

	public CaseFragment addWhenColumnNotNull(String alias, String columnName, String value) {
		cases.put( alias + StringHelper.DOT + columnName, value );
		return this;
	}

	public String toFragmentString() {
		StringBuffer buf = new StringBuffer( cases.size() * 15 + 10 );

		Iterator iter = cases.entrySet().iterator();
		while ( iter.hasNext() ) {
			Map.Entry me = (Map.Entry) iter.next();

            if (me.getValue().equals("0")) {
                buf.insert(0, me.getKey());
            } else {
                buf.append(", ")
                    .append( me.getKey() )
                    .append(", ")
                    .append( me.getValue() );
            }
		}

		buf.insert(0, "decode (").append(",0 )");
		if (returnColumnName!=null) {
			buf.append(" as ")
				.append(returnColumnName);
		}
		return buf.toString();
	}
}
\ No newline at end of file