upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25
77659 commits 882 branches 1195 tags 7.2 GiB
Commit graph

165 commits

Author SHA1 Message Date
Côme Chilliet
7407a324d9
Fix LENGTH function name across databases 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-03-28 00:01:17 +02:00
Côme Chilliet
25af856ed2 Use OCTET_LENGTH which is more common than LENGTHB 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-03-24 20:35:02 +00:00
Côme Chilliet
efebbacca4 Add octetLength and charLength to function builder, and tests 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-03-24 20:35:02 +00:00
Côme Chilliet
f1febfe696
Fix log level for exception in QueryBuilder 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-03-24 16:21:28 +01:00
Côme Chilliet
6be7aa112f
Migrate from ILogger to LoggerInterface in lib/private 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-03-24 16:21:25 +01:00
Joas Schilling
fccb98c8b6
Merge pull request #30379 from nextcloud/feature/add-comments-reactions 
Add comments reactions
 2022-01-21 15:08:12 +01:00
Joas Schilling
d850dc0220
Remove order from groupConcat as it is not working everywhere 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-01-21 08:39:39 -03:00
Vitor Mattos
f071b4dfbb
Fix groupConcat and ordering on Oracle 
Signed-off-by: Vitor Mattos <vitor@php.rio>
 2022-01-21 08:39:39 -03:00
Vitor Mattos
afe5b6dd8a
Prevent query error when use subquery 
Signed-off-by: Vitor Mattos <vitor@php.rio>
 2022-01-21 08:37:06 -03:00
Joas Schilling
de9fe8fcc1
Merge pull request #30471 from nextcloud/enh/cast-char-mysql 
Explicitly cast char in the query builder
 2022-01-20 14:32:56 +01:00
Vitor Mattos
f732cf1b04
Unit tests 
Signed-off-by: Vitor Mattos <vitor@php.rio>
 2022-01-07 09:54:41 +01:00
Vitor Mattos
814924a787
Accept multipe args on concat 
Signed-off-by: Vitor Mattos <vitor@php.rio>
 2022-01-06 08:12:10 -03:00
Joas Schilling
eebed2c434
Fix psalm complaint 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-01-04 17:32:07 +01:00
Julius Härtl
a169ca306e
Explicitly cast char in the query builder 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2022-01-04 16:53:00 +01:00
Joas Schilling
005e717fe6
Use quote function 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-01-04 13:59:54 +01:00
Joas Schilling
ecc92067bf
Try escaping Oracle single quotes 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-01-04 13:36:55 +01:00
Joas Schilling
46ad6fa3c7
Add a test with integer 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-01-04 09:15:17 +01:00
Joas Schilling
e3e73a12ef
Fix oracle LISTAGG 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-01-03 21:43:53 -03:00
Vitor Mattos
fb6a9f308d
Add unit test 
Signed-off-by: Vitor Mattos <vitor@php.rio>
 2022-01-03 21:41:38 -03:00
Vitor Mattos
7b9fea85b6
Add unit test and orderBy parameter 
Signed-off-by: Vitor Mattos <vitor@php.rio>
 2022-01-03 12:45:00 -03:00
Vitor Mattos
79b3df00f8
Add group_concat aggregator function 
Signed-off-by: Vitor Mattos <vitor@php.rio>
 2022-01-03 07:48:11 -03:00
Côme Chilliet
18a91f02fa
Fix default value for $type in OC\DB\QueryBuilder\ExpressionBuilder\ExpressionBuilder::literal 
This fixes PHP errors about passing null to PDO::quote second parameter.
We may want to change IExpressionBuilder as well?

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-11-23 09:29:02 +01:00
Joas Schilling
5bb49feef8
Allow NULL as well for limit, not integer only 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-11-15 18:51:28 +01:00
Christoph Wurst
130ab63ca1
Bump doctrine/dbal from 3.0.0 to 3.1.3 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-10-22 09:03:45 +02:00
Arthur Schiwon
ce283c12b6
make it possible to override the default collation 
- allows admins to configure it for edge cases like accent sensitivity

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-09-01 11:57:47 +02:00
Joas Schilling
aae16c21e6
Allow casting query functions as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-07-07 14:20:24 +02:00
John Molakvoæ (skjnldsv)
215aef3cbd
Update php licenses 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2021-06-04 22:02:41 +02:00
Christoph Wurst
865661ed75
Rename IQueryBuilder::executeUpdate to IQueryBuilder::executeStatement 
Because executeUpdate wasn't a great name. And in DBAL they also use
executeStatement more consistently now.

Ref https://github.com/doctrine/dbal/issues/4607

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-05-05 10:31:54 +02:00
Roeland Jago Douma
85e48d796c
Merge pull request #25929 from nextcloud/techdept/psalm/25839/redundantcasts 
Remove Redundantcasts
 2021-03-05 08:42:54 +01:00
Roeland Jago Douma
d7f7d3bc51 Type CompositeExpression and ICompositeExpression 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2021-03-04 21:47:44 +01:00
Roeland Jago Douma
c3f1eb4f7f Remove Redundantcasts 
For #25839

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2021-03-04 14:44:04 +01:00
Roeland Jago Douma
76a6328d10 Add executeQuery and executeUpdate 
Names shamelessly copied from Doctrine itself.
Internally it is still using the same flow. But I added some checks
around it.

This should make static analysis a bit more happy. Which in turn makes
me more happy.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2021-03-04 14:03:31 +01:00
Joas Schilling
a6246be34c
Merge pull request #25656 from nextcloud/enh/type/expressionbuilder 
Type the experssionbuilders
 2021-03-03 11:37:16 +01:00
Roeland Jago Douma
4bdf9f5849 Type the experssionbuilders 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2021-03-03 10:44:09 +01:00
Robin Appelman
47dd8e54b5
allow non string join conditions in query builder 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-03 10:43:15 +01:00
dependabot-preview[bot]
eb502c02ff
Bump nextcloud/coding-standard from 0.3.0 to 0.5.0 
Bumps [nextcloud/coding-standard](https://github.com/nextcloud/coding-standard) from 0.3.0 to 0.5.0.
- [Release notes](https://github.com/nextcloud/coding-standard/releases)
- [Changelog](https://github.com/nextcloud/coding-standard/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nextcloud/coding-standard/compare/v0.3.0...v0.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-02-18 13:31:24 +01:00
Arthur Schiwon
f9484d15cb
DB: warn on parameter number constraints 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-01-11 13:43:34 +01:00
Christoph Wurst
8b64e92b92
Bump doctrine/dbal from 2.12.0 to 3.0.0 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-01-08 11:45:19 +01:00
Christoph Wurst
9ce3ea3368
Update license headers 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-12-30 14:07:05 +01:00
Roeland Jago Douma
adc4f1a811
Merge pull request #22916 from J0WI/unifiy-links-to-php.net 
Unify links to php.net
 2020-12-22 09:53:31 +01:00
Christoph Wurst
d89a75be0b
Update all license headers for Nextcloud 21 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-12-16 18:48:22 +01:00
Joas Schilling
5828f3c4f9
Prevent * and other things in the same query for Oracle 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-12-14 09:35:50 +01:00
Vincent Petry
a50bcdabcc
Prevent log_query to mess up regular execution flow 
When the "log_query" debug config parameter is set, SQL queries are
logged. However, if an error occurs when converting the values to
string, it will abort the request.

This fix catches the error and continues instead.

Also added handler for DateTime value which is already known to cause
aborts here.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2020-12-02 14:10:35 +01:00
Morris Jobke
1b613c84e9
Merge pull request #24007 from nextcloud/select-distinct-multiple 
allow selecting multiple columns with SELECT DISTINCT
 2020-11-19 22:39:01 +01:00
Joas Schilling
a8cb8e21c1
Add types to function builder 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-16 19:46:24 +01:00
Robin Appelman
a61a757b85
allow selecting multiple columns with SELECT DISTINCT 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-11-16 15:45:17 +01:00
Roeland Jago Douma
a5fa9604ba
Merge pull request #23923 from nextcloud/bugfix/oci/fix-greatest-order-for-oracle 
Fix greatest/least order for oracle
 2020-11-07 16:55:13 +01:00
Joas Schilling
d9e471771a
Update parameters 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-07 14:06:03 +01:00
Joas Schilling
cb8bef1f37
Fix iLike() falsely turning escaped % and _ into wildcards 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-06 16:22:13 +01:00
Joas Schilling
3aaf2fabb1
Make sure Oracle always casts everything in the best way 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-06 12:13:22 +01:00
Joas Schilling
cfc35fa49a
Fix casting to integer on Oracle 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-06 08:38:08 +01:00
Roeland Jago Douma
fe46149560
Psalm fixes 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-10-30 19:27:53 +01:00
Daniel Kesselberg
0e3ddf1b27
Add explicit typecast for $value. 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2020-10-03 17:15:14 +02:00
Daniel Kesselberg
64b10f61df
Update signature for set 
also ILiteral and IQueryFunction are valid.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2020-10-02 19:15:34 +02:00
Daniel Kesselberg
8fdb74bdd5
Update signature for in/notIn 
$y is always passed to quoteColumnName hence ILiteral|IParameter|IQueryFunction are supported.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2020-10-02 19:09:28 +02:00
Daniel Kesselberg
d14c971ad6
Update signature for like/notLike/in/notIn 
$x is always passed to quoteColumnName hence ILiteral|IParameter|IQueryFunction are supported.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2020-10-02 18:59:53 +02:00
J0WI
68ce17e59b Unify links to php.net 
Update all links to https://www.php.net/

Signed-off-by: J0WI <J0WI@users.noreply.github.com>
 2020-09-17 17:40:04 +02:00
Christoph Wurst
2a054e6c04
Update the license headers for Nextcloud 20 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-08-24 14:54:25 +02:00
Daniel Kesselberg
10ac844448
Update documentation for QueryBuilder::set 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2020-08-14 19:55:01 +02:00
Christoph Wurst
cb057829f7
Update license headers for 19 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-29 11:57:22 +02:00
Roeland Jago Douma
cbcf072b23
Revert "Make sure MySQL is not saying 'this' = 'this ' is true" 2020-04-15 23:49:16 +02:00
Joas Schilling
16e9bf2309
Make sure MySQL is not saying 'this' = 'this ' is true 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-04-15 09:14:12 +02:00
Christoph Wurst
caff1023ea
Format control structures, classes, methods and function 
To continue this formatting madness, here's a tiny patch that adds
unified formatting for control structures like if and loops as well as
classes, their methods and anonymous functions. This basically forces
the constructs to start on the same line. This is not exactly what PSR2
wants, but I think we can have a few exceptions with "our" style. The
starting of braces on the same line is pracrically standard for our
code.

This also removes and empty lines from method/function bodies at the
beginning and end.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-10 14:19:56 +02:00
Christoph Wurst
14c996d982
Use elseif instead of else if 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-10 10:35:09 +02:00
Christoph Wurst
41b5e5923a
Use exactly one empty line after the namespace declaration 
For PSR2

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-09 11:48:10 +02:00
Christoph Wurst
1a9330cd69
Update the license headers for Nextcloud 19 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-03-31 14:52:54 +02:00
Christoph Wurst
b80ebc9674
Use the short array syntax, everywhere 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-03-26 16:34:56 +01:00
Christoph Wurst
5bf3d1bb38
Update license headers 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-12-05 15:38:45 +01:00
Robin Appelman
9e450d727a
add LEAST and GREATER to db function builder 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-11-26 12:05:30 +01:00
Roeland Jago Douma
68748d4f85
Some php-cs fixes 
* Order the imports
* No leading slash on imports
* Empty line before namespace
* One line per import
* Empty after imports
* Emmpty line at bottom of file

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-22 20:52:10 +01:00
Robin Appelman
ac209cea52
add count() as shortcut for count('*') in FunctionBuilder 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-11-13 11:30:32 +01:00
Robin Appelman
0e9feeb090
return from QueryBuilder instead of IQueryBuilder 
this make the type hints work properly with querybuilder subclasses

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-11-13 11:30:27 +01:00
Robin Appelman
8ef5a366ec
add MAX and MIN to functionbuilder 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-09-06 12:28:17 +02:00
Joas Schilling
f906913177
Allow to use Subqueries in from 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-04-16 15:42:21 +02:00
Robin Appelman
bfd539017f
add casting to string for postgresql query builder 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-03-14 14:19:10 +01:00
Joas Schilling
bb352fb667
Use the defined func()->count() instead of manual counting 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-11-08 15:44:45 +01:00
Robin Appelman
3047ef31bd
Add count to function builder 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-06-14 14:32:22 +02:00
Robin Appelman
89a9d35d90 dont keep shared database locks when running cli scripts 
For cli scripts we don't have the assumption that the universe will be cleaned up soon

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-04-11 19:21:45 +02:00
Roeland Jago Douma
ab04f3cb19
Fix Array to String conversion in QueryBuilder 
Fixes #9080

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-05 09:08:32 +02:00
Roeland Jago Douma
46c195b58b
Made IExpressionBuilder varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:35:09 +01:00
Roeland Jago Douma
0009358c17
Made orHaving varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:32:31 +01:00
Roeland Jago Douma
408c2103db
Made addHaving varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:31:33 +01:00
Roeland Jago Douma
2c585afea1
Make having varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:31:04 +01:00
Roeland Jago Douma
c6eba3c925
Made addGroupBy varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:30:14 +01:00
Roeland Jago Douma
afbad7e15e
Made groupBy varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:29:36 +01:00
Roeland Jago Douma
d6b93e6620
Made orWhere varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:28:27 +01:00
Roeland Jago Douma
07cb6aaeff
Made andWhere varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:27:43 +01:00
Roeland Jago Douma
222dbb7bc9
Made where varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:27:11 +01:00
Roeland Jago Douma
2976b39102
Made AddSelect varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 09:25:32 +01:00
Roeland Jago Douma
c8aee70a0b
Made select varadic 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-13 08:07:08 +01:00
Robin Appelman
42b3aa3a0a
reuse query builder 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-01-12 13:57:55 +01:00
Robin Appelman
aad01894e3
refactor user searching 
add additional user searching tests

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-20 15:51:37 +01:00
Morris Jobke
0eebff152a
Update license headers 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-06 16:56:19 +01:00
Joas Schilling
78412fda9c
Add a method to compare empty strings with an expression 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-02 09:50:41 +02:00
Joas Schilling
bb58667511
Fix ILIKE regex for oracle 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-02 09:48:16 +02:00
Joas Schilling
8ec6c1f259
Quote aliases as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-02 09:48:15 +02:00
Lukas Reschke
66b8208791
Function also accepts ints 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:16 +02:00
Joas Schilling
50912fb94f
Add brackets around concat statements so comparing the result works as intended 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-28 15:36:26 +02:00
Morris Jobke
c54a59d51e
Remove unused use statements 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-22 19:23:31 -05:00
Morris Jobke
124fdf8062 Merge pull request #4331 from nextcloud/query-builder-sum 
Add sum() to the query function builder
 2017-04-12 12:55:09 -05:00