From 297f9b86692c6ac58922998a18691db92a3d5e1d Mon Sep 17 00:00:00 2001 From: scottmk Date: Wed, 10 Mar 2010 19:41:50 +0000 Subject: [PATCH] 1. Eliminate somed source_definitions from the IDL where there is already an equivalent view. In the presence of a tablename attribute, the source_definitions were being ignored anyway. This step applies to classes aufhl, aufhml, and aufhil. 2. For class aufhmxl: the IDL had both a tablename and a source_definition, but there was no table or view corresponding to the tablename. I eliminated the source_definition and created the corresponding view action.unfulfilled_hold_max_loop. 3. For class aufhol: the IDL had both a tablename and a source_definition, but neither was valid. The tablename didn't exist in the database, and the source_definition referenced the action.unfulfilled_hold_max_loop view, which didn't exist. I removed the tablename attribute and left the source_definition in place, which is now valid because in step 2 I created the missing view. 4. Unrelated: added 201.acq.audit-functions.sql to the list of installation scripts to run in build-db.sh. M Open-ILS/src/sql/Pg/090.schema.action.sql M Open-ILS/src/sql/Pg/002.schema.config.sql A Open-ILS/src/sql/Pg/upgrade/0185.schema.acq.aufhmxl-view.sql M Open-ILS/src/sql/Pg/build-db.sh M Open-ILS/examples/fm_IDL.xml git-svn-id: svn://svn.open-ils.org/ILS/trunk@15778 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/examples/fm_IDL.xml | 56 ++++--------------- Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +- Open-ILS/src/sql/Pg/090.schema.action.sql | 6 ++ Open-ILS/src/sql/Pg/build-db.sh | 1 + .../upgrade/0185.schema.acq.aufhmxl-view.sql | 11 ++++ 5 files changed, 30 insertions(+), 46 deletions(-) create mode 100644 Open-ILS/src/sql/Pg/upgrade/0185.schema.acq.aufhmxl-view.sql diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml index e0ad0d6805..2acae77e79 100644 --- a/Open-ILS/examples/fm_IDL.xml +++ b/Open-ILS/examples/fm_IDL.xml @@ -4394,7 +4394,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - + @@ -5138,7 +5138,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - + @@ -6017,16 +6017,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - - - SELECT u.hold, - c.circ_lib, - count(*) - FROM action.unfulfilled_hold_list u - JOIN asset.copy c ON (c.id = u.current_copy) - GROUP BY 1,2 - - @@ -6039,14 +6029,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - - - SELECT hold, - min(count) - FROM action.unfulfilled_hold_loops - GROUP BY 1 - - @@ -6057,14 +6039,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - - - SELECT DISTINCT l.* - FROM action.unfulfilled_hold_loops l - JOIN action.unfulfilled_hold_min_loop m USING (hold) - WHERE l.count = m.min - - @@ -6077,14 +6051,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - - - SELECT hold, - max(count) - FROM action.unfulfilled_hold_loops - GROUP BY 1 - - @@ -6094,7 +6060,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - + SELECT DISTINCT l.* @@ -6181,7 +6147,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - + @@ -6220,12 +6186,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - - - - - - + + + + + + @@ -6241,7 +6207,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - + diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index 753124ec4e..3c7b5a3a30 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 ('0184'); -- miker +INSERT INTO config.upgrade_log (version) VALUES ('0185'); -- Scott McKellar CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/090.schema.action.sql b/Open-ILS/src/sql/Pg/090.schema.action.sql index 11e7600ec6..f7951b386d 100644 --- a/Open-ILS/src/sql/Pg/090.schema.action.sql +++ b/Open-ILS/src/sql/Pg/090.schema.action.sql @@ -473,6 +473,12 @@ CREATE OR REPLACE VIEW action.unfulfilled_hold_innermost_loop AS JOIN action.unfulfilled_hold_min_loop m USING (hold) WHERE l.count = m.min; +CREATE VIEW action.unfulfilled_hold_max_loop AS + SELECT hold, + max(count) AS max + FROM action.unfulfilled_hold_loops + GROUP BY 1; + -- represents a circ chain summary CREATE TYPE action.circ_chain_summary AS ( diff --git a/Open-ILS/src/sql/Pg/build-db.sh b/Open-ILS/src/sql/Pg/build-db.sh index a6642a0b38..77f614ef0d 100755 --- a/Open-ILS/src/sql/Pg/build-db.sh +++ b/Open-ILS/src/sql/Pg/build-db.sh @@ -106,6 +106,7 @@ ordered_file_list=" 110.hold_matrix.sql 200.schema.acq.sql + 201.acq.audit-functions.sql 210.schema.serials.sql 300.schema.staged_search.sql diff --git a/Open-ILS/src/sql/Pg/upgrade/0185.schema.acq.aufhmxl-view.sql b/Open-ILS/src/sql/Pg/upgrade/0185.schema.acq.aufhmxl-view.sql new file mode 100644 index 0000000000..3fb91b8399 --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/0185.schema.acq.aufhmxl-view.sql @@ -0,0 +1,11 @@ +BEGIN; + +INSERT INTO config.upgrade_log (version) VALUES ('0185'); -- Scott McKellar + +CREATE VIEW action.unfulfilled_hold_max_loop AS + SELECT hold, + max(count) AS max + FROM action.unfulfilled_hold_loops + GROUP BY 1; + +COMMIT; -- 2.43.2