From e39ddc7c17600cfba142f7f3c995258f3d30a96d Mon Sep 17 00:00:00 2001 From: eikek Date: Fri, 12 Aug 2022 12:59:13 +0200 Subject: [PATCH] Rename column 'value' to 'value_' In sql 'value' is a reserved word and should not be used (unless quoted). Postgresql and MariaDB are ok with it, but the new version of h2 is now complaining. --- .../main/resources/db/migration/h2/V1.39.3__rename_value.sql | 1 + .../resources/db/migration/mariadb/V1.39.3__rename_value.sql | 1 + .../resources/db/migration/postgresql/V1.39.3__rename_value.sql | 1 + .../store/src/main/scala/docspell/store/records/RContact.scala | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 modules/store/src/main/resources/db/migration/h2/V1.39.3__rename_value.sql create mode 100644 modules/store/src/main/resources/db/migration/mariadb/V1.39.3__rename_value.sql create mode 100644 modules/store/src/main/resources/db/migration/postgresql/V1.39.3__rename_value.sql diff --git a/modules/store/src/main/resources/db/migration/h2/V1.39.3__rename_value.sql b/modules/store/src/main/resources/db/migration/h2/V1.39.3__rename_value.sql new file mode 100644 index 00000000..3431ffd9 --- /dev/null +++ b/modules/store/src/main/resources/db/migration/h2/V1.39.3__rename_value.sql @@ -0,0 +1 @@ +alter table "contact" rename column "value" to "value_"; diff --git a/modules/store/src/main/resources/db/migration/mariadb/V1.39.3__rename_value.sql b/modules/store/src/main/resources/db/migration/mariadb/V1.39.3__rename_value.sql new file mode 100644 index 00000000..d2744742 --- /dev/null +++ b/modules/store/src/main/resources/db/migration/mariadb/V1.39.3__rename_value.sql @@ -0,0 +1 @@ +alter table `contact` rename column `value` to `value_`; diff --git a/modules/store/src/main/resources/db/migration/postgresql/V1.39.3__rename_value.sql b/modules/store/src/main/resources/db/migration/postgresql/V1.39.3__rename_value.sql new file mode 100644 index 00000000..3431ffd9 --- /dev/null +++ b/modules/store/src/main/resources/db/migration/postgresql/V1.39.3__rename_value.sql @@ -0,0 +1 @@ +alter table "contact" rename column "value" to "value_"; diff --git a/modules/store/src/main/scala/docspell/store/records/RContact.scala b/modules/store/src/main/scala/docspell/store/records/RContact.scala index e6e79734..350c9ef4 100644 --- a/modules/store/src/main/scala/docspell/store/records/RContact.scala +++ b/modules/store/src/main/scala/docspell/store/records/RContact.scala @@ -30,7 +30,7 @@ object RContact { val tableName = "contact" val contactId = Column[Ident]("contactid", this) - val value = Column[String]("value", this) + val value = Column[String]("value_", this) val kind = Column[ContactKind]("kind", this) val personId = Column[Ident]("pid", this) val orgId = Column[Ident]("oid", this)