Attachment 156847 Details for Bug 16223 – Bug 16223: (QA follow-up) Adjust DB changes

[patch] Bug 16223: (QA follow-up) Adjust DB changes

Bug-16223-QA-follow-up-Adjust-DB-changes.patch (text/plain), 3.02 KB, created by Tomás Cohen Arazi (tcohen) on 2023-10-11 15:11:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomás Cohen Arazi (tcohen)

Created: 2023-10-11 15:11:08 UTC

Size: 3.02 KB

patch

obsolete

>From 6c9f6b933e19d0180f4341a292db1ac36ac2febd Mon Sep 17 00:00:00 2001
>From: Tomas Cohen Arazi <tomascohen@theke.io>
>Date: Wed, 11 Oct 2023 11:32:25 -0300
>Subject: [PATCH] Bug 16223: (QA follow-up) Adjust DB changes
>
>Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
>---
> .../data/mysql/atomicupdate/bug_16223.pl      | 36 ++++++++++++-------
> installer/data/mysql/kohastructure.sql        |  2 ++
> 2 files changed, 25 insertions(+), 13 deletions(-)
>
>diff --git a/installer/data/mysql/atomicupdate/bug_16223.pl b/installer/data/mysql/atomicupdate/bug_16223.pl
>index 12aa40823ae..65269c8b39d 100755
>--- a/installer/data/mysql/atomicupdate/bug_16223.pl
>+++ b/installer/data/mysql/atomicupdate/bug_16223.pl
>@@ -1,24 +1,34 @@
> use Modern::Perl;
> 
> return {
>-    bug_number => "16223",
>+    bug_number  => "16223",
>     description => "Add new columns lift_after_payment and fee_limit to table restriction_types",
>-    up => sub {
>+    up          => sub {
>         my ($args) = @_;
>-        my ($dbh, $out) = @$args{qw(dbh out)};
>+        my ( $dbh, $out ) = @$args{qw(dbh out)};
> 
>-        if( !column_exists( 'restriction_types', 'lift_after_payment' ) ) {
>-            $dbh->do(q{
>-                ALTER TABLE restriction_types ADD COLUMN `lift_after_payment` tinyint(1) NOT NULL DEFAULT 0
>-            });
>+        if ( !column_exists( 'restriction_types', 'lift_after_payment' ) ) {
>+            $dbh->do(
>+                q{
>+                ALTER TABLE restriction_types
>+                    ADD COLUMN `lift_after_payment` tinyint(1) NOT NULL DEFAULT 0
>+                    AFTER `is_default`
>+            }
>+            );
>+
>+            say $out "Added column 'restriction_types.lift_after_payment'";
>         }
>-        say $out "Added column lift_after_payment";
> 
>-        if( !column_exists( 'restriction_types', 'fee_limit' ) ) {
>-            $dbh->do(q{
>-                ALTER TABLE restriction_types ADD COLUMN `fee_limit` decimal(28,6) DEFAULT NULL
>-            });
>+        if ( !column_exists( 'restriction_types', 'fee_limit' ) ) {
>+            $dbh->do(
>+                q{
>+                ALTER TABLE restriction_types
>+                    ADD COLUMN `fee_limit` decimal(28,6) DEFAULT NULL
>+                    AFTER `lift_after_payment`
>+            }
>+            );
>+
>+            say $out "Added column 'restriction_types.fee_limit'";
>         }
>-        say $out "Added column fee_limit";
>     },
> };
>diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
>index daaf3926ef2..d91bd46b323 100644
>--- a/installer/data/mysql/kohastructure.sql
>+++ b/installer/data/mysql/kohastructure.sql
>@@ -5048,6 +5048,8 @@ CREATE TABLE `restriction_types` (
>   `display_text` text NOT NULL,
>   `is_system` tinyint(1) NOT NULL DEFAULT 0,
>   `is_default` tinyint(1) NOT NULL DEFAULT 0,
>+  `lift_after_payment` tinyint(1) NOT NULL DEFAULT 0,
>+  `fee_limit` decimal(28,6) DEFAULT NULL,
>   PRIMARY KEY (`code`)
> ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
> /*!40101 SET character_set_client = @saved_cs_client */;
>-- 
>2.42.0

Actions: View | Diff | Splinter Review

Attachments on bug 16223: 50078 | 50084 | 99697 | 99698 | 104399 | 104400 | 114272 | 114273 | 118526 | 118572 | 118574 | 118575 | 122768 | 122769 | 127252 | 128005 | 132284 | 132285 | 132286 | 132287 | 143388 | 143389 | 143390 | 143462 | 143670 | 143671 | 143672 | 143688 | 143689 | 143690 | 143765 | 143766 | 143767 | 143768 | 143769 | 143770 | 143936 | 146051 | 146052 | 146053 | 146054 | 146055 | 146056 | 146057 | 148307 | 148308 | 148309 | 148310 | 148311 | 148312 | 148313 | 150024 | 150025 | 150026 | 150027 | 150028 | 150029 | 153024 | 153025 | 153026 | 153027 | 153028 | 153029 | 155644 | 155645 | 155646 | 155647 | 155648 | 155649 | 155650 | 156841 | 156842 | 156843 | 156844 | 156845 | 156846 | 156847 | 156848 | 156849 | 156850