diff --git a/lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php b/lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php
index f9347210c1..556ef22144 100644
--- a/lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php
+++ b/lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php
@@ -24,9 +24,52 @@
 namespace OC\DB\QueryBuilder\FunctionBuilder;
 
 use OC\DB\QueryBuilder\QueryFunction;
+use OCP\DB\QueryBuilder\ILiteral;
+use OCP\DB\QueryBuilder\IParameter;
+use OCP\DB\QueryBuilder\IQueryFunction;
 
 class OCIFunctionBuilder extends FunctionBuilder {
 	public function md5($input) {
 		return new QueryFunction('LOWER(DBMS_OBFUSCATION_TOOLKIT.md5 (input => UTL_RAW.cast_to_raw(' . $this->helper->quoteColumnName($input) .')))');
 	}
+
+	/**
+	 * As per https://docs.oracle.com/cd/B19306_01/server.102/b14200/functions060.htm
+	 * Oracle uses the first value to cast the rest or the values. So when the
+	 * first value is a literal, plain value or column, instead of doing the
+	 * math, it will cast the expression to int and continue with a "0". So when
+	 * the second parameter is a function or column, we have to put that as
+	 * first parameter.
+	 *
+	 * @param string|ILiteral|IParameter|IQueryFunction $x
+	 * @param string|ILiteral|IParameter|IQueryFunction $y
+	 * @return QueryFunction
+	 */
+	public function greatest($x, $y) {
+		if (is_string($y) || $y instanceof IQueryFunction) {
+			return parent::greatest($y, $x);
+		}
+
+		return parent::greatest($x, $y);
+	}
+
+	/**
+	 * As per https://docs.oracle.com/cd/B19306_01/server.102/b14200/functions060.htm
+	 * Oracle uses the first value to cast the rest or the values. So when the
+	 * first value is a literal, plain value or column, instead of doing the
+	 * math, it will cast the expression to int and continue with a "0". So when
+	 * the second parameter is a function or column, we have to put that as
+	 * first parameter.
+	 *
+	 * @param string|ILiteral|IParameter|IQueryFunction $x
+	 * @param string|ILiteral|IParameter|IQueryFunction $y
+	 * @return QueryFunction
+	 */
+	public function least($x, $y) {
+		if (is_string($y) || $y instanceof IQueryFunction) {
+			return parent::least($y, $x);
+		}
+
+		return parent::least($x, $y);
+	}
 }