root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

reverted schema update implementation for Hibernate 3.2 compatibility (SPR-6509)

This commit is contained in:
Juergen Hoeller 2009-12-04 17:19:47 +00:00
parent 604a9f077d
commit 0d413c7e36
1 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
org.springframework.orm/src/main/java/org/springframework/orm/hibernate3/LocalSessionFactoryBean.java
View File

@ -40,7 +40,6 @@ import org.hibernate.cfg.NamingStrategy;
import org.hibernate.dialect.Dialect; import org.hibernate.dialect.Dialect;
import org.hibernate.engine.FilterDefinition; import org.hibernate.engine.FilterDefinition;
import org.hibernate.event.EventListeners; import org.hibernate.event.EventListeners;
import org.hibernate.jdbc.Work;
import org.hibernate.tool.hbm2ddl.DatabaseMetadata; import org.hibernate.tool.hbm2ddl.DatabaseMetadata;
import org.hibernate.transaction.JTATransactionFactory; import org.hibernate.transaction.JTATransactionFactory;
@ -936,13 +935,10 @@ public class LocalSessionFactoryBean extends AbstractSessionFactoryBean implemen
hibernateTemplate.execute( hibernateTemplate.execute(
new HibernateCallback<Object>() { new HibernateCallback<Object>() {
public Object doInHibernate(Session session) throws HibernateException, SQLException { public Object doInHibernate(Session session) throws HibernateException, SQLException {
session.doWork(new Work() { Connection con = session.connection();
public void execute(Connection connection) throws SQLException { Dialect dialect = Dialect.getDialect(getConfiguration().getProperties());
Dialect dialect = Dialect.getDialect(getConfiguration().getProperties()); String[] sql = getConfiguration().generateDropSchemaScript(dialect);
String[] sql = getConfiguration().generateDropSchemaScript(dialect); executeSchemaScript(con, sql);
executeSchemaScript(connection, sql);
}
});
return null; return null;
} }
} }
@ -968,13 +964,10 @@ public class LocalSessionFactoryBean extends AbstractSessionFactoryBean implemen
hibernateTemplate.execute( hibernateTemplate.execute(
new HibernateCallback<Object>() { new HibernateCallback<Object>() {
public Object doInHibernate(Session session) throws HibernateException, SQLException { public Object doInHibernate(Session session) throws HibernateException, SQLException {
session.doWork(new Work() { Connection con = session.connection();
public void execute(Connection connection) throws SQLException { Dialect dialect = Dialect.getDialect(getConfiguration().getProperties());
Dialect dialect = Dialect.getDialect(getConfiguration().getProperties()); String[] sql = getConfiguration().generateSchemaCreationScript(dialect);
String[] sql = getConfiguration().generateSchemaCreationScript(dialect); executeSchemaScript(con, sql);
executeSchemaScript(connection, sql);
}
});
return null; return null;
} }
} }
@ -1003,14 +996,11 @@ public class LocalSessionFactoryBean extends AbstractSessionFactoryBean implemen
hibernateTemplate.execute( hibernateTemplate.execute(
new HibernateCallback<Object>() { new HibernateCallback<Object>() {
public Object doInHibernate(Session session) throws HibernateException, SQLException { public Object doInHibernate(Session session) throws HibernateException, SQLException {
session.doWork(new Work() { Connection con = session.connection();
public void execute(Connection connection) throws SQLException { Dialect dialect = Dialect.getDialect(getConfiguration().getProperties());
Dialect dialect = Dialect.getDialect(getConfiguration().getProperties()); DatabaseMetadata metadata = new DatabaseMetadata(con, dialect);
DatabaseMetadata metadata = new DatabaseMetadata(connection, dialect); String[] sql = getConfiguration().generateSchemaUpdateScript(dialect, metadata);
String[] sql = getConfiguration().generateSchemaUpdateScript(dialect, metadata); executeSchemaScript(con, sql);
executeSchemaScript(connection, sql);
}
});
return null; return null;
} }
} }