[hibernate-commits] Hibernate SVN: r11147 - in branches/Branch_3_2/HibernateExt/tools/src: test/org/hibernate/tool/test/jdbc2cfg and 1 other directory.
Author: max.andersen(a)jboss.com
Date: 2007-02-03 09:00:10 -0500 (Sat, 03 Feb 2007)
New Revision: 11147
Modified:
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/JDBCReader.java
branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/OverrideBinderTest.java
Log:
HBX-866 schema-selection is not applying pattern matching
Modified:
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/JDBCReader.java
===================================================================
---
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/JDBCReader.java 2007-02-02
21:01:27 UTC (rev 11146)
+++
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/JDBCReader.java 2007-02-03
14:00:10 UTC (rev 11147)
@@ -32,6 +32,7 @@
import org.hibernate.mapping.Table;
import org.hibernate.mapping.UniqueKey;
import org.hibernate.sql.Alias;
+import org.hibernate.util.StringHelper;
public class JDBCReader {
@@ -443,7 +444,9 @@
try {
progress.startSubTask("Finding tables in " + schemaSelection);
- tableIterator = getMetaDataDialect().getTables(schemaSelection.getMatchCatalog(),
schemaSelection.getMatchSchema(), schemaSelection.getMatchTable());
+ tableIterator =
getMetaDataDialect().getTables(StringHelper.replace(schemaSelection.getMatchCatalog(),".*",
"%"),
+
StringHelper.replace(schemaSelection.getMatchSchema(),".*", "%"),
+
StringHelper.replace(schemaSelection.getMatchTable(),".*", "%"));
String[] lastQualifier = null;
String[] foundQualifier = new String[2];
Modified:
branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/OverrideBinderTest.java
===================================================================
---
branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/OverrideBinderTest.java 2007-02-02
21:01:27 UTC (rev 11146)
+++
branches/Branch_3_2/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/OverrideBinderTest.java 2007-02-03
14:00:10 UTC (rev 11147)
@@ -118,6 +118,17 @@
assertEquals("OVRTEST",ss.getMatchSchema());
assertEquals(".*",ss.getMatchTable());
+ JDBCMetaDataConfiguration configuration = new JDBCMetaDataConfiguration();
+
+ OverrideRepository ox = new OverrideRepository();
+ ox.addSchemaSelection(new SchemaSelection(null, null, "DUMMY.*"));
+ configuration.setReverseEngineeringStrategy(ox.getReverseEngineeringStrategy(new
DefaultReverseEngineeringStrategy()));
+ configuration.readFromJDBC();
+
+ Iterator tableMappings = configuration.getTableMappings();
+ Table t = (Table) tableMappings.next();
+ assertEquals(t.getName(), "DUMMY");
+ assertFalse(tableMappings.hasNext());
}