[koha-commits] main Koha release repository branch master updated. v16.05.00-1397-g6d5b056

Git repo owner gitmaster at git.koha-community.org
Fri Nov 18 14:53:39 CET 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, master has been updated
       via  6d5b056a14e5671f51735dded7609f65ca389f00 (commit)
      from  660be0e0195613ce9eaaf45b17d2e5db4ad705f0 (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 6d5b056a14e5671f51735dded7609f65ca389f00
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 20 11:40:13 2016 +0100

    Bug 17323: Column search_history.time cannot be null
    
    When doing a search, with SearchHistory pref switched on:
    
    DBD::mysql::st execute failed: Column 'time' cannot be null [for Statement "
            INSERT INTO search_history(
                userid, sessionid, query_desc, query_cgi, type, total, time
            ) VALUES(
                ?, ?, ?, ?, ?, ?, ?
            )
        " with ParamValues: 0="7874", 1='12338a0bd8da63e32c79ee84f8493a07', 2="kw,wrdl: d", 3='q=d', 4='biblio', 5=6104, 6=undef] at C4/Search/History.pm line 34.
    
    Since MySLQ 5.7, undef does not mean "the default value".
    To let the DBMS set the default value (CURRENT_TIMESTAMP), the parameter should not be passed
    
    Test plan:
    OPAC+Intranet, swith the 2 SearchHistory syspref on
    Do a search
    => Without this patch, you will get an error in the log and the row will not be inserted in the table.
    => With this patch, everything must go fine
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Not verified with MySQL 5.7. But this looks good to me.
    Works under Jessie.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

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

Summary of changes:
 C4/Search/History.pm            |    6 +++---
 t/db_dependent/Search/History.t |   18 +++++++++++++++++-
 2 files changed, 20 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list