From 26bf540268af59808fb17ec8000abfe2db265a51 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Joonas=20Kylm=C3=A4l=C3=A4?= <joonas.kylmala@helsinki.fi>
Date: Wed, 2 Jun 2021 20:22:51 +0300
Subject: [PATCH] Bug 28490: Comment out the relationship data removing DB
 update step

These columns that were actively used to store non-patron guarantor
relationship info were dropped incorrectly. In a later patch the
relationship fields will be re-added.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Petro Vashchuk <stalkernoid@gmail.com>
Signed-off-by: Emmi Takkinen <emmi.takkinen@koha-suomi.fi>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

JD Amended patch: Add a "SKIP" note on the DBrev we commented out

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 installer/data/mysql/updatedatabase.pl | 36 ++++++++++++++------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 6a68c11719..4e5dfbfc8f 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -24229,25 +24229,29 @@ if( CheckVersion( $DBversion ) ) {
 
 $DBversion = '20.12.00.048';
 if( CheckVersion( $DBversion ) ) {
-    if ( column_exists( 'borrowers', 'relationship' ) ) {
-        $dbh->do(q{
-            ALTER TABLE borrowers DROP COLUMN relationship
-        });
-    }
 
-    if ( column_exists( 'deletedborrowers', 'relationship' ) ) {
-        $dbh->do(q{
-            ALTER TABLE deletedborrowers DROP COLUMN relationship
-        });
-    }
+    # This DB upgrade has been commented out because it removes
+    # actively used data, the relationship columns will be added back
 
-    if ( column_exists( 'borrower_modifications', 'relationship' ) ) {
-        $dbh->do(q{
-            ALTER TABLE borrower_modifications DROP COLUMN relationship
-        });
-    }
+    # if ( column_exists( 'borrowers', 'relationship' ) ) {
+    #     $dbh->do(q{
+    #         ALTER TABLE borrowers DROP COLUMN relationship
+    #     });
+    # }
+
+    # if ( column_exists( 'deletedborrowers', 'relationship' ) ) {
+    #     $dbh->do(q{
+    #         ALTER TABLE deletedborrowers DROP COLUMN relationship
+    #     });
+    # }
+
+    # if ( column_exists( 'borrower_modifications', 'relationship' ) ) {
+    #     $dbh->do(q{
+    #         ALTER TABLE borrower_modifications DROP COLUMN relationship
+    #     });
+    # }
 
-    NewVersion( $DBversion, 26995, "Drop column relationship from borrower tables");
+    NewVersion( $DBversion, 26995, "[SKIP] Drop column relationship from borrower tables [not executed]");
 }
 
 $DBversion = '20.12.00.049';
-- 
2.39.5