[koha-commits] main Koha release repository branch 3.22.x updated. v3.22.06-102-g09a3572

Wed May 25 10:09:47 CEST 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  09a35722ab562a5fe33f933d77d2d18510ee0122 (commit)
       via  b5035de9d6853fffe5ff84fa7091433072ec26ab (commit)
       via  e8a703b076fde26dd626711bae5a459bfdf16bb1 (commit)
       via  24373a1745cb8ba7e6cf0aec24bdd4f958944b54 (commit)
       via  7c7109c4569de1f2afb2cec4013c40b242d8c730 (commit)
      from  2293f85092714133d47bf846069d48c81e23e4f5 (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 09a35722ab562a5fe33f933d77d2d18510ee0122
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Sat May 21 09:04:27 2016 +0100

    Bug 13669: Catch the errors to have them to the logs

    This patch redirect STDERR to a variable to retrieve the errors raised
    by the DBMS when loading a sql file, it could be useful to debug errors.

    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    It's better of course, trying to load a failed fiel
    it outputs mysl errors
    DBD::mysql::st execute failed: You have an error in your SQL syntax...
    No errors

    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 8da05cb2a8793b5866c50f796569ce3336807256)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit b5035de9d6853fffe5ff84fa7091433072ec26ab
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Fri May 20 14:26:14 2016 -0300

    Bug 13669: Re-adds error handling to load_sql

    This patch prevents crashing in case an
    error is detected when loading a file

    To test:
    1) Apply patch
    2) Mangle kohastructure.sql or any sample
    file adding and invalid SQL line
    3) Run webinstaller and check that the error
    is handled gracefully

    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 080f5a6b8ed1c958983bd8f528bda4b32cc76ebf)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit e8a703b076fde26dd626711bae5a459bfdf16bb1
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Wed May 18 16:25:25 2016 -0300

    Bug 13669: (alternative) use DBIx::RunSQL

    Alternative POC solution, on top of
    previous patches, feel free to obsolte.

    This patch use DBIx::RunSQL->run_sql_file
    to procees each sql file.

    To test:
    1) Apply all patches
    2) Same test plan of patch 1

    Timing test running web installer, marc21,
    all sample data, time in seconds

    a) without patch
    structure   data
    59.7        66.5
    58.6        66.0

    b) SQL::SplitStatement (patch 1+2)
    59.4        101
    59.7        102

    c) DBIx::RunSQL (patch 3)
    60.7        66.8
    59.4        66.2

    Tomas' version is a bit slower loading sample data,
    all give similar results processing kohastructure.

    New dependency to package: DBIx::RunSQL

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

    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 e64f01ce0d6b3ff127a23070aa82427b69d89263)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 24373a1745cb8ba7e6cf0aec24bdd4f958944b54
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Wed May 18 17:34:06 2016 -0300

    Bug 13669: (followup) Fix kohastructure.sql so FK dependencies are sorted

    The current table creation order is left to mysql's strategy, which is not
    suitable for parsing the SQL files and passing one statement at a time in
    the current order.

    This patch just moves table creation statements around so FK constraints are
    defined for previously created tables.

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

    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 2358185379ed325eb388b717250e90978ffdea5a)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 7c7109c4569de1f2afb2cec4013c40b242d8c730
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Wed May 18 13:23:25 2016 -0300

    Bug 13669: Use perl to load SQL statements from sample data

    This patch changes C4::Installer::load_sql so it uses File::Slurp [1] to read
    the SQL files, and SQL::SplitStatement to extract the statements from the full SQL
    file so they can be passed to $dbh->do.

    To test:
    - On Mysql 5.5, run the webinstaller
    => SUCCESS: Everything works as expected
    - Apply the patch
    - Run
      $ mysql -uroot
      > DROP DATABASE koha_kohadev ; CREATE DATABASE koha_kohadev;
    - Run the webinstaller
    => SUCCESS: Everything works as expected
    - On Mysql 5.6+ (5.7 is implied)
    - Run
      $ mysql -uroot
      > DROP DATABASE koha_kohadev ; CREATE DATABASE koha_kohadev;
    - Run the webinstaller
    => FAIL: It cannot load the sql files due to a password-in-command-line error
    - Apply the patch
    - Make sure everything is clean (it should):
      $ mysql -uroot
      > DROP DATABASE koha_kohadev ; CREATE DATABASE koha_kohadev;
    - Run the webinstaller
    => SUCCESS: EVerything works as expected
    - Sign off :-D

    [1] Note: This is a POC patch, in the sense that it does the job, fixes a nasty problem
    but using File::Slurp to load the SQL files in memory comes with a big runtime penalty.
    You will notice the install procedure is now much slower, for instance.

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

    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 5c151f35aac55c3b4c92fb11397d4ef3b8c9f9b8)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

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

Summary of changes:
 C4/Installer.pm                                    |   76 +-
 .../en/optional/marc21_holdings_coded_values.sql   |    3 +-
 installer/data/mysql/kohastructure.sql             | 1500 ++++++++++----------
 3 files changed, 776 insertions(+), 803 deletions(-)

hooks/post-receive
-- 
main Koha release repository