[koha-commits] main Koha release repository branch 3.22.x updated. v3.22.14-11-gd0d628c

Git repo owner gitmaster at git.koha-community.org
Thu Jan 19 16:51:31 CET 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, 3.22.x has been updated
       via  d0d628c6118256c9c69ccdff4e2e2cde0e7615cd (commit)
       via  6086ae2f0b6faf4ed34c4338aab3b885164f4970 (commit)
       via  691136da81e6d3eedf2f11ef88b9f0811fb40a83 (commit)
       via  c6927e6ef07749313a0adaf4b804065f949d7504 (commit)
       via  96c27a95d5f3d50c68ed26915249269e42df5f68 (commit)
       via  2e5c2a8201566f9d2df42e77a58c82505b3e77dd (commit)
      from  d0543e3ddee99e539eeb566343ac769f31d57c45 (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 d0d628c6118256c9c69ccdff4e2e2cde0e7615cd
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Jan 12 10:44:46 2017 +0100

    Bug 17234: Need to separate KEY and FOREIGN KEY checks
    
    In the previous patch we use the constraint_exists subroutine to verify
    if an index or a foreign key exists.
    But the `SHOW INDEX` query does not return foreign keys (as its name
    suggests!).
    We need another subroutine foreign_key_exists to check the FK existence.
    
    I have found that because t/db_dependent/TestBuilder.t fails on
    oai_sets_biblios, because oai_sets_biblios_ibfk_1 has not been removed.
    
    Test plan:
    0/ Do not apply this patch
    1/ Use a 3.20 DB
    2/ update the DB
    3/ SHOW CREATE TABLE oai_sets_biblios
    will display oai_sets_biblios_ibfk_1
    
    Apply the patch and repeat 1, 2, 3
    => Will not display oai_sets_biblios_ibfk_1
    It has been removed as expected.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 05fdd855c8da85d3be27d42721f6a544b0145e57)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    (cherry picked from commit ba45608b0d823e4bac4e6794392d53f4eda4b9c2)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 6086ae2f0b6faf4ed34c4338aab3b885164f4970
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Jan 2 11:36:53 2017 +0100

    Bug 17234: Test the column and constraint non-existence
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 435b7badc22d9c05cb16623d6f423206992ec476)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    (cherry picked from commit cd6782d5b4be87f724b5d2d36ff1dedd4cfab503)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 691136da81e6d3eedf2f11ef88b9f0811fb40a83
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Fri Dec 30 14:08:33 2016 -0500

    Bug 17234: Two new functions lack tests
    
    This adds two tests to t/db_dependent/Installer.t
    
    TEST PLAN
    ---------
    1) Apply patch
    2) prove -v t/db_dependent/Installer.t
       -- column and constraint tests were added.
    3) run koha qa test tools
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 8938631f38bb22456424219d3c3453493df6f848)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    (cherry picked from commit 4518ec795d253901215621235f3c1bf6e76f4df0)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit c6927e6ef07749313a0adaf4b804065f949d7504
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 27 08:28:09 2016 +0100

    Bug 17234: Move new subroutines to C4::Installer
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 0b15c5e2cc5d5a84b062c5c5738fe54ab5df98ab)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    (cherry picked from commit a34a60823fc2ed3f92a68e85e2591c0d82f5b4d3)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 96c27a95d5f3d50c68ed26915249269e42df5f68
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 20 16:55:40 2016 +0100

    Bug 17234: Add constraint_exists and column_exists to updatedatabase.pl
    
    These 2 subroutines will help us deal with the absense of ALTER IGNORE
    TABLE
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit c08922180e83b0222dc3d54a292aaf49cc15000a)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    (cherry picked from commit 70fe225bea608b61b40f237a13195eb028da4231)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 2e5c2a8201566f9d2df42e77a58c82505b3e77dd
Author: Blou <philippe.blouin at inlibro.com>
Date:   Fri Sep 2 08:05:48 2016 -0400

    Bug 17234 - updatedatabase.pl's ALTER IGNORE break with mysql 5.7.4+
    
    The doc says: "As of MySQL 5.7.4, the IGNORE clause for ALTER TABLE is removed and its use produces an error."
    This fix replaces ALTER IGNORE with ALTER in updatedatabase.pl
    
    To TEST, try an upgrade from 3.18 to 3.22 after installing the latest mysql (at least 5.7.4, by the doc).
    Some will fail with error
    
    DBD::mysql::db do failed: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'IGNORE TABLE aqbasket
                ADD KEY authorisedby (authorisedby)' at line 1 [for Statement "
            ALTER IGNORE TABLE aqbasket
                ADD KEY authorisedby (authorisedby)
        "] at ./installer/data/mysql/updatedatabase.pl line 10563.
    
    0) Find a database on 3.18, save it.
    1) Set your code base to 3.22(or master)
    2) run updatedatabase.pl
    3) See the errors.
    4) Apply the patch
    5) Reload the 3.18 database
    6) succeed with updatedatabase.pl
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit acf425bbbcb8c22f3655472f90285869c3ad7164)
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    (cherry picked from commit e2e61a798cd9e07dfdb4026b1ab455f1a07cd301)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

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

Summary of changes:
 C4/Installer.pm                        |   37 +++++++
 installer/data/mysql/updatedatabase.pl |  182 ++++++++++++++++++++------------
 t/db_dependent/Installer.t             |   73 ++++++++++---
 3 files changed, 209 insertions(+), 83 deletions(-)


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list