[Springframework-cvs] spring/src/org/springframework/orm/hibernate LocalSessionFactoryBean.java,1.36.4.3,1.36.4.4

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/src/org/springframework/orm/hibernate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19629/src/org/springframework/orm/hibernate

Modified Files:
      Tag: mbranch-1-2
	LocalSessionFactoryBean.java 
Log Message:
backported fixes and enhancements from 2.0 M4 (HEAD)

Index: LocalSessionFactoryBean.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/orm/hibernate/LocalSessionFactoryBean.java,v
retrieving revision 1.36.4.3
retrieving revision 1.36.4.4
diff -C2 -d -r1.36.4.3 -r1.36.4.4
*** LocalSessionFactoryBean.java	23 Feb 2006 22:37:05 -0000	1.36.4.3
--- LocalSessionFactoryBean.java	21 Apr 2006 00:13:49 -0000	1.36.4.4
***************
*** 605,609 ****
  				public Object doInHibernate(Session session) throws HibernateException, SQLException {
  					Connection con = session.connection();
! 					final Dialect dialect = Dialect.getDialect(configuration.getProperties());
  					String[] sql = configuration.generateSchemaCreationScript(dialect);
  					executeSchemaScript(con, sql);
--- 605,609 ----
  				public Object doInHibernate(Session session) throws HibernateException, SQLException {
  					Connection con = session.connection();
! 					Dialect dialect = Dialect.getDialect(configuration.getProperties());
  					String[] sql = configuration.generateSchemaCreationScript(dialect);
  					executeSchemaScript(con, sql);
***************
*** 624,633 ****
  	 * <p>Uses the SessionFactory that this bean generates for accessing a JDBC
  	 * connection to perform the script.
! 	 * @throws HibernateException in case of Hibernate initialization errors
  	 * @see #setSchemaUpdate
  	 * @see net.sf.hibernate.cfg.Configuration#generateSchemaUpdateScript
  	 * @see net.sf.hibernate.tool.hbm2ddl.SchemaUpdate
  	 */
! 	public void updateDatabaseSchema() throws HibernateException {
  		logger.info("Updating database schema for Hibernate SessionFactory");
  		HibernateTemplate hibernateTemplate = new HibernateTemplate(this.sessionFactory);
--- 624,633 ----
  	 * <p>Uses the SessionFactory that this bean generates for accessing a JDBC
  	 * connection to perform the script.
! 	 * @throws DataAccessException in case of script execution errors
  	 * @see #setSchemaUpdate
  	 * @see net.sf.hibernate.cfg.Configuration#generateSchemaUpdateScript
  	 * @see net.sf.hibernate.tool.hbm2ddl.SchemaUpdate
  	 */
! 	public void updateDatabaseSchema() throws DataAccessException {
  		logger.info("Updating database schema for Hibernate SessionFactory");
  		HibernateTemplate hibernateTemplate = new HibernateTemplate(this.sessionFactory);
***************
*** 637,641 ****
  				public Object doInHibernate(Session session) throws HibernateException, SQLException {
  					Connection con = session.connection();
! 					final Dialect dialect = Dialect.getDialect(configuration.getProperties());
  					DatabaseMetadata metadata = new DatabaseMetadata(con, dialect);
  					String[] sql = configuration.generateSchemaUpdateScript(dialect, metadata);
--- 637,641 ----
  				public Object doInHibernate(Session session) throws HibernateException, SQLException {
  					Connection con = session.connection();
! 					Dialect dialect = Dialect.getDialect(configuration.getProperties());
  					DatabaseMetadata metadata = new DatabaseMetadata(con, dialect);
  					String[] sql = configuration.generateSchemaUpdateScript(dialect, metadata);