Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/collection
In directory sc8-pr-cvs1:/tmp/cvs-serv19888/net/sf/hibernate/collection
Modified Files:
CollectionPersister.java ODMGCollection.java
Log Message:
wrap all SQLExceptions fixed a bug in SchemaExport where generated foreign key constraints did not used qualified tablename for referenced table
Index: CollectionPersister.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/collection/CollectionPersister.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CollectionPersister.java 5 Jan 2003 02:11:20 -0000 1.3
--- CollectionPersister.java 14 Jan 2003 13:42:07 -0000 1.4
***************
*** 86,90 ****
! public CollectionPersister(Collection collection, DatastoreImpl datastore, String defaultSchema, SessionFactoryImplementor factory) throws MappingException, CacheException {
collectionType = collection.getType();
--- 86,90 ----
! public CollectionPersister(Collection collection, DatastoreImpl datastore, SessionFactoryImplementor factory) throws MappingException, CacheException {
collectionType = collection.getType();
***************
*** 128,137 ****
}
Table table = associatedClass.getTable();
! qualifiedTableName = table.getQualifiedName(defaultSchema);
enableJoinedFetch = OuterJoinLoader.EAGER;
}
else {
Table table = collection.getTable();
! qualifiedTableName = table.getQualifiedName(defaultSchema);
elementType = collection.getElement().getType();
span = collection.getElement().getColumnSpan();
--- 128,137 ----
}
Table table = associatedClass.getTable();
! qualifiedTableName = table.getQualifiedName( factory.getDefaultSchema() );
enableJoinedFetch = OuterJoinLoader.EAGER;
}
else {
Table table = collection.getTable();
! qualifiedTableName = table.getQualifiedName( factory.getDefaultSchema() );
elementType = collection.getElement().getType();
span = collection.getElement().getColumnSpan();
Index: ODMGCollection.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/collection/ODMGCollection.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ODMGCollection.java 5 Jan 2003 02:11:20 -0000 1.4
--- ODMGCollection.java 14 Jan 2003 13:42:08 -0000 1.5
***************
*** 2,6 ****
package net.sf.hibernate.collection;
- import java.sql.SQLException;
import java.util.Iterator;
--- 2,5 ----
***************
*** 58,64 ****
throw new QueryInvalidException( he.getMessage() );
}
- catch (SQLException sqle) {
- throw new QueryInvalidException( sqle.getMessage() );
- }
}
--- 57,60 ----
***************
*** 72,78 ****
catch (HibernateException he) {
throw new QueryInvalidException( he.getMessage() );
- }
- catch (SQLException sqle) {
- throw new QueryInvalidException( sqle.getMessage() );
}
}
--- 68,71 ----
|
