Remove OC_DB::dropTable

diff --git a/apps/files_trashbin/appinfo/update.php b/apps/files_trashbin/appinfo/update.php
index bd2ee6bb3901f8d99bc61e918e1b32da41f4e377..09b1b6931a7f8ce2e7dc47e4d6ad3d872a1f7c7c 100644 (file)
--- a/apps/files_trashbin/appinfo/update.php
+++ b/apps/files_trashbin/appinfo/update.php
@@ -25,12 +25,6 @@
 $config = \OC::$server->getConfig();
 $installedVersion = $config->getAppValue('files_trashbin', 'installed_version');
 
-if (version_compare($installedVersion, '0.6', '<')) {
-       //size of the trash bin could be incorrect, remove it for all users to
-       //enforce a recalculation during next usage.
-       \OC_DB::dropTable('files_trashsize');
-}
-
 if (version_compare($installedVersion, '0.6.4', '<')) {
        $isExpirationEnabled = $config->getSystemValue('trashbin_auto_expire', true);
        $oldObligation = $config->getSystemValue('trashbin_retention_obligation', null);

diff --git a/apps/files_versions/appinfo/update.php b/apps/files_versions/appinfo/update.php
index ef6772f30793c2c7e4d897f5da63f6b14ed098a3..eb04cf090ed302fa7a2e38c19096bf49a2334e56 100644 (file)
--- a/apps/files_versions/appinfo/update.php
+++ b/apps/files_versions/appinfo/update.php
@@ -20,11 +20,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
-$installedVersion=OCP\Config::getAppValue('files_versions', 'installed_version');
-// move versions to new directory
-if (version_compare($installedVersion, '1.0.4', '<')) {
-       \OC_DB::dropTable("files_versions");
-}
 
 // Cron job for deleting expired trash items
 \OC::$server->getJobList()->add('OCA\Files_Versions\BackgroundJob\ExpireVersions');

diff --git a/lib/private/db.php b/lib/private/db.php
index a4a7b7d17d4de5a19fe4997fbf276d55e5c5ca41..f339855fb20a5bb780f030335f235a31a5864fe4 100644 (file)
--- a/lib/private/db.php
+++ b/lib/private/db.php
@@ -253,15 +253,6 @@ class OC_DB {
                return $result;
        }
 
-       /**
-        * drop a table - the database prefix will be prepended
-        * @param string $tableName the table to drop
-        */
-       public static function dropTable($tableName) {
-               $connection = \OC::$server->getDatabaseConnection();
-               $connection->dropTable($tableName);
-       }
-
        /**
         * remove all tables defined in a database structure xml file
         * @param string $file the xml file describing the tables

diff --git a/tests/lib/db/connection.php b/tests/lib/db/connection.php
index ab3b48b259fa767529a6d5d7a7308dfb3e1353a2..348a5e31e090abc4c4344f28d8d230c375a84f20 100644 (file)
--- a/tests/lib/db/connection.php
+++ b/tests/lib/db/connection.php
@@ -40,7 +40,7 @@ class Connection extends \Test\TestCase {
        protected static function dropTestTable()
        {
                if (\OC::$server->getConfig()->getSystemValue('dbtype', 'sqlite') !== 'oci') {
-                       \OC_DB::dropTable('table');
+                       \OC::$server->getDatabaseConnection()->dropTable('table');
                }
        }
 

diff --git a/tests/lib/db/mdb2schemamanager.php b/tests/lib/db/mdb2schemamanager.php
index e194e701d84748cc87ee1f501205112944fb8ad0..470e385b858b50aa21ee3350b7ac67d54216abfb 100644 (file)
--- a/tests/lib/db/mdb2schemamanager.php
+++ b/tests/lib/db/mdb2schemamanager.php
@@ -24,7 +24,7 @@ class MDB2SchemaManager extends \Test\TestCase {
                // do not drop the table for Oracle as it will create a bogus transaction
                // that will break the following test suites requiring transactions
                if (\OC::$server->getConfig()->getSystemValue('dbtype', 'sqlite') !== 'oci') {
-                       \OC_DB::dropTable('table');
+                       \OC::$server->getDatabaseConnection()->dropTable('table');
                }
 
                parent::tearDown();