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

New function "dba::update" and changed unique index for the conversations

Browse source
This commit is contained in:
Michael 2017-04-28 05:50:27 +00:00
parent 3b5e1bbfc3
commit 782783aa52
4 changed files with 37 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
database.sql
View file

@ -1,6 +1,6 @@
-- ------------------------------------------
-- Friendica 3.5.2-dev (Asparagus)
-- DB_UPDATE_VERSION 1220
-- DB_UPDATE_VERSION 1221
-- ------------------------------------------

26
include/dba.php
View file

@ -753,6 +753,32 @@ class dba {
return self::e($sql, $param);
}
/**
* @brief Updates rows
*
* @param string $table Table name
* @param array $fields contains the fields that are updated
* @param array $condition condition array with the key values
*
* @return boolean was the update successfull?
*/
static public function update($table, $fields, $condition) {
$sql = "UPDATE `".self::$dbo->escape($table)."` SET `".
implode("` = ?, `", array_keys($fields))."` = ? WHERE `".
implode("` = ? AND `", array_keys($condition))."` = ?";
$params = array();
foreach ($fields AS $value) {
$params[] = $value;
}
foreach ($condition AS $value) {
$params[] = $value;
}
self::e($sql, $params);
}
/**
* @brief Closes the current statement
*

2
include/dbstructure.php
View file

@ -820,7 +820,7 @@ function db_definition() {
"received" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
),
"indexes" => array(
"PRIMARY" => array("item-uri", "protocol"),
"PRIMARY" => array("item-uri"),
"conversation-uri" => array("conversation-uri"),
)
);

10
include/items.php
View file

@ -716,7 +716,15 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
$conversation['source'] = $arr['source'];
}
dba::insert('conversation', $conversation);
$conv = dba::fetch_first("SELECT `protocol` FROM `conversation` WHERE `item-uri` = ?", $conversation['item-uri']);
if (dbm::is_result($conv)) {
// Replace the conversation entry when the new one is better
if (($conv['protocol'] == 0) OR ($conv['protocol'] > $conversation['protocol'])) {
dba::update('conversation', $conversation, array('item-uri' => $conversation['item-uri']));
}
} else {
dba::insert('conversation', $conversation);
}
}
unset($arr['conversation-uri']);