From 0d413c7e36c3f93dd8835846ed6258125776aa89 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 4 Dec 2009 17:19:47 +0000 Subject: [PATCH] reverted schema update implementation for Hibernate 3.2 compatibility (SPR-6509) --- .../hibernate3/LocalSessionFactoryBean.java | 36 +++++++------------ 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/LocalSessionFactoryBean.java b/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/LocalSessionFactoryBean.java index 23ca09e5254..07ede778ab4 100644 --- a/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/LocalSessionFactoryBean.java +++ b/org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/LocalSessionFactoryBean.java @@ -40,7 +40,6 @@ import org.hibernate.cfg.NamingStrategy; import org.hibernate.dialect.Dialect; import org.hibernate.engine.FilterDefinition; import org.hibernate.event.EventListeners; -import org.hibernate.jdbc.Work; import org.hibernate.tool.hbm2ddl.DatabaseMetadata; import org.hibernate.transaction.JTATransactionFactory; @@ -936,13 +935,10 @@ public class LocalSessionFactoryBean extends AbstractSessionFactoryBean implemen hibernateTemplate.execute( new HibernateCallback() { public Object doInHibernate(Session session) throws HibernateException, SQLException { - session.doWork(new Work() { - public void execute(Connection connection) throws SQLException { - Dialect dialect = Dialect.getDialect(getConfiguration().getProperties()); - String[] sql = getConfiguration().generateDropSchemaScript(dialect); - executeSchemaScript(connection, sql); - } - }); + Connection con = session.connection(); + Dialect dialect = Dialect.getDialect(getConfiguration().getProperties()); + String[] sql = getConfiguration().generateDropSchemaScript(dialect); + executeSchemaScript(con, sql); return null; } } @@ -968,13 +964,10 @@ public class LocalSessionFactoryBean extends AbstractSessionFactoryBean implemen hibernateTemplate.execute( new HibernateCallback() { public Object doInHibernate(Session session) throws HibernateException, SQLException { - session.doWork(new Work() { - public void execute(Connection connection) throws SQLException { - Dialect dialect = Dialect.getDialect(getConfiguration().getProperties()); - String[] sql = getConfiguration().generateSchemaCreationScript(dialect); - executeSchemaScript(connection, sql); - } - }); + Connection con = session.connection(); + Dialect dialect = Dialect.getDialect(getConfiguration().getProperties()); + String[] sql = getConfiguration().generateSchemaCreationScript(dialect); + executeSchemaScript(con, sql); return null; } } @@ -1003,14 +996,11 @@ public class LocalSessionFactoryBean extends AbstractSessionFactoryBean implemen hibernateTemplate.execute( new HibernateCallback() { public Object doInHibernate(Session session) throws HibernateException, SQLException { - session.doWork(new Work() { - public void execute(Connection connection) throws SQLException { - Dialect dialect = Dialect.getDialect(getConfiguration().getProperties()); - DatabaseMetadata metadata = new DatabaseMetadata(connection, dialect); - String[] sql = getConfiguration().generateSchemaUpdateScript(dialect, metadata); - executeSchemaScript(connection, sql); - } - }); + Connection con = session.connection(); + Dialect dialect = Dialect.getDialect(getConfiguration().getProperties()); + DatabaseMetadata metadata = new DatabaseMetadata(con, dialect); + String[] sql = getConfiguration().generateSchemaUpdateScript(dialect, metadata); + executeSchemaScript(con, sql); return null; } }