From f3d56b51db5d0196dbdf86b9042e515816708fd6 Mon Sep 17 00:00:00 2001
From: Daniel <d.hornung@indiscale.com>
Date: Fri, 8 Nov 2024 13:57:13 +0100
Subject: [PATCH] Fix: Applying dump upgrade script twice no longer fails.

---
 CHANGELOG.md                                     | 2 ++
 dump_updates/2024-10-02.dump_fix_mariadb_10_6.sh | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b100138..5ea239a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- [SQL dump migration can now be applied twice](https://gitlab.indiscale.com/caosdb/src/caosdb-mysqlbackend/-/issues/60): Fixed an error in the regex.
+
 ### Security
 
 ## [8.0.0] - 2024-10-24 ##
diff --git a/dump_updates/2024-10-02.dump_fix_mariadb_10_6.sh b/dump_updates/2024-10-02.dump_fix_mariadb_10_6.sh
index 4450b83..8b9e484 100755
--- a/dump_updates/2024-10-02.dump_fix_mariadb_10_6.sh
+++ b/dump_updates/2024-10-02.dump_fix_mariadb_10_6.sh
@@ -35,10 +35,10 @@ set -euo pipefail
 IFS=$'\n\t'
 
 script='
-s/Offset INT UNSIGNED) RETURNS varbinary(255)/HeadOffset INT UNSIGNED) RETURNS varbinary(255)/
+/^[[:blank:]]+Offset INT UNSIGNED/s/Offset INT UNSIGNED\) RETURNS varbinary\(255\)/HeadOffset INT UNSIGNED\) RETURNS varbinary(255)/
 s/LIMIT 1 OFFSET Offset/LIMIT 1 OFFSET HeadOffset/
 '
 
-sed -e "$script"
+sed -E -e "$script"
 
 unset script
-- 
GitLab