ensure we don't use deleted copy locations

Signed-off-by: Jason Etheridge <jason@esilibrary.com>

diff --git a/sql/base/base.sql b/sql/base/base.sql
index 4cc945d..40a1e8b 100644 (file)
--- a/sql/base/base.sql
+++ b/sql/base/base.sql
@@ -2751,6 +2751,7 @@ CREATE OR REPLACE FUNCTION migration_tools.handle_shelf (TEXT,TEXT,TEXT,INTEGER)
             || ' SET x_shelf = id FROM asset_copy_location b'
             || ' WHERE BTRIM(UPPER(a.desired_shelf)) = BTRIM(UPPER(b.name))'
             || ' AND b.owning_lib = $1'
+            || ' AND NOT b.deleted'
         USING org;
 
         FOREACH o IN ARRAY org_list LOOP
@@ -2758,6 +2759,7 @@ CREATE OR REPLACE FUNCTION migration_tools.handle_shelf (TEXT,TEXT,TEXT,INTEGER)
                 || ' SET x_shelf = id FROM asset.copy_location b'
                 || ' WHERE BTRIM(UPPER(a.desired_shelf)) = BTRIM(UPPER(b.name))'
                 || ' AND b.owning_lib = $1 AND x_shelf IS NULL'
+                || ' AND NOT b.deleted'
             USING o;
         END LOOP;