[open-ils-commits] r15394 - in trunk/Open-ILS/src/sql/Pg: . upgrade (scottmk)

[svn at svn.open-ils.org]

Author: scottmk
Date: 2010-01-28 09:06:23 -0500 (Thu, 28 Jan 2010)
New Revision: 15394

Added:
   trunk/Open-ILS/src/sql/Pg/upgrade/0142.schema.acq.fund_debit_total_view.sql
Modified:
   trunk/Open-ILS/src/sql/Pg/002.schema.config.sql
   trunk/Open-ILS/src/sql/Pg/200.schema.acq.sql
Log:
Oops: need to coalesce before summing, not after.

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/0142.schema.acq.fund_debit_total_view.sql


Modified: trunk/Open-ILS/src/sql/Pg/002.schema.config.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/002.schema.config.sql	2010-01-27 21:31:12 UTC (rev 15393)
+++ trunk/Open-ILS/src/sql/Pg/002.schema.config.sql	2010-01-28 14:06:23 UTC (rev 15394)
@@ -51,7 +51,7 @@
     install_date    TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
 );
 
-INSERT INTO config.upgrade_log (version) VALUES ('0141'); -- Scott McKellar
+INSERT INTO config.upgrade_log (version) VALUES ('0142'); -- Scott McKellar
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,

Modified: trunk/Open-ILS/src/sql/Pg/200.schema.acq.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/200.schema.acq.sql	2010-01-27 21:31:12 UTC (rev 15393)
+++ trunk/Open-ILS/src/sql/Pg/200.schema.acq.sql	2010-01-28 14:06:23 UTC (rev 15394)
@@ -851,7 +851,7 @@
 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
+			SUM( COALESCE( 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 )

Added: trunk/Open-ILS/src/sql/Pg/upgrade/0142.schema.acq.fund_debit_total_view.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/upgrade/0142.schema.acq.fund_debit_total_view.sql	                        (rev 0)
+++ trunk/Open-ILS/src/sql/Pg/upgrade/0142.schema.acq.fund_debit_total_view.sql	2010-01-28 14:06:23 UTC (rev 15394)
@@ -0,0 +1,14 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0142'); -- Scott McKellar
+
+CREATE OR REPLACE VIEW acq.fund_debit_total AS
+    SELECT  fund.id AS fund,
+            fund_debit.encumbrance AS encumbrance,
+            SUM( COALESCE( 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;