Skip to content

Commit 824e832

Browse files
affonsovaffonsoBQ
andauthored
Revert "[AD-763] [JDBC] remove table null check in getPrimaryKeys and getImportedKeys (#351)" (#371)
* Revert "[AD-763] [JDBC] remove table null check in getPrimaryKeys and getImportedKeys (#351)" This reverts commit 6524d3a * Commit Code Coverage Badge Co-authored-by: affonsoBQ <affonsoBQ@users.noreply.github.com>
1 parent 5f0482e commit 824e832

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.github/badges/branches.svg

Lines changed: 1 addition & 1 deletion
Loading

.github/badges/jacoco.svg

Lines changed: 1 addition & 1 deletion
Loading

src/main/java/software/amazon/documentdb/jdbc/DocumentDbDatabaseMetaData.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ public ResultSet getPrimaryKeys(final String catalog, final String schema,
513513
final List<List<Object>> metaData = new ArrayList<>();
514514
if (schema == null || properties.getDatabase().equals(schema)) {
515515
for (String tableName : databaseMetadata.getTableSchemaMap().keySet()) {
516-
if (tableName.equals(table)) {
516+
if (table == null || tableName.equals(table)) {
517517
final DocumentDbSchemaTable metadataTable = databaseMetadata
518518
.getTableSchemaMap().get(tableName);
519519
if (metadataTable == null) {
@@ -576,7 +576,7 @@ private void addImportedKeysForSchema(final String table,
576576
final List<List<Object>> metaData) throws SQLException {
577577
final String regexTablePattern = convertPatternToRegex(table);
578578
for (String tableName : databaseMetadata.getTableSchemaMap().keySet()) {
579-
if (tableName.matches(regexTablePattern)) {
579+
if (table == null || tableName.matches(regexTablePattern)) {
580580
final DocumentDbSchemaTable schemaTable = databaseMetadata
581581
.getTableSchemaMap().get(tableName);
582582
if (schemaTable == null) {

src/test/java/software/amazon/documentdb/jdbc/DocumentDbDatabaseMetaDataTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ void testGetPrimaryKeysFilters() throws SQLException {
503503
final ResultSet emptyResultSetTable = metadata.getPrimaryKeys(null, null, "invalidCollection");
504504
Assertions.assertFalse(emptyResultSetTable.next());
505505
final ResultSet noFilterPrimaryKeys = metadata.getPrimaryKeys(null, null, null);
506-
Assertions.assertFalse(noFilterPrimaryKeys.next());
506+
Assertions.assertTrue(noFilterPrimaryKeys.next());
507507
}
508508

509509
@Test
@@ -523,7 +523,7 @@ void testGetImportedKeysFilters() throws SQLException {
523523
}
524524

525525
final ResultSet noFilterImportedKeys = metadata.getImportedKeys(null, null, null);
526-
Assertions.assertFalse(noFilterImportedKeys.next());
526+
Assertions.assertTrue(noFilterImportedKeys.next());
527527

528528
}
529529

0 commit comments

Comments
 (0)