Backporting r17715 from trunk: Patch from Dan Wells to extend the serial schema a...

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@17716 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 1ce11ca..41f379e 100644 (file)
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -68,7 +68,7 @@ CREATE TABLE config.upgrade_log (
     install_date    TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
 );
 
-INSERT INTO config.upgrade_log (version) VALUES ('0399'); -- miker
+INSERT INTO config.upgrade_log (version) VALUES ('0403'); -- dbwells via miker
 
 CREATE TABLE config.bib_source (
        id              SERIAL  PRIMARY KEY,

diff --git a/Open-ILS/src/sql/Pg/210.schema.serials.sql b/Open-ILS/src/sql/Pg/210.schema.serials.sql
index a96a67c..a7fda12 100644 (file)
--- a/Open-ILS/src/sql/Pg/210.schema.serials.sql
+++ b/Open-ILS/src/sql/Pg/210.schema.serials.sql
@@ -68,6 +68,8 @@ CREATE TABLE serial.caption_and_pattern (
                                  CONSTRAINT cap_type CHECK ( type in
                                  ( 'basic', 'supplement', 'index' )),
        create_date  TIMESTAMPTZ  NOT NULL DEFAULT now(),
+       start_date   TIMESTAMPTZ  NOT NULL DEFAULT now(),
+       end_date     TIMESTAMPTZ,
        active       BOOL         NOT NULL DEFAULT FALSE,
        pattern_code TEXT         NOT NULL,       -- must contain JSON
        enum_1       TEXT,
@@ -90,6 +92,11 @@ CREATE TABLE serial.distribution (
        record_entry          BIGINT  REFERENCES serial.record_entry (id)
                                                                  ON DELETE SET NULL
                                                                  DEFERRABLE INITIALLY DEFERRED,
+       summary_method        TEXT    CONSTRAINT sdist_summary_method_check
+                                     CHECK (summary_method IS NULL
+                                     OR summary_method IN ( 'add_to_sre',
+                                     'merge_with_sre', 'use_sre_only',
+                                     'use_sdist_only')),
        subscription          INT     NOT NULL
                                      REFERENCES serial.subscription (id)
                                                                  ON DELETE CASCADE
@@ -274,7 +281,8 @@ CREATE TABLE serial.basic_summary (
                                    ON DELETE CASCADE
                                    DEFERRABLE INITIALLY DEFERRED,
        generated_coverage  TEXT    NOT NULL,
-       textual_holdings    TEXT
+       textual_holdings    TEXT,
+       show_generated      BOOL    NOT NULL DEFAULT TRUE
 );
 CREATE INDEX serial_basic_summary_dist_idx ON serial.basic_summary (distribution);
 
@@ -285,7 +293,8 @@ CREATE TABLE serial.supplement_summary (
                                    ON DELETE CASCADE
                                    DEFERRABLE INITIALLY DEFERRED,
        generated_coverage  TEXT    NOT NULL,
-       textual_holdings    TEXT
+       textual_holdings    TEXT,
+       show_generated      BOOL    NOT NULL DEFAULT TRUE
 );
 CREATE INDEX serial_supplement_summary_dist_idx ON serial.supplement_summary (distribution);
 
@@ -296,7 +305,8 @@ CREATE TABLE serial.index_summary (
                                    ON DELETE CASCADE
                                    DEFERRABLE INITIALLY DEFERRED,
        generated_coverage  TEXT    NOT NULL,
-       textual_holdings    TEXT
+       textual_holdings    TEXT,
+       show_generated      BOOL    NOT NULL DEFAULT TRUE
 );
 CREATE INDEX serial_index_summary_dist_idx ON serial.index_summary (distribution);
 

diff --git a/Open-ILS/src/sql/Pg/upgrade/0403.schema.serials-tweaks.sql b/Open-ILS/src/sql/Pg/upgrade/0403.schema.serials-tweaks.sql
new file mode 100644 (file)
index 0000000..703932a
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0403.schema.serials-tweaks.sql
@@ -0,0 +1,35 @@
+-- serials schema tweaks
+
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0403'); -- dbwells via miker
+
+------- caption_and_pattern changes
+ALTER TABLE serial.caption_and_pattern
+ADD COLUMN start_date  TIMESTAMP WITH TIME ZONE DEFAULT NOW();
+
+ALTER TABLE serial.caption_and_pattern
+ADD COLUMN end_date    TIMESTAMP WITH TIME ZONE;
+
+
+------- *_summary changes
+ALTER TABLE serial.basic_summary
+ADD COLUMN show_generated      BOOL    NOT NULL DEFAULT TRUE;
+
+ALTER TABLE serial.supplement_summary
+ADD COLUMN show_generated      BOOL    NOT NULL DEFAULT TRUE;
+
+ALTER TABLE serial.index_summary
+ADD COLUMN show_generated      BOOL    NOT NULL DEFAULT TRUE;
+
+
+------- distribution changes
+ALTER TABLE serial.distribution
+
+ADD COLUMN summary_method      TEXT    CONSTRAINT summary_method_check CHECK (
+                                       summary_method IS NULL
+                                       OR summary_method IN ( 'add_to_sre',
+                                       'merge_with_sre', 'use_sre_only',
+                                       'use_sdist_only'));
+
+COMMIT;