Menu
▾
▴
[Hibernate-commits] Hibernate2/src/net/sf/hibernate/impl BatcherImpl.java,1.1.1.1,1.2 BatchingBatcher.java,1.1.1.1,1.2 CacheEntry.java,1.1.1.1,1.2 DatastoreImpl.java,1.1.1.1,1.2 FilterImpl.java,1.2,1.3 IteratorImpl.java,1.1.1.1,1.2 NonBatchingBatcher.java,1.1.1.1,1.2 QueryImpl.java,1.2,1.3 ScheduledCollectionAction.java,1.2,1.3 ScheduledCollectionRecreate.java,1.2,1.3 ScheduledCollectionRemove.java,1.2,1.3 ScheduledCollectionUpdate.java,1.2,1.3 ScheduledDeletion.java,1.1.1.1,1.2 ScheduledEntityAction.java,1.1.1.1,1.2 ScheduledInsertion.java,1.1.1.1,1.2 ScheduledUpdate.java,1.1.1.1,1.2 ScrollableResultsImpl.java,1.1.1.1,1.2 SessionFactoryImpl.java,1.2,1.3 SessionFactoryObjectFactory.java,1.1.1.1,1.2 SessionImpl.java,1.4,1.5
Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl
In directory sc8-pr-cvs1:/tmp/cvs-serv14211/src/net/sf/hibernate/impl
Modified Files:
BatcherImpl.java BatchingBatcher.java CacheEntry.java
DatastoreImpl.java FilterImpl.java IteratorImpl.java
NonBatchingBatcher.java QueryImpl.java
ScheduledCollectionAction.java
ScheduledCollectionRecreate.java
ScheduledCollectionRemove.java ScheduledCollectionUpdate.java
ScheduledDeletion.java ScheduledEntityAction.java
ScheduledInsertion.java ScheduledUpdate.java
ScrollableResultsImpl.java SessionFactoryImpl.java
SessionFactoryObjectFactory.java SessionImpl.java
Log Message:
reformatted code with beautiful, shiny, happy TABS!
improved an exception
Index: BatcherImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/BatcherImpl.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BatcherImpl.java 1 Jan 2003 13:54:44 -0000 1.1.1.1
--- BatcherImpl.java 4 Jan 2003 11:15:28 -0000 1.2
***************
*** 26,35 ****
protected final SessionImplementor session;
protected final SessionFactoryImplementor factory;
!
private PreparedStatement batchUpdate;
private String batchUpdateSQL;
!
private HashSet statementsToClose = new HashSet();
!
public BatcherImpl(SessionImplementor session) {
this.session = session;
--- 26,35 ----
protected final SessionImplementor session;
protected final SessionFactoryImplementor factory;
!
private PreparedStatement batchUpdate;
private String batchUpdateSQL;
!
private HashSet statementsToClose = new HashSet();
!
public BatcherImpl(SessionImplementor session) {
this.session = session;
***************
*** 40,44 ****
return batchUpdate;
}
!
public PreparedStatement prepareStatement(String sql) throws SQLException, HibernateException {
executeBatch();
--- 40,44 ----
return batchUpdate;
}
!
public PreparedStatement prepareStatement(String sql) throws SQLException, HibernateException {
executeBatch();
***************
*** 49,57 ****
logOpen();
PreparedStatement ps = factory.getPreparedStatement( session.connection(), sql, scrollable );
! factory.setFetchSize(ps);
statementsToClose.add(ps);
return ps;
}
!
public void closeQueryStatement(PreparedStatement ps) throws SQLException {
statementsToClose.remove(ps);
--- 49,57 ----
logOpen();
PreparedStatement ps = factory.getPreparedStatement( session.connection(), sql, scrollable );
! factory.setFetchSize(ps);
statementsToClose.add(ps);
return ps;
}
!
public void closeQueryStatement(PreparedStatement ps) throws SQLException {
statementsToClose.remove(ps);
***************
*** 59,68 ****
factory.closePreparedStatement(ps);
}
!
public void closeStatement(PreparedStatement ps) throws SQLException {
logClose();
factory.closePreparedStatement(ps);
}
!
public PreparedStatement prepareBatchStatement(String sql) throws SQLException, HibernateException {
if ( !sql.equals(batchUpdateSQL) ) {
--- 59,68 ----
factory.closePreparedStatement(ps);
}
!
public void closeStatement(PreparedStatement ps) throws SQLException {
logClose();
factory.closePreparedStatement(ps);
}
!
public PreparedStatement prepareBatchStatement(String sql) throws SQLException, HibernateException {
if ( !sql.equals(batchUpdateSQL) ) {
***************
*** 72,76 ****
return batchUpdate;
}
!
public void executeBatch() throws SQLException, HibernateException {
if (batchUpdate!=null) {
--- 72,76 ----
return batchUpdate;
}
!
public void executeBatch() throws SQLException, HibernateException {
if (batchUpdate!=null) {
***************
*** 86,90 ****
}
}
!
public void closeStatements() {
Iterator iter = statementsToClose.iterator();
--- 86,90 ----
}
}
!
public void closeStatements() {
Iterator iter = statementsToClose.iterator();
***************
*** 101,105 ****
statementsToClose.clear();
}
!
protected abstract void doExecuteBatch(PreparedStatement ps) throws SQLException, HibernateException;
--- 101,105 ----
statementsToClose.clear();
}
!
protected abstract void doExecuteBatch(PreparedStatement ps) throws SQLException, HibernateException;
***************
*** 112,117 ****
private static void logClose() {
! if ( log.isTraceEnabled() )
! open--;
}
}
--- 112,120 ----
private static void logClose() {
! if ( log.isTraceEnabled() )
! open--;
}
}
+
+
+
Index: BatchingBatcher.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/BatchingBatcher.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BatchingBatcher.java 1 Jan 2003 13:54:44 -0000 1.1.1.1
--- BatchingBatcher.java 4 Jan 2003 11:15:29 -0000 1.2
***************
*** 13,19 ****
*/
public class BatchingBatcher extends BatcherImpl {
!
private int batchSize;
!
public BatchingBatcher(SessionImplementor session) {
super(session);
--- 13,19 ----
*/
public class BatchingBatcher extends BatcherImpl {
!
private int batchSize;
!
public BatchingBatcher(SessionImplementor session) {
super(session);
***************
*** 21,25 ****
public void addToBatch(int expectedRowCount) throws SQLException, HibernateException {
!
log.trace("Adding to batch");
PreparedStatement batchUpdate = getStatement();
--- 21,25 ----
public void addToBatch(int expectedRowCount) throws SQLException, HibernateException {
!
log.trace("Adding to batch");
PreparedStatement batchUpdate = getStatement();
***************
*** 36,49 ****
catch (HibernateException he) {
closeStatement(batchUpdate);
! throw he;
}
}
!
}
protected void doExecuteBatch(PreparedStatement ps) throws SQLException, HibernateException {
! if ( log.isDebugEnabled() )
! log.debug("Executing batch size: " + batchSize );
!
try {
if (batchSize!=0) {
--- 36,49 ----
catch (HibernateException he) {
closeStatement(batchUpdate);
! throw he;
}
}
!
}
protected void doExecuteBatch(PreparedStatement ps) throws SQLException, HibernateException {
! if ( log.isDebugEnabled() )
! log.debug("Executing batch size: " + batchSize );
!
try {
if (batchSize!=0) {
***************
*** 68,73 ****
}
}
- }
--- 68,76 ----
}
}
+
+
+
+ }
Index: CacheEntry.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/CacheEntry.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** CacheEntry.java 1 Jan 2003 13:54:44 -0000 1.1.1.1
--- CacheEntry.java 4 Jan 2003 11:15:29 -0000 1.2
***************
*** 27,32 ****
}
!
! private Object[] disassemble(Object object, ClassPersister persister, SessionImplementor session) throws HibernateException {
Object[] values = persister.getPropertyValues(object);
Type[] propertyTypes = persister.getPropertyTypes();
--- 27,32 ----
}
!
! private Object[] disassemble(Object object, ClassPersister persister, SessionImplementor session) throws HibernateException {
Object[] values = persister.getPropertyValues(object);
Type[] propertyTypes = persister.getPropertyTypes();
***************
*** 35,50 ****
}
return values;
! }
!
public Object[] assemble(Object instance, Serializable id, ClassPersister persister, SessionImplementor session) throws SQLException, HibernateException {
if ( subclass!=persister.getMappedClass() ) throw new AssertionFailure("Tried to assemble a different subclass instance");
!
return assemble(state, instance, id, persister, session);
!
}
!
! private Object[] assemble(Object[] values, Object result, Serializable id, ClassPersister persister, SessionImplementor session) throws HibernateException, SQLException {
Type[] propertyTypes = persister.getPropertyTypes();
Object[] assembledProps = new Object[propertyTypes.length];
--- 35,50 ----
}
return values;
! }
!
public Object[] assemble(Object instance, Serializable id, ClassPersister persister, SessionImplementor session) throws SQLException, HibernateException {
if ( subclass!=persister.getMappedClass() ) throw new AssertionFailure("Tried to assemble a different subclass instance");
!
return assemble(state, instance, id, persister, session);
!
}
!
! private Object[] assemble(Object[] values, Object result, Serializable id, ClassPersister persister, SessionImplementor session) throws HibernateException, SQLException {
Type[] propertyTypes = persister.getPropertyTypes();
Object[] assembledProps = new Object[propertyTypes.length];
***************
*** 60,65 ****
return assembledProps;
! }
-
}
--- 60,68 ----
return assembledProps;
! }
!
}
+
+
+
Index: DatastoreImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/DatastoreImpl.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** DatastoreImpl.java 1 Jan 2003 13:55:45 -0000 1.1.1.1
--- DatastoreImpl.java 4 Jan 2003 11:15:29 -0000 1.2
***************
*** 30,34 ****
import net.sf.hibernate.dialect.Dialect;
! /**
* NOT threadsafe
*/
--- 30,34 ----
import net.sf.hibernate.dialect.Dialect;
! /**
* NOT threadsafe
*/
***************
*** 49,53 ****
return ( (Collection) collections.get(role) ).getKey().getType();
}
!
public Iterator getClassMaps() {
return classes.values().iterator();
--- 49,53 ----
return ( (Collection) collections.get(role) ).getKey().getType();
}
!
public Iterator getClassMaps() {
return classes.values().iterator();
***************
*** 57,65 ****
return collections.values().iterator();
}
!
! public Iterator getTableMaps() {
! return tables.values().iterator();
}
!
public PersistentClass getPersistentClass(Class persistentClass) {
return (PersistentClass) classes.get(persistentClass);
--- 57,65 ----
return collections.values().iterator();
}
!
! public Iterator getTableMaps() {
! return tables.values().iterator();
}
!
public PersistentClass getPersistentClass(Class persistentClass) {
return (PersistentClass) classes.get(persistentClass);
***************
*** 74,81 ****
log.error("Could not configure datastore from file: " + xmlFile, e);
throw new MappingException(e);
! }
return this;
}
!
public Datastore storeXML(String xml) throws MappingException {
if ( log.isDebugEnabled() ) log.debug("Mapping XML:\n" + xml);
--- 74,81 ----
log.error("Could not configure datastore from file: " + xmlFile, e);
throw new MappingException(e);
! }
return this;
}
!
public Datastore storeXML(String xml) throws MappingException {
if ( log.isDebugEnabled() ) log.debug("Mapping XML:\n" + xml);
***************
*** 86,90 ****
log.error("Could not configure datastore from XML", e);
throw new MappingException(e);
! }
return this;
}
--- 86,90 ----
log.error("Could not configure datastore from XML", e);
throw new MappingException(e);
! }
return this;
}
***************
*** 98,102 ****
log.error("Could not configure datastore from XML document", e);
throw new MappingException(e);
! }
return this;
}
--- 98,102 ----
log.error("Could not configure datastore from XML document", e);
throw new MappingException(e);
! }
return this;
}
***************
*** 132,136 ****
return storeInputStream(rsrc);
}
!
public Datastore storeClass(Class persistentClass) throws MappingException {
String fileName = persistentClass.getName().replace('.','/') + ".hbm.xml";
--- 132,136 ----
return storeInputStream(rsrc);
}
!
public Datastore storeClass(Class persistentClass) throws MappingException {
String fileName = persistentClass.getName().replace('.','/') + ".hbm.xml";
***************
*** 166,170 ****
log.info( "Found mapping documents in jar: " + z.getName() );
try {
! storeInputStream( jarFile.getInputStream(z) );
}
catch (MappingException me) {
--- 166,170 ----
log.info( "Found mapping documents in jar: " + z.getName() );
try {
! storeInputStream( jarFile.getInputStream(z) );
}
catch (MappingException me) {
***************
*** 179,183 ****
return this;
!
}
--- 179,183 ----
return this;
!
}
***************
*** 189,201 ****
if ( dialect.dropConstraints() ) {
! Iterator iter = getTableMaps();
! while ( iter.hasNext() ) {
! Table table = (Table)iter.next();
! Iterator subIter = table.foreignKeyIterator();
! while ( subIter.hasNext() ) {
! ForeignKey fk = (ForeignKey)subIter.next();
! script.add(fk.sqlDropString(dialect));
! }
! }
}
--- 189,201 ----
if ( dialect.dropConstraints() ) {
! Iterator iter = getTableMaps();
! while ( iter.hasNext() ) {
! Table table = (Table)iter.next();
! Iterator subIter = table.foreignKeyIterator();
! while ( subIter.hasNext() ) {
! ForeignKey fk = (ForeignKey)subIter.next();
! script.add(fk.sqlDropString(dialect));
! }
! }
}
***************
*** 208,218 ****
if (dropString!=null) script.add(dropString);
}
!
! return ArrayHelper.toStringArray(script);
}
!
public String[] generateSchemaCreationScript(Dialect dialect) throws HibernateException {
secondPassCompile();
!
ArrayList script = new ArrayList(50);
--- 208,218 ----
if (dropString!=null) script.add(dropString);
}
!
! return ArrayHelper.toStringArray(script);
}
!
public String[] generateSchemaCreationScript(Dialect dialect) throws HibernateException {
secondPassCompile();
!
ArrayList script = new ArrayList(50);
***************
*** 223,248 ****
}
! iter = getTableMaps();
! while ( iter.hasNext() ) {
! Table table = (Table) iter.next();
! Iterator subIter;
!
! if ( dialect.hasAlterTable() ) {
! subIter = table.foreignKeyIterator();
! while ( subIter.hasNext() ) {
! ForeignKey fk = (ForeignKey) subIter.next();
! script.add( fk.sqlCreateString(dialect, this) );
! }
! }
!
! subIter = table.indexIterator();
! while ( subIter.hasNext() ) {
! Index index = (Index) subIter.next();
! script.add( index.sqlCreateString(dialect, this) );
! }
! }
iter = generators.values().iterator();
! while ( iter.hasNext() )
{
String[] lines = ( (PersistentIdentifierGenerator) iter.next() ).sqlCreateStrings(dialect);
--- 223,248 ----
}
! iter = getTableMaps();
! while ( iter.hasNext() ) {
! Table table = (Table) iter.next();
! Iterator subIter;
!
! if ( dialect.hasAlterTable() ) {
! subIter = table.foreignKeyIterator();
! while ( subIter.hasNext() ) {
! ForeignKey fk = (ForeignKey) subIter.next();
! script.add( fk.sqlCreateString(dialect, this) );
! }
! }
!
! subIter = table.indexIterator();
! while ( subIter.hasNext() ) {
! Index index = (Index) subIter.next();
! script.add( index.sqlCreateString(dialect, this) );
! }
! }
iter = generators.values().iterator();
! while ( iter.hasNext() )
{
String[] lines = ( (PersistentIdentifierGenerator) iter.next() ).sqlCreateStrings(dialect);
***************
*** 252,308 ****
return ArrayHelper.toStringArray(script);
}
!
! public String[] generateSchemaUpdateScript(Dialect dialect, JdbcDatabaseInfo databaseInfo) throws HibernateException {
! secondPassCompile();
!
! ArrayList script = new ArrayList(50);
!
! Iterator iter = getTableMaps();
! while ( iter.hasNext() ) {
! Table table = (Table) iter.next();
! JdbcTableInfo tableInfo = databaseInfo.getTableInfo(table.getName());
! if (tableInfo == null) {
! script.add( table.sqlCreateString(dialect, this) );
! }
! else {
! final String sql = table.sqlAlterString(dialect, this, tableInfo);
! if (sql != null) script.add(sql);
! }
! }
!
! iter = getTableMaps();
! while (iter.hasNext()) {
! Table table = (Table)iter.next();
! JdbcTableInfo tableInfo = databaseInfo.getTableInfo(table.getName());
! Iterator subIter;
!
! if (dialect.hasAlterTable()) {
! subIter = table.foreignKeyIterator();
! while (subIter.hasNext()) {
! ForeignKey fk = (ForeignKey)subIter.next();
! if (tableInfo == null || tableInfo.getForeignKeyInfo(fk.getName())==null)
! script.add(fk.sqlCreateString(dialect, this));
! }
! }
!
! subIter = table.indexIterator();
! while (subIter.hasNext()) {
! Index index = (Index)subIter.next();
! if (tableInfo == null || tableInfo.getIndexInfo(index.getName())==null)
! script.add(index.sqlCreateString(dialect, this));
! }
! }
!
! iter = generators.values().iterator();
! while (iter.hasNext()) {
! PersistentIdentifierGenerator generator = (PersistentIdentifierGenerator)iter.next();
! if (!databaseInfo.isSequence(generator.generatorKey())) {
! String[] lines = generator.sqlCreateStrings(dialect);
! for (int i = 0; i < lines.length; i++) script.add(lines[i]);
! }
! }
!
! return ArrayHelper.toStringArray(script);
! }
// This method may be called many times!!
private void secondPassCompile() throws MappingException {
--- 252,308 ----
return ArrayHelper.toStringArray(script);
}
!
! public String[] generateSchemaUpdateScript(Dialect dialect, JdbcDatabaseInfo databaseInfo) throws HibernateException {
! secondPassCompile();
!
! ArrayList script = new ArrayList(50);
!
! Iterator iter = getTableMaps();
! while ( iter.hasNext() ) {
! Table table = (Table) iter.next();
! JdbcTableInfo tableInfo = databaseInfo.getTableInfo(table.getName());
! if (tableInfo == null) {
! script.add( table.sqlCreateString(dialect, this) );
! }
! else {
! final String sql = table.sqlAlterString(dialect, this, tableInfo);
! if (sql != null) script.add(sql);
! }
! }
!
! iter = getTableMaps();
! while (iter.hasNext()) {
! Table table = (Table)iter.next();
! JdbcTableInfo tableInfo = databaseInfo.getTableInfo(table.getName());
! Iterator subIter;
!
! if (dialect.hasAlterTable()) {
! subIter = table.foreignKeyIterator();
! while (subIter.hasNext()) {
! ForeignKey fk = (ForeignKey)subIter.next();
! if (tableInfo == null || tableInfo.getForeignKeyInfo(fk.getName())==null)
! script.add(fk.sqlCreateString(dialect, this));
! }
! }
!
! subIter = table.indexIterator();
! while (subIter.hasNext()) {
! Index index = (Index)subIter.next();
! if (tableInfo == null || tableInfo.getIndexInfo(index.getName())==null)
! script.add(index.sqlCreateString(dialect, this));
! }
! }
!
! iter = generators.values().iterator();
! while (iter.hasNext()) {
! PersistentIdentifierGenerator generator = (PersistentIdentifierGenerator)iter.next();
! if (!databaseInfo.isSequence(generator.generatorKey())) {
! String[] lines = generator.sqlCreateStrings(dialect);
! for (int i = 0; i < lines.length; i++) script.add(lines[i]);
! }
! }
!
! return ArrayHelper.toStringArray(script);
! }
// This method may be called many times!!
private void secondPassCompile() throws MappingException {
***************
*** 315,330 ****
//TODO: Somehow add the newly created foreign keys to the internal collection
! iter = getTableMaps();
while ( iter.hasNext() ) {
! Table table = (Table)iter.next();
! Iterator subIter = table.foreignKeyIterator();
! while (subIter.hasNext()) {
! ForeignKey fk = (ForeignKey)subIter.next();
! if (fk.getReferencedTable() == null) {
! PersistentClass referencedClass = (PersistentClass)classes.get(fk.getReferencedClass());
! if (referencedClass == null)
! throw new MappingException("An association refers to an unmapped class: " + fk.getReferencedClass().getName());
! fk.setReferencedTable(referencedClass.getTable());
! }
}
}
--- 315,330 ----
//TODO: Somehow add the newly created foreign keys to the internal collection
! iter = getTableMaps();
while ( iter.hasNext() ) {
! Table table = (Table)iter.next();
! Iterator subIter = table.foreignKeyIterator();
! while (subIter.hasNext()) {
! ForeignKey fk = (ForeignKey)subIter.next();
! if (fk.getReferencedTable() == null) {
! PersistentClass referencedClass = (PersistentClass)classes.get(fk.getReferencedClass());
! if (referencedClass == null)
! throw new MappingException("An association refers to an unmapped class: " + fk.getReferencedClass().getName());
! fk.setReferencedTable(referencedClass.getTable());
! }
}
}
***************
*** 343,347 ****
public void onDelete(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) {
}
!
/**
* @see net.sf.hibernate.Interceptor#onFlushDirty(Object, Object[], Object[], String[], Type[])
--- 343,347 ----
public void onDelete(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) {
}
!
/**
* @see net.sf.hibernate.Interceptor#onFlushDirty(Object, Object[], Object[], String[], Type[])
***************
*** 350,354 ****
return false;
}
!
/**
* @see net.sf.hibernate.Interceptor#onLoad(Object, Object[], String[], Type[])
--- 350,354 ----
return false;
}
!
/**
* @see net.sf.hibernate.Interceptor#onLoad(Object, Object[], String[], Type[])
***************
*** 357,361 ****
return false;
}
!
/**
* @see net.sf.hibernate.Interceptor#onSave(Object, Object[], String[], Type[])
--- 357,361 ----
return false;
}
!
/**
* @see net.sf.hibernate.Interceptor#onSave(Object, Object[], String[], Type[])
***************
*** 364,368 ****
return false;
}
!
/**
* @see net.sf.hibernate.Interceptor#onPostFlush(Object, Serializable, Object[], String[], Type[])
--- 364,368 ----
return false;
}
!
/**
* @see net.sf.hibernate.Interceptor#onPostFlush(Object, Serializable, Object[], String[], Type[])
***************
*** 370,374 ****
public void onPostFlush(Object entity, Serializable id, Object[] currentState, String[] propertyNames, Type[] types) {
}
!
/**
* @see net.sf.hibernate.Interceptor#postFlush(Iterator)
--- 370,374 ----
public void onPostFlush(Object entity, Serializable id, Object[] currentState, String[] propertyNames, Type[] types) {
}
!
/**
* @see net.sf.hibernate.Interceptor#postFlush(Iterator)
***************
*** 376,380 ****
public void postFlush(Iterator entities) {
}
!
/**
* @see net.sf.hibernate.Interceptor#preFlush(Iterator)
--- 376,380 ----
public void postFlush(Iterator entities) {
}
!
/**
* @see net.sf.hibernate.Interceptor#preFlush(Iterator)
***************
*** 382,386 ****
public void preFlush(Iterator entities) {
}
!
}
--- 382,386 ----
public void preFlush(Iterator entities) {
}
!
}
***************
*** 397,401 ****
return new SessionFactoryImpl(this, Environment.getProperties(), interceptor);
}
!
public SessionFactory buildSessionFactory(Properties connectionProps, Interceptor interceptor) throws HibernateException {
secondPassCompile();
--- 397,401 ----
return new SessionFactoryImpl(this, Environment.getProperties(), interceptor);
}
!
public SessionFactory buildSessionFactory(Properties connectionProps, Interceptor interceptor) throws HibernateException {
secondPassCompile();
***************
*** 403,406 ****
return new SessionFactoryImpl(this, connectionProps, interceptor);
}
!
}
--- 403,409 ----
return new SessionFactoryImpl(this, connectionProps, interceptor);
}
!
}
+
+
+
Index: FilterImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/FilterImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FilterImpl.java 3 Jan 2003 13:36:01 -0000 1.2
--- FilterImpl.java 4 Jan 2003 11:15:29 -0000 1.3
***************
*** 16,20 ****
private Object collection;
!
public FilterImpl(String queryString, Object collection, SessionImplementor session) {
super(queryString, session);
--- 16,20 ----
private Object collection;
!
public FilterImpl(String queryString, Object collection, SessionImplementor session) {
super(queryString, session);
***************
*** 22,26 ****
}
!
/**
* @see net.sf.hibernate.Query#iterate()
--- 22,26 ----
}
!
/**
* @see net.sf.hibernate.Query#iterate()
***************
*** 31,35 ****
return getSession().iterateFilter(collection, getQueryString(), getValues().toArray(), (Type[]) getTypes().toArray(NO_TYPES), getSelection(), getNamedParams() );
}
!
/**
* @see net.sf.hibernate.Query#list()
--- 31,35 ----
return getSession().iterateFilter(collection, getQueryString(), getValues().toArray(), (Type[]) getTypes().toArray(NO_TYPES), getSelection(), getNamedParams() );
}
!
/**
* @see net.sf.hibernate.Query#list()
***************
*** 40,44 ****
return getSession().filter(collection, getQueryString(), getValues().toArray(), (Type[]) getTypes().toArray(NO_TYPES), getSelection(), getNamedParams() );
}
!
/**
* @see net.sf.hibernate.Query#scroll()
--- 40,44 ----
return getSession().filter(collection, getQueryString(), getValues().toArray(), (Type[]) getTypes().toArray(NO_TYPES), getSelection(), getNamedParams() );
}
!
/**
* @see net.sf.hibernate.Query#scroll()
***************
*** 47,50 ****
throw new UnsupportedOperationException("Can't scroll filters");
}
!
}
--- 47,53 ----
throw new UnsupportedOperationException("Can't scroll filters");
}
!
}
+
+
+
Index: IteratorImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/IteratorImpl.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** IteratorImpl.java 1 Jan 2003 13:55:45 -0000 1.1.1.1
--- IteratorImpl.java 4 Jan 2003 11:15:29 -0000 1.2
***************
*** 16,22 ****
public final class IteratorImpl implements Iterator {
!
private static final Log log = LogFactory.getLog(IteratorImpl.class);
!
private final ResultSet rs;
private final SessionImplementor sess;
--- 16,22 ----
public final class IteratorImpl implements Iterator {
!
private static final Log log = LogFactory.getLog(IteratorImpl.class);
!
private final ResultSet rs;
private final SessionImplementor sess;
***************
*** 28,34 ****
private final String[][] names;
! public IteratorImpl(ResultSet rs, SessionImplementor sess, Type[] types, String[][] columnNames)
! throws HibernateException, SQLException {
!
this.rs=rs;
this.sess = sess;
--- 28,34 ----
private final String[][] names;
! public IteratorImpl(ResultSet rs, SessionImplementor sess, Type[] types, String[][] columnNames)
! throws HibernateException, SQLException {
!
this.rs=rs;
this.sess = sess;
***************
*** 36,40 ****
this.names = columnNames;
! single = types.length==1;
postNext( rs.next() );
--- 36,40 ----
this.names = columnNames;
! single = types.length==1;
postNext( rs.next() );
***************
*** 54,62 ****
}
}
!
public boolean hasNext() {
return hasNext;
}
!
public Object next() {
if ( nextResults==null ) throw new NoSuchElementException("No more results");
--- 54,62 ----
}
}
!
public boolean hasNext() {
return hasNext;
}
!
public Object next() {
if ( nextResults==null ) throw new NoSuchElementException("No more results");
***************
*** 76,80 ****
}
}
!
public void remove() {
if (!single) throw new UnsupportedOperationException("Not a single column hibernate query result set");
--- 76,80 ----
}
}
!
public void remove() {
if (!single) throw new UnsupportedOperationException("Not a single column hibernate query result set");
***************
*** 86,92 ****
log.error("could not remove", sqle);
throw new LazyInitializationException(sqle);
! }
}
!
}
--- 86,95 ----
log.error("could not remove", sqle);
throw new LazyInitializationException(sqle);
! }
}
!
}
+
+
+
Index: NonBatchingBatcher.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/NonBatchingBatcher.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** NonBatchingBatcher.java 1 Jan 2003 13:55:45 -0000 1.1.1.1
--- NonBatchingBatcher.java 4 Jan 2003 11:15:29 -0000 1.2
***************
*** 16,29 ****
super(session);
}
!
public void addToBatch(int expectedRowCount) throws SQLException, HibernateException {
int rowCount = getStatement().executeUpdate();
//negative expected row count means we don't know how many rows to expect
! if ( expectedRowCount>0 && expectedRowCount!=rowCount )
! throw new HibernateException("SQL update or deletion failed (row not found)");
}
protected void doExecuteBatch(PreparedStatement ps) throws SQLException, HibernateException {
}
!
}
--- 16,32 ----
super(session);
}
!
public void addToBatch(int expectedRowCount) throws SQLException, HibernateException {
int rowCount = getStatement().executeUpdate();
//negative expected row count means we don't know how many rows to expect
! if ( expectedRowCount>0 && expectedRowCount!=rowCount )
! throw new HibernateException("SQL update or deletion failed (row not found)");
}
protected void doExecuteBatch(PreparedStatement ps) throws SQLException, HibernateException {
}
!
}
+
+
+
Index: QueryImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/QueryImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** QueryImpl.java 3 Jan 2003 13:36:01 -0000 1.2
--- QueryImpl.java 4 Jan 2003 11:15:29 -0000 1.3
***************
*** 34,38 ****
private final SessionImplementor session;
private String queryString;
!
private RowSelection selection;
private ArrayList values = new ArrayList(4);
--- 34,38 ----
private final SessionImplementor session;
private String queryString;
!
private RowSelection selection;
private ArrayList values = new ArrayList(4);
***************
*** 51,63 ****
return session.iterate(queryString, values.toArray(), (Type[]) types.toArray(NO_TYPES), selection, namedParams);
}
!
public ScrollableResults scroll() throws SQLException, HibernateException {
return session.scroll(queryString, values.toArray(), (Type[]) types.toArray(NO_TYPES), selection, namedParams);
}
!
public List list() throws SQLException, HibernateException {
return session.find(queryString, values.toArray(), (Type[]) types.toArray(NO_TYPES), selection, namedParams);
}
!
public void setMaxResults(int maxResults) {
selection.setMaxRows(new Integer(maxResults));
--- 51,63 ----
return session.iterate(queryString, values.toArray(), (Type[]) types.toArray(NO_TYPES), selection, namedParams);
}
!
public ScrollableResults scroll() throws SQLException, HibernateException {
return session.scroll(queryString, values.toArray(), (Type[]) types.toArray(NO_TYPES), selection, namedParams);
}
!
public List list() throws SQLException, HibernateException {
return session.find(queryString, values.toArray(), (Type[]) types.toArray(NO_TYPES), selection, namedParams);
}
!
public void setMaxResults(int maxResults) {
selection.setMaxRows(new Integer(maxResults));
***************
*** 67,75 ****
selection.setTimeout(new Integer(timeout));
}
!
public void setFirstResult(int firstResult) {
selection.setFirstRow(new Integer(firstResult));
}
!
public void setParameter(int position, Object val, Type type) {
int size = values.size();
--- 67,75 ----
selection.setTimeout(new Integer(timeout));
}
!
public void setFirstResult(int firstResult) {
selection.setFirstRow(new Integer(firstResult));
}
!
public void setParameter(int position, Object val, Type type) {
int size = values.size();
***************
*** 87,159 ****
}
}
!
public void setString(int position, String val) {
setParameter(position, val, Hibernate.STRING);
}
!
public void setCharacter(int position, char val) {
setParameter(position, new Character(val), Hibernate.CHARACTER);
}
!
public void setBoolean(int position, boolean val) {
setParameter(position, new Boolean(val), Hibernate.BOOLEAN);
}
!
public void setByte(int position, byte val) {
setParameter(position, new Byte(val), Hibernate.BYTE);
}
!
public void setShort(int position, short val) {
setParameter(position, new Short(val), Hibernate.SHORT);
}
!
public void setInteger(int position, int val) {
setParameter(position, new Integer(val), Hibernate.INTEGER);
}
!
public void setLong(int position, long val) {
setParameter(position, new Long(val), Hibernate.LONG);
}
!
public void setFloat(int position, float val) {
setParameter(position, new Float(val), Hibernate.FLOAT);
}
!
public void setDouble(int position, double val) {
setParameter(position, new Double(val), Hibernate.DOUBLE);
}
!
public void setBinary(int position, byte[] val) {
setParameter(position, val, Hibernate.BINARY);
}
!
public void setSerializable(int position, Serializable val) {
setParameter(position, val, Hibernate.SERIALIZABLE);
}
!
public void setDate(int position, Date date) {
setParameter(position, date, Hibernate.DATE);
}
!
public void setTime(int position, Date date) {
setParameter(position, date, Hibernate.TIME);
}
!
public void setTimestamp(int position, Date date) {
setParameter(position, date, Hibernate.TIMESTAMP);
}
!
public void setEntity(int position, Object val) {
setParameter( position, val, Hibernate.association( val.getClass() ) );
}
!
public void setEnum(int position, Object val) throws MappingException {
setParameter( position, val, Hibernate.enum( val.getClass() ) );
}
!
public void setLocale(int position, Locale locale) {
setParameter(position, locale, Hibernate.LOCALE);
}
!
public void setCalendar(int position, Calendar calendar) {
setParameter(position, calendar, Hibernate.CALENDAR);
--- 87,159 ----
}
}
!
public void setString(int position, String val) {
setParameter(position, val, Hibernate.STRING);
}
!
public void setCharacter(int position, char val) {
setParameter(position, new Character(val), Hibernate.CHARACTER);
}
!
public void setBoolean(int position, boolean val) {
setParameter(position, new Boolean(val), Hibernate.BOOLEAN);
}
!
public void setByte(int position, byte val) {
setParameter(position, new Byte(val), Hibernate.BYTE);
}
!
public void setShort(int position, short val) {
setParameter(position, new Short(val), Hibernate.SHORT);
}
!
public void setInteger(int position, int val) {
setParameter(position, new Integer(val), Hibernate.INTEGER);
}
!
public void setLong(int position, long val) {
setParameter(position, new Long(val), Hibernate.LONG);
}
!
public void setFloat(int position, float val) {
setParameter(position, new Float(val), Hibernate.FLOAT);
}
!
public void setDouble(int position, double val) {
setParameter(position, new Double(val), Hibernate.DOUBLE);
}
!
public void setBinary(int position, byte[] val) {
setParameter(position, val, Hibernate.BINARY);
}
!
public void setSerializable(int position, Serializable val) {
setParameter(position, val, Hibernate.SERIALIZABLE);
}
!
public void setDate(int position, Date date) {
setParameter(position, date, Hibernate.DATE);
}
!
public void setTime(int position, Date date) {
setParameter(position, date, Hibernate.TIME);
}
!
public void setTimestamp(int position, Date date) {
setParameter(position, date, Hibernate.TIMESTAMP);
}
!
public void setEntity(int position, Object val) {
setParameter( position, val, Hibernate.association( val.getClass() ) );
}
!
public void setEnum(int position, Object val) throws MappingException {
setParameter( position, val, Hibernate.enum( val.getClass() ) );
}
!
public void setLocale(int position, Locale locale) {
setParameter(position, locale, Hibernate.LOCALE);
}
!
public void setCalendar(int position, Calendar calendar) {
setParameter(position, calendar, Hibernate.CALENDAR);
***************
*** 163,167 ****
setParameter(position, calendar, Hibernate.CALENDAR_DATE);
}
!
public void setBinary(String name, byte[] val) {
setParameter(name, val, Hibernate.BINARY);
--- 163,167 ----
setParameter(position, calendar, Hibernate.CALENDAR_DATE);
}
!
public void setBinary(String name, byte[] val) {
setParameter(name, val, Hibernate.BINARY);
***************
*** 171,211 ****
setParameter(name, new Boolean(val), Hibernate.BOOLEAN);
}
!
public void setByte(String name, byte val) {
setParameter(name, new Byte(val), Hibernate.BYTE);
}
!
public void setCharacter(String name, char val) {
setParameter(name, new Character(val), Hibernate.CHARACTER);
}
!
public void setDate(String name, Date date) {
setParameter(name, date, Hibernate.DATE);
}
!
public void setDouble(String name, double val) {
setParameter(name, new Double(val), Hibernate.DOUBLE);
}
!
public void setEntity(String name, Object val) {
setParameter( name, val, Hibernate.association( val.getClass() ) );
}
!
public void setEnum(String name, Object val) throws MappingException {
setParameter( name, val, Hibernate.enum( val.getClass() ) );
}
!
public void setFloat(String name, float val) {
setParameter(name, new Float(val), Hibernate.FLOAT);
}
!
public void setInteger(String name, int val) {
setParameter(name, new Integer(val), Hibernate.INTEGER);
}
!
public void setLocale(String name, Locale locale) {
setParameter(name, locale, Hibernate.LOCALE);
}
!
public void setCalendar(String name, Calendar calendar) {
setParameter(name, calendar, Hibernate.CALENDAR);
--- 171,211 ----
setParameter(name, new Boolean(val), Hibernate.BOOLEAN);
}
!
public void setByte(String name, byte val) {
setParameter(name, new Byte(val), Hibernate.BYTE);
}
!
public void setCharacter(String name, char val) {
setParameter(name, new Character(val), Hibernate.CHARACTER);
}
!
public void setDate(String name, Date date) {
setParameter(name, date, Hibernate.DATE);
}
!
public void setDouble(String name, double val) {
setParameter(name, new Double(val), Hibernate.DOUBLE);
}
!
public void setEntity(String name, Object val) {
setParameter( name, val, Hibernate.association( val.getClass() ) );
}
!
public void setEnum(String name, Object val) throws MappingException {
setParameter( name, val, Hibernate.enum( val.getClass() ) );
}
!
public void setFloat(String name, float val) {
setParameter(name, new Float(val), Hibernate.FLOAT);
}
!
public void setInteger(String name, int val) {
setParameter(name, new Integer(val), Hibernate.INTEGER);
}
!
public void setLocale(String name, Locale locale) {
setParameter(name, locale, Hibernate.LOCALE);
}
!
public void setCalendar(String name, Calendar calendar) {
setParameter(name, calendar, Hibernate.CALENDAR);
***************
*** 215,259 ****
setParameter(name, calendar, Hibernate.CALENDAR_DATE);
}
!
public void setLong(String name, long val) {
setParameter(name, new Long(val), Hibernate.LONG);
}
!
public void setParameter(String name, Object val, Type type) {
namedParams.put(name, new TypedValue(type, val) );
}
!
public void setSerializable(String name, Serializable val) {
setParameter(name, val, Hibernate.SERIALIZABLE);
}
!
public void setShort(String name, short val) {
setParameter(name, new Short(val), Hibernate.SHORT);
}
!
public void setString(String name, String val) {
setParameter(name, val, Hibernate.STRING);
}
!
public void setTime(String name, Date date) {
setParameter(name, date, Hibernate.TIME);
}
!
public void setTimestamp(String name, Date date) {
setParameter(name, date, Hibernate.TIMESTAMP);
}
!
public void setBigDecimal(int position, BigDecimal number) {
setParameter(position, number, Hibernate.BIG_DECIMAL);
}
!
public void setBigDecimal(String name, BigDecimal number) {
setParameter(name, number, Hibernate.BIG_DECIMAL);
}
!
public void setParameter(int position, Object val) throws HibernateException {
setParameter( position, val, guessType(val) );
}
!
public void setParameter(String name, Object val) throws HibernateException {
setParameter( name, val, guessType(val) );
--- 215,259 ----
setParameter(name, calendar, Hibernate.CALENDAR_DATE);
}
!
public void setLong(String name, long val) {
setParameter(name, new Long(val), Hibernate.LONG);
}
!
public void setParameter(String name, Object val, Type type) {
namedParams.put(name, new TypedValue(type, val) );
}
!
public void setSerializable(String name, Serializable val) {
setParameter(name, val, Hibernate.SERIALIZABLE);
}
!
public void setShort(String name, short val) {
setParameter(name, new Short(val), Hibernate.SHORT);
}
!
public void setString(String name, String val) {
setParameter(name, val, Hibernate.STRING);
}
!
public void setTime(String name, Date date) {
setParameter(name, date, Hibernate.TIME);
}
!
public void setTimestamp(String name, Date date) {
setParameter(name, date, Hibernate.TIMESTAMP);
}
!
public void setBigDecimal(int position, BigDecimal number) {
setParameter(position, number, Hibernate.BIG_DECIMAL);
}
!
public void setBigDecimal(String name, BigDecimal number) {
setParameter(name, number, Hibernate.BIG_DECIMAL);
}
!
public void setParameter(int position, Object val) throws HibernateException {
setParameter( position, val, guessType(val) );
}
!
public void setParameter(String name, Object val) throws HibernateException {
setParameter( name, val, guessType(val) );
***************
*** 280,290 ****
}
!
public Type[] getReturnTypes() throws HibernateException {
return session.getFactory().getReturnTypes(queryString);
}
!
public void setParameterList(String name, Collection vals, Type type) throws HibernateException {
!
StringBuffer list = new StringBuffer(16);
Iterator iter = vals.iterator();
--- 280,290 ----
}
!
public Type[] getReturnTypes() throws HibernateException {
return session.getFactory().getReturnTypes(queryString);
}
!
public void setParameterList(String name, Collection vals, Type type) throws HibernateException {
!
StringBuffer list = new StringBuffer(16);
Iterator iter = vals.iterator();
***************
*** 298,302 ****
queryString = StringHelper.replaceOnce( queryString, ':' + name, list.toString() );
}
!
public void setParameterList(String name, Collection vals) throws HibernateException {
setParameterList(name, vals, guessType( vals.iterator().next() ) );
--- 298,302 ----
queryString = StringHelper.replaceOnce( queryString, ':' + name, list.toString() );
}
!
public void setParameterList(String name, Collection vals) throws HibernateException {
setParameterList(name, vals, guessType( vals.iterator().next() ) );
***************
*** 319,346 ****
}
}
!
SessionImplementor getSession() {
return session;
}
!
ArrayList getValues() {
return values;
}
!
ArrayList getTypes() {
return types;
}
!
RowSelection getSelection() {
return selection;
}
!
String getQueryString() {
return queryString;
}
!
Map getNamedParams() {
return namedParams;
}
!
}
--- 319,349 ----
}
}
!
SessionImplementor getSession() {
return session;
}
!
ArrayList getValues() {
return values;
}
!
ArrayList getTypes() {
return types;
}
!
RowSelection getSelection() {
return selection;
}
!
String getQueryString() {
return queryString;
}
!
Map getNamedParams() {
return namedParams;
}
!
}
+
+
+
Index: ScheduledCollectionAction.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/ScheduledCollectionAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ScheduledCollectionAction.java 3 Jan 2003 13:36:01 -0000 1.2
--- ScheduledCollectionAction.java 4 Jan 2003 11:15:29 -0000 1.3
***************
*** 37,40 ****
return id.hashCode();
}*/
!
}
--- 37,43 ----
return id.hashCode();
}*/
!
}
+
+
+
Index: ScheduledCollectionRecreate.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/ScheduledCollectionRecreate.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ScheduledCollectionRecreate.java 3 Jan 2003 13:36:01 -0000 1.2
--- ScheduledCollectionRecreate.java 4 Jan 2003 11:15:29 -0000 1.3
***************
*** 10,14 ****
final class ScheduledCollectionRecreate extends ScheduledCollectionAction implements SessionImpl.Executable {
!
private final PersistentCollection collection;
--- 10,14 ----
final class ScheduledCollectionRecreate extends ScheduledCollectionAction implements SessionImpl.Executable {
!
private final PersistentCollection collection;
***************
*** 22,26 ****
persister.recreate(collection, id, session);
}
!
}
--- 22,29 ----
persister.recreate(collection, id, session);
}
!
}
+
+
+
Index: ScheduledCollectionRemove.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/ScheduledCollectionRemove.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ScheduledCollectionRemove.java 3 Jan 2003 13:36:01 -0000 1.2
--- ScheduledCollectionRemove.java 4 Jan 2003 11:15:29 -0000 1.3
***************
*** 18,23 ****
persister.remove(id, session);
}
!
}
--- 18,26 ----
persister.remove(id, session);
}
!
}
+
+
+
Index: ScheduledCollectionUpdate.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/ScheduledCollectionUpdate.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ScheduledCollectionUpdate.java 3 Jan 2003 13:36:01 -0000 1.2
--- ScheduledCollectionUpdate.java 4 Jan 2003 11:15:29 -0000 1.3
***************
*** 10,14 ****
final class ScheduledCollectionUpdate extends ScheduledCollectionAction implements SessionImpl.Executable {
!
private final PersistentCollection collection;
--- 10,14 ----
final class ScheduledCollectionUpdate extends ScheduledCollectionAction implements SessionImpl.Executable {
!
private final PersistentCollection collection;
***************
*** 35,37 ****
--- 35,40 ----
}
+
+
+
Index: ScheduledDeletion.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/ScheduledDeletion.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ScheduledDeletion.java 1 Jan 2003 13:55:49 -0000 1.1.1.1
--- ScheduledDeletion.java 4 Jan 2003 11:15:29 -0000 1.2
***************
*** 23,31 ****
session.postDelete(instance);
}
!
public void afterTransactionCompletion() throws CacheException {
if ( persister.hasCache() ) persister.getCache().release(id);
}
!
}
--- 23,34 ----
session.postDelete(instance);
}
!
public void afterTransactionCompletion() throws CacheException {
if ( persister.hasCache() ) persister.getCache().release(id);
}
!
}
+
+
+
Index: ScheduledEntityAction.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/ScheduledEntityAction.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ScheduledEntityAction.java 1 Jan 2003 13:55:49 -0000 1.1.1.1
--- ScheduledEntityAction.java 4 Jan 2003 11:15:29 -0000 1.2
***************
*** 10,14 ****
public abstract class ScheduledEntityAction implements Executable {
!
protected final SessionImplementor session;
protected final Serializable id;
--- 10,14 ----
public abstract class ScheduledEntityAction implements Executable {
!
protected final SessionImplementor session;
protected final Serializable id;
***************
*** 24,28 ****
this.instance = instance;
}
!
public final Serializable[] getPropertySpaces() {
return persister.getPropertySpaces(instance);
--- 24,28 ----
this.instance = instance;
}
!
public final Serializable[] getPropertySpaces() {
return persister.getPropertySpaces(instance);
***************
*** 37,40 ****
return id.hashCode();
}*/
!
}
--- 37,43 ----
return id.hashCode();
}*/
!
}
+
+
+
Index: ScheduledInsertion.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/ScheduledInsertion.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ScheduledInsertion.java 1 Jan 2003 13:55:49 -0000 1.1.1.1
--- ScheduledInsertion.java 4 Jan 2003 11:15:29 -0000 1.2
***************
*** 11,30 ****
final class ScheduledInsertion extends ScheduledEntityAction implements SessionImpl.Executable{
private final Object[] state;
!
public ScheduledInsertion(Serializable id, Object[] state, Object instance, ClassPersister persister, SessionImplementor session) {
super(session, id, instance, persister);
this.state = state;
}
!
public void execute() throws HibernateException, SQLException {
persister.insert(id, state, instance, session);
session.postInsert(instance);
}
!
public void afterTransactionCompletion() {
//do nothing
}
- }
--- 11,33 ----
final class ScheduledInsertion extends ScheduledEntityAction implements SessionImpl.Executable{
private final Object[] state;
!
public ScheduledInsertion(Serializable id, Object[] state, Object instance, ClassPersister persister, SessionImplementor session) {
super(session, id, instance, persister);
this.state = state;
}
!
public void execute() throws HibernateException, SQLException {
persister.insert(id, state, instance, session);
session.postInsert(instance);
}
!
public void afterTransactionCompletion() {
//do nothing
}
+
+
+ }
+
Index: ScheduledUpdate.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/ScheduledUpdate.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ScheduledUpdate.java 1 Jan 2003 13:55:49 -0000 1.1.1.1
--- ScheduledUpdate.java 4 Jan 2003 11:15:29 -0000 1.2
***************
*** 11,19 ****
final class ScheduledUpdate extends ScheduledEntityAction implements SessionImpl.Executable {
!
private final Object[] fields;
private final Object lastVersion;
private final int[] dirtyFields;
!
public ScheduledUpdate(Serializable id, Object[] fields, int[] dirtyProperties, Object lastVersion, Object instance, ClassPersister persister, SessionImplementor session) {
super(session, id, instance, persister);
--- 11,19 ----
final class ScheduledUpdate extends ScheduledEntityAction implements SessionImpl.Executable {
!
private final Object[] fields;
private final Object lastVersion;
private final int[] dirtyFields;
!
public ScheduledUpdate(Serializable id, Object[] fields, int[] dirtyProperties, Object lastVersion, Object instance, ClassPersister persister, SessionImplementor session) {
super(session, id, instance, persister);
***************
*** 27,31 ****
persister.update(id, fields, dirtyFields, lastVersion, instance, session);
}
!
public void afterTransactionCompletion() throws CacheException {
if ( persister.hasCache() ) persister.getCache().release(id);
--- 27,31 ----
persister.update(id, fields, dirtyFields, lastVersion, instance, session);
}
!
public void afterTransactionCompletion() throws CacheException {
if ( persister.hasCache() ) persister.getCache().release(id);
***************
*** 33,35 ****
--- 33,38 ----
}
+
+
+
Index: ScrollableResultsImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/ScrollableResultsImpl.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ScrollableResultsImpl.java 1 Jan 2003 13:55:51 -0000 1.1.1.1
--- ScrollableResultsImpl.java 4 Jan 2003 11:15:29 -0000 1.2
***************
*** 32,36 ****
return rs.relative(i);
}
!
/**
* @see net.sf.hibernate.ScrollableResults#first()
--- 32,36 ----
return rs.relative(i);
}
!
/**
* @see net.sf.hibernate.ScrollableResults#first()
***************
*** 39,43 ****
return rs.first();
}
!
/**
* @see net.sf.hibernate.ScrollableResults#last()
--- 39,43 ----
return rs.first();
}
!
/**
* @see net.sf.hibernate.ScrollableResults#last()
***************
*** 46,50 ****
return rs.last();
}
!
/**
* @see net.sf.hibernate.ScrollableResults#advance()
--- 46,50 ----
return rs.last();
}
!
/**
* @see net.sf.hibernate.ScrollableResults#advance()
***************
*** 53,57 ****
return rs.next();
}
!
/**
* @see net.sf.hibernate.ScrollableResults#retreat()
--- 53,57 ----
return rs.next();
}
!
/**
* @see net.sf.hibernate.ScrollableResults#retreat()
***************
*** 60,64 ****
return rs.previous();
}
!
/**
* @see net.sf.hibernate.ScrollableResults#get()
--- 60,64 ----
return rs.previous();
}
!
/**
* @see net.sf.hibernate.ScrollableResults#get()
***************
*** 71,75 ****
return row;
}
!
/**
* @see net.sf.hibernate.ScrollableResults#get(int)
--- 71,75 ----
return row;
}
!
/**
* @see net.sf.hibernate.ScrollableResults#get(int)
***************
*** 78,85 ****
return types[col].nullSafeGet( rs, names[col], sess, null );
}
!
! public ScrollableResultsImpl(ResultSet rs, SessionImplementor sess, Type[] types)
! throws HibernateException, SQLException {
!
this.rs=rs;
this.sess = sess;
--- 78,85 ----
return types[col].nullSafeGet( rs, names[col], sess, null );
}
!
! public ScrollableResultsImpl(ResultSet rs, SessionImplementor sess, Type[] types)
! throws HibernateException, SQLException {
!
this.rs=rs;
this.sess = sess;
***************
*** 98,110 ****
}
!
/**
* @see net.sf.hibernate.ScrollableResults#getBigDecimal(int)
*/
public BigDecimal getBigDecimal(int col)
! throws SQLException, HibernateException {
return (BigDecimal) get(col);
}
!
/**
* @see net.sf.hibernate.ScrollableResults#getBinary(int)
--- 98,110 ----
}
!
/**
* @see net.sf.hibernate.ScrollableResults#getBigDecimal(int)
*/
public BigDecimal getBigDecimal(int col)
! throws SQLException, HibernateException {
return (BigDecimal) get(col);
}
!
/**
* @see net.sf.hibernate.ScrollableResults#getBinary(int)
***************
*** 113,131 ****
return (byte[]) get(col);
}
!
! /**
! * @see net.sf.hibernate.ScrollableResults#getBlob(int)
! */
! public Blob getBlob(int col) throws SQLException, HibernateException {
! return (Blob) get(col);
! }
!
! /**
! * @see net.sf.hibernate.ScrollableResults#getClob(int)
! */
! public Clob getClob(int col) throws SQLException, HibernateException {
! return (Clob) get(col);
! }
!
/**
* @see net.sf.hibernate.ScrollableResults#getBoolean(int)
--- 113,131 ----
return (byte[]) get(col);
}
!
! /**
! * @see net.sf.hibernate.ScrollableResults#getBlob(int)
! */
! public Blob getBlob(int col) throws SQLException, HibernateException {
! return (Blob) get(col);
! }
!
! /**
! * @see net.sf.hibernate.ScrollableResults#getClob(int)
! */
! public Clob getClob(int col) throws SQLException, HibernateException {
! return (Clob) get(col);
! }
!
/**
* @see net.sf.hibernate.ScrollableResults#getBoolean(int)
***************
*** 134,138 ****
return (Boolean) get(col);
}
!
/**
* @see net.sf.hibernate.ScrollableResults#getByte(int)
--- 134,138 ----
return (Boolean) get(col);
}
!
/**
* @see net.sf.hibernate.ScrollableResults#getByte(int)
***************
*** 141,145 ****
return (Byte) get(col);
}
!
/**
* @see net.sf.hibernate.ScrollableResults#getCharacter(int)
--- 141,145 ----
return (Byte) get(col);
}
!
/**
* @see net.sf.hibernate.ScrollableResults#getCharacter(int)
***************
*** 148,152 ****
return (Character) get(col);
}
!
/**
* @see net.sf.hibernate.ScrollableResults#getDate(int)
--- 148,152 ----
return (Character) get(col);
}
!
/**
* @see net.sf.hibernate.ScrollableResults#getDate(int)
***************
*** 155,163 ****
return (Date) get(col);
}
!
public Calendar getCalendar(int col) throws SQLException, HibernateException {
return (Calendar) get(col);
}
!
/**
* @see net.sf.hibernate.ScrollableResults#getDouble(int)
--- 155,163 ----
return (Date) get(col);
}
!
public Calendar getCalendar(int col) throws SQLException, HibernateException {
return (Calendar) get(col);
}
!
/**
* @see net.sf.hibernate.ScrollableResults#getDouble(int)
***************
*** 166,170 ****
return (Double) get(col);
}
!
/**
* @see net.sf.hibernate.ScrollableResults#getFloat(int)
--- 166,170 ----
return (Double) get(col);
}
!
/**
* @see net.sf.hibernate.ScrollableResults#getFloat(int)
***************
*** 173,177 ****
return (Float) get(col);
}
!
/**
* @see net.sf.hibernate.ScrollableResults#getInteger(int)
--- 173,177 ----
return (Float) get(col);
}
!
/**
* @see net.sf.hibernate.ScrollableResults#get...
[truncated message content] |
