Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-6482 ddl from schema export is not correctly formatted

This commit is contained in:
Strong Liu 2011-07-26 02:00:06 +08:00
parent 7529dd8e81
commit bfa4734521
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java
View File

@ -42,6 +42,7 @@ import java.util.Properties;
import org.jboss.logging.Logger; import org.jboss.logging.Logger;
import org.hibernate.HibernateException; import org.hibernate.HibernateException;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Configuration;
import org.hibernate.cfg.Environment; import org.hibernate.cfg.Environment;
@ -127,17 +128,18 @@ public class SchemaExport {
this.connectionHelper = new SuppliedConnectionProviderConnectionHelper( this.connectionHelper = new SuppliedConnectionProviderConnectionHelper(
serviceRegistry.getService( ConnectionProvider.class ) serviceRegistry.getService( ConnectionProvider.class )
); );
this.sqlStatementLogger = serviceRegistry.getService( JdbcServices.class ).getSqlStatementLogger(); JdbcServices jdbcServices = serviceRegistry.getService( JdbcServices.class );
this.sqlStatementLogger = jdbcServices.getSqlStatementLogger();
this.formatter = ( sqlStatementLogger.isFormat() ? FormatStyle.DDL : FormatStyle.NONE ).getFormatter(); this.formatter = ( sqlStatementLogger.isFormat() ? FormatStyle.DDL : FormatStyle.NONE ).getFormatter();
this.sqlExceptionHelper = serviceRegistry.getService( JdbcServices.class ).getSqlExceptionHelper(); this.sqlExceptionHelper = jdbcServices.getSqlExceptionHelper();
this.importFiles = ConfigurationHelper.getString( this.importFiles = ConfigurationHelper.getString(
Environment.HBM2DDL_IMPORT_FILES, AvailableSettings.HBM2DDL_IMPORT_FILES,
serviceRegistry.getService( ConfigurationService.class ).getSettings(), serviceRegistry.getService( ConfigurationService.class ).getSettings(),
DEFAULT_IMPORT_FILE DEFAULT_IMPORT_FILE
); );
final Dialect dialect = metadata.getServiceRegistry().getService( JdbcServices.class ).getDialect(); final Dialect dialect = jdbcServices.getDialect();
this.dropSQL = metadata.getDatabase().generateDropSchemaScript( dialect ); this.dropSQL = metadata.getDatabase().generateDropSchemaScript( dialect );
this.createSQL = metadata.getDatabase().generateSchemaCreationScript( dialect ); this.createSQL = metadata.getDatabase().generateSchemaCreationScript( dialect );
} }
@ -389,7 +391,7 @@ public class SchemaExport {
if ( delimiter != null ) { if ( delimiter != null ) {
formatted += delimiter; formatted += delimiter;
} }
sqlStatementLogger.logStatement( formatted ); sqlStatementLogger.logStatement( sqlCommand, formatter );
for ( Exporter exporter : exporters ) { for ( Exporter exporter : exporters ) {
try { try {
exporter.export( formatted ); exporter.export( formatted );