[koha-commits] main Koha release repository branch master updated. v3.14.00-858-g1931d2d
Git repo owner
gitmaster at git.koha-community.org
Mon Apr 21 00:29:58 CEST 2014
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 1931d2d22ffb2dfb2e7b8c64a3d866cc2d9f48bb (commit)
via 91619116129f37eca3088a90bb67975d8dd78301 (commit)
from 9708138a86dd66e876bf3ff6e24dfdf1ae3d51d9 (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 1931d2d22ffb2dfb2e7b8c64a3d866cc2d9f48bb
Author: Galen Charlton <gmc at esilibrary.com>
Date: Sun Apr 20 16:04:27 2014 +0000
Bug 9915: (follow-up) use SQL placeholders
This patch teaches C4::Reports::Guided::execute_query()
how to accept a list of query parameter values. It then
follows-up on the main patch by simplifying how it converts
report parameters to a complete SQL query, and removes the
use of DBI->quote() and complicated regexes.
To test:
[1] Verify that using the OPAC svc/report service with
sql_params continues to work.
[2] Verify that there are no regressions with running
reports from the staff interface, both via the web
service and the reports interface.
[3] Verify that prove -v /db_dependent/Reports_Guided.t passes.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes all tests and QA script.
No regressions found.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 91619116129f37eca3088a90bb67975d8dd78301
Author: Chris Cormack <chris at bigballofwax.co.nz>
Date: Sun Mar 24 20:29:18 2013 +1300
Bug 9915: Allow sql_params to be passed to a report using the OPAC svc/report interface
Test plan:
1/ Make a public report that contains SQL parameters
2/ Test it from the staff side
3/ Hit the url like
cgi-bin/koha/svc/report?id=1&sql_params=chris&sql_params=chris2
4/ Test you get JSON
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes all tests and QA script.
Tested with a public report:
select * from items
- cgi-bin/koha/svc/report?id=6
- URL shows JSON and all items
select * from items where itype = <<itype>>
- cgi-bin/koha/svc/report?id=6&sql_params=BK
- URL shows JSON and only BK items
select * from items where itype = <<itype>> and homebranch = <<homebranch>>
- cgi-bin/koha/svc/report?id=6&sql_params=BK&sql_params=MPL
- URL shows JSON and only BK items in MPL
select * from items where itype = <<itype|itemtypes>> and homebranch = <<homebranch|branches>>
- same as above
- URL shows JSON and only BK items in MPL
select * from items where dateaccessioned = 2013-12-15
- cgi-bin/koha/svc/report?id=6&sql_params=BK&sql_params=MPL&sql_params=2013-12-15
- URL shows JSON and correct items
Note: This will currently only work for public reports!
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Reports/Guided.pm | 33 +++++++++++++++++++--------------
opac/svc/report | 39 +++++++++++++++++++++++++++------------
t/db_dependent/Reports_Guided.t | 23 ++++++++++++++++++++---
3 files changed, 66 insertions(+), 29 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list