Merge branch '2.1.x' into 2.2.x

Conflicts:
	grails-hibernate/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/cfg/GrailsDomainBinder.java

Author: graemerocher

grails-hibernate/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/cfg/GrailsDomainBinder.java

@@ -1183,11 +1183,22 @@ private static void bindCollectionTable(GrailsDomainClassProperty property, Mapp
             Collection collection, Table ownerTable, String sessionFactoryBeanName) {
 
         String prefix = ownerTable.getSchema();
+        PropertyConfig config = getPropertyConfig(property);
+        JoinTable jt = config != null ? config.getJoinTable() : null;
         NamingStrategy namingStrategy = getNamingStrategy(sessionFactoryBeanName);
         String tableName = (prefix == null ? "" : prefix + '.') + namingStrategy.tableName(calculateTableForMany(property, sessionFactoryBeanName));
-
+        String schemaName = mappings.getSchemaName();
+        String catalogName = mappings.getCatalogName();
+        if(jt != null) {
+            if(jt.getSchema() != null) {
+                schemaName = jt.getSchema();
+            }
+            if(jt.getCatalog() != null) {
+                catalogName = jt.getCatalog();
+            }
+        }
         collection.setCollectionTable(mappings.addTable(
-              mappings.getSchemaName(), mappings.getCatalogName(),
+                schemaName, catalogName,
               tableName, null, false));
     }
 

grails-hibernate/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/cfg/HibernateMappingBuilder.groovy

@@ -483,6 +483,8 @@ class HibernateMappingBuilder {
                     join.name = joinArgs
                 }
                 else if (joinArgs instanceof Map) {
+                    if (joinArgs.schema) join.schema = joinArgs.remove('schema')
+                    if (joinArgs.catalog) join.catalog = joinArgs.remove('catalog')
                     if (joinArgs.name) join.name = joinArgs.remove('name')
                     if (joinArgs.key) {
                         join.key = new ColumnConfig(name:joinArgs.remove('key'))

grails-hibernate/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/cfg/JoinTable.groovy

@@ -9,6 +9,8 @@ package org.codehaus.groovy.grails.orm.hibernate.cfg
  */
 class JoinTable {
     String name
+    String catalog
+    String schema
     ColumnConfig key
     ColumnConfig column
 }

grails-test-suite-persistence/src/test/groovy/org/codehaus/groovy/grails/orm/hibernate/HibernateMappingBuilderTests.groovy

@@ -330,13 +330,15 @@ class HibernateMappingBuilderTests extends GroovyTestCase {
 
         mapping = builder.evaluate {
             columns {
-                things joinTable:[name:'foo', key:'foo_id', column:'bar_id']
+                things joinTable:[name:'foo', key:'foo_id', column:'bar_id', schema: 'foos', catalog: 'bars']
             }
         }
 
         property = mapping.getPropertyConfig('things')
         assert property?.joinTable
         assertEquals "foo", property.joinTable.name
+        assertEquals "foos", property.joinTable.schema
+        assertEquals "bars", property.joinTable.catalog
         assertEquals "foo_id", property.joinTable.key.name
         assertEquals "bar_id", property.joinTable.column.name
     }