From ebb4811a75d6c5a324b932a56df5e7cd6c068446 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sat, 6 Oct 2018 14:06:24 +0200 Subject: Respect new table names on import --- Zotlabs/Module/Import.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php index c5c52674a..6016328a5 100644 --- a/Zotlabs/Module/Import.php +++ b/Zotlabs/Module/Import.php @@ -426,7 +426,7 @@ class Import extends \Zotlabs\Web\Controller { unset($group['id']); $group['uid'] = $channel['channel_id']; - create_table_from_array('groups', $group); + create_table_from_array('pgrp', $group); } $r = q("select * from pgrp where uid = %d", intval($channel['channel_id']) @@ -448,7 +448,7 @@ class Import extends \Zotlabs\Web\Controller { if($x['old'] == $group_member['gid']) $group_member['gid'] = $x['new']; } - create_table_from_array('group_member', $group_member); + create_table_from_array('pgrp_member', $group_member); } } -- cgit v1.2.3 From 4f70fd3e71fe9e3719c3e327fda566b9638e5d77 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sat, 6 Oct 2018 14:39:54 +0200 Subject: Add new table names in docs --- doc/database/db_group_member.bb | 14 -------------- doc/database/db_pgrp_member.bb | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 doc/database/db_group_member.bb create mode 100644 doc/database/db_pgrp_member.bb diff --git a/doc/database/db_group_member.bb b/doc/database/db_group_member.bb deleted file mode 100644 index b9ab8171d..000000000 --- a/doc/database/db_group_member.bb +++ /dev/null @@ -1,14 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td]sequential ID[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]uid[/td][td]channel.channel_id of the owner of this data[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]gid[/td][td]groups.id of the associated group[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]xchan[/td][td]xchan.xchan_hash of the member assigned to the associated group[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_pgrp_member.bb b/doc/database/db_pgrp_member.bb new file mode 100644 index 000000000..b9ab8171d --- /dev/null +++ b/doc/database/db_pgrp_member.bb @@ -0,0 +1,14 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td]sequential ID[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]uid[/td][td]channel.channel_id of the owner of this data[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]gid[/td][td]groups.id of the associated group[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]xchan[/td][td]xchan.xchan_hash of the member assigned to the associated group[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file -- cgit v1.2.3 From 2e4772ac0e9e0fe1ca55d4caac6f16b715c68a73 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sat, 6 Oct 2018 14:40:48 +0200 Subject: Update db_groups.bb --- doc/database/db_groups.bb | 18 ------------------ doc/database/db_pgrp.bb | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 doc/database/db_groups.bb create mode 100644 doc/database/db_pgrp.bb diff --git a/doc/database/db_groups.bb b/doc/database/db_groups.bb deleted file mode 100644 index 73265b90e..000000000 --- a/doc/database/db_groups.bb +++ /dev/null @@ -1,18 +0,0 @@ -[table] -[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra -[/th][/tr] -[tr][td]id[/td][td]sequential ID[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment -[/td][/tr] -[tr][td]hash[/td][td]unique hash representing this group with the group name appended[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] -[/td][/tr] -[tr][td]uid[/td][td]channel.channel_id owning this data[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] -[/td][/tr] -[tr][td]visible[/td][td]1 indicates the member list is not private[/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]deleted[/td][td]1 indicates the group has been deleted[/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] -[/td][/tr] -[tr][td]gname[/td][td]human readable name of group[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] -[/td][/tr] -[/table] - -Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file diff --git a/doc/database/db_pgrp.bb b/doc/database/db_pgrp.bb new file mode 100644 index 000000000..73265b90e --- /dev/null +++ b/doc/database/db_pgrp.bb @@ -0,0 +1,18 @@ +[table] +[tr][th]Field[/th][th]Description[/th][th]Type[/th][th]Null[/th][th]Key[/th][th]Default[/th][th]Extra +[/th][/tr] +[tr][td]id[/td][td]sequential ID[/td][td]int(10) unsigned[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment +[/td][/tr] +[tr][td]hash[/td][td]unique hash representing this group with the group name appended[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td] +[/td][/tr] +[tr][td]uid[/td][td]channel.channel_id owning this data[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td] +[/td][/tr] +[tr][td]visible[/td][td]1 indicates the member list is not private[/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]deleted[/td][td]1 indicates the group has been deleted[/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td] +[/td][/tr] +[tr][td]gname[/td][td]human readable name of group[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td] +[/td][/tr] +[/table] + +Return to [zrl=[baseurl]/help/database]database documentation[/zrl] \ No newline at end of file -- cgit v1.2.3 From 4cb46c124afe93cab76076dd815d737c17f30d40 Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sat, 6 Oct 2018 14:43:40 +0200 Subject: Update intro_for_developers.bb --- doc/intro_for_developers.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/intro_for_developers.bb b/doc/intro_for_developers.bb index 6ef7a4d9e..172008b7f 100644 --- a/doc/intro_for_developers.bb +++ b/doc/intro_for_developers.bb @@ -55,8 +55,8 @@ [li]ffinder - friend suggestion stuff[/li] [li]fserver - obsolete[/li] [li]fsuggest - friend suggestion stuff[/li] - [li]groups - privacy groups[/li] - [li]group_member - privacy groups[/li] + [li]pgrp - privacy groups[/li] + [li]pgrp_member - privacy groups[/li] [li]hook - plugin hook registry[/li] [li]hubloc - Red location storage, ties a location to an xchan[/li] [li]item - posts[/li] -- cgit v1.2.3 From c087aaf5be13a55a75c1308aef1077d1a1b59d5d Mon Sep 17 00:00:00 2001 From: Max Kostikov Date: Sat, 6 Oct 2018 14:48:04 +0200 Subject: Update database.bb --- doc/database.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/database.bb b/doc/database.bb index 160ec505e..a72081e4a 100644 --- a/doc/database.bb +++ b/doc/database.bb @@ -16,8 +16,8 @@ [tr][td][zrl=[baseurl]/help/database/db_config]config[/zrl][/td][td]main configuration storage[/td][/tr] [tr][td][zrl=[baseurl]/help/database/db_conv]conv[/zrl][/td][td]Diaspora private messages meta conversation structure[/td][/tr] [tr][td][zrl=[baseurl]/help/database/db_event]event[/zrl][/td][td]Events[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_group_member]group_member[/zrl][/td][td]privacy groups (collections), group info[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_groups]groups[/zrl][/td][td]privacy groups (collections), member info[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_pgrp_member]pgrp_member[/zrl][/td][td]privacy groups (collections), group info[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_pgrp]pgrp[/zrl][/td][td]privacy groups (collections), member info[/td][/tr] [tr][td][zrl=[baseurl]/help/database/db_hook]hook[/zrl][/td][td]plugin hook registry[/td][/tr] [tr][td][zrl=[baseurl]/help/database/db_hubloc]hubloc[/zrl][/td][td]xchan location storage, ties a hub location to an xchan[/td][/tr] [tr][td][zrl=[baseurl]/help/database/db_iconfig]iconfig[/zrl][/td][td]extensible arbitrary storage for items[/td][/tr] -- cgit v1.2.3