rename fun to func

Signed-off-by: Robin Appelman <robin@icewind.nl>
nextcloud · Sep 21, 2017 · d6fe1e5 · d6fe1e5
1 parent 250562b
commit d6fe1e5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/3rdparty b/3rdparty
diff --git a/lib/private/DB/QueryBuilder/QueryBuilder.php b/lib/private/DB/QueryBuilder/QueryBuilder.php
@@ -136,7 +136,7 @@ public function expr() {
 	 *
 	 * @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/public/DB/QueryBuilder/IQueryBuilder.php b/lib/public/DB/QueryBuilder/IQueryBuilder.php
@@ -111,7 +111,7 @@ public function expr();
 	 * @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
@@ -43,31 +43,31 @@ protected function setUp() {
 	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());
 	}
 
 	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());
 	}
 
 	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());
 	}
 
 	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());
 	}