Merge pull request #57 from Onlineberatung/develop

[pull] develop from Onlineberatung:develop
virtualidentityag · Oct 28, 2022 · c2fd96f · c2fd96f
2 parents 433b8e3 + 6731f61
commit c2fd96f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/main/resources/db/changelog/changeset/0001_initsql/initTables.sql b/src/main/resources/db/changelog/changeset/0001_initsql/initTables.sql
@@ -2,8 +2,8 @@ CREATE TABLE `agencyservice`.`diocese` (
   `id` bigint(21) NOT NULL,
   `name` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
   `id_old` bigint(21) NOT NULL,
-  `create_date` datetime NOT NULL DEFAULT UTC_TIMESTAMP(),
-  `update_date` datetime NOT NULL DEFAULT UTC_TIMESTAMP(),
+  `create_date` datetime NOT NULL DEFAULT (UTC_TIMESTAMP),
+  `update_date` datetime NOT NULL DEFAULT (UTC_TIMESTAMP),
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 CREATE SEQUENCE agencyservice.sequence_diocese
@@ -21,8 +21,8 @@ CREATE TABLE `agencyservice`.`agency` (
   `city` varchar(100) COLLATE utf8_unicode_ci DEFAULT  NULL,
   `is_team_agency` tinyint(4) NOT NULL DEFAULT '0',
   `id_old` bigint(21) NOT NULL,
-  `create_date` datetime NOT NULL DEFAULT UTC_TIMESTAMP(),
-  `update_date` datetime NOT NULL DEFAULT UTC_TIMESTAMP(),
+  `create_date` datetime NOT NULL DEFAULT (UTC_TIMESTAMP),
+  `update_date` datetime NOT NULL DEFAULT (UTC_TIMESTAMP),
   PRIMARY KEY (`id`),
   KEY `diocese_id` (`diocese_id`),
   CONSTRAINT `agency_ibfk_1` FOREIGN KEY (`diocese_id`) REFERENCES `diocese` (`id`) ON UPDATE CASCADE
@@ -38,8 +38,8 @@ CREATE TABLE `agencyservice`.`agency_postcode_range` (
   `agency_id` bigint(21) NOT NULL,
   `postcode_from` varchar(5) COLLATE utf8_unicode_ci NOT NULL,
   `postcode_to` varchar(5) COLLATE utf8_unicode_ci NOT NULL,
-  `create_date` datetime NOT NULL DEFAULT UTC_TIMESTAMP(),
-  `update_date` datetime NOT NULL DEFAULT UTC_TIMESTAMP(),
+  `create_date` datetime NOT NULL DEFAULT (UTC_TIMESTAMP),
+  `update_date` datetime NOT NULL DEFAULT (UTC_TIMESTAMP),
   PRIMARY KEY (`id`),
   KEY `agency_id` (`agency_id`),
   CONSTRAINT `agency_postcode_range_ibfk_1` FOREIGN KEY (`agency_id`) REFERENCES `agency` (`id`) ON UPDATE CASCADE

diff --git a/src/main/resources/db/changelog/changeset/0009_agency_topic/agencyTopic.sql b/src/main/resources/db/changelog/changeset/0009_agency_topic/agencyTopic.sql
@@ -2,8 +2,8 @@ CREATE TABLE `agencyservice`.`agency_topic` (
     `id` bigint(21) NOT NULL,
     `agency_id` bigint(21) NOT NULL,
     `topic_id` bigint(21) NOT NULL,
-    `create_date` datetime NOT NULL DEFAULT UTC_TIMESTAMP(),
-    `update_date` datetime NOT NULL DEFAULT UTC_TIMESTAMP(),
+    `create_date` datetime NOT NULL DEFAULT (UTC_TIMESTAMP),
+    `update_date` datetime NOT NULL DEFAULT (UTC_TIMESTAMP),
     PRIMARY KEY (`id`),
     KEY `agency_id` (`agency_id`),
     CONSTRAINT `agency_topic_ibfk_1` FOREIGN KEY (`agency_id`) REFERENCES `agency` (`id`) ON UPDATE CASCADE