[Hibernate-commits] Hibernate/cirrus/hibernate/impl CollectionPersister.java,1.87,1.88 SessionFactoryImpl.java,1.61,1.62

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

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/impl
In directory sc8-pr-cvs1:/tmp/cvs-serv31865/hibernate/impl

Modified Files:
	CollectionPersister.java SessionFactoryImpl.java 
Log Message:
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/Hibernate/cirrus/hibernate/impl/CollectionPersister.java,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** CollectionPersister.java	1 Jan 2003 15:04:09 -0000	1.87
--- CollectionPersister.java	14 Jan 2003 13:01:08 -0000	1.88
***************
*** 2,9 ****
  package cirrus.hibernate.impl;
  
- import java.sql.*;
  import java.io.InvalidObjectException;
  import java.io.ObjectStreamException;
  import java.io.Serializable;
  import java.util.Iterator;
  import java.util.StringTokenizer;
--- 2,11 ----
  package cirrus.hibernate.impl;
  
  import java.io.InvalidObjectException;
  import java.io.ObjectStreamException;
  import java.io.Serializable;
+ import java.sql.PreparedStatement;
+ import java.sql.ResultSet;
+ import java.sql.SQLException;
  import java.util.Iterator;
  import java.util.StringTokenizer;
***************
*** 12,20 ****
  import org.apache.commons.logging.LogFactory;
  
  import cirrus.hibernate.helpers.JDBCExceptionReporter;
  import cirrus.hibernate.helpers.StringHelper;
  import cirrus.hibernate.id.IdentifierGenerator;
! import cirrus.hibernate.loader.*;
! import cirrus.hibernate.map.*;
  import cirrus.hibernate.metadata.CollectionMetadata;
  import cirrus.hibernate.type.AbstractComponentType;
--- 14,35 ----
  import org.apache.commons.logging.LogFactory;
  
+ import cirrus.hibernate.HibernateException;
+ import cirrus.hibernate.MappingException;
+ import cirrus.hibernate.cache.CacheConcurrencyStrategy;
+ import cirrus.hibernate.cache.CacheException;
+ import cirrus.hibernate.collections.PersistentCollection;
+ import cirrus.hibernate.engine.SessionFactoryImplementor;
+ import cirrus.hibernate.engine.SessionImplementor;
  import cirrus.hibernate.helpers.JDBCExceptionReporter;
  import cirrus.hibernate.helpers.StringHelper;
  import cirrus.hibernate.id.IdentifierGenerator;
! import cirrus.hibernate.loader.CollectionInitializer;
! import cirrus.hibernate.loader.CollectionLoader;
! import cirrus.hibernate.loader.OneToManyLoader;
! import cirrus.hibernate.loader.OuterJoinLoader;
! import cirrus.hibernate.map.Collection;
! import cirrus.hibernate.map.Column;
! import cirrus.hibernate.map.PersistentClass;
! import cirrus.hibernate.map.Table;
  import cirrus.hibernate.metadata.CollectionMetadata;
  import cirrus.hibernate.type.AbstractComponentType;
***************
*** 22,31 ****
  import cirrus.hibernate.type.PersistentCollectionType;
  import cirrus.hibernate.type.Type;
- import cirrus.hibernate.HibernateException;
- import cirrus.hibernate.MappingException;
- import cirrus.hibernate.cache.CacheConcurrencyStrategy;
- import cirrus.hibernate.cache.CacheException;
- import cirrus.hibernate.collections.PersistentCollection;
- import cirrus.hibernate.engine.*;
  
  /** 
--- 37,40 ----
***************
*** 81,85 ****
  
  	
! 	public CollectionPersister(Collection collection, DatastoreImpl datastore, String defaultSchema, SessionFactoryImplementor factory) throws MappingException, CacheException {
  		
  		collectionType = collection.getType();
--- 90,94 ----
  
  	
! 	public CollectionPersister(Collection collection, DatastoreImpl datastore, SessionFactoryImplementor factory) throws MappingException, CacheException {
  		
  		collectionType = collection.getType();
***************
*** 130,139 ****
  			}
  			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();
--- 139,148 ----
  			}
  			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: SessionFactoryImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/impl/SessionFactoryImpl.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** SessionFactoryImpl.java	28 Dec 2002 02:25:49 -0000	1.61
--- SessionFactoryImpl.java	14 Jan 2003 13:01:09 -0000	1.62
***************
*** 2,6 ****
  package cirrus.hibernate.impl;
  
- import java.util.HashMap;
  import java.io.FileInputStream;
  import java.io.IOException;
--- 2,5 ----
***************
*** 18,37 ****
  import java.sql.SQLException;
  import java.util.ArrayList;
  import java.util.Iterator;
  import java.util.Map;
  import java.util.Properties;
- import java.util.Collections;
  
  import javax.xml.transform.Templates;
  import javax.xml.transform.TransformerFactory;
  import javax.xml.transform.TransformerFactoryConfigurationError;
  import javax.xml.transform.stream.StreamSource;
- import javax.naming.NamingException;
- import javax.naming.Reference;
- import javax.naming.StringRefAddr;
  
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
- import org.apache.commons.collections.ReferenceMap;
  
  import cirrus.hibernate.AssertionFailure;
--- 17,37 ----
  import java.sql.SQLException;
  import java.util.ArrayList;
+ import java.util.Collections;
+ import java.util.HashMap;
  import java.util.Iterator;
  import java.util.Map;
  import java.util.Properties;
  
+ import javax.naming.NamingException;
+ import javax.naming.Reference;
+ import javax.naming.StringRefAddr;
  import javax.xml.transform.Templates;
  import javax.xml.transform.TransformerFactory;
  import javax.xml.transform.TransformerFactoryConfigurationError;
  import javax.xml.transform.stream.StreamSource;
  
+ import org.apache.commons.collections.ReferenceMap;
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
  
  import cirrus.hibernate.AssertionFailure;
***************
*** 47,51 ****
  import cirrus.hibernate.connection.ConnectionProvider;
  import cirrus.hibernate.connection.ConnectionProviderFactory;
! import cirrus.hibernate.engine.*;
  import cirrus.hibernate.helpers.JDBCExceptionReporter;
  import cirrus.hibernate.helpers.PropertiesHelper;
--- 47,51 ----
  import cirrus.hibernate.connection.ConnectionProvider;
  import cirrus.hibernate.connection.ConnectionProviderFactory;
! import cirrus.hibernate.engine.SessionFactoryImplementor;
  import cirrus.hibernate.helpers.JDBCExceptionReporter;
  import cirrus.hibernate.helpers.PropertiesHelper;
***************
*** 58,63 ****
  import cirrus.hibernate.metadata.ClassMetadata;
  import cirrus.hibernate.metadata.CollectionMetadata;
! import cirrus.hibernate.persister.*;
! import cirrus.hibernate.ps.*;
  import cirrus.hibernate.query.FilterTranslator;
  import cirrus.hibernate.query.QueryTranslator;
--- 58,66 ----
  import cirrus.hibernate.metadata.ClassMetadata;
  import cirrus.hibernate.metadata.CollectionMetadata;
! import cirrus.hibernate.persister.ClassPersister;
! import cirrus.hibernate.persister.EntityPersister;
! import cirrus.hibernate.persister.MultiTableEntityPersister;
! import cirrus.hibernate.persister.Queryable;
! import cirrus.hibernate.ps.PreparedStatementCache;
  import cirrus.hibernate.query.FilterTranslator;
  import cirrus.hibernate.query.QueryTranslator;
***************
*** 208,212 ****
  			collectionPersisters.put( 
  				map.getRole(),
! 				new CollectionPersister(map, datastore, defaultSchema, this)
  			);
  		}
--- 211,215 ----
  			collectionPersisters.put( 
  				map.getRole(),
! 				new CollectionPersister(map, datastore, this)
  			);
  		}