[koha-commits] main Koha release repository branch 20.05.x updated. v20.05.05-54-g076fcca891

Git repo owner gitmaster at git.koha-community.org
Fri Nov 13 22:56:22 CET 2020


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, 20.05.x has been updated
       via  076fcca891258e9f9800066f4f6a33889247a5c3 (commit)
       via  a88f367c63a2d649625fe367fa64ce3c888638ab (commit)
       via  5fc0d24ca8c58407e4461142054cb67a4aec5a00 (commit)
       via  9999d88169db3bd51d30b489d762a615c1872f7f (commit)
       via  610fab83e0c8d0304f695e95174ae5804cb2ed72 (commit)
       via  fee8aa2b1cf4c90c37e55d7286bafe8a8b0307de (commit)
      from  7485f479fafb1b04d7681432c5cc421ab3f2afae (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 076fcca891258e9f9800066f4f6a33889247a5c3
Author: Lucas Gass <lucas at bywatersolutions.com>
Date:   Fri Nov 13 21:20:24 2020 +0000

    Bug 18050: DBRev 20.05.05.002
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit a88f367c63a2d649625fe367fa64ce3c888638ab
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Mon Oct 5 06:17:34 2020 +0000

    Bug 18050: (QA follow-up) Adjust conditions and make use of message text
    
    - When we run into invalid data, we use Augustin's suggested solution
      and copy the data into a separate table, setting the budget_period_id to
      NULL.
    - We amend the output using the new $message.
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 3c8bef50a223e70fe3023222f5f940a2b1771b5d)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit 5fc0d24ca8c58407e4461142054cb67a4aec5a00
Author: Agustin Moyano <agustinmoyano at theke.io>
Date:   Fri Oct 9 15:14:26 2020 -0300

    Bug 18050: (follow-up) Force adding FK constraint
    
    When there are inconsistent budget_period_id in aqbudgets this patch
    creates the table _bug_18050_aqbudgets with the original data, then sets
    the column to null and warns the user that there is inconsistent data.
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 1193dddd8beb4a10a78e385b221c0f908d92dcf6)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit 9999d88169db3bd51d30b489d762a615c1872f7f
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Sun Sep 13 23:31:52 2020 +0000

    Bug 18050: Add relation alias to schema
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 2800b53bdd6df1e87f72673bc79ed4896f4e4e35)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit 610fab83e0c8d0304f695e95174ae5804cb2ed72
Author: Lucas Gass <lucas at bywatersolutions.com>
Date:   Fri Nov 13 21:15:16 2020 +0000

    Bug 18050: DBIC
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit fee8aa2b1cf4c90c37e55d7286bafe8a8b0307de
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Sun Sep 13 22:42:27 2020 +0000

    Bug 18050: Add FK constraint on aqbudgets.budget_period_id
    
    This adds a FK constraint on aqbudgets.budget_period_id so that
    a fund cannot be added with an invalid aqbudget.budget_period_id.
    
    We should not have funds that belong to no budget. In case we have, the
    update will be skipped and a note displayed.
    
    Part1:
    - Before applying the patch
    - Make sure you have a budget with some funds linked to it
    - You will have to change one of the funds to link to an invalid
      budget with SQL:
      UPDATE aqbudgets SET budget_period_id = 999 WHERE budget_id = max(budget_id);
    - Apply patch
    - Run updatedatabase - verify that you see the hint about 1 existing fund with invalid budget.
    - Repair your fund with SQL
      UPDATE aqbudgets SET budget_period_id = ... WHERE budget_id = max(budget_id);
      (... needs to be your existing budget_period_id)
    - Run updatedatabase again - verify it runs successfully now.
    - If you try to change the budget_period_id to a non-existing now with SQL, you will
      get a database error. The new FK doesn't permit it.
    Part 2:
    - Start fresh with the web installer, verify there are no errors on
      creating the database tables
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 0ce62b29bf5ebe30125eb4c631de11391134f109)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

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

Summary of changes:
 Koha.pm                                |  2 +-
 Koha/Schema/Result/Aqbudget.pm         | 33 +++++++++++++++++++++++++---
 Koha/Schema/Result/Aqbudgetperiod.pm   | 21 ++++++++++++++++--
 installer/data/mysql/kohastructure.sql |  3 ++-
 installer/data/mysql/updatedatabase.pl | 39 ++++++++++++++++++++++++++++++++++
 5 files changed, 91 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list