From commits-return-30188-archive-asf-public=cust-asf.ponee.io@geode.apache.org Fri Dec 21 19:37:16 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id EABE6180675 for ; Fri, 21 Dec 2018 19:37:15 +0100 (CET) Received: (qmail 80759 invoked by uid 500); 21 Dec 2018 18:37:15 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 80750 invoked by uid 99); 21 Dec 2018 18:37:15 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Dec 2018 18:37:15 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 6E2B5875EC; Fri, 21 Dec 2018 18:37:14 +0000 (UTC) Date: Fri, 21 Dec 2018 18:37:13 +0000 To: "commits@geode.apache.org" Subject: [geode] 01/02: changed default catalog and schema from null to empty string MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: dschneider@apache.org In-Reply-To: <154541743108.9073.379328154044704411@gitbox.apache.org> References: <154541743108.9073.379328154044704411@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: geode X-Git-Refname: refs/heads/feature/GEODE-6225 X-Git-Reftype: branch X-Git-Rev: d179a99262dba71951769d41b5884b7ac760d07c X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20181221183714.6E2B5875EC@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. dschneider pushed a commit to branch feature/GEODE-6225 in repository https://gitbox.apache.org/repos/asf/geode.git commit d179a99262dba71951769d41b5884b7ac760d07c Author: Darrel Schneider AuthorDate: Fri Dec 21 10:35:22 2018 -0800 changed default catalog and schema from null to empty string --- .../connectors/jdbc/internal/TableMetaDataManager.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManager.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManager.java index f5f9b16..b8971ef 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManager.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManager.java @@ -34,6 +34,8 @@ import org.apache.geode.connectors.jdbc.JdbcConnectorException; * remembered so that it does not need to be recomputed for the same table name. */ public class TableMetaDataManager { + private static final String DEFAULT_CATALOG = ""; + private static final String DEFAULT_SCHEMA = ""; private final ConcurrentMap tableToMetaDataMap = new ConcurrentHashMap<>(); @@ -48,7 +50,7 @@ public class TableMetaDataManager { TableMetaData result; try { DatabaseMetaData metaData = connection.getMetaData(); - try (ResultSet tables = metaData.getTables(null, null, "%", null)) { + try (ResultSet tables = metaData.getTables(DEFAULT_CATALOG, DEFAULT_SCHEMA, "%", null)) { String realTableName = getTableNameFromMetaData(tableName, tables); List keys = getPrimaryKeyColumnNamesFromMetaData(realTableName, metaData, ids); String quoteString = metaData.getIdentifierQuoteString(); @@ -100,7 +102,9 @@ public class TableMetaDataManager { checkColumnExistsInTable(tableName, metaData, key); } } else { - try (ResultSet primaryKeys = metaData.getPrimaryKeys(null, null, tableName)) { + try ( + ResultSet primaryKeys = + metaData.getPrimaryKeys(DEFAULT_CATALOG, DEFAULT_SCHEMA, tableName)) { while (primaryKeys.next()) { String key = primaryKeys.getString("COLUMN_NAME"); keys.add(key); @@ -116,7 +120,8 @@ public class TableMetaDataManager { private void getDataTypesFromMetaData(String tableName, DatabaseMetaData metaData, TableMetaData result) throws SQLException { - try (ResultSet columnData = metaData.getColumns(null, null, tableName, "%")) { + try (ResultSet columnData = + metaData.getColumns(DEFAULT_CATALOG, DEFAULT_SCHEMA, tableName, "%")) { while (columnData.next()) { String columnName = columnData.getString("COLUMN_NAME"); int dataType = columnData.getInt("DATA_TYPE"); @@ -128,7 +133,8 @@ public class TableMetaDataManager { private void checkColumnExistsInTable(String tableName, DatabaseMetaData metaData, String columnName) throws SQLException { int caseInsensitiveMatches = 0; - try (ResultSet columnData = metaData.getColumns(null, null, tableName, "%")) { + try (ResultSet columnData = + metaData.getColumns(DEFAULT_CATALOG, DEFAULT_SCHEMA, tableName, "%")) { while (columnData.next()) { String realColumnName = columnData.getString("COLUMN_NAME"); if (columnName.equals(realColumnName)) {