Attachment 71263 Details for Bug 11708 – Bug 11708: Remove column aqbasketgroups.closed

[patch] Bug 11708: Remove column aqbasketgroups.closed

Bug-11708-Remove-column-aqbasketgroupsclosed.patch (text/plain), 5.47 KB, created by Julian Maurice on 2018-02-06 16:46:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julian Maurice

Created: 2018-02-06 16:46:37 UTC

Size: 5.47 KB

patch

obsolete

>From 59639c0861d05f0f75c246528dcc8587447bc110 Mon Sep 17 00:00:00 2001
>From: Julian Maurice <julian.maurice@biblibre.com>
>Date: Mon, 9 Feb 2015 16:26:32 +0100
>Subject: [PATCH] Bug 11708: Remove column aqbasketgroups.closed
>
>It is redundant with aqbasketgroups.closeddate
>
>Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
>
>Patch updated: use atomic update
>---
> C4/Acquisition.pm                                  | 25 +++++++++++++---------
> ...g-11708-remove-column-aqbasketgroups-closed.sql |  3 +++
> installer/data/mysql/kohastructure.sql             |  3 +--
> 3 files changed, 19 insertions(+), 12 deletions(-)
> create mode 100644 installer/data/mysql/atomicupdate/Bug-11708-remove-column-aqbasketgroups-closed.sql
>
>diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
>index acebbfdef3..15f4fa0ad4 100644
>--- a/C4/Acquisition.pm
>+++ b/C4/Acquisition.pm
>@@ -476,8 +476,7 @@ sub CloseBasketgroup {
>     my $dbh        = C4::Context->dbh;
>     my $sth = $dbh->prepare("
>         UPDATE aqbasketgroups
>-        SET    closed=1,
>-               closeddate=CAST(NOW() AS DATE)
>+        SET closeddate=CAST(NOW() AS DATE)
>         WHERE  id=?
>     ");
>     $sth->execute($basketgroupno);
>@@ -498,7 +497,7 @@ sub ReOpenBasketgroup {
>     my $dbh        = C4::Context->dbh;
>     my $sth = $dbh->prepare("
>         UPDATE aqbasketgroups
>-        SET    closed=0, closeddate=NULL
>+        SET    closeddate=NULL
>         WHERE  id=?
>     ");
>     $sth->execute($basketgroupno);
>@@ -923,7 +922,7 @@ $hashref->{'freedeliveryplace'} is the 'freedeliveryplace' field of the basketgr
> 
> $hashref->{'deliverycomment'} is the 'deliverycomment' field of the basketgroup in the aqbasketgroups table,
> 
>-$hashref->{'closed'} is the 'closed' field of the aqbasketgroups table, it is false if 0, true otherwise.
>+$hashref->{'closed'} set 'closeddate' if true, or reset 'closeddate' if defined but false.
> 
> =cut
> 
>@@ -932,7 +931,7 @@ sub NewBasketgroup {
>     die "booksellerid is required to create a basketgroup" unless $basketgroupinfo->{'booksellerid'};
>     my $query = "INSERT INTO aqbasketgroups (";
>     my @params;
>-    foreach my $field (qw(name billingplace deliveryplace freedeliveryplace deliverycomment closed)) {
>+    foreach my $field (qw(name billingplace deliveryplace freedeliveryplace deliverycomment)) {
>         if ( defined $basketgroupinfo->{$field} ) {
>             $query .= "$field, ";
>             push(@params, $basketgroupinfo->{$field});
>@@ -987,7 +986,7 @@ $hashref->{'freedeliveryplace'} is the 'freedeliveryplace' field of the basketgr
> 
> $hashref->{'deliverycomment'} is the 'deliverycomment' field of the basketgroup in the aqbasketgroups table,
> 
>-$hashref->{'closed'} is the 'closed' field of the aqbasketgroups table, it is false if 0, true otherwise.
>+$hashref->{'closed'} set 'closeddate' if true, or reset 'closeddate' if defined but false.
> 
> =cut
> 
>@@ -999,12 +998,12 @@ sub ModBasketgroup {
>     my @params;
> 
>     if ($basketgroupinfo->{closed}) {
>-        $query .= "closeddate = IF(closed = 0, CAST(NOW() AS DATE), closeddate), ";
>+        $query .= "closeddate = IF(closeddate IS NULL, CAST(NOW() AS DATE), closeddate), ";
>     } elsif (defined $basketgroupinfo->{closed}) {
>         $query .= "closeddate = NULL, ";
>     }
> 
>-    foreach my $field (qw(name billingplace deliveryplace freedeliveryplace deliverycomment closed)) {
>+    foreach my $field (qw(name billingplace deliveryplace freedeliveryplace deliverycomment)) {
>         if ( defined $basketgroupinfo->{$field} ) {
>             $query .= "$field=?, ";
>             push(@params, $basketgroupinfo->{$field});
>@@ -1077,7 +1076,9 @@ sub GetBasketgroup {
>         { Slice => {} },
>         $basketgroupid
>     );
>-    return $result_set->[0];    # id is unique
>+    my $basketgroup = $result_set->[0];    # id is unique
>+    $basketgroup->{closed} = defined($basketgroup->{closeddate}) ? 1 : 0;
>+    return $basketgroup;
> }
> 
> #------------------------------------------------------------#
>@@ -1097,7 +1098,11 @@ sub GetBasketgroups {
>     my $dbh = C4::Context->dbh;
>     my $sth = $dbh->prepare($query);
>     $sth->execute($booksellerid);
>-    return $sth->fetchall_arrayref({});
>+    my $basketgroups = $sth->fetchall_arrayref({});
>+    foreach my $bg (@$basketgroups) {
>+        $bg->{closed} = defined($bg->{closeddate}) ? 1 : 0;
>+    }
>+    return $basketgroups;
> }
> 
> #------------------------------------------------------------#
>diff --git a/installer/data/mysql/atomicupdate/Bug-11708-remove-column-aqbasketgroups-closed.sql b/installer/data/mysql/atomicupdate/Bug-11708-remove-column-aqbasketgroups-closed.sql
>new file mode 100644
>index 0000000000..5e95153668
>--- /dev/null
>+++ b/installer/data/mysql/atomicupdate/Bug-11708-remove-column-aqbasketgroups-closed.sql
>@@ -0,0 +1,3 @@
>+UPDATE aqbasketgroups SET closeddate = CAST(NOW() AS DATE) WHERE closed = 1;
>+
>+ALTER TABLE aqbasketgroups DROP COLUMN closed;
>\ No newline at end of file
>diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
>index 91fb4e018c..0dedbd0e3f 100644
>--- a/installer/data/mysql/kohastructure.sql
>+++ b/installer/data/mysql/kohastructure.sql
>@@ -2837,8 +2837,7 @@ DROP TABLE IF EXISTS `aqbasketgroups`;
> CREATE TABLE `aqbasketgroups` (
>   `id` int(11) NOT NULL auto_increment,
>   `name` varchar(50) default NULL,
>-  `closed` tinyint(1) default NULL,
>-  closeddate date default NULL, -- the date the basketgroup was closed
>+  `closeddate` date default NULL,
>   `booksellerid` int(11) NOT NULL,
>   `deliveryplace` varchar(10) default NULL,
>   `freedeliveryplace` text default NULL,
>-- 
>2.14.2

Actions: View | Diff | Splinter Review

Attachments on bug 11708: 25115 | 25116 | 25117 | 26003 | 26004 | 26006 | 28868 | 28869 | 28870 | 28871 | 28872 | 31305 | 31306 | 31307 | 31308 | 31309 | 31530 | 31531 | 31532 | 31533 | 31534 | 31535 | 31536 | 31537 | 31538 | 31539 | 31540 | 31541 | 31542 | 31543 | 31544 | 31702 | 31703 | 31704 | 31705 | 31748 | 31749 | 31750 | 31751 | 31752 | 31753 | 32909 | 32910 | 32911 | 32912 | 32913 | 32914 | 33308 | 33309 | 33310 | 33311 | 33312 | 33313 | 34936 | 34937 | 34938 | 34939 | 34940 | 34941 | 34977 | 35748 | 35749 | 35750 | 35751 | 35752 | 35753 | 35754 | 35755 | 35756 | 35971 | 35972 | 35973 | 35974 | 35975 | 35976 | 35977 | 35978 | 35979 | 40260 | 40261 | 40262 | 40263 | 40264 | 40265 | 40266 | 40267 | 40268 | 40272 | 48992 | 48993 | 48994 | 48995 | 48996 | 52417 | 52418 | 52419 | 52420 | 52421 | 55277 | 55278 | 55279 | 58770 | 58771 | 58772 | 58773 | 58774 | 58775 | 58776 | 58777 | 58778 | 59301 | 59302 | 59303 | 59304 | 59305 | 59306 | 59307 | 59308 | 59309 | 61018 | 61019 | 61020 | 61021 | 61022 | 61023 | 61024 | 61025 | 61026 | 71260 | 71261 | 71262 | 71263 | 71264 | 71265 | 71266 | 71267 | 71268 | 72069 | 72070 | 72071 | 72072 | 72073 | 72074 | 72075 | 72076 | 72077 | 72691 | 72692 | 72693 | 72694 | 72695 | 72696 | 72697 | 72698 | 72699 | 74213 | 74214 | 74215 | 74216 | 74217 | 74218 | 74219 | 74220 | 74221 | 74222 | 74302 | 74303 | 74304 | 74305 | 74306 | 74307 | 74308 | 74309 | 74310 | 74311 | 74349 | 74350 | 74351 | 74352 | 74353 | 74354 | 74355 | 74356 | 74357 | 74358 | 75003 | 75004 | 75908 | 75909 | 78662 | 78663 | 78664 | 80697 | 80698 | 80699 | 80700 | 80979 | 80980 | 80981 | 80982 | 85786 | 85787 | 91285 | 91286 | 92378 | 92379 | 92380 | 92381 | 92382 | 93460 | 93461 | 93462 | 93463 | 93464 | 93482 | 93483 | 93484 | 93485 | 93487 | 104928 | 104929 | 104930 | 104931 | 104932 | 104933 | 104934 | 104935