From daaafd86e2dfea8e9c3e4f0c41f7cb77c926c104 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Sat, 6 Jun 2015 19:35:10 +0200 Subject: [PATCH] DB_DataObject recommends using ->tableName() --- classes/File.php | 4 ++-- classes/Managed_DataObject.php | 6 +++--- classes/Memcached_DataObject.php | 6 +++--- classes/Safe_DataObject.php | 10 +++++----- classes/Status_network_tag.php | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/classes/File.php b/classes/File.php index d4abbfddee..1a29ea5107 100644 --- a/classes/File.php +++ b/classes/File.php @@ -488,13 +488,13 @@ class File extends Managed_DataObject throw new ServerException('URL already exists in DB'); } $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)$url), $this->_quote((string)$this->urlhash))); if ($result === false) { 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; diff --git a/classes/Managed_DataObject.php b/classes/Managed_DataObject.php index a69a957bcc..ec51402993 100644 --- a/classes/Managed_DataObject.php +++ b/classes/Managed_DataObject.php @@ -406,7 +406,7 @@ abstract class Managed_DataObject extends Memcached_DataObject common_log_db_error($this, 'UPDATE', __FILE__); // rollback as something bad occurred $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(); $this->encache(); @@ -428,7 +428,7 @@ abstract class Managed_DataObject extends Memcached_DataObject common_log_db_error($this, 'UPDATE', __FILE__); // rollback as something bad occurred $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. @@ -438,7 +438,7 @@ abstract class Managed_DataObject extends Memcached_DataObject common_log_db_error($this, 'UPDATE', __FILE__); // rollback as something bad occurred $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(); $this->encache(); diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php index c725e1d9aa..c1f6f644db 100644 --- a/classes/Memcached_DataObject.php +++ b/classes/Memcached_DataObject.php @@ -461,11 +461,11 @@ class Memcached_DataObject extends Safe_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(); } - return $_DB_DATAOBJECT['INI'][$this->_database][$this->__table."__keys"]; + return $_DB_DATAOBJECT['INI'][$this->_database][$this->tableName()."__keys"]; } function encache() @@ -836,7 +836,7 @@ class Memcached_DataObject extends Safe_DataObject if (!$dsn) { 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}"])) { diff --git a/classes/Safe_DataObject.php b/classes/Safe_DataObject.php index 8e5e72c013..6aed88ae1f 100644 --- a/classes/Safe_DataObject.php +++ b/classes/Safe_DataObject.php @@ -186,7 +186,7 @@ class Safe_DataObject extends GS_DataObject // database loaded - but this is table is not available.. if ( - empty($_DB_DATAOBJECT['INI'][$this->_database][$this->__table]) + empty($_DB_DATAOBJECT['INI'][$this->_database][$this->tableName()]) && !empty($_DB_DATAOBJECT['CONFIG']['proxy']) ) { if (!empty($_DB_DATAOBJECT['CONFIG']['debug'])) { @@ -197,7 +197,7 @@ class Safe_DataObject extends GS_DataObject $x = new DB_DataObject_Generator; - $x->fillTableSchema($this->_database,$this->__table); + $x->fillTableSchema($this->_database,$this->tableName()); } return true; } @@ -225,7 +225,7 @@ class Safe_DataObject extends GS_DataObject // 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; } // - if not try building it.. @@ -234,11 +234,11 @@ class Safe_DataObject extends GS_DataObject require_once 'DB/DataObject/Generator.php'; $x = new DB_DataObject_Generator; - $x->fillTableSchema($this->_database,$this->__table); + $x->fillTableSchema($this->_database,$this->tableName()); // should this fail!!!??? 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); // 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. diff --git a/classes/Status_network_tag.php b/classes/Status_network_tag.php index 9e5ff89be3..b45224ff74 100644 --- a/classes/Status_network_tag.php +++ b/classes/Status_network_tag.php @@ -38,7 +38,7 @@ class Status_network_tag extends Safe_DataObject $sn = new Status_network(); $sn->_connect(); - $config['db']['table_'. $this->__table] = $sn->_database; + $config['db']['table_'. $this->tableName()] = $sn->_database; $this->_connect(); }