Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 08:40:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4066 from MrPetovan/bug/4046-remove-group_member-uid

Browse source 
Remove group_member.uid
This commit is contained in:
Michael Vogel 2017-12-15 17:47:57 +01:00 committed by GitHub
commit 39dcec66d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -43,7 +43,7 @@ define('FRIENDICA_PLATFORM', 'Friendica');
define('FRIENDICA_CODENAME', 'Asparagus');
define('FRIENDICA_VERSION', '3.6-dev');
define('DFRN_PROTOCOL_VERSION', '2.23');
define('DB_UPDATE_VERSION', 1236);
define('DB_UPDATE_VERSION', 1237);
define('NEW_UPDATE_ROUTINE_VERSION', 1170);
/**

2
include/acl_selectors.php
View file

@ -529,7 +529,7 @@ function acl_lookup(App $a, $out_type = 'json') {
// This can be done when we can delete cache entries via wildcard
$r = q("SELECT `group`.`id`, `group`.`name`, GROUP_CONCAT(DISTINCT `group_member`.`contact-id` SEPARATOR ',') AS uids
FROM `group`
INNER JOIN `group_member` ON `group_member`.`gid`=`group`.`id` AND `group_member`.`uid` = `group`.`uid`
INNER JOIN `group_member` ON `group_member`.`gid`=`group`.`id`
WHERE NOT `group`.`deleted` AND `group`.`uid` = %d
$sql_extra
GROUP BY `group`.`name`, `group`.`id`

2
include/uimport.php
View file

@ -232,8 +232,6 @@ function import_account(App $a, $file) {
}
foreach ($account['group_member'] as &$group_member) {
$group_member['uid'] = $newuid;
$import = 0;
foreach ($account['group'] as $group) {
if ($group['id'] == $group_member['gid'] && isset($group['newid'])) {

2
mod/uexport.php
View file

@ -109,7 +109,7 @@ function uexport_account($a) {
);
$group_member = _uexport_multirow(
sprintf("SELECT * FROM `group_member` WHERE uid = %d", intval(local_user()))
sprintf("SELECT `group_member`.`gid`, `group_member`.`contact-id` FROM `group_member` INNER JOIN `group` ON `group`.`id` = `group_member`.`gid` WHERE `group`.`uid` = %d", intval(local_user()))
);
$output = array(

4
src/Database/DBStructure.php
View file

@ -990,15 +990,13 @@ class DBStructure {
$database["group_member"] = array(
"fields" => array(
"id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
"uid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
"gid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0", "relation" => array("group" => "id")),
"contact-id" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0", "relation" => array("contact" => "id")),
),
"indexes" => array(
"PRIMARY" => array("id"),
"contactid" => array("contact-id"),
"gid_contactid" => array("gid", "contact-id"),
"uid_gid_contactid" => array("UNIQUE", "uid", "gid", "contact-id"),
"gid_contactid" => array("UNIQUE", "gid", "contact-id"),
)
);
$database["gserver"] = array(

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`
INNER 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` = ?;",

2
update.php
View file

@ -1,6 +1,6 @@
<?php
define('UPDATE_VERSION' , 1236);
define('UPDATE_VERSION' , 1237);
use Friendica\Core\Config;
use Friendica\Core\PConfig;