[hibernate-commits] Hibernate SVN: r20855 - tools/trunk/src/java/org/hibernate/cfg/reveng/dialect.
Author: dgeraskov
Date: 2010-11-03 05:15:19 -0400 (Wed, 03 Nov 2010)
New Revision: 20855
Modified:
tools/trunk/src/java/org/hibernate/cfg/reveng/dialect/MySQLMetaDataDialect.java
Log:
JBIDE-7488
MySQLMetaDataDialect should use "catalog" as db_name, but not
"schema"
Modified: tools/trunk/src/java/org/hibernate/cfg/reveng/dialect/MySQLMetaDataDialect.java
===================================================================
---
tools/trunk/src/java/org/hibernate/cfg/reveng/dialect/MySQLMetaDataDialect.java 2010-10-28
09:14:10 UTC (rev 20854)
+++
tools/trunk/src/java/org/hibernate/cfg/reveng/dialect/MySQLMetaDataDialect.java 2010-11-03
09:15:19 UTC (rev 20855)
@@ -22,10 +22,11 @@
log.debug("geSuggestedPrimaryKeyStrategyName(" + catalog + "." +
schema + "." + table + ")");
- sql = "show table status " + (schema==null?"":" from "
+ schema + " ") + (table==null?"":" like '" + table +
"' ");
+ sql = "show table status " + (catalog==null?"":" from "
+ catalog + " ") + (table==null?"":" like '" + table +
"' ");
PreparedStatement statement = getConnection().prepareStatement( sql );
final String sc = schema;
+ final String cat = catalog;
return new ResultSetIterator(statement.executeQuery(), getSQLExceptionConverter()) {
Map element = new HashMap();
@@ -33,7 +34,7 @@
element.clear();
element.put("TABLE_NAME", tableRs.getString("NAME"));
element.put("TABLE_SCHEM", sc);
- element.put("TABLE_CAT", null);
+ element.put("TABLE_CAT", cat);
String string = tableRs.getString("AUTO_INCREMENT");
if(string==null) {