fix: fix oci string length with empty strings

icewind1991 · icewind1991 · commit 05ef7132dc64 · 2025-08-01T15:23:45.000+02:00
Signed-off-by: Robin Appelman &lt;robin@icewind.nl&gt;
diff --git a/lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php b/lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php
@@ -81,12 +81,12 @@ public function groupConcat($expr, ?string $separator = ','): IQueryFunction {
 	public function octetLength($field, $alias = ''): IQueryFunction {
 		$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
 		$quotedName = $this->helper->quoteColumnName($field);
-		return new QueryFunction('LENGTHB(' . $quotedName . ')' . $alias);
+		return new QueryFunction('COALESCE(LENGTHB(' . $quotedName . '), 0)' . $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);
+		return new QueryFunction('COALESCE(LENGTH(' . $quotedName . '), 0)' . $alias);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -81,12 +81,12 @@ public function groupConcat($expr, ?string $separator = ','): IQueryFunction {`
`81`	`81`	`public function octetLength($field, $alias = ''): IQueryFunction {`
`82`	`82`	`$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';`
`83`	`83`	`$quotedName = $this->helper->quoteColumnName($field);`
`84`		`- return new QueryFunction('LENGTHB(' . $quotedName . ')' . $alias);`
	`84`	`+ return new QueryFunction('COALESCE(LENGTHB(' . $quotedName . '), 0)' . $alias);`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`public function charLength($field, $alias = ''): IQueryFunction {`
`88`	`88`	`$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';`
`89`	`89`	`$quotedName = $this->helper->quoteColumnName($field);`
`90`		`- return new QueryFunction('LENGTH(' . $quotedName . ')' . $alias);`
	`90`	`+ return new QueryFunction('COALESCE(LENGTH(' . $quotedName . '), 0)' . $alias);`
`91`	`91`	`}`
`92`	`92`	`}`