Merge branch 'master' of git.evergreen-ils.org:Evergreen into dbs/array_accum_2_array_agg

Conflicts:
	Open-ILS/src/sql/Pg/990.schema.unapi.sql

Signed-off-by: Dan Scott <dscott@laurentian.ca>

diff --cc Open-ILS/src/sql/Pg/990.schema.unapi.sql
index 4e5a4eb,70996fc..a070436
--- 1/Open-ILS/src/sql/Pg/990.schema.unapi.sql
--- 2/Open-ILS/src/sql/Pg/990.schema.unapi.sql
+++ b/Open-ILS/src/sql/Pg/990.schema.unapi.sql
@@@ -3,7 -3,8 +3,8 @@@ DROP SCHEMA IF EXISTS unapi CASCADE
  BEGIN;
  CREATE SCHEMA unapi;
  
 -CREATE OR REPLACE FUNCTION evergreen.array_remove_item_by_value(inp ANYARRAY, el ANYELEMENT) RETURNS anyarray AS $$ SELECT ARRAY_ACCUM(x.e) FROM UNNEST( $1 ) x(e) WHERE x.e <> $2; $$ LANGUAGE SQL;
+ CREATE OR REPLACE FUNCTION evergreen.org_top() RETURNS SETOF actor.org_unit AS $$ SELECT * FROM actor.org_unit WHERE parent_ou IS NULL LIMIT 1; $$ LANGUAGE SQL ROWS 1;
 +CREATE OR REPLACE FUNCTION evergreen.array_remove_item_by_value(inp ANYARRAY, el ANYELEMENT) RETURNS anyarray AS $$ SELECT ARRAY_AGG(x.e) FROM UNNEST( $1 ) x(e) WHERE x.e <> $2; $$ LANGUAGE SQL;
  
  CREATE TABLE unapi.bre_output_layout (
      name                TEXT    PRIMARY KEY,

diff --cc Open-ILS/src/sql/Pg/999.functions.global.sql
Simple merge