[hibernate-commits] Hibernate SVN: r10726 - in trunk/Hibernate3/src/org/hibernate: mapping tool/hbm2ddl

Author: max.andersen(a)jboss.com Date: 2006-11-06 09:50:05 -0500 (Mon, 06 Nov 2006) New Revision: 10726 Modified: trunk/Hibernate3/src/org/hibernate/mapping/Table.java trunk/Hibernate3/src/org/hibernate/tool/hbm2ddl/DatabaseMetadata.java trunk/Hibernate3/src/org/hibernate/tool/hbm2ddl/TableMetadata.java Log: HHH-1629 schema update/validator quote handling (additional workaround for mysql) merged from branch3_2 Modified: trunk/Hibernate3/src/org/hibernate/mapping/Table.java =================================================================== --- trunk/Hibernate3/src/org/hibernate/mapping/Table.java 2006-11-06 14:35:20 UTC (rev 10725) +++ trunk/Hibernate3/src/org/hibernate/mapping/Table.java 2006-11-06 14:50:05 UTC (rev 10726) @@ -251,7 +251,7 @@ ColumnMetadata columnInfo = tableInfo.getColumnMetadata( col.getName() ); if ( columnInfo == null ) { - throw new HibernateException( "Missing column: " + col.getName() ); + throw new HibernateException( "Missing column: " + col.getName() + " in " + Table.qualify( tableInfo.getCatalog(), tableInfo.getSchema(), tableInfo.getName())); } else { final boolean typesMatch = col.getSqlType( dialect, mapping ) Modified: trunk/Hibernate3/src/org/hibernate/tool/hbm2ddl/DatabaseMetadata.java =================================================================== --- trunk/Hibernate3/src/org/hibernate/tool/hbm2ddl/DatabaseMetadata.java 2006-11-06 14:35:20 UTC (rev 10725) +++ trunk/Hibernate3/src/org/hibernate/tool/hbm2ddl/DatabaseMetadata.java 2006-11-06 14:50:05 UTC (rev 10726) @@ -60,8 +60,9 @@ try { ResultSet rs = null; try { - - if ( (isQuoted && meta.storesUpperCaseQuotedIdentifiers()) + if ( (isQuoted && meta.storesMixedCaseQuotedIdentifiers())) { + rs = meta.getTables(catalog, schema, name, TYPES); + } else if ( (isQuoted && meta.storesUpperCaseQuotedIdentifiers()) || (!isQuoted && meta.storesUpperCaseIdentifiers() )) { rs = meta.getTables( StringHelper.toUpperCase(catalog), Modified: trunk/Hibernate3/src/org/hibernate/tool/hbm2ddl/TableMetadata.java =================================================================== --- trunk/Hibernate3/src/org/hibernate/tool/hbm2ddl/TableMetadata.java 2006-11-06 14:35:20 UTC (rev 10725) +++ trunk/Hibernate3/src/org/hibernate/tool/hbm2ddl/TableMetadata.java 2006-11-06 14:50:05 UTC (rev 10726) @@ -48,6 +48,14 @@ return name; } + public String getCatalog() { + return catalog; + } + + public String getSchema() { + return schema; + } + public String toString() { return "TableMetadata(" + name + ')'; }