diff options
| -rw-r--r-- | apps/files_trashbin/appinfo/update.php | 6 | ||||
| -rw-r--r-- | apps/files_versions/appinfo/update.php | 5 | ||||
| -rw-r--r-- | lib/private/db.php | 9 | ||||
| -rw-r--r-- | tests/lib/db/connection.php | 2 | ||||
| -rw-r--r-- | tests/lib/db/mdb2schemamanager.php | 2 |
5 files changed, 2 insertions, 22 deletions
diff --git a/apps/files_trashbin/appinfo/update.php b/apps/files_trashbin/appinfo/update.php index bd2ee6bb390..09b1b6931a7 100644 --- 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 ef6772f3079..eb04cf090ed 100644 --- 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 a4a7b7d17d4..f339855fb20 100644 --- a/lib/private/db.php +++ b/lib/private/db.php @@ -254,15 +254,6 @@ class OC_DB { } /** - * 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 ab3b48b259f..348a5e31e09 100644 --- 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 e194e701d84..470e385b858 100644 --- 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(); |