[open-ils-commits] r15244 - in trunk/Open-ILS/src/sql/Pg: . upgrade (erickson)
svn at svn.open-ils.org
svn at svn.open-ils.org
Wed Dec 30 09:40:38 EST 2009
Author: erickson
Date: 2009-12-30 09:40:36 -0500 (Wed, 30 Dec 2009)
New Revision: 15244
Added:
trunk/Open-ILS/src/sql/Pg/upgrade/0128.schema.billing-matt-views.sql
Modified:
trunk/Open-ILS/src/sql/Pg/002.schema.config.sql
trunk/Open-ILS/src/sql/Pg/080.schema.money.sql
trunk/Open-ILS/src/sql/Pg/500.view.cross-schema.sql
Log:
updated some existing billing views to use the new (faster) money.materialized_billable_xact_summary
Modified: trunk/Open-ILS/src/sql/Pg/002.schema.config.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/002.schema.config.sql 2009-12-29 20:47:33 UTC (rev 15243)
+++ trunk/Open-ILS/src/sql/Pg/002.schema.config.sql 2009-12-30 14:40:36 UTC (rev 15244)
@@ -51,7 +51,7 @@
install_date TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
);
-INSERT INTO config.upgrade_log (version) VALUES ('0127'); -- miker
+INSERT INTO config.upgrade_log (version) VALUES ('0128'); -- berick
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
Modified: trunk/Open-ILS/src/sql/Pg/080.schema.money.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/080.schema.money.sql 2009-12-29 20:47:33 UTC (rev 15243)
+++ trunk/Open-ILS/src/sql/Pg/080.schema.money.sql 2009-12-30 14:40:36 UTC (rev 15244)
@@ -254,6 +254,11 @@
CREATE TABLE money.materialized_billable_xact_summary AS
SELECT * FROM money.billable_xact_summary WHERE 1=0;
+-- TODO: Define money.materialized_billable_xact_summary w/ explicit columns and
+-- remove the definition above for money.billable_xact_summary.
+CREATE OR REPLACE VIEW money.billable_xact_summary AS
+ SELECT * FROM money.materialized_billable_xact_summary;
+
CREATE INDEX money_mat_summary_id_idx ON money.materialized_billable_xact_summary (id);
CREATE INDEX money_mat_summary_usr_idx ON money.materialized_billable_xact_summary (usr);
CREATE INDEX money_mat_summary_xact_start_idx ON money.materialized_billable_xact_summary (xact_start);
@@ -489,13 +494,15 @@
$$ LANGUAGE PLPGSQL;
CREATE OR REPLACE VIEW money.usr_summary AS
- SELECT usr,
- SUM(total_paid) AS total_paid,
- SUM(total_owed) AS total_owed,
- SUM(balance_owed) AS balance_owed
- FROM money.billable_xact_summary
- GROUP BY 1;
+ SELECT
+ usr,
+ sum(total_paid) AS total_paid,
+ sum(total_owed) AS total_owed,
+ sum(balance_owed) AS balance_owed
+ FROM money.materialized_billable_xact_summary
+ GROUP BY usr;
+
CREATE OR REPLACE VIEW money.usr_circulation_summary AS
SELECT usr,
SUM(total_paid) AS total_paid,
Modified: trunk/Open-ILS/src/sql/Pg/500.view.cross-schema.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/500.view.cross-schema.sql 2009-12-29 20:47:33 UTC (rev 15243)
+++ trunk/Open-ILS/src/sql/Pg/500.view.cross-schema.sql 2009-12-30 14:40:36 UTC (rev 15244)
@@ -17,52 +17,6 @@
BEGIN;
-CREATE OR REPLACE VIEW money.open_billable_xact_summary AS
- SELECT xact.id AS id,
- xact.usr AS usr,
- COALESCE(circ.circ_lib,groc.billing_location,res.pickup_lib) AS billing_location,
- xact.xact_start AS xact_start,
- xact.xact_finish AS xact_finish,
- SUM(credit.amount) AS total_paid,
- MAX(credit.payment_ts) AS last_payment_ts,
- LAST(credit.note) AS last_payment_note,
- LAST(credit.payment_type) AS last_payment_type,
- SUM(debit.amount) AS total_owed,
- MAX(debit.billing_ts) AS last_billing_ts,
- LAST(debit.note) AS last_billing_note,
- LAST(debit.billing_type) AS last_billing_type,
- COALESCE(SUM(debit.amount),0) - COALESCE(SUM(credit.amount),0) AS balance_owed,
- p.relname AS xact_type
- FROM money.billable_xact xact
- JOIN pg_class p ON (xact.tableoid = p.oid)
- LEFT JOIN "action".circulation circ ON (circ.id = xact.id)
- LEFT JOIN money.grocery groc ON (groc.id = xact.id)
- LEFT JOIN booking.reservation res ON (groc.id = xact.id)
- LEFT JOIN (
- SELECT billing.xact,
- billing.voided,
- sum(billing.amount) AS amount,
- max(billing.billing_ts) AS billing_ts,
- last(billing.note) AS note,
- last(billing.billing_type) AS billing_type
- FROM money.billing
- WHERE billing.voided IS FALSE
- GROUP BY billing.xact, billing.voided
- ) debit ON (xact.id = debit.xact AND debit.voided IS FALSE)
- LEFT JOIN (
- SELECT payment_view.xact,
- payment_view.voided,
- sum(payment_view.amount) AS amount,
- max(payment_view.payment_ts) AS payment_ts,
- last(payment_view.note) AS note,
- last(payment_view.payment_type) AS payment_type
- FROM money.payment_view
- WHERE payment_view.voided IS FALSE
- GROUP BY payment_view.xact, payment_view.voided
- ) credit ON (xact.id = credit.xact AND credit.voided IS FALSE)
- WHERE xact.xact_finish IS NULL
- GROUP BY 1,2,3,4,5,15
- ORDER BY MAX(debit.billing_ts), MAX(credit.payment_ts);
CREATE OR REPLACE VIEW money.billable_xact_summary_location_view AS
SELECT m.*, COALESCE(c.circ_lib, g.billing_location, r.pickup_lib) AS billing_location
@@ -71,23 +25,31 @@
LEFT JOIN money.grocery g ON (g.id = m.id)
LEFT JOIN booking.reservation r ON (r.id = m.id);
+CREATE OR REPLACE VIEW money.open_billable_xact_summary AS
+ SELECT * FROM money.billable_xact_summary_location_view
+ WHERE xact_finish IS NULL;
+
CREATE OR REPLACE VIEW money.open_usr_summary AS
- SELECT usr,
- SUM(total_paid) AS total_paid,
- SUM(total_owed) AS total_owed,
- SUM(balance_owed) AS balance_owed
- FROM money.open_billable_xact_summary
- GROUP BY 1;
+ SELECT
+ usr,
+ sum(total_paid) AS total_paid,
+ sum(total_owed) AS total_owed,
+ sum(balance_owed) AS balance_owed
+ FROM money.materialized_billable_xact_summary
+ WHERE xact_finish IS NULL
+ GROUP BY usr;
CREATE OR REPLACE VIEW money.open_usr_circulation_summary AS
- SELECT usr,
- SUM(total_paid) AS total_paid,
- SUM(total_owed) AS total_owed,
- SUM(balance_owed) AS balance_owed
- FROM money.open_billable_xact_summary
- WHERE xact_type = 'circulation'
- GROUP BY 1;
+ SELECT
+ usr,
+ SUM(total_paid) AS total_paid,
+ SUM(total_owed) AS total_owed,
+ SUM(balance_owed) AS balance_owed
+ FROM money.materialized_billable_xact_summary
+ WHERE xact_type = 'circulation' AND xact_finish IS NULL
+ GROUP BY usr;
+
-- Not a view, but it's cross-schema..
CREATE TABLE config.idl_field_doc (
id BIGSERIAL PRIMARY KEY,
Added: trunk/Open-ILS/src/sql/Pg/upgrade/0128.schema.billing-matt-views.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/upgrade/0128.schema.billing-matt-views.sql (rev 0)
+++ trunk/Open-ILS/src/sql/Pg/upgrade/0128.schema.billing-matt-views.sql 2009-12-30 14:40:36 UTC (rev 15244)
@@ -0,0 +1,44 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0128');
+
+DROP VIEW money.open_usr_circulation_summary;
+DROP VIEW money.open_billable_xact_summary;
+
+CREATE OR REPLACE VIEW money.billable_xact_summary AS
+ SELECT * FROM money.materialized_billable_xact_summary;
+
+CREATE OR REPLACE VIEW money.open_billable_xact_summary AS
+ SELECT * FROM money.billable_xact_summary_location_view
+ WHERE xact_finish IS NULL;
+
+CREATE OR REPLACE VIEW money.open_usr_circulation_summary AS
+ SELECT
+ usr,
+ SUM(total_paid) AS total_paid,
+ SUM(total_owed) AS total_owed,
+ SUM(balance_owed) AS balance_owed
+ FROM money.materialized_billable_xact_summary
+ WHERE xact_type = 'circulation' AND xact_finish IS NULL
+ GROUP BY usr;
+
+CREATE OR REPLACE VIEW money.usr_summary AS
+ SELECT
+ usr,
+ sum(total_paid) AS total_paid,
+ sum(total_owed) AS total_owed,
+ sum(balance_owed) AS balance_owed
+ FROM money.materialized_billable_xact_summary
+ GROUP BY usr;
+
+CREATE OR REPLACE VIEW money.open_usr_summary AS
+ SELECT
+ usr,
+ sum(total_paid) AS total_paid,
+ sum(total_owed) AS total_owed,
+ sum(balance_owed) AS balance_owed
+ FROM money.materialized_billable_xact_summary
+ WHERE xact_finish IS NULL
+ GROUP BY usr;
+
+COMMIT;
More information about the open-ils-commits
mailing list