From 51a8b2f63ee7630444e8ad513c1c3df7a316dc48 Mon Sep 17 00:00:00 2001 From: miker Date: Wed, 30 Jan 2008 16:02:39 +0000 Subject: [PATCH] changing fund to funding_source and budget to fund git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@8534 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/examples/fm_IDL.xml | 58 +++++++++++++++++----------------- Open-ILS/src/sql/Pg/200.schema.acq.sql | 24 +++++++------- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml index e8e6d35a2e..aeda8acd12 100644 --- a/Open-ILS/examples/fm_IDL.xml +++ b/Open-ILS/examples/fm_IDL.xml @@ -2354,13 +2354,13 @@ - - + + - - + + @@ -2370,25 +2370,25 @@ - - - - + + + + - - + + - + - + @@ -2408,45 +2408,45 @@ - - + + - + - + - - + + - + - + - - + + - + @@ -2456,14 +2456,14 @@ - - + + - - + + @@ -2471,8 +2471,8 @@ - - + + diff --git a/Open-ILS/src/sql/Pg/200.schema.acq.sql b/Open-ILS/src/sql/Pg/200.schema.acq.sql index c8ef47dd0d..a427262724 100644 --- a/Open-ILS/src/sql/Pg/200.schema.acq.sql +++ b/Open-ILS/src/sql/Pg/200.schema.acq.sql @@ -40,31 +40,31 @@ CREATE TABLE acq.provider_share_map ( CONSTRAINT provider_share_once_per_owner UNIQUE (provider,org) ); -CREATE TABLE acq.fund ( +CREATE TABLE acq.funding_source ( id SERIAL PRIMARY KEY, name TEXT NOT NULL, owner INT NOT NULL REFERENCES actor.org_unit (id), currency_type TEXT NOT NULL REFERENCES acq.currency_type (code), - CONSTRAINT fund_name_once_per_owner UNIQUE (name,owner) + CONSTRAINT funding_source_name_once_per_owner UNIQUE (name,owner) ); -CREATE TABLE acq.fund_share_map ( +CREATE TABLE acq.funding_source_share_map ( id SERIAL PRIMARY KEY, - fund INT NOT NULL REFERENCES acq.fund (id), + funding_source INT NOT NULL REFERENCES acq.funding_source (id), org INT NOT NULL REFERENCES actor.org_unit (id), - CONSTRAINT fund_share_once_per_owner UNIQUE (fund,org) + CONSTRAINT funding_source_share_once_per_owner UNIQUE (funding_source,org) ); -CREATE TABLE acq.fund_credit ( +CREATE TABLE acq.funding_source_credit ( id SERIAL PRIMARY KEY, - fund INT NOT NULL REFERENCES acq.fund (id), + funding_source INT NOT NULL REFERENCES acq.funding_source (id), amount NUMERIC NOT NULL, note TEXT ); -CREATE TABLE acq.fund_debit ( +CREATE TABLE acq.funding_source_debit ( id SERIAL PRIMARY KEY, - fund INT NOT NULL REFERENCES acq.fund (id), + funding_source INT NOT NULL REFERENCES acq.funding_source (id), origin_amount NUMERIC NOT NULL, -- pre-exchange-rate amount origin_currency_type TEXT NOT NULL REFERENCES acq.currency_type (code), amount NUMERIC NOT NULL, @@ -208,7 +208,7 @@ CREATE TRIGGER ingest_picklist_entry_trigger AFTER INSERT OR UPDATE ON acq.picklist_entry FOR EACH ROW EXECUTE PROCEDURE public.ingest_acq_marc(); -CREATE TABLE acq.budget ( +CREATE TABLE acq.fund ( id SERIAL PRIMARY KEY, org INT NOT NULL REFERENCES actor.org_unit (id) ON UPDATE CASCADE ON DELETE CASCADE, name TEXT NOT NULL, @@ -216,10 +216,10 @@ CREATE TABLE acq.budget ( CONSTRAINT name_once_per_org_year UNIQUE (org,name,year) ); -CREATE TABLE acq.budget_allocation ( +CREATE TABLE acq.fund_allocation ( id SERIAL PRIMARY KEY, + funding_source INT NOT NULL REFERENCES acq.funding_source (id) ON UPDATE CASCADE ON DELETE CASCADE, fund INT NOT NULL REFERENCES acq.fund (id) ON UPDATE CASCADE ON DELETE CASCADE, - budget INT NOT NULL REFERENCES acq.budget (id) ON UPDATE CASCADE ON DELETE CASCADE, amount NUMERIC, percent NUMERIC CHECK (percent IS NULL OR percent BETWEEN 0.0 AND 100.0), allocator INT NOT NULL REFERENCES actor.usr (id), -- 2.11.0