keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2332 from annando/1602-no-guid

Browse source 
Get rid of the "guid" table. We don't need it anymore.
This commit is contained in:
fabrixxm 2016-02-09 13:40:05 +01:00
commit b5100b3154
5 changed files with 0 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/database.md
View file

@ -27,7 +27,6 @@ Database Tables
| [group](help/database/db_group) | privacy groups, group info | | [group](help/database/db_group) | privacy groups, group info |
| [group_member](help/database/db_group_member) | privacy groups, member info | | [group_member](help/database/db_group_member) | privacy groups, member info |
| [gserver](help/database/db_gserver) | | | [gserver](help/database/db_gserver) | |
| [guid](help/database/db_guid) | |
| [hook](help/database/db_hook) | plugin hook registry | | [hook](help/database/db_hook) | plugin hook registry |
| [intro](help/database/db_intro) | | | [intro](help/database/db_intro) | |
| [item](help/database/db_item) | all posts | | [item](help/database/db_item) | all posts |

12
doc/database/db_guid.md
View file

@ -1,12 +0,0 @@
Table guid
==========
| Field | Description | Type | Null | Key | Default | Extra |
|---------|------------------|------------------|------|-----|---------|----------------|
| id | sequential ID | int(10) unsigned | NO | PRI | NULL | auto_increment |
| guid | | varchar(255) | NO | MUL | | |
| plink | | varchar(255) | NO | MUL | | |
| uri | | varchar(255) | NO | MUL | | |
| network | | varchar(32) | NO | | | |
Return to [database documentation](help/database)

15
include/dbstructure.php
View file

@ -748,21 +748,6 @@ function db_definition() {
"nurl" => array("nurl"), "nurl" => array("nurl"),
) )
); );
$database["guid"] = array(
"fields" => array(
"id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
"guid" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"plink" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"uri" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"network" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
),
"indexes" => array(
"PRIMARY" => array("id"),
"guid" => array("guid"),
"plink" => array("plink"),
"uri" => array("uri"),
)
);
$database["hook"] = array( $database["hook"] = array(
"fields" => array( "fields" => array(
"id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"), "id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),

13
include/items.php
View file

@ -291,16 +291,6 @@ function add_page_info_to_body($body, $texturl = false, $no_photos = false) {
return $body; return $body;
} }
function add_guid($item) {
$r = q("SELECT `guid` FROM `guid` WHERE `guid` = '%s' LIMIT 1", dbesc($item["guid"]));
if ($r)
return;
q("INSERT INTO `guid` (`guid`,`plink`,`uri`,`network`) VALUES ('%s','%s','%s','%s')",
dbesc($item["guid"]), dbesc($item["plink"]),
dbesc($item["uri"]), dbesc($item["network"]));
}
/** /**
* Adds a "lang" specification in a "postopts" element of given $arr, * Adds a "lang" specification in a "postopts" element of given $arr,
* if possible and not already present. * if possible and not already present.
@ -778,9 +768,6 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
return 0; return 0;
} elseif(count($r)) { } elseif(count($r)) {
// Store the guid and other relevant data
add_guid($arr);
$current_post = $r[0]['id']; $current_post = $r[0]['id'];
logger('item_store: created item ' . $current_post); logger('item_store: created item ' . $current_post);

3
mod/item.php
View file

@ -844,9 +844,6 @@ function item_post(&$a) {
// NOTREACHED // NOTREACHED
} }
// Store the guid and other relevant data
add_guid($datarray);
$post_id = $r[0]['id']; $post_id = $r[0]['id'];
logger('mod_item: saved item ' . $post_id); logger('mod_item: saved item ' . $post_id);