Adding support for schema/catalog/table arguments

src/main/java/org/hibernate/forge/generate/DefaultReverseEngineeringStrategyWithSchemaSelection.java

@@ -0,0 +1,63 @@
+package org.hibernate.forge.generate;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.hibernate.cfg.reveng.DefaultReverseEngineeringStrategy;
+import org.hibernate.cfg.reveng.ReverseEngineeringStrategy;
+import org.hibernate.cfg.reveng.SchemaSelection;
+import org.hibernate.forge.common.Constants;
+import org.hibernate.util.StringHelper;
+
+/**
+ * Defines a {@link SchemaSelection} limitation on reverse engineering strategy.
+ * 
+ * @author jpereira - Linkare TI
+ * 
+ */
+public class DefaultReverseEngineeringStrategyWithSchemaSelection extends
+		DefaultReverseEngineeringStrategy {
+
+	private List<SchemaSelection> schemaSelections;
+
+	/**
+	 * Creates a new {@link ReverseEngineeringStrategy} with additional
+	 * limitations by catalog, schema and table
+	 * 
+	 * @param catalogs
+	 *            The catalogs to use ( FOO* matches any catalog named FOOX,
+	 *            FOOBAR, FOO, etc)
+	 * @param schemas
+	 *            The schemas to use ( FOO* matches any schema named FOOX,
+	 *            FOOBAR, FOO, etc)
+	 * @param tables
+	 *            The tables to use ( FOO* matches any table named FOOX, FOOBAR,
+	 *            FOO, etc)
+	 */
+	public DefaultReverseEngineeringStrategyWithSchemaSelection(
+			String catalogs, String schemas, String tables) {
+
+		String catalog = catalogs == null ? Constants.CATALOG_DEFAULT
+				: catalogs;
+		String schema = schemas == null ? Constants.SCHEMA_DEFAULT : schemas;
+		String table = tables == null ? Constants.TABLE_DEFAULT : tables;
+
+		catalog = StringHelper.replace(catalog, "*", "%");
+		schema = StringHelper.replace(schema, "*", "%");
+		table = StringHelper.replace(table, "*", "%");
+
+		SchemaSelection schemaSelection = new SchemaSelection(catalog, schema,
+				table);
+		schemaSelections = Collections.singletonList(schemaSelection);
+	}
+
+	/**
+	 * Obtains the list of schema selections (built at construct time)
+	 * 
+	 * @return The schema limitations for this reverse engineering strategy
+	 */
+	@Override
+	public List getSchemaSelections() {
+		return schemaSelections;
+	}
+}

src/main/java/org/hibernate/forge/generate/GenerateEntitiesPlugin.java

@@ -16,6 +16,7 @@
 import org.hibernate.cfg.reveng.DefaultReverseEngineeringStrategy;
 import org.hibernate.cfg.reveng.ReverseEngineeringSettings;
 import org.hibernate.cfg.reveng.ReverseEngineeringStrategy;
+import org.hibernate.cfg.reveng.TableIdentifier;
 import org.hibernate.forge.common.Constants;
 import org.hibernate.forge.common.UrlClassLoaderExecutor;
 import org.hibernate.forge.connections.ConnectionProfile;
@@ -73,7 +74,7 @@ public void generateEntities(
 	{
 		ConnectionProfile connectionProfile = buildConnectionProfile(connectionProfileName, url, user, password, dialect, driver, path);
 		JDBCMetaDataConfiguration jmdc = configureMetaData(connectionProfile);
-		jmdc.setReverseEngineeringStrategy(createReverseEngineeringStrategy(packageName, manyToMany, oneToOne, optimisticLock));
+		jmdc.setReverseEngineeringStrategy(createReverseEngineeringStrategy(packageName, manyToMany, oneToOne, optimisticLock, catalogs,schemas, tables));
 		try {
 			doReverseEngineering(connectionProfile.driver, connectionProfile.path, jmdc);
 		} catch (Throwable t) {
@@ -127,8 +128,8 @@ private ReverseEngineeringStrategy createReverseEngineeringStrategy(
 			String packageName,
 			Boolean manyToMany,
 			Boolean oneToOne,
-			Boolean optimisticLock) {
-		ReverseEngineeringStrategy strategy = new DefaultReverseEngineeringStrategy();
+			Boolean optimisticLock, String catalogs, String schemas, String tables) {
+		ReverseEngineeringStrategy strategy = new DefaultReverseEngineeringStrategyWithSchemaSelection(catalogs,schemas,tables);
 		ReverseEngineeringSettings revengsettings = 
 				new ReverseEngineeringSettings(strategy)
 					.setDefaultPackageName(determinePackageName(packageName))
@@ -176,6 +177,7 @@ public void run() {
 								Thread.currentThread().getContextClassLoader())
 								.newInstance();
 						DriverManager.registerDriver(new DelegatingDriver(jdbcDriver));
+
 						jmdc.readFromJDBC();
 						jmdc.buildMappings();
 					} catch (Exception e) {

src/test/java/org/hibernate/forge/connections/ConnectionProfileHelperTest.java

@@ -29,7 +29,7 @@ public class ConnectionProfileHelperTest
    private static final String BEANS_XML =
             "<beans>                                                            " +
             "  <alternatives>                                                   " +
-            "    <class>org.hibernate.forge.database.MockConfiguration</class>" +
+            "    <class>org.hibernate.forge.connections.MockConfiguration</class>" +
             "  </alternatives>                                                  " +
             "</beans>                                                           ";
 

src/test/java/org/hibernate/forge/connections/ConnectionProfilePluginTest.java

@@ -23,7 +23,7 @@ public class ConnectionProfilePluginTest extends AbstractShellTest {
    private static final String BEANS_XML = 
             "<beans>                                                            " +
             "  <alternatives>                                                   " +
-            "    <class>org.hibernate.forge.database.MockConnectionProfileHelper</class>" +
+            "    <class>org.hibernate.forge.connections.MockConnectionProfileHelper</class>" +
             "  </alternatives>                                                  " +
             "</beans>                                                           ";    
 

src/test/java/org/hibernate/forge/generate/GenerateEntitiesPluginTest.java

@@ -3,10 +3,17 @@
 import java.io.File;
 import java.sql.Connection;
 import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.List;
+
+import junit.framework.Assert;
 
 import org.h2.tools.Server;
 import org.hibernate.forge.connections.ConnectionProfile;
 import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.forge.project.Project;
+import org.jboss.forge.resources.DirectoryResource;
+import org.jboss.forge.resources.Resource;
 import org.jboss.forge.test.AbstractShellTest;
 import org.jboss.forge.test.MavenArtifactResolver;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
@@ -44,13 +51,183 @@ public void testH2() throws Exception {
 						+ " --pathToDriver " + resolveH2DriverJarPath()
 						+ " --url jdbc:h2:tcp://localhost/mem:test"
 						+ " --dialect org.hibernate.dialect.H2Dialect"
-						+ " --user foo" //+ " --password bar"
+						+ " --user foo" // + " --password bar"
 						+ " --entityPackage com.test.model");
 
 		server.stop();
 
 	}
 
+	@Test
+	public void testSchemaTestH2() throws Exception {
+
+		Server server = Server.createTcpServer().start();
+		Class.forName("org.h2.Driver");
+		Connection conn = DriverManager
+				.getConnection("jdbc:h2:tcp://localhost/mem:test;USER=foo;PASSWORD=bar");
+		createSampleSchemasAndTables(conn);
+
+		Project javaProject = initializeJavaProject();
+		queueInputLines("");
+		getShell().execute("project install-facet forge.spec.jpa");
+		queueInputLines("bar");
+		getShell().execute(
+				"generate-entities" + " --driver org.h2.Driver"
+						+ " --pathToDriver " + resolveH2DriverJarPath()
+						+ " --url jdbc:h2:tcp://localhost/mem:test"
+						+ " --dialect org.hibernate.dialect.H2Dialect"
+						+ " --user foo" // + " --password bar"
+						+ " --entityPackage com.test.model --schema TEST*");
+
+		DirectoryResource srcModelDir = javaProject.getProjectRoot()
+				.getChildDirectory("src/main/java/com/test/model");
+		List<Resource<?>> generatedSrcFiles = srcModelDir.listResources();
+		StringBuilder entities = new StringBuilder();
+		for (Resource<?> resource : generatedSrcFiles) {
+			entities.append(resource.getName()).append(",");
+		}
+
+		Assert.assertEquals(
+				"Generation was wrong: 5 entities were expected - current: '"
+						+ entities.toString() + "'", generatedSrcFiles.size(),
+				5);
+
+		for (Resource<?> resource : generatedSrcFiles) {
+			Assert.assertTrue("Generation was wrong: " + resource.getName()
+					+ " was not expected!",
+					resource.getName().startsWith("Client")
+							|| resource.getName().startsWith("Customer")
+							|| resource.getName().startsWith("Batatas"));
+
+		}
+
+		server.stop();
+
+	}
+
+	@Test
+	public void testSchemaTest1H2() throws Exception {
+
+		Server server = Server.createTcpServer().start();
+		Class.forName("org.h2.Driver");
+		Connection conn = DriverManager
+				.getConnection("jdbc:h2:tcp://localhost/mem:test;USER=foo;PASSWORD=bar");
+		createSampleSchemasAndTables(conn);
+
+		Project javaProject = initializeJavaProject();
+		queueInputLines("");
+		getShell().execute("project install-facet forge.spec.jpa");
+		queueInputLines("bar");
+		getShell().execute(
+				"generate-entities" + " --driver org.h2.Driver"
+						+ " --pathToDriver " + resolveH2DriverJarPath()
+						+ " --url jdbc:h2:tcp://localhost/mem:test"
+						+ " --dialect org.hibernate.dialect.H2Dialect"
+						+ " --user foo" // + " --password bar"
+						+ " --entityPackage com.test.model --schema TEST2");
+
+		DirectoryResource srcModelDir = javaProject.getProjectRoot()
+				.getChildDirectory("src/main/java/com/test/model");
+		List<Resource<?>> generatedSrcFiles = srcModelDir.listResources();
+
+		StringBuilder entities = new StringBuilder();
+		for (Resource<?> resource : generatedSrcFiles) {
+			entities.append(resource.getName()).append(",");
+		}
+		Assert.assertEquals(
+				"Generation was wrong: 1 entity was expected - current: '"
+						+ entities.toString() + "'", generatedSrcFiles.size(),
+				1);
+		for (Resource<?> resource : generatedSrcFiles) {
+			Assert.assertTrue("Generation was wrong: " + resource.getName()
+					+ " was not expected!",
+					resource.getName().equals("Batatas.java"));
+		}
+
+		server.stop();
+
+	}
+
+	@Test
+	public void testTableNamesH2() throws Exception {
+
+		Server server = Server.createTcpServer().start();
+		Class.forName("org.h2.Driver");
+		Connection conn = DriverManager
+				.getConnection("jdbc:h2:tcp://localhost/mem:test;USER=foo;PASSWORD=bar");
+		createSampleSchemasAndTables(conn);
+
+		Project javaProject = initializeJavaProject();
+		queueInputLines("");
+		getShell().execute("project install-facet forge.spec.jpa");
+		queueInputLines("bar");
+		getShell().execute(
+				"generate-entities" + " --driver org.h2.Driver"
+						+ " --pathToDriver " + resolveH2DriverJarPath()
+						+ " --url jdbc:h2:tcp://localhost/mem:test"
+						+ " --dialect org.hibernate.dialect.H2Dialect"
+						+ " --user foo" // + " --password bar"
+						+ " --entityPackage com.test.model --table CUSTOMER*");
+
+		DirectoryResource srcModelDir = javaProject.getProjectRoot()
+				.getChildDirectory("src/main/java/com/test/model");
+		List<Resource<?>> generatedSrcFiles = srcModelDir.listResources();
+		StringBuilder entities = new StringBuilder();
+		for (Resource<?> resource : generatedSrcFiles) {
+			entities.append(resource.getName()).append(",");
+		}
+		Assert.assertEquals(
+				"Generation was wrong: 2 entities were expected - current: '"
+						+ entities.toString() + "'", generatedSrcFiles.size(),
+				2);
+		for (Resource<?> resource : generatedSrcFiles) {
+			Assert.assertTrue("Generation was wrong: " + resource.getName()
+					+ " was not expected!",
+					resource.getName().startsWith("Customer"));
+
+		}
+
+		server.stop();
+
+	}
+
+	private void createSampleSchemasAndTables(Connection conn)
+			throws SQLException {
+		conn.createStatement().execute("CREATE SCHEMA TEST1");
+		conn.createStatement().execute("CREATE SCHEMA TEST2");
+		conn.createStatement().execute("CREATE SCHEMA ANOTHERTEST");
+		conn.commit();
+
+		conn.createStatement().execute(
+				"CREATE TABLE TEST1.customer1(" + "	id INTEGER PRIMARY KEY,"
+						+ "	first_name VARCHAR(256),"
+						+ "	last_name VARCHAR(256))");
+		conn.createStatement().execute(
+				"CREATE TABLE TEST1.customer2(" + "	id INTEGER PRIMARY KEY,"
+						+ "	first_name VARCHAR(256),"
+						+ "	last_name VARCHAR(256))");
+		conn.createStatement().execute(
+				"CREATE TABLE TEST1.client1(" + "	id INTEGER PRIMARY KEY,"
+						+ "	first_name VARCHAR(256),"
+						+ "	last_name VARCHAR(256))");
+		conn.createStatement().execute(
+				"CREATE TABLE TEST1.client2(" + "	id INTEGER PRIMARY KEY,"
+						+ "	first_name VARCHAR(256),"
+						+ "	last_name VARCHAR(256))");
+
+		conn.createStatement().execute(
+				"CREATE TABLE TEST2.batatas(" + "	id INTEGER PRIMARY KEY,"
+						+ "	first_name VARCHAR(256),"
+						+ "	last_name VARCHAR(256))");
+
+		conn.createStatement().execute(
+				"CREATE TABLE ANOTHERTEST.foo(" + "	id INTEGER PRIMARY KEY,"
+						+ "	first_name VARCHAR(256),"
+						+ "	last_name VARCHAR(256))");
+
+		conn.commit();
+	}
+
 	@Test
 	public void test() throws Exception {
 		initializeJavaProject();