[koha-commits] main Koha release repository branch 3.14.x updated. v3.14.01-69-g808e0f4

[Git repo owner]

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.14.x has been updated
       via  808e0f46f2b87036812788b6d32835244607e329 (commit)
       via  afc546d9a92a7159bd29f6615a3d48dcc42c3dfb (commit)
       via  95d96afb54eca86cae327e0a05da05de5a4c7f62 (commit)
      from  83823153cfa50d0b0d80b2c42515fcfaa4a52332 (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 808e0f46f2b87036812788b6d32835244607e329
Author: Fridolin SOMERS <fridolin.somers at biblibre.com>
Date:   Fri Jan 3 09:26:30 2014 +0100

    Bug 11384: DBRev 3.14.01.002
    
    Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>

commit afc546d9a92a7159bd29f6615a3d48dcc42c3dfb
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Wed Dec 11 16:55:31 2013 +0000

    Bug 11384: (follow-up) update DBIC schema classes
    
    This patch updates the DBIC schema class for CollectionTracking
    to reflect the new name of its primary key column.
    
    To test:
    
    The CollectionTracking class is not currently used, but
    if you *really* want to test this, take a look at the following
    branch: http://git.librarypolice.com/?p=koha-galen.git;a=shortlog;h=refs/heads/pg
    
    Then, set up a PostgreSQL database, update koha-conf.xml to point to it,
    then run pg/deploy and verify that the collections_tracking table is created
    in the Pg database.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 7a52759b0f1f48661d357a0738cb68f6cb17edae)
    Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>

commit 95d96afb54eca86cae327e0a05da05de5a4c7f62
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Wed Dec 11 16:49:01 2013 +0000

    Bug 11384: rename the collections_tracking.ctId column
    
    'ctId' as a column name conflicts with one of the system
    columns that PostgreSQL uses for each table, and consequently
    needs to be renamed to enable deploying the schema to a Pg
    database.  This patch makes this change.
    
    To test:
    
    [1] Apply the patch and run the SQL specified in the database
        updated.
    [2] Verify that the collections_tracking table no longer has
        a ctId column, but now has collections_tracking_id.
    [3] Verify that prove -v t/db_dependent/RotatingCollections.t
        passes.
    [4] Verify that installer/data/mysql/kohastructure.sql runs
        cleanly in an empty database.
    
    This patch does not affect user-visible behavior given the fact
    that the rotating collections feature is currently disabled.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 5f015d050281a676670b592831f5b1bd11c81f47)
    Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
    
    Conflicts:
    	installer/data/mysql/updatedatabase.pl

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

Summary of changes:
 C4/RotatingCollections.pm                |    2 +-
 Koha/Schema/Result/CollectionTracking.pm |   12 ++++++------
 installer/data/mysql/kohastructure.sql   |    4 ++--
 installer/data/mysql/updatedatabase.pl   |    9 +++++++++
 kohaversion.pl                           |    2 +-
 5 files changed, 19 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
main Koha release repository