Do not quote catalog when add it to mapping

src/java/org/hibernate/cfg/reveng/MappingsDatabaseCollector.java

@@ -20,11 +20,12 @@ public Iterator iterateTables() {
 	}
 
 	public Table addTable(String schema, String catalog, String name) {
-		return mappings.addTable(quote(schema), quote(catalog), quote(name), null, false);
+		//pass catalog as it is as Table#setCatalog(catalog) doesn't do unquote
+		return mappings.addTable(quote(schema), catalog, quote(name), null, false);
 	}
 
 	public Table getTable(String schema, String catalog, String name) {
-		return mappings.getTable(quote(schema), quote(catalog), quote(name));
+		return mappings.getTable(quote(schema), catalog, quote(name));
 	}
 
 }

src/test/org/hibernate/tool/JDBCMetaDataBinderTestCase.java

@@ -71,6 +71,7 @@ protected void assertEqualIdentifiers(String expected, String actual) {
 	 */
 	protected void executeDDL(String[] sqls, boolean ignoreErrors) throws SQLException {		
 		Configuration configuration = new Configuration();
+		configure(configuration);
 		Settings testSettings = configuration.buildSettings();
 
 		if(!appliesTo( testSettings.getDialect() )) {
@@ -151,6 +152,11 @@ protected void tearDown() throws Exception {
 	/**
 	 * @param cfg2
 	 */
+	protected void configure(Configuration configuration) {
+
+
+	}
+
 	protected void configure(JDBCMetaDataConfiguration configuration) {
 
 

src/test/org/hibernate/tool/hbm2x/H2SpecialSymbolsTest.java

@@ -0,0 +1,63 @@
+/*
+ * Created on 27.03.2012
+ */
+package org.hibernate.tool.hbm2x;
+
+import java.sql.SQLException;
+
+import org.hibernate.cfg.Configuration;
+import org.hibernate.cfg.JDBCMetaDataConfiguration;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.tool.JDBCMetaDataBinderTestCase;
+import org.hibernate.tool.test.TestHelper;
+
+/**
+ * @author Dmitry Geraskov (geraskov@gmail.com)
+ *
+ */
+public class H2SpecialSymbolsTest extends JDBCMetaDataBinderTestCase {
+
+	private static final String SCHEMA = "\"TEST2.DOT\"";
+	private static final String TABLE = "\"TEST3.DOT\"";
+
+	protected String[] getCreateSQL() {
+		return new String[]{
+				"create schema " + SCHEMA,
+				"create table " + SCHEMA +'.'  + TABLE +" (ID integer not null unique, NAME varchar(255), primary key (ID), unique (ID));", 
+		};
+	}
+
+	protected String[] getDropSQL() {
+		return new String[]{
+				"drop table " + SCHEMA + '.' + TABLE,
+				"drop schema " + SCHEMA
+
+		};
+	}
+
+	protected void configure(Configuration configuration) {
+		configuration.setProperty("hibernate.connection.url", "jdbc:h2:testdb/test.dot;LOCK_MODE=0;TRACE_LEVEL_SYSTEM_OUT=2");
+	}
+
+	protected void configure(JDBCMetaDataConfiguration configuration) {
+		configure((Configuration)configuration);
+	}
+
+	public void testGenerateJava() throws SQLException, ClassNotFoundException {
+		ArtifactCollector collector = new ArtifactCollector();
+		POJOExporter exporter = new POJOExporter(cfg,getOutputDir());
+		exporter.setArtifactCollector(collector);
+		exporter.getProperties().setProperty("ejb3", "true");
+		exporter.start();
+
+		assertTrue("Can't read tables", cfg.getTableMappings().hasNext());
+		assertTrue("Nothing is generated", collector.getFileCount("java") > 0);
+
+		TestHelper.deleteDir(getOutputDir());
+	}
+
+	public boolean appliesTo(Dialect dialect) {
+		return dialect instanceof org.hibernate.dialect.H2Dialect;
+	}
+
+}

src/test/org/hibernate/tool/hbm2x/Hbm2XAllTests.java

@@ -34,7 +34,7 @@ public static Test suite() {
 		suite.addTestSuite(GenericExporterTest.class);
 		suite.addTestSuite(Hbm2JavaTest.class);		
 		//$JUnit-END$
-
+		suite.addTestSuite(H2SpecialSymbolsTest.class);
 		suite.addTestSuite(H2IdentityTest.class);
 		suite.addTestSuite(MySQLIdentityTest.class);
 		suite.addTestSuite(HSQLIdentityTest.class);