diff options
| -rw-r--r-- | lib/private/DB/QueryBuilder/QueryBuilder.php | 2 | ||||
| -rw-r--r-- | lib/private/Files/Cache/Cache.php | 2 | ||||
| -rw-r--r-- | lib/public/DB/QueryBuilder/IQueryBuilder.php | 2 | ||||
| -rw-r--r-- | tests/lib/DB/QueryBuilder/FunctionBuilderTest.php | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/lib/private/DB/QueryBuilder/QueryBuilder.php b/lib/private/DB/QueryBuilder/QueryBuilder.php index 3ff31de19a3..eac13b452ac 100644 --- a/lib/private/DB/QueryBuilder/QueryBuilder.php +++ b/lib/private/DB/QueryBuilder/QueryBuilder.php @@ -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) { diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php index ce3e38dd46f..1f3f2433e45 100644 --- a/lib/private/Files/Cache/Cache.php +++ b/lib/private/Files/Cache/Cache.php @@ -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 diff --git a/lib/public/DB/QueryBuilder/IQueryBuilder.php b/lib/public/DB/QueryBuilder/IQueryBuilder.php index 2a88e7ac566..a176bb917a3 100644 --- a/lib/public/DB/QueryBuilder/IQueryBuilder.php +++ b/lib/public/DB/QueryBuilder/IQueryBuilder.php @@ -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. diff --git a/tests/lib/DB/QueryBuilder/FunctionBuilderTest.php b/tests/lib/DB/QueryBuilder/FunctionBuilderTest.php index b1ef3d7bb75..c270e105fc1 100644 --- a/tests/lib/DB/QueryBuilder/FunctionBuilderTest.php +++ b/tests/lib/DB/QueryBuilder/FunctionBuilderTest.php @@ -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()); } |