From: Dan Scott Date: Sat, 11 Jun 2011 11:15:55 +0000 (-0400) Subject: Merge branch 'rel_2_0' of git.evergreen-ils.org:Evergreen into dbs/unnest_2_0 X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=d5d6f43993957eb31e1fb5d188d50c2c87e9665f;p=working%2FEvergreen.git Merge branch 'rel_2_0' of git.evergreen-ils.org:Evergreen into dbs/unnest_2_0 --- d5d6f43993957eb31e1fb5d188d50c2c87e9665f diff --cc Open-ILS/src/sql/Pg/300.schema.staged_search.sql index 0a6649ae6f,42326a030f..40e6dce879 --- a/Open-ILS/src/sql/Pg/300.schema.staged_search.sql +++ b/Open-ILS/src/sql/Pg/300.schema.staged_search.sql @@@ -231,11 -236,10 +231,10 @@@ BEGI PERFORM 1 FROM asset.call_number cn JOIN asset.copy cp ON (cp.call_number = cn.id) - JOIN actor.org_unit a ON (cp.circ_lib = a.id) WHERE NOT cn.deleted AND NOT cp.deleted - AND cp.circ_lib IN ( SELECT * FROM search.explode_array( search_org_list ) ) - AND cn.record IN ( SELECT * FROM search.explode_array( core_result.records ) ) + AND cp.circ_lib IN ( SELECT * FROM unnest( search_org_list ) ) + AND cn.record IN ( SELECT * FROM unnest( core_result.records ) ) LIMIT 1; IF NOT FOUND THEN