Commit 0a1e7b79 authored by Daniel Haag's avatar Daniel Haag
Browse files

Merge remote-tracking branch 'origin/master'

Conflicts:
	install/postgres_db_structure_functions.sql
parents 87ce420f 15334f75
......@@ -132,7 +132,6 @@ ALTER FUNCTION get_tcexam_group_appointment_users(character varying, character v
-- get_tcexam_group_users
CREATE OR REPLACE FUNCTION get_tcexam_group_users(group_id character varying)
RETURNS text AS
$BODY$
......@@ -149,16 +148,18 @@ SELECT XMLSERIALIZE ( CONTENT
XMLFOREST(user_level)
))) as text )
FROM users_and_groups u
FROM (SELECT * FROM (
SELECT * FROM tce_user_groups g
LEFT JOIN tce_usrgroups ug ON g.group_id = ug.usrgrp_group_id) ug
LEFT JOIN tce_users u ON u.user_id = ug.usrgrp_user_id) u
WHERE u.external_id LIKE concat($1,':%')
;
$BODY$
LANGUAGE sql VOLATILE
COST 1;
ALTER FUNCTION get_tcexam_group_users(character varying)
OWNER TO postgres;
COST 1;
-- insert_tcexam_group
......@@ -319,7 +320,6 @@ ALTER FUNCTION update_tcexam_user(text, character varying, character varying)
OWNER TO postgres;
-- create esb user
-- CREATE USER esb WITH PASSWORD '....';
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment