Fix LENGTH function name across databases

come-nc · backportbot-nextcloud[bot] · commit bbbb251e44d4 · 2022-12-13T16:14:16.000Z
Signed-off-by: Côme Chilliet &lt;come.chilliet@nextcloud.com&gt;
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/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);
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public function octetLength($field, $alias = ''): IQueryFunction {`
`88`	`88`	`public function charLength($field, $alias = ''): IQueryFunction {`
`89`	`89`	`$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';`
`90`	`90`	`$quotedName = $this->helper->quoteColumnName($field);`
`91`		`- return new QueryFunction('LENGTH(' . $quotedName . ')' . $alias);`
	`91`	`+ return new QueryFunction('CHAR_LENGTH(' . $quotedName . ')' . $alias);`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`public function max($field): IQueryFunction {`
Original file line number	Diff line number	Diff line change
`@@ -44,4 +44,10 @@ public function octetLength($field, $alias = ''): IQueryFunction {`
`44`	`44`	`$quotedName = $this->helper->quoteColumnName($field);`
`45`	`45`	`return new QueryFunction('LENGTH(CAST(' . $quotedName . ' as BLOB))' . $alias);`
`46`	`46`	`}`
	`47`	`+`
	`48`	`+ public function charLength($field, $alias = ''): IQueryFunction {`
	`49`	`+ $alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';`
	`50`	`+ $quotedName = $this->helper->quoteColumnName($field);`
	`51`	`+ return new QueryFunction('LENGTH(' . $quotedName . ')' . $alias);`
	`52`	`+ }`
`47`	`53`	`}`