Skip to content
Open
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 @@ -3,9 +3,9 @@
import java.io.IOException;
import java.io.UncheckedIOException;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;

Expand All @@ -22,11 +22,16 @@ public class InMemorySQLDataSource extends IterableSQLDataSource implements InMe
public InMemorySQLDataSource(Connection connection, String query) {
super(connection, query);
}

public InMemorySQLDataSource(Connection connection, String query, Object... params) {
super(connection, query, params);
}

@Override
public List<String[]> readAll() {
try (Statement statement = connection.createStatement()) {
ResultSet resultSet = statement.executeQuery(query);
try (PreparedStatement preparedStatement = connection.prepareStatement(query)) {
bindParameters(preparedStatement, params);
ResultSet resultSet = preparedStatement.executeQuery();
List<String[]> allData = new ArrayList<>();
while (resultSet.next()) {
allData.add(getNextFrom(resultSet));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import java.io.IOException;
import java.io.UncheckedIOException;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.sql.Statement;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
Expand All @@ -21,10 +21,16 @@ public class IterableSQLDataSource implements IterableDataSource {
protected boolean hasMoreData = true;
protected final String query;
protected final Connection connection;
protected final Object[] params;

public IterableSQLDataSource(Connection connection, String query) {
this(connection, query, new Object[0]);
}

public IterableSQLDataSource(Connection connection, String query, Object... params) {
this.connection = connection;
this.query = query;
this.params = params;
}

@Override
Expand Down Expand Up @@ -53,9 +59,10 @@ public String[] getColumnNames() {
@Override
public void open() {
try {
Statement statement = connection.createStatement();
log.info("Executing query: {}", query);
resultSet = statement.executeQuery(query);
PreparedStatement preparedStatement = connection.prepareStatement(query);
bindParameters(preparedStatement, params);
log.debug("Executing query: {}", query);
resultSet = preparedStatement.executeQuery();
} catch (SQLException e) {
throw new UncheckedIOException(new IOException(e));
}
Expand Down Expand Up @@ -105,4 +112,10 @@ protected static String[] getColumnsFrom(ResultSet resultSet) throws SQLExceptio
return columns;
}

protected static void bindParameters(PreparedStatement ps, Object[] params) throws SQLException {
for (int i = 0; i < params.length; i++) {
ps.setObject(i + 1, params[i]);
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,27 @@ public void wrongQuery(IterableSQLDataSource source) {

assertTrue(thrown.getMessage().contains("NON_EXISTING_TABLE"));
}

static Stream<Arguments> parameterizedSources() {
String query = "SELECT * FROM PEOPLE WHERE ID = ?";
IterableSQLDataSource iterableSource = new IterableSQLDataSource(connection, query, "1");
InMemorySQLDataSource inMemorySource = new InMemorySQLDataSource(connection, query, "1");
return Stream.of(of(Utils.named(iterableSource)), of(Utils.named(inMemorySource)));
}

@ParameterizedTest
@MethodSource("parameterizedSources")
public void happyPathWithParams(IterableSQLDataSource source) {
source.open();

assertEquals("ID", source.getColumnNames()[0]);
assertEquals("NAME", source.getColumnNames()[1]);
assertEquals("SURNAME", source.getColumnNames()[2]);

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