|
From: <one...@us...> - 2003-01-14 13:42:44
|
Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/engine
In directory sc8-pr-cvs1:/tmp/cvs-serv19888/net/sf/hibernate/engine
Modified Files:
Cascades.java SessionFactoryImplementor.java
SessionImplementor.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: Cascades.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/engine/Cascades.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Cascades.java 5 Jan 2003 02:11:20 -0000 1.4
--- Cascades.java 14 Jan 2003 13:42:08 -0000 1.5
***************
*** 3,7 ****
import java.io.Serializable;
- import java.sql.SQLException;
import java.util.Iterator;
--- 3,6 ----
***************
*** 39,43 ****
* cascade the action to the child object
*/
! abstract void cascade(Session session, Object child) throws SQLException, HibernateException;
/**
* Should this action be cascaded to the given (possibly uninitialized) collection?
--- 38,42 ----
* cascade the action to the child object
*/
! abstract void cascade(Session session, Object child) throws HibernateException;
/**
* Should this action be cascaded to the given (possibly uninitialized) collection?
***************
*** 50,54 ****
*/
public static final CascadingAction ACTION_DELETE = new CascadingAction() {
! void cascade(Session session, Object child) throws SQLException, HibernateException {
log.trace("cacading to delete()");
session.delete(child);
--- 49,53 ----
*/
public static final CascadingAction ACTION_DELETE = new CascadingAction() {
! void cascade(Session session, Object child) throws HibernateException {
log.trace("cacading to delete()");
session.delete(child);
***************
*** 63,67 ****
*/
public static final CascadingAction ACTION_SAVE_UPDATE = new CascadingAction() {
! void cascade(Session session, Object child) throws SQLException, HibernateException {
if (
!(child instanceof HibernateProxy) ||
--- 62,66 ----
*/
public static final CascadingAction ACTION_SAVE_UPDATE = new CascadingAction() {
! void cascade(Session session, Object child) throws HibernateException {
if (
!(child instanceof HibernateProxy) ||
***************
*** 204,208 ****
* Cascade an action to the child
*/
! private static void cascade(SessionImplementor session, Object child, Type type, CascadingAction action, int cascadeTo) throws SQLException, HibernateException {
if (child!=null) {
if ( type.isAssociationType() ) {
--- 203,207 ----
* Cascade an action to the child
*/
! private static void cascade(SessionImplementor session, Object child, Type type, CascadingAction action, int cascadeTo) throws HibernateException {
if (child!=null) {
if ( type.isAssociationType() ) {
***************
*** 264,268 ****
* Cascade an action from the parent object to all its children
*/
! public static void cascade(SessionImplementor session, ClassPersister persister, Object parent, Cascades.CascadingAction action, int cascadeTo) throws SQLException, HibernateException {
if ( persister.hasCascades() ) { // performance opt
if ( log.isTraceEnabled() ) log.trace( "processing cascades for: " + persister.getClassName() );
--- 263,267 ----
* Cascade an action from the parent object to all its children
*/
! public static void cascade(SessionImplementor session, ClassPersister persister, Object parent, Cascades.CascadingAction action, int cascadeTo) throws HibernateException {
if ( persister.hasCascades() ) { // performance opt
if ( log.isTraceEnabled() ) log.trace( "processing cascades for: " + persister.getClassName() );
Index: SessionFactoryImplementor.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/engine/SessionFactoryImplementor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SessionFactoryImplementor.java 5 Jan 2003 02:11:20 -0000 1.4
--- SessionFactoryImplementor.java 14 Jan 2003 13:42:09 -0000 1.5
***************
*** 65,73 ****
* Obtain a JDBC connection
*/
! public Connection openConnection() throws SQLException;
/**
* Release a JDBC connection
*/
! public void closeConnection(Connection conn) throws SQLException;
/**
* Get the names of all persistent classes that implement/extend the given interface/class
--- 65,73 ----
* Obtain a JDBC connection
*/
! public Connection openConnection() throws HibernateException;
/**
* Release a JDBC connection
*/
! public void closeConnection(Connection conn) throws HibernateException;
/**
* Get the names of all persistent classes that implement/extend the given interface/class
Index: SessionImplementor.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/engine/SessionImplementor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SessionImplementor.java 5 Jan 2003 02:11:20 -0000 1.4
--- SessionImplementor.java 14 Jan 2003 13:42:10 -0000 1.5
***************
*** 109,130 ****
* Execute a <tt>find()</tt> query
*/
! public List find(String query, Object[] values, Type[] types, RowSelection selection, Map namedParams) throws SQLException, HibernateException;
/**
* Execute an <tt>iterate()</tt> query
*/
! public Iterator iterate(String query, Object[] values, Type[] types, RowSelection selection, Map namedParams) throws SQLException, HibernateException;
/**
* Execute a <tt>scroll()</tt> query
*/
! public ScrollableResults scroll(String query, Object[] values, Type[] types, RowSelection selection, Map namedParams) throws SQLException, HibernateException;
/**
* Execute a filter
*/
! public List filter(Object collection, String filter, Object[] values, Type[] types, RowSelection selection, Map namedParams) throws SQLException, HibernateException;
/**
* Iterate a filter
*/
! public Iterator iterateFilter(Object collection, String filter, Object[] values, Type[] types, RowSelection selection, Map namedParams) throws SQLException, HibernateException;
/**
* Get the <tt>ClassPersister</tt> for an object
--- 109,130 ----
* Execute a <tt>find()</tt> query
*/
! public List find(String query, Object[] values, Type[] types, RowSelection selection, Map namedParams) throws HibernateException;
/**
* Execute an <tt>iterate()</tt> query
*/
! public Iterator iterate(String query, Object[] values, Type[] types, RowSelection selection, Map namedParams) throws HibernateException;
/**
* Execute a <tt>scroll()</tt> query
*/
! public ScrollableResults scroll(String query, Object[] values, Type[] types, RowSelection selection, Map namedParams) throws HibernateException;
/**
* Execute a filter
*/
! public List filter(Object collection, String filter, Object[] values, Type[] types, RowSelection selection, Map namedParams) throws HibernateException;
/**
* Iterate a filter
*/
! public Iterator iterateFilter(Object collection, String filter, Object[] values, Type[] types, RowSelection selection, Map namedParams) throws HibernateException;
/**
* Get the <tt>ClassPersister</tt> for an object
|