Index: tools/src/java/org/hibernate/cfg/reveng/DefaultDatabaseCollector.java
===================================================================
--- tools/src/java/org/hibernate/cfg/reveng/DefaultDatabaseCollector.java	(revision 19569)
+++ tools/src/java/org/hibernate/cfg/reveng/DefaultDatabaseCollector.java	(working copy)
@@ -39,11 +39,24 @@
 			table.setCatalog(catalog);
 			tables.put(key, table);
 			
-			String qualifier = StringHelper.qualifier(key);
+			// The old qualifier algorithm breaks down if the key contains dots in table names, etc.
+			// Instead, build the qualifier using the known catalog and schema names.
+			// String qualifier = StringHelper.qualifier(key);
+			String qualifier = "";
+			if(catalog != null) {
+				qualifier += catalog;
+			}
+			if(schema != null) {
+				if(!qualifier.equals("")) {
+					qualifier += ".";
+				}
+				qualifier += schema;
+			}
+			
 			List schemaList = (List) qualifiers.get(qualifier);
 			if(schemaList==null) {
 				schemaList = new ArrayList();
-				qualifiers.put(qualifier, schemaList);				
+				qualifiers.put(qualifier, schemaList);			
 			}
 			schemaList.add(table);
 		}