[open-ils-commits] [GIT] Evergreen ILS branch master updated. 8e763e316ffb2ff9d1db05f683b6c7aa447f66e6
Evergreen Git
git at git.evergreen-ils.org
Tue Apr 25 13:35:39 EDT 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via 8e763e316ffb2ff9d1db05f683b6c7aa447f66e6 (commit)
via 539fb4d13f02b5176bf9ce75edf87500efbb563b (commit)
via 53aacfabcc9a3cafe47acafb7096bd2e4944c97a (commit)
via 16b99833988e0fc833352fe0a7d02e27592cd373 (commit)
from ad823c9ca5de2fde0caad76ac421081aeb024ef5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8e763e316ffb2ff9d1db05f683b6c7aa447f66e6
Author: Jason Stephenson <jason at sigio.com>
Date: Tue Apr 25 13:33:08 2017 -0400
LP#1545115: Stamping upgrade script for description field in matrix tables
Signed-off-by: Jason Stephenson <jason at sigio.com>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index bfeeb14..d23ebf1 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -91,7 +91,7 @@ CREATE TRIGGER no_overlapping_deps
BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1033', :eg_version); -- gmcharlt/kmlussier
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1034', :eg_version); -- rhamby/gmcharlt/dyrcona
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.policy_matrix_description_field.sql b/Open-ILS/src/sql/Pg/upgrade/1034.schema.policy_matrix_description_field.sql
similarity index 71%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.schema.policy_matrix_description_field.sql
rename to Open-ILS/src/sql/Pg/upgrade/1034.schema.policy_matrix_description_field.sql
index dda68a1..afedb11 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.policy_matrix_description_field.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1034.schema.policy_matrix_description_field.sql
@@ -1,6 +1,6 @@
BEGIN;
--- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('1034', :eg_version);
ALTER TABLE config.hold_matrix_matchpoint
ADD COLUMN description TEXT;
commit 539fb4d13f02b5176bf9ce75edf87500efbb563b
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Tue Apr 25 12:36:27 2017 -0400
LP#1545115: add release notes entry
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Jason Stephenson <jason at sigio.com>
diff --git a/docs/RELEASE_NOTES_NEXT/Administration/add_description_field_to_policy_matrices.adoc b/docs/RELEASE_NOTES_NEXT/Administration/add_description_field_to_policy_matrices.adoc
new file mode 100644
index 0000000..53218c7
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/Administration/add_description_field_to_policy_matrices.adoc
@@ -0,0 +1,5 @@
+Add Description Field to Circulation and Hold Configuration Entries
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+The circulation and hold policy configuration rules now each have a
+description field. This allows administrators to add comments to
+describe the purpose of each rule.
commit 53aacfabcc9a3cafe47acafb7096bd2e4944c97a
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Tue Apr 25 09:55:00 2017 -0400
LP#1545115: consolidate schema update scripts into one
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Jason Stephenson <jason at sigio.com>
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.policy_matrix_description_field.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.policy_matrix_description_field.sql
new file mode 100644
index 0000000..dda68a1
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.policy_matrix_description_field.sql
@@ -0,0 +1,11 @@
+BEGIN;
+
+-- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+ALTER TABLE config.hold_matrix_matchpoint
+ ADD COLUMN description TEXT;
+
+ALTER TABLE config.circ_matrix_matchpoint
+ ADD COLUMN description TEXT;
+
+COMMIT;
diff --git a/Open-ILS/src/sql/Pg/upgrade/xxxx.schema.add_description_circ_matrix.sql b/Open-ILS/src/sql/Pg/upgrade/xxxx.schema.add_description_circ_matrix.sql
deleted file mode 100644
index a461c4b..0000000
--- a/Open-ILS/src/sql/Pg/upgrade/xxxx.schema.add_description_circ_matrix.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-BEGIN;
-
-ALTER TABLE config.circ_matrix_matchpoint
- ADD COLUMN description TEXT;
-
-COMMIT;
diff --git a/Open-ILS/src/sql/Pg/upgrade/xxxx.schema.add_description_hold_matrix.sql b/Open-ILS/src/sql/Pg/upgrade/xxxx.schema.add_description_hold_matrix.sql
deleted file mode 100644
index f65fc13..0000000
--- a/Open-ILS/src/sql/Pg/upgrade/xxxx.schema.add_description_hold_matrix.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-BEGIN;
-
-ALTER TABLE config.hold_matrix_matchpoint
- ADD COLUMN description TEXT;
-
-COMMIT;
commit 16b99833988e0fc833352fe0a7d02e27592cd373
Author: Rogan Hamby <rogan.hamby at gmail.com>
Date: Mon Apr 25 12:59:12 2016 -0400
LP#1545115: add description field for policy matrix tables
This patch adds description column for the
config.hold_matrix_matchpoint and circ_matrix_matchpoint tables
and pgTAP tests for them.
Signed-off-by: Rogan Hamby <rogan.hamby at gmail.com>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Jason Stephenson <jason at sigio.com>
diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index ee01905..4c1ed76 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -1870,6 +1870,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
<field reporter:label="Max Holds" name="max_holds" reporter:datatype="int"/>
<field reporter:label="Max includes Frozen" name="include_frozen_holds" reporter:datatype="bool"/>
<field reporter:label="Copy Age Hold Protection Rule" name="age_hold_protect_rule" reporter:datatype="link"/>
+ <field name="description" reporter:datatype="text" reporter:label="Description"/>
</fields>
<links>
<link field="user_home_ou" reltype="has_a" key="id" map="" class="aou"/>
@@ -1928,6 +1929,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
<field reporter:label="Script Test" name="script_test" reporter:datatype="text"/>
<field name="total_copy_hold_ratio" reporter:datatype="float" reporter:label="Minimum Total Copy/Hold Ratio"/>
<field name="available_copy_hold_ratio" reporter:datatype="float" reporter:label="Minimum Available Copy/Hold Ratio"/>
+ <field name="description" reporter:datatype="text" reporter:label="Description"/>
</fields>
<links>
<link field="org_unit" reltype="has_a" key="id" map="" class="aou"/>
diff --git a/Open-ILS/src/sql/Pg/100.circ_matrix.sql b/Open-ILS/src/sql/Pg/100.circ_matrix.sql
index 53b207a..09b4e3d 100644
--- a/Open-ILS/src/sql/Pg/100.circ_matrix.sql
+++ b/Open-ILS/src/sql/Pg/100.circ_matrix.sql
@@ -81,7 +81,8 @@ CREATE TABLE config.circ_matrix_matchpoint (
grace_period INTERVAL, -- Grace period override
script_test TEXT, -- javascript source
total_copy_hold_ratio FLOAT,
- available_copy_hold_ratio FLOAT
+ available_copy_hold_ratio FLOAT,
+ description TEXT
);
-- Nulls don't count for a constraint match, so we have to coalesce them into something that does.
diff --git a/Open-ILS/src/sql/Pg/110.hold_matrix.sql b/Open-ILS/src/sql/Pg/110.hold_matrix.sql
index fe17a9a..3b47b62 100644
--- a/Open-ILS/src/sql/Pg/110.hold_matrix.sql
+++ b/Open-ILS/src/sql/Pg/110.hold_matrix.sql
@@ -55,7 +55,8 @@ CREATE TABLE config.hold_matrix_matchpoint (
max_holds INT, -- Total hold requests must be less than this, NULL means skip (always pass)
include_frozen_holds BOOL NOT NULL DEFAULT TRUE, -- Include frozen hold requests in the count for max_holds test
stop_blocked_user BOOL NOT NULL DEFAULT FALSE, -- Stop users who cannot check out items from placing holds
- age_hold_protect_rule INT REFERENCES config.rule_age_hold_protect (id) DEFERRABLE INITIALLY DEFERRED -- still not sure we want to move this off the copy
+ age_hold_protect_rule INT REFERENCES config.rule_age_hold_protect (id) DEFERRABLE INITIALLY DEFERRED, -- still not sure we want to move this off the copy
+ description TEXT
);
-- Nulls don't count for a constraint match, so we have to coalesce them into something that does.
diff --git a/Open-ILS/src/sql/Pg/t/lp1545115-circ-and-hold-matrix-get-notes.pg b/Open-ILS/src/sql/Pg/t/lp1545115-circ-and-hold-matrix-get-notes.pg
new file mode 100644
index 0000000..65e8c46
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/t/lp1545115-circ-and-hold-matrix-get-notes.pg
@@ -0,0 +1,17 @@
+-- Load the TAP functions.
+BEGIN;
+
+-- Plan the tests.
+SELECT plan(2);
+
+-- Run the tests.
+
+SELECT has_column('config', 'circ_matrix_matchpoint', 'description',
+ 'Column "description" on config.circ_matrix_matchpoint should exist');
+SELECT has_column('config', 'hold_matrix_matchpoint', 'description',
+ 'Column "description" on config.hold_matrix_matchpoint should exist');
+
+-- Finish the tests and clean up.
+SELECT * FROM finish();
+ROLLBACK;
+
diff --git a/Open-ILS/src/sql/Pg/upgrade/xxxx.schema.add_description_circ_matrix.sql b/Open-ILS/src/sql/Pg/upgrade/xxxx.schema.add_description_circ_matrix.sql
new file mode 100644
index 0000000..a461c4b
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/xxxx.schema.add_description_circ_matrix.sql
@@ -0,0 +1,6 @@
+BEGIN;
+
+ALTER TABLE config.circ_matrix_matchpoint
+ ADD COLUMN description TEXT;
+
+COMMIT;
diff --git a/Open-ILS/src/sql/Pg/upgrade/xxxx.schema.add_description_hold_matrix.sql b/Open-ILS/src/sql/Pg/upgrade/xxxx.schema.add_description_hold_matrix.sql
new file mode 100644
index 0000000..f65fc13
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/xxxx.schema.add_description_hold_matrix.sql
@@ -0,0 +1,6 @@
+BEGIN;
+
+ALTER TABLE config.hold_matrix_matchpoint
+ ADD COLUMN description TEXT;
+
+COMMIT;
diff --git a/Open-ILS/src/templates/conify/global/config/circ_matrix_matchpoint.tt2 b/Open-ILS/src/templates/conify/global/config/circ_matrix_matchpoint.tt2
index a576d46..df2b8cc 100644
--- a/Open-ILS/src/templates/conify/global/config/circ_matrix_matchpoint.tt2
+++ b/Open-ILS/src/templates/conify/global/config/circ_matrix_matchpoint.tt2
@@ -9,7 +9,7 @@
<table jsId="cmGrid"
style="height: 600px;"
dojoType="openils.widget.AutoGrid"
- fieldOrder="['id', 'active', 'grp', 'org_unit', 'copy_circ_lib', 'copy_owning_lib', 'user_home_ou', 'is_renewal', 'juvenile_flag', 'circ_modifier', 'copy_location', 'marc_type', 'marc_form', 'marc_bib_level', 'marc_vr_format', 'ref_flag', 'usr_age_lower_bound', 'usr_age_upper_bound', 'item_age', 'circulate', 'duration_rule', 'renewals', 'hard_due_date', 'recurring_fine_rule', 'grace_period', 'max_fine_rule', 'available_copy_hold_ratio', 'total_copy_hold_ratio', 'script_test']"
+ fieldOrder="['id', 'active', 'grp', 'org_unit', 'copy_circ_lib', 'copy_owning_lib', 'user_home_ou', 'is_renewal', 'juvenile_flag', 'circ_modifier', 'copy_location', 'marc_type', 'marc_form', 'marc_bib_level', 'marc_vr_format', 'ref_flag', 'usr_age_lower_bound', 'usr_age_upper_bound', 'item_age', 'circulate', 'duration_rule', 'renewals', 'hard_due_date', 'recurring_fine_rule', 'grace_period', 'max_fine_rule', 'available_copy_hold_ratio', 'total_copy_hold_ratio', 'script_test', 'description']"
defaultCellWidth='"auto"'
query="{id: '*'}"
fmClass='ccmm'
diff --git a/Open-ILS/src/templates/conify/global/config/hold_matrix_matchpoint.tt2 b/Open-ILS/src/templates/conify/global/config/hold_matrix_matchpoint.tt2
index d92eaa2..3079f02 100644
--- a/Open-ILS/src/templates/conify/global/config/hold_matrix_matchpoint.tt2
+++ b/Open-ILS/src/templates/conify/global/config/hold_matrix_matchpoint.tt2
@@ -8,7 +8,7 @@
<table jsId="hmGrid"
autoHeight='true'
dojoType="openils.widget.AutoGrid"
- fieldOrder="['id', 'strict_ou_match', 'user_home_ou', 'request_ou', 'pickup_ou', 'item_owning_ou', 'item_circ_ou', 'requestor_grp', 'circ_modifier', 'marc_type', 'marc_form', 'marc_bib_level', 'marc_vr_format']"
+ fieldOrder="['id', 'strict_ou_match', 'user_home_ou', 'request_ou', 'pickup_ou', 'item_owning_ou', 'item_circ_ou', 'requestor_grp', 'circ_modifier', 'marc_type', 'marc_form', 'marc_bib_level', 'marc_vr_format', 'description']"
defaultCellWidth='"auto"'
query="{id: '*'}"
fmClass='chmm'
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/examples/fm_IDL.xml | 2 ++
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/100.circ_matrix.sql | 3 ++-
Open-ILS/src/sql/Pg/110.hold_matrix.sql | 3 ++-
.../t/lp1545115-circ-and-hold-matrix-get-notes.pg | 17 +++++++++++++++++
...1034.schema.policy_matrix_description_field.sql | 11 +++++++++++
.../global/config/circ_matrix_matchpoint.tt2 | 2 +-
.../global/config/hold_matrix_matchpoint.tt2 | 2 +-
.../add_description_field_to_policy_matrices.adoc | 5 +++++
9 files changed, 42 insertions(+), 5 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/t/lp1545115-circ-and-hold-matrix-get-notes.pg
create mode 100644 Open-ILS/src/sql/Pg/upgrade/1034.schema.policy_matrix_description_field.sql
create mode 100644 docs/RELEASE_NOTES_NEXT/Administration/add_description_field_to_policy_matrices.adoc
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list