Skip to content

[stable23] Use getLengthExpression to measure field length instead of like #35757

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
come-nc merged 5 commits into from
Dec 19, 2022
Merged

[stable23] Use getLengthExpression to measure field length instead of like #35757

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
774bb06
Use getLengthExpression to measure field length instead of like
come-nc Mar 24, 2022
131a397
Add octetLength and charLength to function builder, and tests
come-nc Mar 24, 2022
3a61963
Avoid select with no FROM clause for Oracle in tests
come-nc Mar 24, 2022
6e3cd43
Use OCTET_LENGTH which is more common than LENGTHB
come-nc Mar 24, 2022
6185e32
Fix LENGTH function name across databases
come-nc Mar 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix LENGTH function name across databases 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Dec 19, 2022
commit 6185e326dca7e825231041d9be434a3bc09c1031
2 changes: 1 addition & 1 deletion lib/private/DB/QueryBuilder/FunctionBuilder/FunctionBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 6 additions & 0 deletions lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
6 changes: 6 additions & 0 deletions lib/private/DB/QueryBuilder/FunctionBuilder/SqliteFunctionBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}