[koha-commits] main Koha release repository branch 3.22.x updated. v3.22.12-32-gf080cf4

Git repo owner gitmaster at git.koha-community.org
Wed Nov 30 14:04:05 CET 2016


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, 3.22.x has been updated
       via  f080cf45462422cd9f4aa2b0c46db7e563bc5b0f (commit)
       via  0c1201bcce5d6d141658dccd8761c568abc0c795 (commit)
       via  64e417850da2877ee232e277ce443ccec18e3f11 (commit)
       via  96440b4fe1bfec932b7f17b4893dbd8f6ce70073 (commit)
       via  8a47182483e8eac33d49ecd3de22cf62537595d1 (commit)
       via  5aa4771dd2d01f43b5f16a9794422c2914f07c81 (commit)
       via  86c195a5ebf84b557def8e18ac625f591bf186bc (commit)
       via  a81bbe17b50a4a02d0d2915a0c15057ef44cbd3b (commit)
       via  c29b60fb268640d4fdbc40dcb0ca8c15f83c5822 (commit)
       via  b7679dd0a90fc6022b1a1f6126ffbe7ac32521bc (commit)
       via  95c65c5a893e0433f13fcb3aeccd0b6ccefd0e70 (commit)
       via  4df3dbbdde4df7e2f69c59e74ca98cff9fd111b2 (commit)
       via  7c40950513d80c3064140b187624289c9dbdddca (commit)
       via  465e1a203fc398a232a4ba79caebb9003e3266af (commit)
      from  497e28039f392276a4415c49192fb73110ba6642 (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 f080cf45462422cd9f4aa2b0c46db7e563bc5b0f
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri Oct 28 11:30:38 2016 +0000

    Bug 14598: Update DB rev (3.22.12.002)
    
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 0c1201bcce5d6d141658dccd8761c568abc0c795
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Oct 28 09:54:20 2016 +0200

    Bug 14598: [QA Follow-up] Small changes
    
    [1] Renames the dbrev version to XXX; adding a my for $sth, although
        not strictly necessary it feels better.
    [2] Circulation.t stumbles over:
        Undefined subroutine &C4::Circulation::GetItem called at ... line 1283.
        Somehow this is related to use_ok instead of a regular use.
        Worked around this by require_ok and adding a regular use.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 3660c451a36db128c143b6388d0d1f34babff4ac)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 64e417850da2877ee232e277ce443ccec18e3f11
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Apr 7 12:03:49 2016 +0100

    Bug 14598: Fix warning from effective_itemtype
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit ec96a0cb3f25f53fbe14f6c93a8d28b48d3b7286)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 96440b4fe1bfec932b7f17b4893dbd8f6ce70073
Author: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Date:   Wed Apr 6 11:34:26 2016 -0300

    Bug 14598: (QA followup) use deleted{items|biblioitems} during upgrade
    
    If the 'statistics' table contains circulation information about items
    that are no longer on the DB it will raise a warning. This patch
    makes the updatedatabase.pl script use the deleteditems and deletedbiblioitems
    tables to get information for those items on the statistics table.
    
    To reproduce:
    - Have your sample DB contain some circulation data on the statistics table
    - Make sure some of them have NULL itemtype:
    > UPDATE statistics SET itemtype = NULL WHERE type='return';
    - Check the upgrade query catches them:
    > SELECT s.itemnumber, i.itype, b.itemtype FROM  ( SELECT DISTINCT itemnumber    FROM statistics    WHERE ( type = "return" OR type = "localuse" ) AND itemtype IS NULL ) s  LEFT JOIN  ( SELECT itemnumber,biblionumber, itype      FROM items    UNION    SELECT itemnumber,biblionumber, itype      FROM deleteditems ) i  ON (s.itemnumber=i.itemnumber)  LEFT JOIN  ( SELECT biblionumber, itemtype      FROM biblioitems    UNION    SELECT biblionumber, itemtype      FROM deletedbiblioitems ) b  ON (i.biblionumber=b.biblionumber);
    +------------+-------+----------+
    | itemnumber | itype | itemtype |
    +------------+-------+----------+
    |        732 | BK    | BK       |
    |        731 | BK    | BK       |
    +------------+-------+----------+
    2 rows in set (0.00 sec)
    
    - Delete the items, and some biblio too.
    - Re-run the query
    => SUCCESS: Same results
    - Go reset to NULL the itemtypes
    > UPDATE statistics SET itemtype = NULL WHERE type='return';
    - Run the updatedatabase.pl script:
     $ sudo koha-shell koahdev ; cd kohaclone
     $ perl installer/data/mysql/updatedatabase.pl
    => SUCCESS: No warnings
    
    Note: It is possible that on production sites, if the sysadmin is cleaning the
    deleted{items|biblioitems|biblio} tables, there will be warnings. This is expected
    as they need to know some data lacks information.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 3fa514133b33aca3727111d2ddfdd0bdb3d5d639)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 8a47182483e8eac33d49ecd3de22cf62537595d1
Author: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Date:   Fri Apr 1 12:25:39 2016 -0300

    Bug 14598: (followup) Remove unused and non-existent C4::ItemType include
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit e31eb08e29f637f90d095df31388bf64f2b685a9)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 5aa4771dd2d01f43b5f16a9794422c2914f07c81
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Tue Jan 19 14:34:20 2016 +0000

    Bug 14598 [QA Followup] - Update localuse statistics also
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit c042307db35f59fe2dca8d8fa214be7b39b0277e)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 86c195a5ebf84b557def8e18ac625f591bf186bc
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Tue Jan 12 16:04:55 2016 +0000

    Bug 14598 [QA Followup] - Make unit test pass
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit ad800ce36e07915628602c4f6ba2ccf83bacdd16)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit a81bbe17b50a4a02d0d2915a0c15057ef44cbd3b
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri Dec 18 14:59:02 2015 +0000

    Bug 14598 [QA Followup] - Correct the behavior of GetItem
    
    Currently GetItem sets itemtype to the biblio itemtype if no item level
    itemtype exists. Instead, it should only do this if item_level-itypes
    is not set.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 73b85e98755e075044db72b973cb3ebd6c0f4891)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit c29b60fb268640d4fdbc40dcb0ca8c15f83c5822
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri Nov 20 14:23:22 2015 +0000

    Bug 14598 [QA Followup] - Only fetch bib data if needed
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 4384e081968c7dd9c95c34d78bda2eba199a3243)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit b7679dd0a90fc6022b1a1f6126ffbe7ac32521bc
Author: Brendan A Gallagher <brendan at bywatersolutions.com>
Date:   Thu Nov 19 21:13:05 2015 +0000

    Bug 14598 - QA Followup touching CanBookBeIssued subroutine
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 096b6c3938d060ab973e76f6840bd26ec8ef26cd)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 95c65c5a893e0433f13fcb3aeccd0b6ccefd0e70
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Tue Sep 1 11:52:17 2015 -0300

    Bug 14598: (DB update) fix NULL itemtypes in statistics on 'return' rows
    
    This patch introduces an updatedatabase.pl entry that takes care of
    updating existing statistics rows.
    
    It does so by looping on the statistics rows, collecting itemnumber occurences
    that are have NULL itemtypes.
    It then chooses the right itemtype following what is proposed on bug 14651, and
    then updates the rows in statistics using the calculated itemtype.
    
    Regards
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 2cdec7ff9178fd8f70b5885b7c2936ddf09e69f7)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 4df3dbbdde4df7e2f69c59e74ca98cff9fd111b2
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Mon Jul 27 11:16:56 2015 -0400

    Bug 14598: (QA followup) Don't die on bad barcode
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 34eb4c1fa95ea14047413436b8df42299d029ca4)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 7c40950513d80c3064140b187624289c9dbdddca
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Mon Jul 27 11:40:38 2015 -0300

    Bug 14598: Make C4::Circulation::AddReturn store the right itemtype
    
    This patch makes C4::Circulation::AddReturn correctly store the itemtype
    on the 'statistics' table.
    
    To reproduce:
    - Checkout master.
    - Make a checkout.
    - Check the 'statistics' table and notice the itemtype is correctly set
      > SELECT * FROM statistics;
    - Check the item in.
    - Check the 'statistics' table and notice the itemtype is not set
      > SELECT * FROM statistics WHERE type="return";
    => FAIL: itemtype is set to NULL
    
    To test:
    - Apply the regression tests patch
    - Run the tests:
      $ prove t/db_dependent/Circulation/Returns.t
    => FAIL: Tests fail
    - Apply this patch
    - Run the regression tests:
      $ prove t/db_dependent/Circulation/Returns.t
    => SUCCESS: Tests now pass.
    - Repeat the 'To reproduce' steps
    => SUCCESS: itemtype is now correctly set (in real life)
    - Happily sign off :-D
    
    Sponsored-by: Universidad Empresarial Siglo 21
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 285ac7a31eb50262af9c6a51502630ba150b14fa)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 465e1a203fc398a232a4ba79caebb9003e3266af
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Sun Jul 26 02:05:16 2015 -0300

    Bug 14598: (regression tests) AddReturn should store itemtype on 'statistics' table
    
    This patch adds tests for C4::Circulation::AddReturn(). Both tests are wrapped
    inside a subtest, and look for AddReturn storing the right itemtype on the
    'statistics' table.
    
    Note: It also refactors the file a bit, to avoid side effects. And uses TestBuilder
    to make it independent on already-present db data. It also removes warnings by mocking
    C4::Context::userenv
    
    To test:
    - Apply the patch
    - Run the tests:
      $ prove t/db_dependent/Circulation/Returns.t
    => FAIL: Tests fail bacause AddReturn is not storing the itemtype
    - Sign off :-D
    
    Sponsored-by: Universidad Empresarial Siglo 21
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 357a69b0e174c813ef52d1ee7f47cd810c76938d)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

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

Summary of changes:
 C4/Circulation.pm                      |   33 ++--
 C4/Items.pm                            |   37 ++---
 Koha.pm                                |    2 +-
 Koha/Schema/Result/Item.pm             |    2 +-
 installer/data/mysql/updatedatabase.pl |   50 ++++++
 t/db_dependent/Circulation.t           |   17 +-
 t/db_dependent/Circulation/Returns.t   |  284 +++++++++++++++++++++++++++-----
 t/db_dependent/Items.t                 |   86 +++++++---
 8 files changed, 400 insertions(+), 111 deletions(-)


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list