From 833d79de06ee44cb8e26ba0fa77dc6a78be28690 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Thu, 15 Feb 2024 12:49:56 +0100
Subject: [PATCH] Mapping year to short
---
.../schema/migrate_1.4.0-1.4.1.sql | 38 +++++++++++++++++++
.../java/at/tuwien/mapper/QueryMapper.java | 7 ++--
2 files changed, 42 insertions(+), 3 deletions(-)
create mode 100644 dbrepo-metadata-db/schema/migrate_1.4.0-1.4.1.sql
diff --git a/dbrepo-metadata-db/schema/migrate_1.4.0-1.4.1.sql b/dbrepo-metadata-db/schema/migrate_1.4.0-1.4.1.sql
new file mode 100644
index 0000000000..cabd7e8f8f
--- /dev/null
+++ b/dbrepo-metadata-db/schema/migrate_1.4.0-1.4.1.sql
@@ -0,0 +1,38 @@
+ALTER TABLE mdb_databases
+ DROP SYSTEM VERSIONING;
+ALTER TABLE mdb_databases
+ ADD COLUMN image longblob;
+ALTER TABLE mdb_databases
+ ADD SYSTEM VERSIONING;
+ALTER TABLE mdb_tables
+ DROP SYSTEM VERSIONING;
+ALTER TABLE mdb_tables
+ ADD COLUMN processed_constraints BOOLEAN NOT NULL DEFAULT false;
+ALTER TABLE mdb_tables
+ ADD SYSTEM VERSIONING;
+ALTER TABLE mdb_columns
+ DROP SYSTEM VERSIONING;
+ALTER TABLE mdb_columns
+ DROP COLUMN alias;
+ALTER TABLE mdb_columns
+ ADD SYSTEM VERSIONING;
+ALTER TABLE mdb_constraints_foreign_key
+ DROP SYSTEM VERSIONING;
+ALTER TABLE mdb_constraints_foreign_key
+ ADD COLUMN name VARCHAR(255) NOT NULL;
+ALTER TABLE mdb_constraints_foreign_key
+ ADD SYSTEM VERSIONING;
+ALTER TABLE mdb_constraints_unique
+ DROP SYSTEM VERSIONING;
+ALTER TABLE mdb_constraints_unique
+ ADD COLUMN name VARCHAR(255) NOT NULL;
+ALTER TABLE mdb_constraints_unique
+ ADD SYSTEM VERSIONING;
+ALTER TABLE mdb_view_columns
+ DROP SYSTEM VERSIONING;
+ALTER TABLE mdb_view_columns
+ ADD COLUMN alias VARCHAR(100);
+ALTER TABLE mdb_view_columns
+ CHANGE COLUMN position ordinal_position INTEGER;
+ALTER TABLE mdb_view_columns
+ ADD SYSTEM VERSIONING;
\ No newline at end of file
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/QueryMapper.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/QueryMapper.java
index 536810dfd7..840c1b0295 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/QueryMapper.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/QueryMapper.java
@@ -84,6 +84,7 @@ public interface QueryMapper {
return slug.toLowerCase(Locale.ENGLISH);
}
+ @Transactional(readOnly = true)
default QueryResultDto resultListToQueryResultDto(List<TableColumn> columns, ResultSet result) throws SQLException {
log.trace("mapping result list to query result, columns={}, result={}", columns, result);
final List<Map<String, Object>> resultList = new LinkedList<>();
@@ -922,9 +923,9 @@ public interface QueryMapper {
return String.valueOf(data);
}
case YEAR -> {
- final String tmp = String.valueOf(data);
- log.trace("mapping {} -> year", tmp);
- return tmp.substring(0, tmp.indexOf('-'));
+ final String date = String.valueOf(data);
+ log.trace("mapping {} -> year", date);
+ return Short.valueOf(date.substring(0, date.indexOf('-')));
}
}
log.warn("column type {} is not known", column.getColumnType());
--
GitLab