[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.04-7-g75b0e7a

Git repo owner gitmaster at git.koha-community.org
Thu Sep 27 14:22:03 CEST 2018


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, 18.05.x has been updated
       via  75b0e7a0787d82caa987afc67206fad2b5811e4c (commit)
       via  a54c1b9a1ca86dcab11e4008727221edc42eb69a (commit)
       via  9f306898886efe1c2a29f2b622885ec1dfa4fe9a (commit)
      from  ff3238992788344902835742c7ffd02899409e79 (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 75b0e7a0787d82caa987afc67206fad2b5811e4c
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Sep 21 09:15:08 2018 +0200

    Bug 21281: (QA follow-up) Introduce _add_backtics
    
    Added a (initially trivial) test in Creators/Lib.t too.
    Sometimes you start something, but you end somewhere else ;)
    
    The test seems a bit slower now (regex, lookahead, etc). But this should
    not hurt label creators in daily use.
    Advantages: code is even more solid, consolidated in one place and can be
    tested on its own.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit db683b285cfb31deb9dbdafbc5a18e0b471ffa65)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit a54c1b9a1ca86dcab11e4008727221edc42eb69a
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Wed Sep 5 18:41:32 2018 +0000

    Bug 21281: Correct t/db_dependent/Creators/Lib.t failures
    
    TEST PLAN
    ---------
    1) apply first patch
    2) kshell kohadev
    3) prove -r -v t/db_dependent/Creators/
       -- failures
    4) apply this patch
    5) repeat 2,3
       -- no failures
    6) run koha qa test tools
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    (cherry picked from commit 78124100ec6708de99bea3e4e181da3897130d0e)
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 9f306898886efe1c2a29f2b622885ec1dfa4fe9a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Aug 29 17:05:50 2018 -0300

    Bug 21281: Surround creator_templates.rows with backquotes
    
    'rows' is a reserved word since MariaDB 10.2.4 and MySQL
    https://mariadb.com/kb/en/library/mariadb-1024-release-notes/
    https://dev.mysql.com/doc/refman/8.0/en/keywords.html
    
    Test plan:
    Do not apply this patch and make sure you recreate the reported issue
    Apply this patch and confirm that it is now fixed.
    
    QA will take care for the changes in installer and test files
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 7de47202f2876892524c8b68de962c0776f32881)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

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

Summary of changes:
 C4/Creators/Lib.pm                          |   24 +++++++++++++++++++-----
 installer/data/mysql/patroncards_upgrade.pl |    2 +-
 t/db_dependent/Creators/Lib.t               |   18 ++++++++++++++----
 3 files changed, 34 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list