From 0be165de1df8d8d4f1d54475ea1d4742bf57fe15 Mon Sep 17 00:00:00 2001 From: Kathy Lussier Date: Tue, 21 Feb 2017 11:27:33 -0500 Subject: [PATCH] LP#1665626: Change order of test bib loading As bshum did for e-book records, let's move MR records down to the end of the script to avoid breaking tests. Signed-off-by: Kathy Lussier --- Open-ILS/tests/datasets/sql/bibs_mr.sql | 2 +- Open-ILS/tests/datasets/sql/load_all.sql | 17 +++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Open-ILS/tests/datasets/sql/bibs_mr.sql b/Open-ILS/tests/datasets/sql/bibs_mr.sql index 04f4895349..2d33457139 100644 --- a/Open-ILS/tests/datasets/sql/bibs_mr.sql +++ b/Open-ILS/tests/datasets/sql/bibs_mr.sql @@ -1,4 +1,4 @@ -\set bib_tag '''IMPORT MR''' +\\set bib_tag '''IMPORT MR''' INSERT INTO marcxml_import (tag, marc) VALUES diff --git a/Open-ILS/tests/datasets/sql/load_all.sql b/Open-ILS/tests/datasets/sql/load_all.sql index 821a7b5b84..dbb4e36a3d 100644 --- a/Open-ILS/tests/datasets/sql/load_all.sql +++ b/Open-ILS/tests/datasets/sql/load_all.sql @@ -1,4 +1,4 @@ -N; +BEGIN; -- stop on error \set ON_ERROR_STOP on @@ -30,12 +30,6 @@ N; -- load RDA bibs \i bibs_rda.sql --- load EbookAPI bibs -\i bibs_ebook_api.sql - --- load metarecord bibs -\i bibs_mr.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; @@ -55,9 +49,6 @@ INSERT INTO biblio.record_entry (marc, last_xact_id) -- load RDA copies, etc. \i assets_rda.sql --- load MR copies, etc. -\i assets_mr.sql - -- load copy-related data \i assets_extras.sql @@ -80,6 +71,12 @@ DELETE FROM marcxml_import; -- load EbookAPI bibs \i bibs_ebook_api.sql +-- load metarecord bibs +\i bibs_mr.sql + +-- load MR copies, etc. +\i assets_mr.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; -- 2.11.0