[open-ils-commits] r17875 - trunk/Open-ILS/src/sql/Pg (scottmk)

[svn at svn.open-ils.org]

Author: scottmk
Date: 2010-09-21 14:31:55 -0400 (Tue, 21 Sep 2010)
New Revision: 17875

Modified:
   trunk/Open-ILS/src/sql/Pg/1.6.1-2.0-upgrade-db.sql
Log:
Don't make new auditor columns NOT NULL, or update them

M    Open-ILS/src/sql/Pg/1.6.1-2.0-upgrade-db.sql


Modified: trunk/Open-ILS/src/sql/Pg/1.6.1-2.0-upgrade-db.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/1.6.1-2.0-upgrade-db.sql	2010-09-21 18:18:04 UTC (rev 17874)
+++ trunk/Open-ILS/src/sql/Pg/1.6.1-2.0-upgrade-db.sql	2010-09-21 18:31:55 UTC (rev 17875)
@@ -4619,16 +4619,6 @@
         (35, 'pickup_lib')
 ;
 
-INSERT INTO action_trigger.validator (module, description) VALUES (
-    'HoldIsCancelled',
-    oils_i18n_gettext(
-        'HoldIsCancelled',
-        'Check whether a hold request is cancelled.',
-        'atval',
-        'description'
-    )
-);
-
 -- Create the query schema, and the tables and views therein
 
 DROP SCHEMA IF EXISTS sql CASCADE;
@@ -6069,12 +6059,6 @@
 ALTER TABLE asset.copy ADD COLUMN floating BOOL NOT NULL DEFAULT FALSE;
 ALTER TABLE auditor.asset_copy_history ADD COLUMN floating BOOL;
 
-UPDATE auditor.asset_copy_history
-SET floating  = false;
-
-ALTER TABLE auditor.asset_copy_history
-	ALTER COLUMN floating SET NOT NULL;
-
 DROP INDEX IF EXISTS asset.copy_barcode_key;
 CREATE UNIQUE INDEX copy_barcode_key ON asset.copy (barcode) WHERE deleted = FALSE OR deleted IS FALSE;
 
@@ -7181,12 +7165,6 @@
 ALTER TABLE AUDITOR.actor_usr_history ADD COLUMN 
 	claims_never_checked_out_count INT;
 
-UPDATE auditor.actor_usr_history
-SET claims_never_checked_out_count = 0;
-
-ALTER TABLE AUDITOR.actor_usr_history
-	ALTER COLUMN claims_never_checked_out_count SET NOT NULL;
-
 DROP VIEW auditor.actor_usr_lifecycle;
 
 SELECT auditor.create_auditor_lifecycle( 'actor', 'usr' );
@@ -8576,12 +8554,6 @@
 ALTER TABLE auditor.actor_org_unit_history
 	ADD COLUMN fiscal_calendar INT;
 
-UPDATE auditor.actor_org_unit_history
-SET fiscal_calendar = 1;
-
-ALTER TABLE auditor.actor_org_unit_history
-	ALTER COLUMN fiscal_calendar SET NOT NULL;
-
 DROP VIEW auditor.actor_org_unit_lifecycle;
 
 SELECT auditor.create_auditor_lifecycle( 'actor', 'org_unit' );
@@ -17364,13 +17336,7 @@
 ALTER TABLE auditor.asset_call_number_history
 	ADD COLUMN label_class BIGINT;
 
-UPDATE auditor.asset_call_number_history
-SET label_class = 1;
-
 ALTER TABLE auditor.asset_call_number_history
-	ALTER COLUMN label_class SET NOT NULL;
-
-ALTER TABLE auditor.asset_call_number_history
 	ADD COLUMN label_sortkey TEXT;
 
 -- Pick up the new columns in dependent views