fix keyword-like columns in db must be quoted for new versions of liq…

…uibase and h2
adorsys · Sep 19, 2023 · 633ec76 · 633ec76
1 parent 50c159a
commit 633ec76
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git a/...siness/src/test/java/de/adorsys/datasafe/business/impl/e2e/MultiDFSFunctionalityTest.java b/...siness/src/test/java/de/adorsys/datasafe/business/impl/e2e/MultiDFSFunctionalityTest.java
@@ -43,7 +43,6 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;

diff --git a/...ntime-delegate/src/test/java/de/adorsys/datasafe/runtimedelegate/RuntimeDelegateTest.java b/...ntime-delegate/src/test/java/de/adorsys/datasafe/runtimedelegate/RuntimeDelegateTest.java
@@ -2,7 +2,6 @@
 
 import com.google.testing.compile.Compilation;
 import com.google.testing.compile.JavaFileObjects;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;

diff --git a/datasafe-storage/datasafe-storage-impl-db/pom.xml b/datasafe-storage/datasafe-storage-impl-db/pom.xml
@@ -47,12 +47,6 @@
  <dependency>
  <groupId>org.liquibase</groupId>
  <artifactId>liquibase-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- </exclusions>
  </dependency>
 
  <!-- test -->

diff --git a/...age-impl-db/src/main/java/de/adorsys/datasafe/storage/impl/db/DatabaseStorageService.java b/...age-impl-db/src/main/java/de/adorsys/datasafe/storage/impl/db/DatabaseStorageService.java
@@ -56,15 +56,15 @@ public class DatabaseStorageService implements StorageService {
  @Override
  public boolean objectExists(AbsoluteLocation location) {
  ParsedLocation parsed = new ParsedLocation(location, allowedTables);
- String sql = "SELECT COUNT(*) FROM " + parsed.getTableName() + " WHERE `key` = ?";
+ String sql = "SELECT COUNT(*) FROM " + parsed.getTableName() + " WHERE \"key\" = ?";
  return 0 != conn.jdbcTemplate(location).queryForObject(sql, Integer.class, parsed.getPathWithUser());
  }
 
  @SneakyThrows
  @Override
  public Stream<AbsoluteLocation<ResolvedResource>> list(AbsoluteLocation location) {
  ParsedLocation parsed = new ParsedLocation(location, allowedTables);
- String sql = "SELECT `key`,`last_modified` FROM " + parsed.getTableName() + " WHERE `key` LIKE '"
+ String sql = "SELECT \"key\",`last_modified` FROM " + parsed.getTableName() + " WHERE \"key\" LIKE '"
  + parsed.getPathWithUser() + "%'";
 
  List<Map<String, Object>> keys = conn.jdbcTemplate(location).queryForList(sql);
@@ -80,7 +80,7 @@ public Stream<AbsoluteLocation<ResolvedResource>> list(AbsoluteLocation location
  @Override
  public InputStream read(AbsoluteLocation location) {
  ParsedLocation parsed = new ParsedLocation(location, allowedTables);
- final String sql = "SELECT value FROM " + parsed.getTableName() + " WHERE `key` = ?";
+ final String sql = "SELECT \"value\" FROM " + parsed.getTableName() + " WHERE \"key\" = ?";
  RowMapper<InputStream> rowMapper = (rs, i) -> rs.getClob("value").getAsciiStream();
  List<InputStream> values = conn.jdbcTemplate(location).query(
  sql,
@@ -98,7 +98,7 @@ public InputStream read(AbsoluteLocation location) {
  @Override
  public void remove(AbsoluteLocation location) {
  ParsedLocation parsed = new ParsedLocation(location, allowedTables);
- String sql = "DELETE FROM " + parsed.getTableName() + " WHERE `key` = ?";
+ String sql = "DELETE FROM " + parsed.getTableName() + " WHERE \"key\" = ?";
  conn.jdbcTemplate(location).update(sql, parsed.getPathWithUser());
  }
 
@@ -138,7 +138,7 @@ private static final class PutBlobOnClose extends ByteArrayOutputStream {
 
  @Override
  public void close() throws IOException {
- String sql = "INSERT INTO " + tableName + " (`key`, `value`) VALUES(?, ?)";
+ String sql = "INSERT INTO " + tableName + " (\"key\", \"value\") VALUES(?, ?)";
  KeyHolder holder = new GeneratedKeyHolder();
  jdbcTemplate.update(writeData(sql), holder);
  super.close();