wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added method to DB and fix test

Browse source 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2016-10-24 09:44:33 +02:00
parent 3a8e75a814
commit 7998689bc9
No known key found for this signature in database
GPG key ID: 1E152838F164D13B
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/private/AppFramework/Db/Db.php
View file

@ -31,6 +31,7 @@ use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDb;
use OCP\IDBConnection;
use OCP\PreConditionNotMetException;
use Doctrine\DBAL\Platforms\MySqlPlatform;
/**
* @deprecated use IDBConnection directly, will be removed in ownCloud 10
@ -300,4 +301,14 @@ class Db implements IDb {
public function escapeLikeParameter($param) {
return $this->connection->escapeLikeParameter($param);
}
/**
* Check whether or not the current database support 4byte wide unicode
*
* @return bool
* @since 9.2.0
*/
public function supports4ByteText() {
return $this->connection->supports4ByteText();
}
}

10
tests/lib/Files/PathVerificationTest.php
View file

@ -9,6 +9,7 @@ namespace Test\Files;
use OC\Files\Storage\Local;
use OC\Files\View;
use OCP\Files\InvalidPathException;
/**
* Class PathVerificationTest
@ -79,10 +80,15 @@ class PathVerificationTest extends \Test\TestCase {
/**
* @dataProvider providesAstralPlane
* @expectedException \OCP\Files\InvalidPathException
* @expectedExceptionMessage 4-byte characters are not supported in file names
*/
public function testPathVerificationAstralPlane($fileName) {
$connection = \OC::$server->getDatabaseConnection();
if (!$connection->supports4ByteText()) {
$this->expectException(InvalidPathException::class);
$this->expectExceptionMessage('4-byte characters are not supported in file names');
}
$this->view->verifyPath('', $fileName);
}