[open-ils-commits] [GIT] Evergreen ILS branch master updated. 4fca2c7ba62469646fe6aea141304f5d35b54105
Evergreen Git
git at git.evergreen-ils.org
Mon Dec 17 17:07:26 EST 2018
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 4fca2c7ba62469646fe6aea141304f5d35b54105 (commit)
via 8de5d650be848ab5b36c24ddc6311bf281cca086 (commit)
via 6edccd3319fe217482497b1c781095d346391eb3 (commit)
via c8aea152e8843d1d570b15ea29dfe830f50a07cb (commit)
from 35cf13c59d7b1a851e46b537a4f0356a9e4bc3fc (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 4fca2c7ba62469646fe6aea141304f5d35b54105
Author: Bill Erickson <berickxx at gmail.com>
Date: Mon Dec 17 17:01:45 2018 -0500
LP1806968 Stamping SQL upgrade: Vand. session tracker fixes
Signed-off-by: Bill Erickson <berickxx at gmail.com>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index dbe280d..1c72349 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -92,7 +92,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 ('1140', :eg_version); -- dyrcona/bshum
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1141', :eg_version); -- khuckins/berick/jboyer
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay-record-type-fix.sql b/Open-ILS/src/sql/Pg/upgrade/1141.schema.vandelay-record-type-fix.sql
similarity index 81%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay-record-type-fix.sql
rename to Open-ILS/src/sql/Pg/upgrade/1141.schema.vandelay-record-type-fix.sql
index 0ba8a6e..69cb971 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay-record-type-fix.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1141.schema.vandelay-record-type-fix.sql
@@ -1,6 +1,6 @@
BEGIN;
---SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('1141', :eg_version);
ALTER TABLE vandelay.session_tracker
ALTER COLUMN record_type TYPE TEXT,
commit 8de5d650be848ab5b36c24ddc6311bf281cca086
Author: Bill Erickson <berickxx at gmail.com>
Date: Thu Dec 6 12:18:06 2018 -0500
LP#1806968 Teach Vandelay to pass correct auth tracker type
Pass the correct value ('authority') when creating a Vandelay session
tracker entry for authority records.
Signed-off-by: Bill Erickson <berickxx at gmail.com>
Signed-off-by: Jason Boyer <jboyer at library.in.gov>
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm
index 0647b33..9f11bd8 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm
@@ -909,6 +909,7 @@ sub queued_records_with_matches {
sub create_session_tracker {
my ($user_id, $ws_id, $key, $name, $type, $queue_id, $action, $total_acts) = @_;
my $e = new_editor(xact => 1);
+ $type = 'authority' if $type =~ /auth/;
if ($key) {
# if other trackers exist for this key, adopt the name
commit 6edccd3319fe217482497b1c781095d346391eb3
Author: Bill Erickson <berickxx at gmail.com>
Date: Thu Dec 6 12:09:58 2018 -0500
LP#1806968 Vand ses. tracker upgrade SQL additions
Force the default value to show in the DB as 'bib'::text instead of
'bib'::vandelay.bib_queue_queue_type, which might be confusing.
Removed some stray SQL from the script.
Signed-off-by: Bill Erickson <berickxx at gmail.com>
Signed-off-by: Jason Boyer <jboyer at library.in.gov>
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay-record-type-fix.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay-record-type-fix.sql
index 1187011..0ba8a6e 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay-record-type-fix.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay-record-type-fix.sql
@@ -1,16 +1,14 @@
BEGIN;
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
-
+--SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
ALTER TABLE vandelay.session_tracker
- ALTER COLUMN record_type TYPE TEXT;
+ ALTER COLUMN record_type TYPE TEXT,
+ ALTER COLUMN record_type SET DEFAULT 'bib'::TEXT;
ALTER TABLE vandelay.session_tracker
ADD CONSTRAINT vand_tracker_valid_record_type
CHECK (record_type IN ('bib', 'authority'));
-END;
-$$ LANGUAGE plpgsql;
+COMMIT;
-COMMIT;
\ No newline at end of file
commit c8aea152e8843d1d570b15ea29dfe830f50a07cb
Author: Kyle Huckins <khuckins at catalyte.io>
Date: Tue Nov 27 23:21:15 2018 +0000
LP#1806968 Vandelay record_type sql fix
- Change record_type to TEXT rather than an enum, constrained
with the option of "authority" or "bib"
Signed-off-by: Kyle Huckins <khuckins at catalyte.io>
Changes to be committed:
modified: Open-ILS/src/sql/Pg/012.schema.vandelay.sql
new file: Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay-record-type-fix.sql
Signed-off-by: Bill Erickson <berickxx at gmail.com>
Signed-off-by: Jason Boyer <jboyer at library.in.gov>
diff --git a/Open-ILS/src/sql/Pg/012.schema.vandelay.sql b/Open-ILS/src/sql/Pg/012.schema.vandelay.sql
index 6f48276..1f53ad1 100644
--- a/Open-ILS/src/sql/Pg/012.schema.vandelay.sql
+++ b/Open-ILS/src/sql/Pg/012.schema.vandelay.sql
@@ -2272,7 +2272,7 @@ CREATE TABLE vandelay.session_tracker (
ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-- bib/auth
- record_type vandelay.bib_queue_queue_type NOT NULL DEFAULT 'bib',
+ record_type TEXT NOT NULL DEFAULT 'bib',
-- Queue defines the source of the data, it does not necessarily
-- mean that an action is being performed against an entire queue.
@@ -2300,7 +2300,10 @@ CREATE TABLE vandelay.session_tracker (
CHECK (state IN ('active','error','complete')),
CONSTRAINT vand_tracker_valid_action_type
- CHECK (action_type IN ('upload', 'enqueue', 'import'))
+ CHECK (action_type IN ('upload', 'enqueue', 'import')),
+
+ CONSTRAINT vand_tracker_valid_record_type
+ CHECK (record_type IN ('bib', 'authority'))
);
COMMIT;
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay-record-type-fix.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay-record-type-fix.sql
new file mode 100644
index 0000000..1187011
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay-record-type-fix.sql
@@ -0,0 +1,16 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+
+ALTER TABLE vandelay.session_tracker
+ ALTER COLUMN record_type TYPE TEXT;
+
+ALTER TABLE vandelay.session_tracker
+ ADD CONSTRAINT vand_tracker_valid_record_type
+ CHECK (record_type IN ('bib', 'authority'));
+
+END;
+$$ LANGUAGE plpgsql;
+
+COMMIT;
\ No newline at end of file
-----------------------------------------------------------------------
Summary of changes:
.../perlmods/lib/OpenILS/Application/Vandelay.pm | 1 +
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/012.schema.vandelay.sql | 7 +++++--
.../1141.schema.vandelay-record-type-fix.sql | 14 ++++++++++++++
4 files changed, 21 insertions(+), 3 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/1141.schema.vandelay-record-type-fix.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list