From 0f8d3e793182a6fa9f5e4016f947d864946db50e Mon Sep 17 00:00:00 2001
From: scottmk <scottmk@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Wed, 27 Jan 2010 21:31:12 +0000
Subject: [PATCH] Redefine the view acq.fund_debit_total:
1. Correct the mistaken use of acq.fund_debit.id for fund,
instead of acq.fund_debit.fund.
2. Join to acq.fund so that we get a zero total for a fund
with no debits in acq.fund_debit.
Four other views are affected indirectly because they are defined
in terms of acq.fund_debit_total:
fund_encumbrance_total
fund_spent_total
fund_spent_balance
fund_combined_balance
M Open-ILS/src/sql/Pg/200.schema.acq.sql
M Open-ILS/src/sql/Pg/002.schema.config.sql
A Open-ILS/src/sql/Pg/upgrade/0141.schema.acq.fund_debit_total_view.sql
git-svn-id: svn://svn.open-ils.org/ILS/trunk@15393 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/200.schema.acq.sql | 10 ++++++----
.../Pg/upgrade/0141.schema.acq.fund_debit_total_view.sql | 14 ++++++++++++++
3 files changed, 21 insertions(+), 5 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/0141.schema.acq.fund_debit_total_view.sql
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index d88ab0797e..8e8e616213 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -51,7 +51,7 @@ CREATE TABLE config.upgrade_log (
install_date TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
);
-INSERT INTO config.upgrade_log (version) VALUES ('0140'); -- Scott McKellar
+INSERT INTO config.upgrade_log (version) VALUES ('0141'); -- Scott McKellar
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/200.schema.acq.sql b/Open-ILS/src/sql/Pg/200.schema.acq.sql
index 9b7f0f5345..a3ae738b06 100644
--- a/Open-ILS/src/sql/Pg/200.schema.acq.sql
+++ b/Open-ILS/src/sql/Pg/200.schema.acq.sql
@@ -849,10 +849,12 @@ CREATE OR REPLACE VIEW acq.fund_allocation_total AS
GROUP BY 1;
CREATE OR REPLACE VIEW acq.fund_debit_total AS
- SELECT id AS fund,
- encumbrance,
- SUM(amount) AS amount
- FROM acq.fund_debit
+ SELECT fund.id AS fund,
+ fund_debit.encumbrance AS encumbrance,
+ COALESCE( SUM(fund_debit.amount), 0 ) AS amount
+ FROM acq.fund AS fund
+ LEFT JOIN acq.fund_debit AS fund_debit
+ ON ( fund.id = fund_debit.fund )
GROUP BY 1,2;
CREATE OR REPLACE VIEW acq.fund_encumbrance_total AS
diff --git a/Open-ILS/src/sql/Pg/upgrade/0141.schema.acq.fund_debit_total_view.sql b/Open-ILS/src/sql/Pg/upgrade/0141.schema.acq.fund_debit_total_view.sql
new file mode 100644
index 0000000000..51aaa89c0e
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0141.schema.acq.fund_debit_total_view.sql
@@ -0,0 +1,14 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0141'); -- Scott McKellar
+
+CREATE OR REPLACE VIEW acq.fund_debit_total AS
+ SELECT fund.id AS fund,
+ fund_debit.encumbrance AS encumbrance,
+ COALESCE( SUM(fund_debit.amount), 0 ) AS amount
+ FROM acq.fund AS fund
+ LEFT JOIN acq.fund_debit AS fund_debit
+ ON ( fund.id = fund_debit.fund )
+ GROUP BY 1,2;
+
+COMMIT;
--
2.11.0