GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

updateKeys (for classes with PRI id) now in Managed_DataObject

Browse Source
This commit is contained in:
Mikael Nordfeldth
2015-01-25 11:58:35 +01:00
parent 132ac624a2
commit e38d78eba9
3 changed files with 31 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
classes/Foreign_user.php
View File

@@ -70,33 +70,4 @@ class Foreign_user extends Managed_DataObject
return empty($result) ? null : $fuser;
}
}
function updateKeys(&$orig)
{
$this->_connect();
$parts = array();
foreach (array('id', 'service', 'uri', 'nickname') as $k) {
if (strcmp($this->$k, $orig->$k) != 0) {
$parts[] = $k . ' = ' . $this->_quote($this->$k);
}
}
if (count($parts) == 0) {
// No changes
return true;
}
$toupdate = implode(', ', $parts);
$table = $this->tableName();
if(common_config('db','quote_identifiers')) {
$table = '"' . $table . '"';
}
$qry = 'UPDATE ' . $table . ' SET ' . $toupdate .
' WHERE id = ' . $this->id;
$orig->decache();
$result = $this->query($qry);
if ($result) {
$this->encache();
}
return $result;
}
}

31
classes/Managed_DataObject.php
View File

@@ -320,4 +320,35 @@ abstract class Managed_DataObject extends Memcached_DataObject
// FIXME: How about forcing to return an int? Or will that overflow eventually?
return $this->id;
}
// 'update' won't write key columns, so we have to do it ourselves.
public function updateKeys(&$orig)
{
if (!$orig instanceof $this) {
throw new ServerException('Tried updating a DataObject with a different class than itself.');
}
$this->_connect();
$parts = array();
foreach ($this->keys() as $k) {
if (strcmp($this->$k, $orig->$k) != 0) {
$parts[] = $k . ' = ' . $this->_quote($this->$k);
}
}
if (count($parts) == 0) {
// No changes
return true;
}
$toupdate = implode(', ', $parts);
$table = common_database_tablename($this->tableName());
$qry = 'UPDATE ' . $table . ' SET ' . $toupdate .
' WHERE id = ' . $this->getID();
$orig->decache();
$result = $this->query($qry);
if ($result !== false) {
$this->encache();
}
return $result;
}
}

28
classes/User.php
View File

@@ -152,34 +152,6 @@ class User extends Managed_DataObject
return $this->getProfile()->hasPendingSubscription($other);
}
// 'update' won't write key columns, so we have to do it ourselves.
function updateKeys(&$orig)
{
$this->_connect();
$parts = array();
foreach (array('nickname', 'email', 'incomingemail', 'sms', 'carrier', 'smsemail') as $k) {
if (strcmp($this->$k, $orig->$k) != 0) {
$parts[] = $k . ' = ' . $this->_quote($this->$k);
}
}
if (count($parts) == 0) {
// No changes
return true;
}
$toupdate = implode(', ', $parts);
$table = common_database_tablename($this->tableName());
$qry = 'UPDATE ' . $table . ' SET ' . $toupdate .
' WHERE id = ' . $this->id;
$orig->decache();
$result = $this->query($qry);
if ($result) {
$this->encache();
}
return $result;
}
/**
* Get the most recent notice posted by this user, if any.
*