branch feature/2892 updated (a3a33ad -> 15ceae1)
This is an automated email from the git hooks/post-receive script. New change to branch feature/2892 in repository topia. See http://git.nuiton.org/topia.git from a3a33ad Remove TopiaConfiguration.builder new 15ceae1 Code review The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 15ceae1cf3c5a0ad0fa0bbbec966e2fb08e6c854 Author: Arnaud Thimel <thimel@codelutin.com> Date: Fri Jan 30 18:15:20 2015 +0100 Code review Summary of changes: .../org/nuiton/topia/it/mapping/test17/FixAno3280Test.java | 8 ++++---- .../java/org/nuiton/topia/junit/AbstractDatabaseResource.java | 6 +++++- .../java/org/nuiton/topia/persistence/jdbc/JdbcH2Helper.java | 11 ++++++++++- 3 files changed, 19 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/2892 in repository topia. See http://git.nuiton.org/topia.git commit 15ceae1cf3c5a0ad0fa0bbbec966e2fb08e6c854 Author: Arnaud Thimel <thimel@codelutin.com> Date: Fri Jan 30 18:15:20 2015 +0100 Code review --- .../org/nuiton/topia/it/mapping/test17/FixAno3280Test.java | 8 ++++---- .../java/org/nuiton/topia/junit/AbstractDatabaseResource.java | 6 +++++- .../java/org/nuiton/topia/persistence/jdbc/JdbcH2Helper.java | 11 ++++++++++- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/topia-it/src/test/java/org/nuiton/topia/it/mapping/test17/FixAno3280Test.java b/topia-it/src/test/java/org/nuiton/topia/it/mapping/test17/FixAno3280Test.java index a93e81e..3a61f4b 100644 --- a/topia-it/src/test/java/org/nuiton/topia/it/mapping/test17/FixAno3280Test.java +++ b/topia-it/src/test/java/org/nuiton/topia/it/mapping/test17/FixAno3280Test.java @@ -44,11 +44,11 @@ public class FixAno3280Test extends AbstractMappingTest { public void testTablesExists() throws SQLException { JdbcConfiguration configuration = db.getApplicationContext().getConfiguration(); - JdbcH2Helper jdbcH2Helper = new JdbcH2Helper(configuration); - Assert.assertTrue("Could not find table A.A", jdbcH2Helper.isTableExist("A")); - Assert.assertTrue("Could not find table B.B", jdbcH2Helper.isTableExist("B")); - Assert.assertTrue("Could not find table B.BB17", jdbcH2Helper.isTableExist("BB17")); + JdbcH2Helper jdbcH2Helper = new JdbcH2Helper(configuration); + Assert.assertTrue("Could not find table A.A", jdbcH2Helper.isTableExist("A", "A")); + Assert.assertTrue("Could not find table B.B", jdbcH2Helper.isTableExist("B", "B")); + Assert.assertTrue("Could not find table B.BB17", jdbcH2Helper.isTableExist("B", "BB17")); } diff --git a/topia-junit/src/main/java/org/nuiton/topia/junit/AbstractDatabaseResource.java b/topia-junit/src/main/java/org/nuiton/topia/junit/AbstractDatabaseResource.java index 98cbd3e..4fd9d47 100644 --- a/topia-junit/src/main/java/org/nuiton/topia/junit/AbstractDatabaseResource.java +++ b/topia-junit/src/main/java/org/nuiton/topia/junit/AbstractDatabaseResource.java @@ -66,13 +66,14 @@ public abstract class AbstractDatabaseResource<PersistenceContext extends TopiaP private static final Log log = LogFactory.getLog(AbstractDatabaseResource.class); protected ApplicationContext applicationContext; + protected TopiaConfiguration topiaConfiguration; protected abstract ApplicationContext createApplicationContext(TopiaConfiguration topiaConfiguration); @Override protected void starting(Description description) { TopiaConfigurationBuilder topiaConfigurationBuilder = new TopiaConfigurationBuilder(); - TopiaConfiguration topiaConfiguration = + topiaConfiguration = topiaConfigurationBuilder.forTest( description.getTestClass(), description.getMethodName()); @@ -95,4 +96,7 @@ public abstract class AbstractDatabaseResource<PersistenceContext extends TopiaP return applicationContext.newPersistenceContext(); } + public TopiaConfiguration getTopiaConfiguration() { + return topiaConfiguration; + } } diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/jdbc/JdbcH2Helper.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/jdbc/JdbcH2Helper.java index e4d1daf..da90819 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/jdbc/JdbcH2Helper.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/jdbc/JdbcH2Helper.java @@ -20,11 +20,20 @@ public class JdbcH2Helper extends JdbcHelper { } public boolean isTableExist(String tableName) { + return isTableExist(null, tableName); + } + + /** + * Tests if a given table exists. WARNING : this may not work is the tableName is not exactly the same. + * <p/> + * This method is designed for H2 only. + */ + public boolean isTableExist(String schema, String tableName) { Connection connection = null; ResultSet resultSet = null; try { connection = openConnection(); - resultSet = connection.getMetaData().getTables(null, null, tableName, null); + resultSet = connection.getMetaData().getTables(null, schema, tableName, null); boolean result = resultSet.next(); return result; } catch (SQLException e) { -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm