Skip to content
Snippets Groups Projects
Verified Commit d13fcb9d authored by Martin Weise's avatar Martin Weise
Browse files

Merge branch 'dev'

parents 6b4b47fb 833d79de
No related branches found
No related tags found
1 merge request!250Master
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
......@@ -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());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment