[koha-commits] main Koha release repository branch master updated. v17.05.00-135-gee7969d

Tue Jun 20 19:42:38 CEST 2017

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  ee7969d3461e6ce08b4fbfd982c90f263f19f693 (commit)
       via  4906d58f7c507613c9ad20c4524afd278fca467c (commit)
       via  26957fea0d438046aa5d08c117099f5d2d57406d (commit)
       via  59fcad685e8143bfaeb7a148f248cc7b7f80b742 (commit)
       via  79cb157b3b4bee9f1c079937bd13019c7b7f650f (commit)
       via  be3d39c8b1e2671790ee5cb5cc7295eec3774a35 (commit)
       via  acb7a717482c2a47f7da6a0d883784415bf3b8d5 (commit)
       via  c3c9d61570b61ec49d508261f0500463a73925d6 (commit)
      from  7bcc226facc17eca9bc94cbab9535b2677462446 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ee7969d3461e6ce08b4fbfd982c90f263f19f693
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Tue Jun 20 15:03:35 2017 +0200

    Bug 18651: [QA Follow-up] Fix the MAX(issue_id) calculation

    Found this by inserting the same issue_id in old_issues before checkin:
    The call to ->search( )->get_column is in scalar context and will
    return the number of results, i.e. always 1.
    If you have an issue_id 2 in old_issues, it will crash:
        DBIx::Class::Storage::DBI::_dbh_execute(): Duplicate entry '2' for key 'PRIMARY'

    The fix is fairly simple: Put get_column in list context and pick the first
    array entry.
    NOTE: Using DBIx's get_column()->max here might look simpler here.

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

commit 4906d58f7c507613c9ad20c4524afd278fca467c
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Tue Jun 20 14:19:12 2017 +0200

    Bug 18651: [QA Follow-up] Remove unused variable

    Variable $original_issue_id is not used. The id is retrieved later from
    $issue when updating accountlines.

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

commit 26957fea0d438046aa5d08c117099f5d2d57406d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Jun 15 20:25:18 2017 -0300

    Bug 18651: Limit the life span of the LOCK

    We only need the table to be locked for the fetch, increment, store sequence

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

commit 59fcad685e8143bfaeb7a148f248cc7b7f80b742
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed May 24 12:24:53 2017 -0300

    Bug 18651: Use a READ and WRITE LOCK

    For more info, see:
      commit be156d9ad9e5bcfadab34d44f90e04fd61e256ad
        Bug 15854: Use a READ and WRITE LOCK on message_queue
    and
      commit b40456f7dd4b8a988f9c6a5718452936101cb8ff
        Bug 18364: Do not LOCK/UNLOCK tables from tests

    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

commit 79cb157b3b4bee9f1c079937bd13019c7b7f650f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue May 23 10:27:31 2017 -0300

    Bug 18651: Copy the row before modify the id

    If the "max(issue_id) from old_issue + 1" already exists in issues, the
    move fails.

    For instance we have
    1, 2, 3, 4 in issues

    checkin 4
    1, 2, 3 in issues (AI=5)
    4 in old_issues

    Restart mysql => AI is reset to MAX(issue_id) => 4

    checkout a new one
    1, 2, 3, 4 in issues (AI=5)
    4 in old_issues

    checkin 4 (will get id 5 in old_issues)
    1, 2, 3 in issues (AI=5)
    4, 5 in old_issues

    => This works with and without this patch

    Now we have
    1, 2, 3 in issues (AI=5)
    4, 5 in old_issues

    Restart mysql => AI is reset to MAX(issue_id) => 4

    checkout 2 new ones
    1, 2, 3, 4, 5 in issues (AI=7)
    4, 5 in old_issues

    checkin 4 (4 becomes 6 in old_issues)
    1, 2, 3, 5 in issues (AI=6)
    4, 5, 6 in old_issues

    => This did not work without with patch
    The update of the issue_id was made before the move (so in the issues
    table), the PK did not allow it

    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

commit be3d39c8b1e2671790ee5cb5cc7295eec3774a35
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon May 22 14:30:48 2017 -0300

    Bug 18651: Update accountlines.issue_id is the issue_id has been changed during the move

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

commit acb7a717482c2a47f7da6a0d883784415bf3b8d5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon May 22 14:26:25 2017 -0300

    Bug 18651: Do not charge if the checkin failed

    2. If the move fails for whatever reason (see
    https://lists.katipo.co.nz/pipermail/koha/2017-May/048045.html for an
    example), fines can be charged. It should not

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

commit c3c9d61570b61ec49d508261f0500463a73925d6
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon May 22 12:02:20 2017 -0300

    Bug 18651: Update issue_id in AddReturn

    1. AddReturn returns a $issue hashref with the old issue_id value
    => At first glance it does not affect anything, but would be good to fix
    it for future uses.

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

-----------------------------------------------------------------------

Summary of changes:
 C4/Circulation.pm                    |   52 +++++++++++++++++++++-------------
 t/db_dependent/Circulation/Returns.t |   30 ++++++++++++++++----
 2 files changed, 57 insertions(+), 25 deletions(-)

hooks/post-receive
-- 
main Koha release repository