Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@ public void reset() {
}

protected static String[] getNextFrom(ResultSet resultSet) throws SQLException {
String[] columns = getColumnsFrom(resultSet);
String[] row = new String[columns.length];
for (int i = 0; i < columns.length; ++i) {
row[i] = resultSet.getString(columns[i]);
int columnCount = resultSet.getMetaData().getColumnCount();
String[] row = new String[columnCount];
for (int i = 0; i < columnCount; ++i) {
row[i] = resultSet.getString(i + 1);
}
return row;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,19 @@ public void happyPath(IterableSQLDataSource source) {
public void happyPathMultiTable(IterableSQLDataSource source) {
source.open();

assertEquals("ID", source.getColumnNames()[0]);
assertEquals("VALUE", source.getColumnNames()[1]);
String[] columnNames = source.getColumnNames();
assertEquals("ID", columnNames[0]);
assertEquals("VALUE", columnNames[1]);
assertEquals("ID", columnNames[2]);
assertEquals("NAME", columnNames[3]);
assertEquals("SURNAME", columnNames[4]);

String[] row = source.nextRow();
assertEquals("1", row[0]);
assertEquals("1000", row[1]);
assertEquals("1", row[2]);
assertEquals("Adam", row[3]);
assertEquals("W", row[4]);
Utils.close(source);
}

Expand Down