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

DB_DataObject recommends using ->tableName()

This commit is contained in:
Mikael Nordfeldth 2015-06-06 19:35:10 +02:00
parent 9e52b6f2d1
commit daaafd86e2
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes/File.php
View File

@ -488,13 +488,13 @@ class File extends Managed_DataObject
throw new ServerException('URL already exists in DB'); throw new ServerException('URL already exists in DB');
} }
$sql = 'UPDATE %1$s SET urlhash=%2$s, url=%3$s WHERE urlhash=%4$s;'; $sql = 'UPDATE %1$s SET urlhash=%2$s, url=%3$s WHERE urlhash=%4$s;';
$result = $this->query(sprintf($sql, $this->__table, $result = $this->query(sprintf($sql, $this->tableName(),
$this->_quote((string)self::hashurl($url)), $this->_quote((string)self::hashurl($url)),
$this->_quote((string)$url), $this->_quote((string)$url),
$this->_quote((string)$this->urlhash))); $this->_quote((string)$this->urlhash)));
if ($result === false) { if ($result === false) {
common_log_db_error($this, 'UPDATE', __FILE__); common_log_db_error($this, 'UPDATE', __FILE__);
throw new ServerException("Could not UPDATE {$this->__table}.url"); throw new ServerException("Could not UPDATE {$this->tableName()}.url");
} }
return $result; return $result;

6
classes/Managed_DataObject.php
View File

@ -406,7 +406,7 @@ abstract class Managed_DataObject extends Memcached_DataObject
common_log_db_error($this, 'UPDATE', __FILE__); common_log_db_error($this, 'UPDATE', __FILE__);
// rollback as something bad occurred // rollback as something bad occurred
$this->query('ROLLBACK'); $this->query('ROLLBACK');
throw new ServerException("Could not UPDATE non-keys for {$this->__table}"); throw new ServerException("Could not UPDATE non-keys for {$this->tableName()}");
} }
$orig->decache(); $orig->decache();
$this->encache(); $this->encache();
@ -428,7 +428,7 @@ abstract class Managed_DataObject extends Memcached_DataObject
common_log_db_error($this, 'UPDATE', __FILE__); common_log_db_error($this, 'UPDATE', __FILE__);
// rollback as something bad occurred // rollback as something bad occurred
$this->query('ROLLBACK'); $this->query('ROLLBACK');
throw new ServerException("Could not UPDATE key fields for {$this->__table}"); throw new ServerException("Could not UPDATE key fields for {$this->tableName()}");
} }
// Update non-keys too, if the previous endeavour worked. // Update non-keys too, if the previous endeavour worked.
@ -438,7 +438,7 @@ abstract class Managed_DataObject extends Memcached_DataObject
common_log_db_error($this, 'UPDATE', __FILE__); common_log_db_error($this, 'UPDATE', __FILE__);
// rollback as something bad occurred // rollback as something bad occurred
$this->query('ROLLBACK'); $this->query('ROLLBACK');
throw new ServerException("Could not UPDATE non-keys for {$this->__table}"); throw new ServerException("Could not UPDATE non-keys for {$this->tableName()}");
} }
$orig->decache(); $orig->decache();
$this->encache(); $this->encache();

6
classes/Memcached_DataObject.php
View File

@ -461,11 +461,11 @@ class Memcached_DataObject extends Safe_DataObject
} }
global $_DB_DATAOBJECT; global $_DB_DATAOBJECT;
if (!isset($_DB_DATAOBJECT['INI'][$this->_database][$this->__table."__keys"])) { if (!isset($_DB_DATAOBJECT['INI'][$this->_database][$this->tableName()."__keys"])) {
$this->databaseStructure(); $this->databaseStructure();
} }
return $_DB_DATAOBJECT['INI'][$this->_database][$this->__table."__keys"]; return $_DB_DATAOBJECT['INI'][$this->_database][$this->tableName()."__keys"];
} }
function encache() function encache()
@ -836,7 +836,7 @@ class Memcached_DataObject extends Safe_DataObject
if (!$dsn) { if (!$dsn) {
if (!$this->_database) { if (!$this->_database) {
$this->_database = isset($options["table_{$this->__table}"]) ? $options["table_{$this->__table}"] : null; $this->_database = isset($options["table_{$this->tableName()}"]) ? $options["table_{$this->tableName()}"] : null;
} }
if ($this->_database && !empty($options["database_{$this->_database}"])) { if ($this->_database && !empty($options["database_{$this->_database}"])) {

10
classes/Safe_DataObject.php
View File

@ -186,7 +186,7 @@ class Safe_DataObject extends GS_DataObject
// database loaded - but this is table is not available.. // database loaded - but this is table is not available..
if ( if (
empty($_DB_DATAOBJECT['INI'][$this->_database][$this->__table]) empty($_DB_DATAOBJECT['INI'][$this->_database][$this->tableName()])
&& !empty($_DB_DATAOBJECT['CONFIG']['proxy']) && !empty($_DB_DATAOBJECT['CONFIG']['proxy'])
) { ) {
if (!empty($_DB_DATAOBJECT['CONFIG']['debug'])) { if (!empty($_DB_DATAOBJECT['CONFIG']['debug'])) {
@ -197,7 +197,7 @@ class Safe_DataObject extends GS_DataObject
$x = new DB_DataObject_Generator; $x = new DB_DataObject_Generator;
$x->fillTableSchema($this->_database,$this->__table); $x->fillTableSchema($this->_database,$this->tableName());
} }
return true; return true;
} }
@ -225,7 +225,7 @@ class Safe_DataObject extends GS_DataObject
// now have we loaded the structure.. // now have we loaded the structure..
if (!empty($_DB_DATAOBJECT['INI'][$this->_database][$this->__table])) { if (!empty($_DB_DATAOBJECT['INI'][$this->_database][$this->tableName()])) {
return true; return true;
} }
// - if not try building it.. // - if not try building it..
@ -234,11 +234,11 @@ class Safe_DataObject extends GS_DataObject
require_once 'DB/DataObject/Generator.php'; require_once 'DB/DataObject/Generator.php';
$x = new DB_DataObject_Generator; $x = new DB_DataObject_Generator;
$x->fillTableSchema($this->_database,$this->__table); $x->fillTableSchema($this->_database,$this->tableName());
// should this fail!!!??? // should this fail!!!???
return true; return true;
} }
$this->debug("Cant find database schema: {$this->_database}/{$this->__table} \n". $this->debug("Cant find database schema: {$this->_database}/{$this->tableName()} \n".
"in links file data: " . print_r($_DB_DATAOBJECT['INI'],true),"databaseStructure",5); "in links file data: " . print_r($_DB_DATAOBJECT['INI'],true),"databaseStructure",5);
// we have to die here!! - it causes chaos if we don't (including looping forever!) // we have to die here!! - it causes chaos if we don't (including looping forever!)
// Low level exception. No need for i18n as discussed with Brion. // Low level exception. No need for i18n as discussed with Brion.

2
classes/Status_network_tag.php
View File

@ -38,7 +38,7 @@ class Status_network_tag extends Safe_DataObject
$sn = new Status_network(); $sn = new Status_network();
$sn->_connect(); $sn->_connect();
$config['db']['table_'. $this->__table] = $sn->_database; $config['db']['table_'. $this->tableName()] = $sn->_database;
$this->_connect(); $this->_connect();
} }