[open-ils-commits] [GIT] Evergreen ILS branch master updated. 1a9b8120518584740dd6236ed04d6f0758b5fd36

[Evergreen Git]

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  1a9b8120518584740dd6236ed04d6f0758b5fd36 (commit)
      from  8c620be5eb2eee41554db52516f3eca46898016f (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 1a9b8120518584740dd6236ed04d6f0758b5fd36
Author: Ben Shum <ben at evergreener.net>
Date:   Mon Feb 20 22:34:54 2017 -0500

    LP#1541559: Change order of test bib loading
    
    Move the new ebook bibs to the end of the script and away from the
    rest of bib loading and item creation to avoid breaking tests.
    
    Signed-off-by: Ben Shum <ben at evergreener.net>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/tests/datasets/sql/load_all.sql b/Open-ILS/tests/datasets/sql/load_all.sql
index 54d4e55..50ea078 100644
--- a/Open-ILS/tests/datasets/sql/load_all.sql
+++ b/Open-ILS/tests/datasets/sql/load_all.sql
@@ -30,9 +30,6 @@ BEGIN;
 -- load RDA bibs
 \i bibs_rda.sql
 
--- load EbookAPI bibs
-\i bibs_ebook_api.sql
-
 -- insert all loaded bibs into the biblio.record_entry in insert order
 INSERT INTO biblio.record_entry (marc, last_xact_id) 
     SELECT marc, tag FROM marcxml_import ORDER BY id;
@@ -68,6 +65,16 @@ INSERT INTO biblio.record_entry (marc, last_xact_id)
 -- funds, orders, etc.
 \i acq.sql
 
+-- delete previously imported bibs
+DELETE FROM marcxml_import;
+
+-- load EbookAPI bibs
+\i bibs_ebook_api.sql
+
+-- insert all loaded bibs into the biblio.record_entry in insert order
+INSERT INTO biblio.record_entry (marc, last_xact_id)
+    SELECT marc, tag FROM marcxml_import ORDER BY id;
+
 -- clean up the env
 \i env_destroy.sql
 

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/tests/datasets/sql/load_all.sql |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS