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

HHH-4608: 

- options to specify default schema/catalog name for audit tables

git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@18059 1b8cb986-b30d-0410-93ca-fae66ebed9b2
This commit is contained in:
Adam Warski 2009-11-25 08:35:22 +00:00
parent df17063144
commit 096437dec2
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditMetadataGenerator.java
View File

@ -177,9 +177,9 @@ public final class AuditMetadataGenerator {
return true;
}
private String getSchema(AuditTable auditTable, Table table) {
protected String getSchema(String schemaFromAnnotation, Table table) {
// Get the schema from the annotation ...
String schema = auditTable.schema();
String schema = schemaFromAnnotation;
// ... if empty, try using the default ...
if (StringTools.isEmpty(schema)) {
schema = globalCfg.getDefaultSchemaName();
@ -193,9 +193,9 @@ public final class AuditMetadataGenerator {
return schema;
}
private String getCatalog(AuditTable auditTable, Table table) {
protected String getCatalog(String catalogFromAnnotation, Table table) {
// Get the catalog from the annotation ...
String catalog = auditTable.catalog();
String catalog = catalogFromAnnotation;
// ... if empty, try using the default ...
if (StringTools.isEmpty(catalog)) {
catalog = globalCfg.getDefaultCatalogName();
@ -232,8 +232,8 @@ public final class AuditMetadataGenerator {
auditTableName = verEntCfg.getAuditEntityName(originalTableName);
}
String schema = getSchema(auditingData.getAuditTable(), join.getTable());
String catalog = getCatalog(auditingData.getAuditTable(), join.getTable());
String schema = getSchema(auditingData.getAuditTable().schema(), join.getTable());
String catalog = getCatalog(auditingData.getAuditTable().catalog(), join.getTable());
Element joinElement = MetadataTools.createJoin(parent, auditTableName, schema, catalog);
joinElements.put(join, joinElement);
@ -311,8 +311,8 @@ public final class AuditMetadataGenerator {
@SuppressWarnings({"unchecked"})
public void generateFirstPass(PersistentClass pc, ClassAuditingData auditingData,
EntityXmlMappingData xmlMappingData, boolean isAudited) {
String schema = getSchema(auditingData.getAuditTable(), pc.getTable());
String catalog = getCatalog(auditingData.getAuditTable(), pc.getTable());
String schema = getSchema(auditingData.getAuditTable().schema(), pc.getTable());
String catalog = getCatalog(auditingData.getAuditTable().catalog(), pc.getTable());
if (!isAudited) {
String entityName = pc.getEntityName();

6
envers/src/main/java/org/hibernate/envers/configuration/metadata/CollectionMetadataGenerator.java
View File

@ -475,10 +475,8 @@ public final class CollectionMetadataGenerator {
}
private Element createMiddleEntityXml(String auditMiddleTableName, String auditMiddleEntityName) {
String schema = StringTools.isEmpty(propertyAuditingData.getJoinTable().schema()) ?
propertyValue.getCollectionTable().getSchema() : propertyAuditingData.getJoinTable().schema();
String catalog = StringTools.isEmpty(propertyAuditingData.getJoinTable().catalog()) ?
propertyValue.getCollectionTable().getCatalog() : propertyAuditingData.getJoinTable().catalog();
String schema = mainGenerator.getSchema(propertyAuditingData.getJoinTable().schema(), propertyValue.getCollectionTable());
String catalog = mainGenerator.getCatalog(propertyAuditingData.getJoinTable().catalog(), propertyValue.getCollectionTable());
Element middleEntityXml = MetadataTools.createEntity(xmlMappingData.newAdditionalMapping(),
new AuditTableData(auditMiddleEntityName, auditMiddleTableName, schema, catalog), null);