[hibernate-commits] Hibernate SVN: r10574 - in trunk/HibernateExt/tools/src: java/org/hibernate/cfg test/org/hibernate/tool/hbm2x/query
Author: max.andersen(a)jboss.com
Date: 2006-10-12 15:45:37 -0400 (Thu, 12 Oct 2006)
New Revision: 10574
Modified:
trunk/HibernateExt/tools/src/java/org/hibernate/cfg/JDBCBinder.java
trunk/HibernateExt/tools/src/java/org/hibernate/cfg/JDBCReaderFactory.java
trunk/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/query/QueryExporterTest.java
Log:
HBX-95 create a hbmlint
Modified: trunk/HibernateExt/tools/src/java/org/hibernate/cfg/JDBCBinder.java
===================================================================
--- trunk/HibernateExt/tools/src/java/org/hibernate/cfg/JDBCBinder.java 2006-10-12
17:23:59 UTC (rev 10573)
+++ trunk/HibernateExt/tools/src/java/org/hibernate/cfg/JDBCBinder.java 2006-10-12
19:45:37 UTC (rev 10574)
@@ -102,9 +102,10 @@
/**
* Read JDBC Metadata from the database. Does not create any classes or other ORM
releated structures.
*
+ * @deprecated should use readDatabaseSchema(DatabaseCollector, catalog, schema)
* @param catalog
* @param schema
- * @return
+ * @return
* @throws SQLException
*/
public Map readDatabaseSchema(String catalog, String schema) throws SQLException {
@@ -114,7 +115,7 @@
JDBCReader reader =
JDBCReaderFactory.newJDBCReader(cfg.getProperties(),settings,revengStrategy);
DatabaseCollector dbs = new MappingsDatabaseCollector(mappings);
- dbs = reader.readDatabaseSchema(dbs, catalog, schema);
+ reader.readDatabaseSchema(dbs, catalog, schema);
return dbs.getOneToManyCandidates();
}
Modified: trunk/HibernateExt/tools/src/java/org/hibernate/cfg/JDBCReaderFactory.java
===================================================================
--- trunk/HibernateExt/tools/src/java/org/hibernate/cfg/JDBCReaderFactory.java 2006-10-12
17:23:59 UTC (rev 10573)
+++ trunk/HibernateExt/tools/src/java/org/hibernate/cfg/JDBCReaderFactory.java 2006-10-12
19:45:37 UTC (rev 10574)
@@ -10,11 +10,16 @@
final public class JDBCReaderFactory {
+
public static JDBCReader newJDBCReader(Properties cfg, Settings settings,
ReverseEngineeringStrategy revengStrategy) {
MetaDataDialect mdd = newMetaDataDialect( cfg );
+ return newJDBCReader( settings, revengStrategy, mdd );
+ }
+
+ public static JDBCReader newJDBCReader(Settings settings, ReverseEngineeringStrategy
revengStrategy, MetaDataDialect mdd) {
return new JDBCReader( mdd, settings.getConnectionProvider(), settings
.getSQLExceptionConverter(), settings.getDefaultCatalogName(),
settings.getDefaultSchemaName(), revengStrategy );
}
Modified:
trunk/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/query/QueryExporterTest.java
===================================================================
---
trunk/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/query/QueryExporterTest.java 2006-10-12
17:23:59 UTC (rev 10573)
+++
trunk/HibernateExt/tools/src/test/org/hibernate/tool/hbm2x/query/QueryExporterTest.java 2006-10-12
19:45:37 UTC (rev 10574)
@@ -53,7 +53,9 @@
queries.add("from java.lang.Object");
exporter.setQueries( queries );
- exporter.start();
+ exporter.start();
+
+ factory.close();
}
protected void tearDown() throws Exception {