From f3cc916b7744a6b97800fbb53dba532940863ee9 Mon Sep 17 00:00:00 2001 From: Martin Weise <martin.weise@tuwien.ac.at> Date: Mon, 27 Nov 2023 17:05:49 +0100 Subject: [PATCH] Removed the base unit stuff as it is not needed --- dbrepo-metadata-db/setup-schema.sql | 1 - .../java/at/tuwien/api/database/table/columns/ColumnDto.java | 4 ---- .../tuwien/entities/database/table/columns/TableColumn.java | 3 --- dbrepo-search-db/init/indices/column.json | 3 --- 4 files changed, 11 deletions(-) diff --git a/dbrepo-metadata-db/setup-schema.sql b/dbrepo-metadata-db/setup-schema.sql index 6a9cae540b..972216ac0c 100644 --- a/dbrepo-metadata-db/setup-schema.sql +++ b/dbrepo-metadata-db/setup-schema.sql @@ -160,7 +160,6 @@ CREATE TABLE IF NOT EXISTS `mdb_columns` d INT, auto_generated BOOLEAN DEFAULT false, is_null_allowed BOOLEAN NOT NULL DEFAULT true, - base_unit VARCHAR(100) NULL, val_min NUMERIC NULL, val_max NUMERIC NULL, mean NUMERIC NULL, diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnDto.java index 4bc1e7072d..bf5e9fe292 100644 --- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnDto.java +++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnDto.java @@ -93,10 +93,6 @@ public class ColumnDto { @Field(name = "d", type = FieldType.Integer) private Integer d; - @Schema(example = "KELVIN") - @Field(name = "base_unit", type = FieldType.Keyword) - private String baseUnit; - @Schema(example = "0") @Field(name = "val_min", type = FieldType.Double) private BigDecimal valMin; diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java index 5945f5eedc..552fbd3325 100644 --- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java +++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java @@ -116,9 +116,6 @@ public class TableColumn implements Comparable<TableColumn> { @Column private Integer d; - @Column(name = "base_unit") - private String baseUnit; - @Column(name = "val_min") private BigDecimal valMin; diff --git a/dbrepo-search-db/init/indices/column.json b/dbrepo-search-db/init/indices/column.json index 26648c08e4..ca5f82d211 100644 --- a/dbrepo-search-db/init/indices/column.json +++ b/dbrepo-search-db/init/indices/column.json @@ -36,9 +36,6 @@ "val_min": { "type": "double" }, - "base_unit": { - "type": "keyword" - }, "val_max": { "type": "double" }, -- GitLab