Commit 9ec94101 authored by Clare Lenihan's avatar Clare Lenihan Committed by Clare Lenihan
Browse files

changing char to varchar for group relationships

fixes bug where group relationships aren't detected properly
parent 8a5331aa
...@@ -96,17 +96,17 @@ if ($groups['data']) { ...@@ -96,17 +96,17 @@ if ($groups['data']) {
LEFT JOIN {group_member} gm ON (gm.group = g.id) LEFT JOIN {group_member} gm ON (gm.group = g.id)
LEFT JOIN {group_member_request} gmr ON (gmr.group = g.id) LEFT JOIN {group_member_request} gmr ON (gmr.group = g.id)
LEFT JOIN ( LEFT JOIN (
SELECT g.id, CAST(\'owner\' AS CHAR(7)) AS type SELECT g.id, CAST(\'owner\' AS VARCHAR(7)) AS type
FROM {group} g FROM {group} g
WHERE g.owner = ? WHERE g.owner = ?
UNION SELECT g.id, CAST(\'member\' AS CHAR(7)) AS type UNION SELECT g.id, CAST(\'member\' AS VARCHAR(7)) AS type
FROM {group} g FROM {group} g
INNER JOIN {group_member} gm ON (g.id = gm.group AND gm.member = ?) INNER JOIN {group_member} gm ON (g.id = gm.group AND gm.member = ?)
WHERE g.owner != gm.member WHERE g.owner != gm.member
UNION SELECT g.id, CAST(\'invite\' AS CHAR(7)) AS type UNION SELECT g.id, CAST(\'invite\' AS VARCHAR(7)) AS type
FROM {group} g FROM {group} g
INNER JOIN {group_member_invite} gmi ON (gmi.group = g.id AND gmi.member = ?) INNER JOIN {group_member_invite} gmi ON (gmi.group = g.id AND gmi.member = ?)
UNION SELECT g.id, CAST(\'request\' AS CHAR(7)) AS type UNION SELECT g.id, CAST(\'request\' AS VARCHAR(7)) AS type
FROM {group} g FROM {group} g
INNER JOIN {group_member_request} gmr ON (gmr.group = g.id AND gmr.member = ?) INNER JOIN {group_member_request} gmr ON (gmr.group = g.id AND gmr.member = ?)
) t ON t.id = g.id ) t ON t.id = g.id
......
...@@ -43,7 +43,7 @@ $offset = (int)($offset / $groupsperpage) * $groupsperpage; ...@@ -43,7 +43,7 @@ $offset = (int)($offset / $groupsperpage) * $groupsperpage;
if ($filter == 'owner') { if ($filter == 'owner') {
$sql = ' $sql = '
INNER JOIN ( INNER JOIN (
SELECT g.id, CAST(\'owner\' AS CHAR(7)) AS type SELECT g.id, CAST(\'owner\' AS VARCHAR(7)) AS type
FROM {group} g FROM {group} g
WHERE g.owner = ? WHERE g.owner = ?
) t ON t.id = g.id'; ) t ON t.id = g.id';
...@@ -52,10 +52,10 @@ if ($filter == 'owner') { ...@@ -52,10 +52,10 @@ if ($filter == 'owner') {
else if ($filter == 'member') { else if ($filter == 'member') {
$sql = ' $sql = '
INNER JOIN ( INNER JOIN (
SELECT g.id, CAST(\'owner\' AS CHAR(7)) AS type SELECT g.id, CAST(\'owner\' AS VARCHAR(7)) AS type
FROM {group} g FROM {group} g
WHERE g.owner = ? WHERE g.owner = ?
UNION SELECT g.id, CAST(\'member\' AS CHAR(7)) AS type UNION SELECT g.id, CAST(\'member\' AS VARCHAR(7)) AS type
FROM {group} g FROM {group} g
INNER JOIN {group_member} gm ON (g.id = gm.group AND gm.member = ?) INNER JOIN {group_member} gm ON (g.id = gm.group AND gm.member = ?)
WHERE g.owner != gm.member WHERE g.owner != gm.member
...@@ -65,7 +65,7 @@ else if ($filter == 'member') { ...@@ -65,7 +65,7 @@ else if ($filter == 'member') {
else if ($filter == 'invite') { else if ($filter == 'invite') {
$sql = ' $sql = '
INNER JOIN ( INNER JOIN (
SELECT g.id, CAST(\'invite\' AS CHAR(7)) AS type SELECT g.id, CAST(\'invite\' AS VARCHAR(7)) AS type
FROM {group} g FROM {group} g
INNER JOIN {group_member_invite} gmi ON (gmi.group = g.id AND gmi.member = ?) INNER JOIN {group_member_invite} gmi ON (gmi.group = g.id AND gmi.member = ?)
) t ON t.id = g.id'; ) t ON t.id = g.id';
...@@ -74,7 +74,7 @@ else if ($filter == 'invite') { ...@@ -74,7 +74,7 @@ else if ($filter == 'invite') {
else if ($filter == 'request') { else if ($filter == 'request') {
$sql = ' $sql = '
INNER JOIN ( INNER JOIN (
SELECT g.id, CAST(\'request\' AS CHAR(7)) AS type SELECT g.id, CAST(\'request\' AS VARCHAR(7)) AS type
FROM {group} g FROM {group} g
INNER JOIN {group_member_request} gmr ON (gmr.group = g.id AND gmr.member = ?) INNER JOIN {group_member_request} gmr ON (gmr.group = g.id AND gmr.member = ?)
) t ON t.id = g.id'; ) t ON t.id = g.id';
...@@ -84,17 +84,17 @@ else { // all or some other text ...@@ -84,17 +84,17 @@ else { // all or some other text
$filter = 'all'; $filter = 'all';
$sql = ' $sql = '
INNER JOIN ( INNER JOIN (
SELECT g.id, CAST(\'owner\' AS CHAR(7)) AS type SELECT g.id, CAST(\'owner\' AS VARCHAR(7)) AS type
FROM {group} g FROM {group} g
WHERE g.owner = ? WHERE g.owner = ?
UNION SELECT g.id, CAST(\'member\' AS CHAR(7)) AS type UNION SELECT g.id, CAST(\'member\' AS VARCHAR(7)) AS type
FROM {group} g FROM {group} g
INNER JOIN {group_member} gm ON (g.id = gm.group AND gm.member = ?) INNER JOIN {group_member} gm ON (g.id = gm.group AND gm.member = ?)
WHERE g.owner != gm.member WHERE g.owner != gm.member
UNION SELECT g.id, CAST(\'invite\' AS CHAR(7)) AS type UNION SELECT g.id, CAST(\'invite\' AS VARCHAR(7)) AS type
FROM {group} g FROM {group} g
INNER JOIN {group_member_invite} gmi ON (gmi.group = g.id AND gmi.member = ?) INNER JOIN {group_member_invite} gmi ON (gmi.group = g.id AND gmi.member = ?)
UNION SELECT g.id, CAST(\'request\' AS CHAR(7)) AS type UNION SELECT g.id, CAST(\'request\' AS VARCHAR(7)) AS type
FROM {group} g FROM {group} g
INNER JOIN {group_member_request} gmr ON (gmr.group = g.id AND gmr.member = ?) INNER JOIN {group_member_request} gmr ON (gmr.group = g.id AND gmr.member = ?)
) t ON t.id = g.id'; ) t ON t.id = g.id';
......
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