Fix LENGTH function name across databases

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
nextcloud · Dec 19, 2022 · 6185e32 · 6185e32
1 parent 6e3cd43
commit 6185e32
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/lib/private/DB/QueryBuilder/FunctionBuilder/FunctionBuilder.php b/lib/private/DB/QueryBuilder/FunctionBuilder/FunctionBuilder.php
@@ -88,7 +88,7 @@ public function octetLength($field, $alias = ''): IQueryFunction {
 	public function charLength($field, $alias = ''): IQueryFunction {
 		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
 		$quotedName = $this->helper->quoteColumnName($field);
-		return new QueryFunction('LENGTH(' . $quotedName . ')' . $alias);
+		return new QueryFunction('CHAR_LENGTH(' . $quotedName . ')' . $alias);
 	}
 
 	public function max($field): IQueryFunction {

diff --git a/lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php b/lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php
@@ -78,4 +78,10 @@ public function octetLength($field, $alias = ''): IQueryFunction {
 		$quotedName = $this->helper->quoteColumnName($field);
 		return new QueryFunction('LENGTHB(' . $quotedName . ')' . $alias);
 	}
+
+	public function charLength($field, $alias = ''): IQueryFunction {
+		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
+		$quotedName = $this->helper->quoteColumnName($field);
+		return new QueryFunction('LENGTH(' . $quotedName . ')' . $alias);
+	}
 }
diff --git a/lib/private/DB/QueryBuilder/FunctionBuilder/SqliteFunctionBuilder.php b/lib/private/DB/QueryBuilder/FunctionBuilder/SqliteFunctionBuilder.php
@@ -44,4 +44,10 @@ public function octetLength($field, $alias = ''): IQueryFunction {
 		$quotedName = $this->helper->quoteColumnName($field);
 		return new QueryFunction('LENGTH(CAST(' . $quotedName . ' as BLOB))' . $alias);
 	}
+
+	public function charLength($field, $alias = ''): IQueryFunction {
+		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
+		$quotedName = $this->helper->quoteColumnName($field);
+		return new QueryFunction('LENGTH(' . $quotedName . ')' . $alias);
+	}
 }