hibernate-commits Mailing List for Hibernate (Page 723)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	AbstractComponentType.java ComponentType.java 
	DynaBeanType.java ObjectType.java 
Log Message:
* fixed a bug in SQLExpression
* fixed a bug in Expression.ge()
* improved proxy handling
* fixed problems with select new
* reworked import mechanism
* added <any> mappings

Index: AbstractComponentType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/AbstractComponentType.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AbstractComponentType.java	3 Feb 2003 10:28:48 -0000	1.5
--- AbstractComponentType.java	29 Mar 2003 04:08:49 -0000	1.6
***************
*** 6,12 ****

  /** 
!  * Enables other Component-like types to hold collections
   */
- 
  public interface AbstractComponentType extends Type {
  	public Type[] getSubtypes();
--- 6,11 ----

  /** 
!  * Enables other Component-like types to hold collections and have cascades, etc.
   */
  public interface AbstractComponentType extends Type {
  	public Type[] getSubtypes();

Index: ComponentType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/ComponentType.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ComponentType.java	15 Feb 2003 08:00:55 -0000	1.8
--- ComponentType.java	29 Mar 2003 04:08:49 -0000	1.9
***************
*** 218,222 ****
  		if (optimizer!=null) {
  			try {
! 				optimizer.setPropertyValues(component,values);
  				return;
  			}
--- 218,222 ----
  		if (optimizer!=null) {
  			try {
! 				optimizer.setPropertyValues(component, values);
  				return;
  			}

Index: DynaBeanType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/DynaBeanType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DynaBeanType.java	3 Feb 2003 10:28:48 -0000	1.3
--- DynaBeanType.java	29 Mar 2003 04:08:49 -0000	1.4
***************
*** 74,79 ****
  	 * @see net.sf.hibernate.type.AbstractComponentType#getPropertyValues(java.lang.Object)
  	 */
! 	public Object[] getPropertyValues(Object component)
! 		throws HibernateException {

  		DynaBean bean = (DynaBean) component;
--- 74,78 ----
  	 * @see net.sf.hibernate.type.AbstractComponentType#getPropertyValues(java.lang.Object)
  	 */
! 	public Object[] getPropertyValues(Object component) throws HibernateException {

  		DynaBean bean = (DynaBean) component;

Index: ObjectType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/ObjectType.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ObjectType.java	19 Feb 2003 02:02:08 -0000	1.5
--- ObjectType.java	29 Mar 2003 04:08:49 -0000	1.6
***************
*** 6,10 ****
  import java.sql.ResultSet;
  import java.sql.SQLException;
- import java.sql.Types;

  import net.sf.hibernate.Hibernate;
--- 6,9 ----
***************
*** 14,21 ****
  import net.sf.hibernate.engine.SessionFactoryImplementor;
  import net.sf.hibernate.engine.SessionImplementor;
! import net.sf.hibernate.util.ReflectHelper;

  public class ObjectType extends AbstractType {

  	/**
  	 * @see net.sf.hibernate.type.Type#deepCopy(Object)
--- 13,30 ----
  import net.sf.hibernate.engine.SessionFactoryImplementor;
  import net.sf.hibernate.engine.SessionImplementor;
! import net.sf.hibernate.util.ArrayHelper;

  public class ObjectType extends AbstractType {

+ 	private Type identifierType;
+ 	
+ 	public ObjectType(Type identifierType) {
+ 		this.identifierType = identifierType; 
+ 	}
+ 	
+ 	public ObjectType() {
+ 		this(Hibernate.SERIALIZABLE);
+ 	}
+ 	
  	/**
  	 * @see net.sf.hibernate.type.Type#deepCopy(Object)
***************
*** 79,94 ****
  		//if ( names.length!=2 ) throw new HibernateException("object type mapping must specify exactly two columns");

! 		String className = (String) Hibernate.STRING.nullSafeGet( rs, names[0] );
! 		Serializable id = (Serializable) Hibernate.SERIALIZABLE.nullSafeGet( rs, names[1] );
! 		if (className==null || id==null) {
  			return null;
  		}
  		else {
! 			try {
! 				return session.load( ReflectHelper.classForName(className), id );
! 			}
! 			catch (ClassNotFoundException cnfe) {
! 				throw new HibernateException("Class not found: " + className);
! 			}
  		}
  	}
--- 88,98 ----
  		//if ( names.length!=2 ) throw new HibernateException("object type mapping must specify exactly two columns");

! 		Class clazz = (Class) Hibernate.CLASS.nullSafeGet( rs, names[0] );
! 		Serializable id = (Serializable) identifierType.nullSafeGet(rs, names[1], session, owner);
! 		if (clazz==null || id==null) {
  			return null;
  		}
  		else {
! 			return session.load(clazz, id);
  		}
  	}
***************
*** 100,113 ****
  	throws HibernateException, SQLException {

  		if (value==null) {
! 			st.setNull(index, Types.VARCHAR);
! 			st.setNull(index+1, Types.VARBINARY);
  		}
  		else {
! 			Serializable id = session.getEntityIdentifierIfNotUnsaved(value);
! 			String className = value.getClass().getName();
! 			Hibernate.STRING.nullSafeSet(st, className, index, session);
! 			Hibernate.SERIALIZABLE.nullSafeSet(st, id, index+1, session);
  		}
  	}

--- 104,120 ----
  	throws HibernateException, SQLException {

+ 		Serializable id;
+ 		Class clazz;
  		if (value==null) {
! 			id=null;
! 			clazz=null;
  		}
  		else {
! 			id = session.getEntityIdentifierIfNotUnsaved(value);
! 			clazz = value.getClass();
  		}
+ 		
+ 		Hibernate.CLASS.nullSafeSet(st, clazz, index, session);
+ 		identifierType.nullSafeSet(st, id, index+1, session);
  	}

***************
*** 119,129 ****
  	}

! 	private static final int[] SQL_TYPES = new int[] { Types.VARCHAR, Types.VARBINARY };

  	/**
  	 * @see net.sf.hibernate.type.Type#sqlTypes(Mapping)
  	 */
! 	public int[] sqlTypes(Mapping pi) throws MappingException {
! 		return SQL_TYPES;
  	}

--- 126,139 ----
  	}

! 	//private static final int[] SQL_TYPES = new int[] { Types.VARCHAR, Types.VARBINARY };

  	/**
  	 * @see net.sf.hibernate.type.Type#sqlTypes(Mapping)
  	 */
! 	public int[] sqlTypes(Mapping mapping) throws MappingException {
! 		return ArrayHelper.join( 
! 			Hibernate.CLASS.sqlTypes(mapping),
! 			identifierType.sqlTypes(mapping) 
! 		);
  	}

***************
*** 162,166 ****
  	public Serializable disassemble(Object value, SessionImplementor session)
  	throws HibernateException {
! 		return (value==null) ? null : new ObjectTypeCacheEntry( value.getClass(), session.getEntityIdentifier(value) );
  	}

--- 172,181 ----
  	public Serializable disassemble(Object value, SessionImplementor session)
  	throws HibernateException {
! 		return (value==null) ? 
! 			null : 
! 			new ObjectTypeCacheEntry( 
! 				value.getClass(), 
! 				session.getEntityIdentifier(value) 
! 			);
  	}

2002	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (22)	Nov (308)	Dec (131)
2003	Jan (369)	Feb (171)	Mar (236)	Apr (187)	May (218)	Jun (217)	Jul (127)	Aug (448)	Sep (270)	Oct (231)	Nov (422)	Dec (255)
2004	Jan (111)	Feb (73)	Mar (338)	Apr (351)	May (349)	Jun (495)	Jul (394)	Aug (1048)	Sep (499)	Oct (142)	Nov (269)	Dec (638)
2005	Jan (825)	Feb (1272)	Mar (593)	Apr (690)	May (950)	Jun (958)	Jul (767)	Aug (839)	Sep (525)	Oct (449)	Nov (585)	Dec (455)
2006	Jan (603)	Feb (656)	Mar (195)	Apr (114)	May (136)	Jun (100)	Jul (128)	Aug (68)	Sep (7)	Oct (1)	Nov (1)	Dec (8)
2007	Jan (4)	Feb (3)	Mar (8)	Apr (16)	May (5)	Jun (4)	Jul (6)	Aug (23)	Sep (15)	Oct (5)	Nov (7)	Dec (5)
2008	Jan (5)	Feb (1)	Mar (1)	Apr (5)	May (1)	Jun (1)	Jul	Aug	Sep	Oct	Nov (1)	Dec
2009	Jan	Feb	Mar	Apr	May	Jun	Jul (1)	Aug	Sep	Oct	Nov (1)	Dec
2011	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (1)
2012	Jan	Feb	Mar	Apr (1)	May	Jun (1)	Jul (1)	Aug (1)	Sep	Oct (2)	Nov (3)	Dec (2)
2013	Jan (1)	Feb	Mar (2)	Apr (1)	May	Jun	Jul (1)	Aug	Sep	Oct	Nov	Dec
2014	Jan	Feb	Mar (1)	Apr	May (2)	Jun (1)	Jul	Aug (1)	Sep (1)	Oct	Nov (1)	Dec
2015	Jan	Feb	Mar	Apr (1)	May	Jun	Jul	Aug	Sep (1)	Oct	Nov	Dec
2016	Jan	Feb	Mar (1)	Apr	May (1)	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2017	Jan (1)	Feb	Mar	Apr	May	Jun	Jul (1)	Aug	Sep	Oct	Nov	Dec

hibernate-commits Mailing List for Hibernate (Page 723)

An object relational-mapping (ORM) library for Java

hibernate-commits — CVS commits