This is an automated email from the ASF dual-hosted git repository. arjansh pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/metamodel.git
commit 9f3313d7c3106603d0a06537da5bfe0228b55e29 Author: Kasper Sørensen <i.am.kasper.soren...@gmail.com> AuthorDate: Tue Mar 24 22:40:12 2020 +0100 Whitespace and line length fixes as per PR remarks --- core/src/main/java/org/apache/metamodel/query/FromItem.java | 3 ++- .../apache/metamodel/jdbc/dialects/PostgresqlQueryRewriterTest.java | 2 +- .../org/apache/metamodel/jdbc/integrationtests/PostgresqlTest.java | 5 ++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/org/apache/metamodel/query/FromItem.java b/core/src/main/java/org/apache/metamodel/query/FromItem.java index a8e1a28..397beba 100644 --- a/core/src/main/java/org/apache/metamodel/query/FromItem.java +++ b/core/src/main/java/org/apache/metamodel/query/FromItem.java @@ -222,7 +222,8 @@ public class FromItem extends BaseObject implements QueryItem, Cloneable { } StringBuilder sb = new StringBuilder(); if (_table != null) { - if (_table.getSchema() != null && _table.getSchema().getName() != null && !_table.getSchema().getName().isEmpty()) { + if (_table.getSchema() != null && _table.getSchema().getName() != null + && !_table.getSchema().getName().isEmpty()) { sb.append(_table.getSchema().getName()); sb.append('.'); } diff --git a/jdbc/src/test/java/org/apache/metamodel/jdbc/dialects/PostgresqlQueryRewriterTest.java b/jdbc/src/test/java/org/apache/metamodel/jdbc/dialects/PostgresqlQueryRewriterTest.java index d869bca..481e9e4 100644 --- a/jdbc/src/test/java/org/apache/metamodel/jdbc/dialects/PostgresqlQueryRewriterTest.java +++ b/jdbc/src/test/java/org/apache/metamodel/jdbc/dialects/PostgresqlQueryRewriterTest.java @@ -61,7 +61,7 @@ public class PostgresqlQueryRewriterTest { query.select(selectItem); query.from(new MutableTable("tbl").setSchema(new MutableSchema(""))); assertEquals("SELECT APPROXIMATE COUNT(*) FROM tbl", query.toSql()); - + final PostgresqlQueryRewriter queryRewriter = new PostgresqlQueryRewriter(null); final String sql = queryRewriter.rewriteQuery(query); assertEquals("SELECT COUNT(*) FROM tbl", sql); diff --git a/jdbc/src/test/java/org/apache/metamodel/jdbc/integrationtests/PostgresqlTest.java b/jdbc/src/test/java/org/apache/metamodel/jdbc/integrationtests/PostgresqlTest.java index b72b89e..4132b1c 100644 --- a/jdbc/src/test/java/org/apache/metamodel/jdbc/integrationtests/PostgresqlTest.java +++ b/jdbc/src/test/java/org/apache/metamodel/jdbc/integrationtests/PostgresqlTest.java @@ -504,15 +504,14 @@ public class PostgresqlTest extends AbstractJdbIntegrationTest { }); try { - final Optional<Integer> insertedRows = updateSummary.getInsertedRows(); assertTrue(insertedRows.isPresent()); assertEquals(2, insertedRows.get().intValue()); - + final Optional<Iterable<Object>> generatedKeys = updateSummary.getGeneratedKeys(); assertTrue(generatedKeys.isPresent()); assertEquals("[1, 2]", generatedKeys.get().toString()); - + } finally { if (schema.getTableByName(tableName) != null) { dc.executeUpdate(new DropTable(schema, tableName));