general schema updates

git-svn-id: svn://svn.open-ils.org/ILS/trunk@5220 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index f7ac53f..0077c40 100644 (file)
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -60,7 +60,7 @@ COMMENT ON TABLE config.bib_source IS $$
 $$;
 
 
-INSERT INTO config.bib_source (quality, source) VALUES (90, 'OcLC');
+INSERT INTO config.bib_source (quality, source) VALUES (90, 'oclc');
 INSERT INTO config.bib_source (quality, source) VALUES (10, 'System Local');
 INSERT INTO config.bib_source (quality, source, transcendant) VALUES (1, 'Project Gutenberg', TRUE);
 
@@ -153,9 +153,10 @@ INSERT INTO config.metabib_field ( field_class, name, xpath ) VALUES ( 'keyword'
 CREATE TABLE config.non_cataloged_type (
        id              SERIAL          PRIMARY KEY,
        owning_lib      INT             NOT NULL, -- REFERENCES actor.org_unit (id),
-       name            TEXT            NOT NULL UNIQUE,
+       name            TEXT            NOT NULL,
        circ_duration   INTERVAL        NOT NULL DEFAULT '14 days'::INTERVAL,
-       in_house        BOOL            NOT NULL DEFAULT FALSE
+       in_house        BOOL            NOT NULL DEFAULT FALSE,
+       CONSTRAINT noncat_once_per_lib UNIQUE (owning_lib,name)
 );
 COMMENT ON TABLE config.non_cataloged_type IS $$
 /*
@@ -410,7 +411,7 @@ INSERT INTO config.copy_status (name)                       VALUES ('Missing');
 INSERT INTO config.copy_status (name,holdable)         VALUES ('In process','t');
 INSERT INTO config.copy_status (name,holdable)         VALUES ('In transit','t');
 INSERT INTO config.copy_status (name,holdable)         VALUES ('Reshelving','t');
-INSERT INTO config.copy_status (name)                  VALUES ('On holds shelf');
+INSERT INTO config.copy_status (name,holdable)         VALUES ('On holds shelf','t');
 INSERT INTO config.copy_status (name,holdable)         VALUES ('On order','t');
 INSERT INTO config.copy_status (name)                  VALUES ('ILL');
 INSERT INTO config.copy_status (name)                  VALUES ('Cataloging');
@@ -448,9 +449,9 @@ COMMENT ON TABLE config.net_access_level IS $$
  */
 $$;
 
-INSERT INTO config.net_access_level (name) VALUES ('Restricted');
-INSERT INTO config.net_access_level (name) VALUES ('Full');
-INSERT INTO config.net_access_level (name) VALUES ('None');
+INSERT INTO config.net_access_level (name) VALUES ('Filtered');
+INSERT INTO config.net_access_level (name) VALUES ('Unfiltered');
+INSERT INTO config.net_access_level (name) VALUES ('No Access');
 
 CREATE TABLE config.audience_map (
        code            TEXT    PRIMARY KEY,

diff --git a/Open-ILS/src/sql/Pg/005.schema.actors.sql b/Open-ILS/src/sql/Pg/005.schema.actors.sql
index 2aac089..5e50abd 100644 (file)
--- a/Open-ILS/src/sql/Pg/005.schema.actors.sql
+++ b/Open-ILS/src/sql/Pg/005.schema.actors.sql
@@ -55,6 +55,7 @@ CREATE TABLE actor.usr (
        master_account          BOOL                            NOT NULL DEFAULT FALSE,
        super_user              BOOL                            NOT NULL DEFAULT FALSE,
        barred                  BOOL                            NOT NULL DEFAULT FALSE,
+       deleted                 BOOL                            NOT NULL DEFAULT FALSE,
        usrgroup                SERIAL                          NOT NULL,
        claims_returned_count   INT                             NOT NULL DEFAULT 0,
        credit_forward_balance  NUMERIC(6,2)                    NOT NULL DEFAULT 0.00,
@@ -131,6 +132,8 @@ CREATE TRIGGER actor_crypt_pw_insert_trigger
        BEFORE INSERT ON actor.usr FOR EACH ROW
        EXECUTE PROCEDURE actor.crypt_pw_insert ();
 
+CREATE RULE protect_user_delete AS ON DELETE TO actor.usr DO INSTEAD UPDATE actor.usr SET deleted = TRUE WHERE OLD.id = actor.usr.id;
+
 -- Just so that there is a user...
 INSERT INTO actor.usr ( profile, card, usrname, passwd, first_given_name, family_name, dob, master_account, super_user, ident_type, ident_value, home_ou )
        VALUES ( 1, 1,'admin', 'open-ils', 'Administrator', 'System Account', '1979-01-22', TRUE, TRUE, 1, 'identification', 1 );

diff --git a/Open-ILS/src/sql/Pg/040.schema.asset.sql b/Open-ILS/src/sql/Pg/040.schema.asset.sql
index a138649..8722c4e 100644 (file)
--- a/Open-ILS/src/sql/Pg/040.schema.asset.sql
+++ b/Open-ILS/src/sql/Pg/040.schema.asset.sql
@@ -44,7 +44,7 @@ CREATE TABLE asset.copy (
        deleted         BOOL                            NOT NULL DEFAULT FALSE
 );
 CREATE INDEX cp_cn_idx ON asset.copy (call_number);
-CREATE INDEX cp_avail_cn_idx ON asset.copy (call_number) WHERE status = 0;
+CREATE INDEX cp_avail_cn_idx ON asset.copy (call_number);
 CREATE RULE protect_copy_delete AS ON DELETE TO asset.copy DO INSTEAD UPDATE asset.copy SET deleted = TRUE WHERE OLD.id = asset.copy.id;
 
 CREATE TABLE asset.copy_transparency (