mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename fun to func 

Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2017-03-26 20:45:49 +02:00
parent fee818f493
commit d4a7cfec7c
No known key found for this signature in database
GPG Key ID: 50F2B59C6DEBBCFE
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/DB/QueryBuilder/QueryBuilder.php
View File

@ -139,7 +139,7 @@ class QueryBuilder implements IQueryBuilder {
*
* @return \OCP\DB\QueryBuilder\IFunctionBuilder
*/
public function fun() {
public function func() {
if ($this->connection instanceof OracleConnection) {
return new OCIFunctionBuilder($this->helper);
} else if ($this->connection->getDatabasePlatform() instanceof SqlitePlatform) {

2
lib/private/Files/Cache/Cache.php
View File

@ -529,7 +529,7 @@ class Cache implements ICache {
$sourceLength = strlen($sourcePath);
$query = $this->connection->getQueryBuilder();
$fun = $query->fun();
$fun = $query->func();
$newPathFunction = $fun->concat(
$query->createNamedParameter($targetPath),
$fun->substring('path', $query->createNamedParameter($sourceLength + 1, IQueryBuilder::PARAM_INT))// +1 for the leading slash

2
lib/public/DB/QueryBuilder/IQueryBuilder.php
View File

@ -111,7 +111,7 @@ interface IQueryBuilder {
* @return \OCP\DB\QueryBuilder\IFunctionBuilder
* @since 12.0.0
*/
public function fun();
public function func();
/**
* Gets the type of the currently built query.

8
tests/lib/DB/QueryBuilder/FunctionBuilderTest.php
View File

@ -43,7 +43,7 @@ class FunctionBuilderTest extends TestCase {
public function testConcat() {
$query = $this->connection->getQueryBuilder();
$query->select($query->fun()->concat($query->createNamedParameter('foo'), new Literal("'bar'")));
$query->select($query->func()->concat($query->createNamedParameter('foo'), new Literal("'bar'")));
$this->assertEquals('foobar', $query->execute()->fetchColumn());
}
@ -51,7 +51,7 @@ class FunctionBuilderTest extends TestCase {
public function testMd5() {
$query = $this->connection->getQueryBuilder();
$query->select($query->fun()->md5($query->createNamedParameter('foobar')));
$query->select($query->func()->md5($query->createNamedParameter('foobar')));
$this->assertEquals(md5('foobar'), $query->execute()->fetchColumn());
}
@ -59,7 +59,7 @@ class FunctionBuilderTest extends TestCase {
public function testSubstring() {
$query = $this->connection->getQueryBuilder();
$query->select($query->fun()->substring($query->createNamedParameter('foobar'), new Literal(2), $query->createNamedParameter(2)));
$query->select($query->func()->substring($query->createNamedParameter('foobar'), new Literal(2), $query->createNamedParameter(2)));
$this->assertEquals('oo', $query->execute()->fetchColumn());
}
@ -67,7 +67,7 @@ class FunctionBuilderTest extends TestCase {
public function testSubstringNoLength() {
$query = $this->connection->getQueryBuilder();
$query->select($query->fun()->substring($query->createNamedParameter('foobar'), new Literal(2)));
$query->select($query->func()->substring($query->createNamedParameter('foobar'), new Literal(2)));
$this->assertEquals('oobar', $query->execute()->fetchColumn());
}