[open-ils-commits] r14720 - trunk/Open-ILS/src/sql/Pg (erickson)

[svn at svn.open-ils.org]

Author: erickson
Date: 2009-11-02 11:31:50 -0500 (Mon, 02 Nov 2009)
New Revision: 14720

Modified:
   trunk/Open-ILS/src/sql/Pg/200.schema.acq.sql
   trunk/Open-ILS/src/sql/Pg/800.fkeys.sql
Log:
removed reference to 'percent' on fund allocation.  corrected foreign key syntax for org seting perm

Modified: trunk/Open-ILS/src/sql/Pg/200.schema.acq.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/200.schema.acq.sql	2009-11-02 07:28:26 UTC (rev 14719)
+++ trunk/Open-ILS/src/sql/Pg/200.schema.acq.sql	2009-11-02 16:31:50 UTC (rev 14720)
@@ -133,8 +133,7 @@
     amount      NUMERIC NOT NULL,
     allocator   INT NOT NULL REFERENCES actor.usr (id) DEFERRABLE INITIALLY DEFERRED,
     note        TEXT,
-	create_time TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
-    CONSTRAINT allocation_amount_or_percent CHECK ((percent IS NULL AND amount IS NOT NULL) OR (percent IS NOT NULL AND amount IS NULL))
+	create_time TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
 );
 CREATE INDEX fund_alloc_allocator_idx ON acq.fund_allocation ( allocator );
 

Modified: trunk/Open-ILS/src/sql/Pg/800.fkeys.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/800.fkeys.sql	2009-11-02 07:28:26 UTC (rev 14719)
+++ trunk/Open-ILS/src/sql/Pg/800.fkeys.sql	2009-11-02 16:31:50 UTC (rev 14720)
@@ -98,6 +98,6 @@
 ALTER TABLE config.billing_type ADD CONSTRAINT config_billing_type_owner_fkey FOREIGN KEY (owner) REFERENCES actor.org_unit (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
 
 ALTER TABLE config.org_unit_setting_type ADD CONSTRAINT view_perm_fkey FOREIGN KEY (view_perm) REFERENCES permission.perm_list (id) ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED;
-ALTER TABLE config.org_unit_setting_type ADD CONSTRAINT update_perm_fkey FOREIGN KEY (update_perm) REFERENCES permission.perm_list (id) ON DELETE SET NULL CASCADE DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE config.org_unit_setting_type ADD CONSTRAINT update_perm_fkey FOREIGN KEY (update_perm) REFERENCES permission.perm_list (id) DEFERRABLE INITIALLY DEFERRED;
 
 COMMIT;