From 6bf331b355eee66f1af2070343914f632fa86a8f Mon Sep 17 00:00:00 2001 From: Dmitriy Simushev Date: Fri, 5 Jun 2015 11:39:44 +0000 Subject: [PATCH] Rename "available_update" table to "availableupdate" This is needed to follow naming convention --- src/mibew/configs/database_schema.yml | 2 +- .../classes/Mibew/Maintenance/AvailableUpdate.php | 12 ++++++------ src/mibew/libs/classes/Mibew/Maintenance/Updater.php | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mibew/configs/database_schema.yml b/src/mibew/configs/database_schema.yml index a6a47e0e..3f3d5ef9 100644 --- a/src/mibew/configs/database_schema.yml +++ b/src/mibew/configs/database_schema.yml @@ -318,7 +318,7 @@ plugin: name: [name] # Contains info about all available updates -available_update: +availableupdate: fields: # Artificial ID id: "INT NOT NULL auto_increment PRIMARY KEY" diff --git a/src/mibew/libs/classes/Mibew/Maintenance/AvailableUpdate.php b/src/mibew/libs/classes/Mibew/Maintenance/AvailableUpdate.php index e1ead19c..5e08f80b 100644 --- a/src/mibew/libs/classes/Mibew/Maintenance/AvailableUpdate.php +++ b/src/mibew/libs/classes/Mibew/Maintenance/AvailableUpdate.php @@ -79,7 +79,7 @@ class AvailableUpdate // Load update's info $info = Database::getInstance()->query( - "SELECT * FROM {available_update} WHERE id = :id", + "SELECT * FROM {availableupdate} WHERE id = :id", array(':id' => $id), array('return_rows' => Database::RETURN_ONE_ROW) ); @@ -112,7 +112,7 @@ class AvailableUpdate // Load update info $info = Database::getInstance()->query( - "SELECT * FROM {available_update} WHERE target = :target", + "SELECT * FROM {availableupdate} WHERE target = :target", array(':target' => $target), array('return_rows' => Database::RETURN_ONE_ROW) ); @@ -140,7 +140,7 @@ class AvailableUpdate public static function all() { $rows = Database::getInstance()->query( - "SELECT * FROM {available_update}", + "SELECT * FROM {availableupdate}", null, array('return_rows' => Database::RETURN_ALL_ROWS) ); @@ -182,7 +182,7 @@ class AvailableUpdate } Database::getInstance()->query( - "DELETE FROM {available_update} WHERE id = :id LIMIT 1", + "DELETE FROM {availableupdate} WHERE id = :id LIMIT 1", array(':id' => $this->id) ); } @@ -209,7 +209,7 @@ class AvailableUpdate if (!$this->id) { // This update is new. $db->query( - ("INSERT INTO {available_update} (target, version, url, description) " + ("INSERT INTO {availableupdate} (target, version, url, description) " . "VALUES (:target, :version, :url, :description)"), array( ':target' => $this->target, @@ -222,7 +222,7 @@ class AvailableUpdate } else { // Update existing update $db->query( - ("UPDATE {available_update} SET target = :target, url = :url, " + ("UPDATE {availableupdate} SET target = :target, url = :url, " . "version = :version, description = :description " . "WHERE id = :id"), array( diff --git a/src/mibew/libs/classes/Mibew/Maintenance/Updater.php b/src/mibew/libs/classes/Mibew/Maintenance/Updater.php index a66c6f2c..763a4aa3 100644 --- a/src/mibew/libs/classes/Mibew/Maintenance/Updater.php +++ b/src/mibew/libs/classes/Mibew/Maintenance/Updater.php @@ -342,7 +342,7 @@ class Updater $db->query('ALTER TABLE {locale} ADD UNIQUE KEY code (code)'); // Create a table for available updates. - $db->query('CREATE TABLE {available_update} ( ' + $db->query('CREATE TABLE {availableupdate} ( ' . 'id INT NOT NULL auto_increment PRIMARY KEY, ' . 'target varchar(255) NOT NULL, ' . 'version varchar(255) NOT NULL, '