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

HHH-5043 Incorrect handling of hibernate.default_schema in SchemaUpdate

This commit is contained in:
Strong Liu 2012-04-14 00:32:56 +08:00
parent a334b9f0af
commit 5671de517d
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
View File

@ -1126,22 +1126,23 @@ public class Configuration implements Serializable {
Iterator iter = getTableMappings();
while ( iter.hasNext() ) {
Table table = (Table) iter.next();
String tableSchema = ( table.getSchema() == null ) ? defaultSchema : table.getSchema() ;
String tableCatalog = ( table.getCatalog() == null ) ? defaultCatalog : table.getCatalog();
if ( table.isPhysicalTable() ) {
TableMetadata tableInfo = databaseMetadata.getTableMetadata(
table.getName(),
( table.getSchema() == null ) ? defaultSchema : table.getSchema(),
( table.getCatalog() == null ) ? defaultCatalog : table.getCatalog(),
table.isQuoted()
);
tableSchema,
tableCatalog,
table.isQuoted()
);
if ( tableInfo == null ) {
script.add(
table.sqlCreateString(
dialect,
mapping,
defaultCatalog,
defaultSchema
tableCatalog,
tableSchema
)
);
}
@ -1150,8 +1151,8 @@ public class Configuration implements Serializable {
dialect,
mapping,
tableInfo,
defaultCatalog,
defaultSchema
tableCatalog,
tableSchema
);
while ( subiter.hasNext() ) {
script.add( subiter.next() );
@ -1169,12 +1170,14 @@ public class Configuration implements Serializable {
iter = getTableMappings();
while ( iter.hasNext() ) {
Table table = (Table) iter.next();
String tableSchema = ( table.getSchema() == null ) ? defaultSchema : table.getSchema() ;
String tableCatalog = ( table.getCatalog() == null ) ? defaultCatalog : table.getCatalog();
if ( table.isPhysicalTable() ) {
TableMetadata tableInfo = databaseMetadata.getTableMetadata(
table.getName(),
table.getSchema(),
table.getCatalog(),
tableSchema,
tableCatalog,
table.isQuoted()
);
@ -1195,8 +1198,8 @@ public class Configuration implements Serializable {
fk.sqlCreateString(
dialect,
mapping,
defaultCatalog,
defaultSchema
tableCatalog,
tableSchema
)
);
}
@ -1218,8 +1221,8 @@ public class Configuration implements Serializable {
index.sqlCreateString(
dialect,
mapping,
defaultCatalog,
defaultSchema
tableCatalog,
tableSchema
)
);
}