Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-25 01:50:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove group_member.uid

Browse source 
- Use contact.uid alternatively
- Use JOIN with group table
This commit is contained in:
Hypolite Petovan 2017-12-14 22:47:58 -05:00
parent afbfbde112
commit 179b311978
6 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Model/Contact.php
View file

@ -42,7 +42,7 @@ class Contact extends BaseObject
INNER JOIN `group_member`
ON `contact`.`id` = `group_member`.`contact-id`
WHERE `gid` = ?
AND `group_member`.`uid` = ?
AND `contact`.`uid` = ?
AND NOT `contact`.`self`
AND NOT `contact`.`blocked`
AND NOT `contact`.`pending`
@ -73,7 +73,7 @@ class Contact extends BaseObject
INNER JOIN `group_member`
ON `contact`.`id` = `group_member`.`contact-id`
WHERE `gid` = ?
AND `group_member`.`uid` = ?
AND `contact`.`uid` = ?
AND `contact`.`network` = ?
AND `contact`.`notify` != ""',
$gid,
@ -605,7 +605,9 @@ class Contact extends BaseObject
AND NOT `pending`
AND `id` NOT IN (
SELECT DISTINCT(`contact-id`)
FROM `group_member` WHERE `uid` = %d
FROM `group_member`
JOIN `group` ON `group`.`id` = `group_member`.`gid`
WHERE `group`.`uid` = %d
)
LIMIT %d, %d", intval($uid), intval($uid), intval($start), intval($count)
);

3
src/Model/Group.php
View file

@ -96,8 +96,7 @@ class Group extends BaseObject
AND `contact-id` IN
(SELECT `contact-id`
FROM `group_member`
WHERE `group_member`.`gid` = `group`.`id`
AND `group_member`.`uid` = ?)
WHERE `group_member`.`gid` = `group`.`id`)
) AS `count`
FROM `group`
WHERE `group`.`uid` = ?;",