[hibernate-commits] Hibernate SVN: r10725 - in branches/Branch_3_2/Hibernate3/src/org/hibernate: mapping tool/hbm2ddl

[hibernate-commits at lists.jboss.org]

Author: max.andersen at jboss.com
Date: 2006-11-06 09:35:20 -0500 (Mon, 06 Nov 2006)
New Revision: 10725

Modified:
   branches/Branch_3_2/Hibernate3/src/org/hibernate/mapping/Table.java
   branches/Branch_3_2/Hibernate3/src/org/hibernate/tool/hbm2ddl/DatabaseMetadata.java
   branches/Branch_3_2/Hibernate3/src/org/hibernate/tool/hbm2ddl/TableMetadata.java
Log:
HHH-1629 schema update/validator quote handling (additional workaround for mysql)

Modified: branches/Branch_3_2/Hibernate3/src/org/hibernate/mapping/Table.java
===================================================================
--- branches/Branch_3_2/Hibernate3/src/org/hibernate/mapping/Table.java	2006-11-06 13:27:44 UTC (rev 10724)
+++ branches/Branch_3_2/Hibernate3/src/org/hibernate/mapping/Table.java	2006-11-06 14:35:20 UTC (rev 10725)
@@ -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: branches/Branch_3_2/Hibernate3/src/org/hibernate/tool/hbm2ddl/DatabaseMetadata.java
===================================================================
--- branches/Branch_3_2/Hibernate3/src/org/hibernate/tool/hbm2ddl/DatabaseMetadata.java	2006-11-06 13:27:44 UTC (rev 10724)
+++ branches/Branch_3_2/Hibernate3/src/org/hibernate/tool/hbm2ddl/DatabaseMetadata.java	2006-11-06 14:35:20 UTC (rev 10725)
@@ -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: branches/Branch_3_2/Hibernate3/src/org/hibernate/tool/hbm2ddl/TableMetadata.java
===================================================================
--- branches/Branch_3_2/Hibernate3/src/org/hibernate/tool/hbm2ddl/TableMetadata.java	2006-11-06 13:27:44 UTC (rev 10724)
+++ branches/Branch_3_2/Hibernate3/src/org/hibernate/tool/hbm2ddl/TableMetadata.java	2006-11-06 14:35:20 UTC (rev 10725)
@@ -48,6 +48,14 @@
 		return name;
 	}
 
+	public String getCatalog() {
+		return catalog;
+	}
+	
+	public String getSchema() {
+		return schema;
+	}
+	
 	public String toString() {
 		return "TableMetadata(" + name + ')';
 	}