FIX TestRawSqlService and TestRawSqlBuilder

This commit is contained in:
Jonas Pöhler
2021-07-16 15:17:04 +02:00
parent c621435a28
commit 3d4de4dee5
2 changed files with 2 additions and 5 deletions
@@ -49,7 +49,6 @@ public class DRawSqlService implements SpiRawSqlService {
if (ret.containsKey(name)) {
name = combine(meta.getSchemaName(i), meta.getTableName(i), name);
}
ret.put(name, resultSet.getObject(i));
// convert (C/B)LOBs to java objects.
// A java.sql.Clob depends on an open connection, so storing this object in a map
@@ -21,7 +21,6 @@ import org.tests.model.rawsql.ERawSqlAggBean;
import javax.sql.DataSource;
import java.nio.charset.StandardCharsets;
import java.sql.Blob;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
@@ -327,11 +326,10 @@ public class TestRawSqlBuilder extends BaseTestCase {
pfc.setContent(bytes);
DB.save(pfc);
final String sql = "select content from persistent_file_content where id = ?";
List<SqlRow> rows = new ArrayList<>();
final DataSourceConfig config = ((DefaultServer) DB.getDefault()).getServerConfig().getDataSourceConfig();
final String sql = "select content from persistent_file_content where id = ?";
try (Connection connection = DriverManager.getConnection(config.getUrl(), config.getUsername(), config.getPassword());
PreparedStatement stmt = connection.prepareStatement(sql)) {
stmt.setLong(1, pfc.getId());
@@ -344,7 +342,7 @@ public class TestRawSqlBuilder extends BaseTestCase {
}
assertThat(rows).hasSize(1);
assertThat(((Blob) rows.get(0).get("content")).getBytes(0, bytes.length)).isEqualTo(bytes);
assertThat(rows.get(0).get("content")).isEqualTo(bytes);
}
}