From 1eb33ecb5139b546902654b529ecd0388ee5353f Mon Sep 17 00:00:00 2001 From: Mike Rylander Date: Tue, 5 Sep 2017 15:53:08 -0400 Subject: [PATCH] Incorporate view update from LP#1714589 Signed-off-by: Mike Rylander Signed-off-by: Dan Wells --- .../2.12.5-3.0-beta1-upgrade-db.sql | 37 +++++++++++++++++-- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.12.5-3.0-beta1-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.12.5-3.0-beta1-upgrade-db.sql index 7a8437721a..0da18594c9 100644 --- a/Open-ILS/src/sql/Pg/version-upgrade/2.12.5-3.0-beta1-upgrade-db.sql +++ b/Open-ILS/src/sql/Pg/version-upgrade/2.12.5-3.0-beta1-upgrade-db.sql @@ -728,12 +728,43 @@ CREATE OR REPLACE FUNCTION permission.usr_perms ( INT ) RETURNS SETOF permission ORDER BY 2, 3, 4 ASC, 5 DESC ; $$ LANGUAGE SQL STABLE ROWS 10; -/* XXX See LP 1714589 for a likely revision to this view definition XXX */ - SELECT evergreen.upgrade_deps_block_check('1051', :eg_version); CREATE OR REPLACE VIEW action.all_circulation_slim AS - SELECT * FROM action.circulation + SELECT + id, + usr, + xact_start, + xact_finish, + unrecovered, + target_copy, + circ_lib, + circ_staff, + checkin_staff, + checkin_lib, + renewal_remaining, + grace_period, + due_date, + stop_fines_time, + checkin_time, + create_time, + duration, + fine_interval, + recurring_fine, + max_fine, + phone_renewal, + desk_renewal, + opac_renewal, + duration_rule, + recurring_fine_rule, + max_fine_rule, + stop_fines, + workstation, + checkin_workstation, + copy_location, + checkin_scan_time, + parent_circ + FROM action.circulation UNION ALL SELECT id, -- 2.43.2