diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-07-31 08:49:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-31 08:49:59 +0200 |
| commit | 13469ec49ca8f2a1ba7808d03d62bbfc50adfc34 (patch) | |
| tree | fa00363a678188bddc6ddd4870a8b16694708d1f /lib | |
| parent | 97d06a7698ad8bbf1432d7aa113e945314543f8a (diff) | |
| parent | 50912fb94f25565fd3a603833745da96473ea346 (diff) | |
| download | nextcloud-server-13469ec49ca8f2a1ba7808d03d62bbfc50adfc34.tar.gz nextcloud-server-13469ec49ca8f2a1ba7808d03d62bbfc50adfc34.zip | |
Merge pull request #5922 from nextcloud/master-add-brackets-on-concat-method
[master]Add brackets around concat statements so comparing the result works as intended
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/DB/QueryBuilder/FunctionBuilder/PgSqlFunctionBuilder.php | 2 | ||||
| -rw-r--r-- | lib/private/DB/QueryBuilder/FunctionBuilder/SqliteFunctionBuilder.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/DB/QueryBuilder/FunctionBuilder/PgSqlFunctionBuilder.php b/lib/private/DB/QueryBuilder/FunctionBuilder/PgSqlFunctionBuilder.php index 27ebf1a04f9..26aedb9a8bb 100644 --- a/lib/private/DB/QueryBuilder/FunctionBuilder/PgSqlFunctionBuilder.php +++ b/lib/private/DB/QueryBuilder/FunctionBuilder/PgSqlFunctionBuilder.php @@ -25,6 +25,6 @@ use OC\DB\QueryBuilder\QueryFunction; class PgSqlFunctionBuilder extends FunctionBuilder { public function concat($x, $y) { - return new QueryFunction($this->helper->quoteColumnName($x) . ' || ' . $this->helper->quoteColumnName($y)); + return new QueryFunction('(' . $this->helper->quoteColumnName($x) . ' || ' . $this->helper->quoteColumnName($y) . ')'); } } diff --git a/lib/private/DB/QueryBuilder/FunctionBuilder/SqliteFunctionBuilder.php b/lib/private/DB/QueryBuilder/FunctionBuilder/SqliteFunctionBuilder.php index e985b7306a4..f38445a6d36 100644 --- a/lib/private/DB/QueryBuilder/FunctionBuilder/SqliteFunctionBuilder.php +++ b/lib/private/DB/QueryBuilder/FunctionBuilder/SqliteFunctionBuilder.php @@ -25,6 +25,6 @@ use OC\DB\QueryBuilder\QueryFunction; class SqliteFunctionBuilder extends FunctionBuilder { public function concat($x, $y) { - return new QueryFunction($this->helper->quoteColumnName($x) . ' || ' . $this->helper->quoteColumnName($y)); + return new QueryFunction('(' . $this->helper->quoteColumnName($x) . ' || ' . $this->helper->quoteColumnName($y) . ')'); } } |