summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/encryption/lib/migration.php14
-rw-r--r--apps/encryption/tests/lib/MigrationTest.php74
-rw-r--r--apps/files_trashbin/command/cleanup.php4
-rw-r--r--apps/files_trashbin/tests/command/cleanuptest.php22
4 files changed, 60 insertions, 54 deletions
diff --git a/apps/encryption/lib/migration.php b/apps/encryption/lib/migration.php
index a4da05d7f06..789f5f77757 100644
--- a/apps/encryption/lib/migration.php
+++ b/apps/encryption/lib/migration.php
@@ -67,9 +67,9 @@ class Migration {
*/
private function updateFileCache() {
$query = $this->connection->getQueryBuilder();
- $query->update('`*PREFIX*filecache`')
- ->set('`size`', '`unencrypted_size`')
- ->where($query->expr()->eq('`encrypted`', ':encrypted'))
+ $query->update('*PREFIX*filecache')
+ ->set('size', 'unencrypted_size')
+ ->where($query->expr()->eq('encrypted', $query->createParameter('encrypted')))
->setParameter('encrypted', 1);
$query->execute();
}
@@ -151,8 +151,8 @@ class Migration {
$oldAppValues = $this->connection->getQueryBuilder();
$oldAppValues->select('*')
- ->from('`*PREFIX*appconfig`')
- ->where($oldAppValues->expr()->eq('`appid`', ':appid'))
+ ->from('*PREFIX*appconfig')
+ ->where($oldAppValues->expr()->eq('appid', $oldAppValues->createParameter('appid')))
->setParameter('appid', 'files_encryption');
$appSettings = $oldAppValues->execute();
@@ -166,8 +166,8 @@ class Migration {
$oldPreferences = $this->connection->getQueryBuilder();
$oldPreferences->select('*')
- ->from('`*PREFIX*preferences`')
- ->where($oldPreferences->expr()->eq('`appid`', ':appid'))
+ ->from('*PREFIX*preferences')
+ ->where($oldPreferences->expr()->eq('appid', $oldPreferences->createParameter('appid')))
->setParameter('appid', 'files_encryption');
$preferenceSettings = $oldPreferences->execute();
diff --git a/apps/encryption/tests/lib/MigrationTest.php b/apps/encryption/tests/lib/MigrationTest.php
index c0d8f081342..a05418c5f26 100644
--- a/apps/encryption/tests/lib/MigrationTest.php
+++ b/apps/encryption/tests/lib/MigrationTest.php
@@ -291,13 +291,13 @@ class MigrationTest extends \Test\TestCase {
/** @var \OCP\IDBConnection $connection */
$connection = \OC::$server->getDatabaseConnection();
$query = $connection->getQueryBuilder();
- $query->delete('`*PREFIX*appconfig`')
- ->where($query->expr()->eq('`appid`', ':appid'))
+ $query->delete('*PREFIX*appconfig')
+ ->where($query->expr()->eq('appid', $query->createParameter('appid')))
->setParameter('appid', 'encryption');
$query->execute();
$query = $connection->getQueryBuilder();
- $query->delete('`*PREFIX*preferences`')
- ->where($query->expr()->eq('`appid`', ':appid'))
+ $query->delete('*PREFIX*preferences')
+ ->where($query->expr()->eq('appid', $query->createParameter('appid')))
->setParameter('appid', 'encryption');
$query->execute();
}
@@ -308,10 +308,10 @@ class MigrationTest extends \Test\TestCase {
$m = new Migration(\OC::$server->getConfig(), new \OC\Files\View(), \OC::$server->getDatabaseConnection(), $this->logger);
$m->updateDB();
- $this->verifyDB('`*PREFIX*appconfig`', 'files_encryption', 0);
- $this->verifyDB('`*PREFIX*preferences`', 'files_encryption', 0);
- $this->verifyDB('`*PREFIX*appconfig`', 'encryption', 3);
- $this->verifyDB('`*PREFIX*preferences`', 'encryption', 1);
+ $this->verifyDB('*PREFIX*appconfig', 'files_encryption', 0);
+ $this->verifyDB('*PREFIX*preferences', 'files_encryption', 0);
+ $this->verifyDB('*PREFIX*appconfig', 'encryption', 3);
+ $this->verifyDB('*PREFIX*preferences', 'encryption', 1);
}
@@ -327,20 +327,20 @@ class MigrationTest extends \Test\TestCase {
$m = new Migration(\OC::$server->getConfig(), new \OC\Files\View(), \OC::$server->getDatabaseConnection(), $this->logger);
$m->updateDB();
- $this->verifyDB('`*PREFIX*appconfig`', 'files_encryption', 0);
- $this->verifyDB('`*PREFIX*preferences`', 'files_encryption', 0);
- $this->verifyDB('`*PREFIX*appconfig`', 'encryption', 3);
- $this->verifyDB('`*PREFIX*preferences`', 'encryption', 1);
+ $this->verifyDB('*PREFIX*appconfig', 'files_encryption', 0);
+ $this->verifyDB('*PREFIX*preferences', 'files_encryption', 0);
+ $this->verifyDB('*PREFIX*appconfig', 'encryption', 3);
+ $this->verifyDB('*PREFIX*preferences', 'encryption', 1);
// check if the existing values where overwritten correctly
/** @var \OC\DB\Connection $connection */
$connection = \OC::$server->getDatabaseConnection();
- $query = $connection->createQueryBuilder();
- $query->select('`configvalue`')
- ->from('`*PREFIX*appconfig`')
+ $query = $connection->getQueryBuilder();
+ $query->select('configvalue')
+ ->from('*PREFIX*appconfig')
->where($query->expr()->andX(
- $query->expr()->eq('`appid`', ':appid'),
- $query->expr()->eq('`configkey`', ':configkey')
+ $query->expr()->eq('appid', $query->createParameter('appid')),
+ $query->expr()->eq('configkey', $query->createParameter('configkey'))
))
->setParameter('appid', 'encryption')
->setParameter('configkey', 'publicShareKeyId');
@@ -349,13 +349,13 @@ class MigrationTest extends \Test\TestCase {
$this->assertTrue(isset($value['configvalue']));
$this->assertSame('share_id', $value['configvalue']);
- $query = $connection->createQueryBuilder();
- $query->select('`configvalue`')
- ->from('`*PREFIX*preferences`')
+ $query = $connection->getQueryBuilder();
+ $query->select('configvalue')
+ ->from('*PREFIX*preferences')
->where($query->expr()->andX(
- $query->expr()->eq('`appid`', ':appid'),
- $query->expr()->eq('`configkey`', ':configkey'),
- $query->expr()->eq('`userid`', ':userid')
+ $query->expr()->eq('appid', $query->createParameter('appid')),
+ $query->expr()->eq('configkey', $query->createParameter('configkey')),
+ $query->expr()->eq('userid', $query->createParameter('userid'))
))
->setParameter('appid', 'encryption')
->setParameter('configkey', 'recoverKeyEnabled')
@@ -371,9 +371,9 @@ class MigrationTest extends \Test\TestCase {
/** @var \OCP\IDBConnection $connection */
$connection = \OC::$server->getDatabaseConnection();
$query = $connection->getQueryBuilder();
- $query->select('`appid`')
+ $query->select('appid')
->from($table)
- ->where($query->expr()->eq('`appid`', ':appid'))
+ ->where($query->expr()->eq('appid', $query->createParameter('appid')))
->setParameter('appid', $appid);
$result = $query->execute();
$values = $result->fetchAll();
@@ -396,7 +396,7 @@ class MigrationTest extends \Test\TestCase {
$connection = \OC::$server->getDatabaseConnection();
$query = $connection->getQueryBuilder();
$query->select('*')
- ->from('`*PREFIX*filecache`');
+ ->from('*PREFIX*filecache');
$result = $query->execute();
$entries = $result->fetchAll();
foreach($entries as $entry) {
@@ -414,22 +414,22 @@ class MigrationTest extends \Test\TestCase {
/** @var \OCP\IDBConnection $connection */
$connection = \OC::$server->getDatabaseConnection();
$query = $connection->getQueryBuilder();
- $query->delete('`*PREFIX*filecache`');
+ $query->delete('*PREFIX*filecache');
$query->execute();
$query = $connection->getQueryBuilder();
- $result = $query->select('`fileid`')
- ->from('`*PREFIX*filecache`')
+ $result = $query->select('fileid')
+ ->from('*PREFIX*filecache')
->setMaxResults(1)->execute()->fetchAll();
$this->assertEmpty($result);
$query = $connection->getQueryBuilder();
- $query->insert('`*PREFIX*filecache`')
+ $query->insert('*PREFIX*filecache')
->values(
array(
- '`storage`' => ':storage',
- '`path_hash`' => ':path_hash',
- '`encrypted`' => ':encrypted',
- '`size`' => ':size',
- '`unencrypted_size`' => ':unencrypted_size'
+ 'storage' => $query->createParameter('storage'),
+ 'path_hash' => $query->createParameter('path_hash'),
+ 'encrypted' => $query->createParameter('encrypted'),
+ 'size' => $query->createParameter('size'),
+ 'unencrypted_size' => $query->createParameter('unencrypted_size'),
)
);
for ($i = 1; $i < 20; $i++) {
@@ -443,8 +443,8 @@ class MigrationTest extends \Test\TestCase {
);
}
$query = $connection->getQueryBuilder();
- $result = $query->select('`fileid`')
- ->from('`*PREFIX*filecache`')
+ $result = $query->select('fileid')
+ ->from('*PREFIX*filecache')
->execute()->fetchAll();
$this->assertSame(19, count($result));
}
diff --git a/apps/files_trashbin/command/cleanup.php b/apps/files_trashbin/command/cleanup.php
index de17020ea5c..0cc94912339 100644
--- a/apps/files_trashbin/command/cleanup.php
+++ b/apps/files_trashbin/command/cleanup.php
@@ -108,8 +108,8 @@ class CleanUp extends Command {
if ($this->rootFolder->nodeExists('/' . $uid . '/files_trashbin')) {
$this->rootFolder->get('/' . $uid . '/files_trashbin')->delete();
$query = $this->dbConnection->getQueryBuilder();
- $query->delete('`*PREFIX*files_trash`')
- ->where($query->expr()->eq('`user`', ':uid'))
+ $query->delete('*PREFIX*files_trash')
+ ->where($query->expr()->eq('user', $query->createParameter('uid')))
->setParameter('uid', $uid);
$query->execute();
}
diff --git a/apps/files_trashbin/tests/command/cleanuptest.php b/apps/files_trashbin/tests/command/cleanuptest.php
index ecbaab98bf2..a7400e901fa 100644
--- a/apps/files_trashbin/tests/command/cleanuptest.php
+++ b/apps/files_trashbin/tests/command/cleanuptest.php
@@ -43,7 +43,7 @@ class CleanUpTest extends TestCase {
protected $dbConnection;
/** @var string */
- protected $trashTable = '`*PREFIX*files_trash`';
+ protected $trashTable = '*PREFIX*files_trash';
/** @var string */
protected $user0 = 'user0';
@@ -69,14 +69,17 @@ class CleanUpTest extends TestCase {
for ($i = 0; $i < 10; $i++) {
$query->insert($this->trashTable)
->values(array(
- '`id`' => $query->expr()->literal('file'.$i),
- '`timestamp`' => $query->expr()->literal($i),
- '`location`' => $query->expr()->literal('.'),
- '`user`' => $query->expr()->literal('user'.$i%2)
+ 'id' => $query->expr()->literal('file'.$i),
+ 'timestamp' => $query->expr()->literal($i),
+ 'location' => $query->expr()->literal('.'),
+ 'user' => $query->expr()->literal('user'.$i%2)
))->execute();
}
$getAllQuery = $this->dbConnection->getQueryBuilder();
- $result = $getAllQuery->select('`id`')->from($this->trashTable)->execute()->fetchAll();
+ $result = $getAllQuery->select('id')
+ ->from($this->trashTable)
+ ->execute()
+ ->fetchAll();
$this->assertSame(10, count($result));
}
@@ -107,7 +110,7 @@ class CleanUpTest extends TestCase {
// if the delete operation was execute only files from user1
// should be left.
$query = $this->dbConnection->getQueryBuilder();
- $result = $query->select('`user`')
+ $result = $query->select('user')
->from($this->trashTable)
->execute()->fetchAll();
$this->assertSame(5, count($result));
@@ -118,7 +121,10 @@ class CleanUpTest extends TestCase {
// if no delete operation was execute we should still have all 10
// database entries
$getAllQuery = $this->dbConnection->getQueryBuilder();
- $result = $getAllQuery->select('`id`')->from($this->trashTable)->execute()->fetchAll();
+ $result = $getAllQuery->select('id')
+ ->from($this->trashTable)
+ ->execute()
+ ->fetchAll();
$this->assertSame(10, count($result));
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-15 06:51:27 +0000