Carlos Ferreira
a8ba2df8e6
Simple typo in comments
2020-11-20 19:45:23 +00:00
Morris Jobke
e0e3334fc2
Merge pull request #24230 from nextcloud/backport/24007/stable20
...
[stable20] allow selecting multiple columns with SELECT DISTINCT
2020-11-20 14:27:27 +01:00
Morris Jobke
7fa352b28c
Merge pull request #24228 from nextcloud/backport/24135/stable20
...
[stable20] Fix nextcloud logo in email notifications misalignment
2020-11-20 14:23:00 +01:00
Robin Appelman
f65a89dd07
use file name instead of path in 'not allowed to share' message
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-11-19 21:44:42 +00:00
Robin Appelman
22bf656e02
allow selecting multiple columns with SELECT DISTINCT
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-11-19 21:41:13 +00:00
medcloud
7ccf700432
Fix #23357
...
Signed-off-by: medcloud <42641918+medcloud@users.noreply.github.com>
2020-11-19 20:38:54 +00:00
Maxence Lange
8c398453ac
missing level
...
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2020-11-19 07:40:38 +00:00
Nextcloud bot
6a4ced077e
[tx-robot] updated from transifex
2020-11-19 02:20:21 +00:00
Daniel Calviño Sánchez
cdbb2b3e4b
Merge pull request #24159 from nextcloud/backport/24069/stable20
...
[stable20] Fix default internal expiration date
2020-11-16 17:46:37 +01:00
Daniel Calviño Sánchez
182e28bfbc
Fix default internal expiration date
...
The default expiration date for internal shares was set from the default
link expiration date instead of the internal one.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 13:16:57 +00:00
Roeland Jago Douma
b14ec966c1
Merge pull request #24156 from nextcloud/backport/24112/stable20
...
[stable20] Set up FS before querying storage info in settings
2020-11-16 14:14:43 +01:00
Roeland Jago Douma
bca0633e2b
Merge pull request #24147 from nextcloud/backport/24146/stable20
...
[stable20] Don't throw on SHOW VERSION query
2020-11-16 12:08:56 +01:00
Vincent Petry
32758894a4
Set up FS before querying storage info in settings
...
The personal info section of the personal settings is querying the
storage quota information. For this it requires the FS to be setup which
is not always guaranteed.
This fixes an issue where refreshing the settings page would cause it to
fail after Redis caches are full. It is likely that when Redis cache is
populated, some code path is initializing the FS, so it works so far.
But when the cache is populated, that code path is skipped so the FS is
not guaranteed to be setup...
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-11-16 11:06:35 +00:00
Joas Schilling
7a821da1bc
Merge pull request #24079 from nextcloud/backport/24053/stable20
...
[stable20] Make is_user_defined nullable so we can store false on oracle
2020-11-16 11:23:17 +01:00
Joas Schilling
f10327b245
Don't throw on SHOW VERSION query
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-16 08:59:47 +00:00
Nextcloud bot
66b6ccc69e
[tx-robot] updated from transifex
2020-11-14 02:19:47 +00:00
Morris Jobke
ca363131d9
Dump autoloader
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-11-12 20:46:59 +00:00
Joas Schilling
bb52911d16
Create primary keys on all tables and add a command to create the afterwards
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-12 12:57:52 +01:00
Joas Schilling
f3c183b6c3
Replace the credentials table with one that can have empty user
...
Primary key columns on Oracle can not have empty strings
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-12 12:57:52 +01:00
Joas Schilling
dee42027ed
Don't try to update on NotNullConstraintViolationException, only on unique or foreign key
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-12 12:57:51 +01:00
Joas Schilling
a66591ee79
Fix comparing the empty string for global credentials
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-12 12:57:51 +01:00
Joas Schilling
97b0402984
Empty string is returned as null, but empty string in file cache is the root and exists
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-12 12:57:51 +01:00
Joas Schilling
8ff0523c3d
Make sure columns with an empty default are nullable for Oracle
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-12 12:57:51 +01:00
Joas Schilling
60ca39bb53
Merge pull request #24033 from nextcloud/backport/23993/stable20
...
[stable20] Don't leave cursors open
2020-11-11 10:56:53 +01:00
Nextcloud bot
3d3cebc321
[tx-robot] updated from transifex
2020-11-11 02:20:23 +00:00
Joas Schilling
19816fe85f
Don't leave cursors open when tests fail
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-10 14:18:02 +00:00
Joas Schilling
5f3d62600e
Fix repair mimetype step to not leave stray cursors
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-10 10:27:09 +01:00
Morris Jobke
73c2ad293b
Merge pull request #23998 from nextcloud/backport/23937/stable20
...
[stable20] Use query builder instead of OC_DB in OC\Files\*
2020-11-10 10:26:04 +01:00
Morris Jobke
bf6aa03eb3
Merge pull request #23995 from nextcloud/backport/23741/stable20
...
[stable20] Unlock when promoting to exclusive lock fails
2020-11-10 10:16:34 +01:00
Roeland Jago Douma
8edc29bfef
Merge pull request #23955 from nextcloud/backport/23938/stable20
...
[stable20] Replace some usages of OC_DB in OC\Share\* with query builder
2020-11-10 08:59:54 +01:00
John Molakvoæ
559acf83ed
Removed config.js
2020-11-09 16:01:06 +00:00
Joas Schilling
adcc942553
Use query builder instead of OC_DB in OC\Files\*
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-09 11:01:09 +00:00
John Molakvoæ (skjnldsv)
0c4297cee9
Make sure root storage is valid before checking its size
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-11-09 10:05:54 +00:00
Ashod Nakashian
7298d037b2
Unlock when promoting to exclusive lock fails
...
In certain cases changeLock to EXCLUSIVE fails
and throws LockedException. This leaves the
file locked as SHARED in file_put_contents,
which prevents retrying (because on second
call file_put_contents takes another SHARED
lock on the same file, and changeLock doesn't
allow more than a single SHARED lock to promote
to EXCLUSIVE).
To avoid this case, we catch the LockedException
and unlock before re-throwing.
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
2020-11-09 10:03:15 +00:00
Morris Jobke
20885847c8
Merge pull request #23971 from nextcloud/backport/23936/stable20
...
[stable20] Use query builder instead of OC_DB in trashbin
2020-11-09 10:27:29 +01:00
Morris Jobke
40c4d24e31
Merge pull request #23975 from nextcloud/backport/23923/stable20
...
[stable20] Fix greatest/least order for oracle
2020-11-09 10:17:11 +01:00
Daniel Kesselberg
a01da78f1d
Add explicit typecast for $value.
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-11-09 10:13:36 +01:00
Nextcloud bot
0624ca3527
[tx-robot] updated from transifex
2020-11-09 02:19:02 +00:00
Joas Schilling
b3dfa9290d
Update parameters
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-07 15:57:47 +00:00
Joas Schilling
2e3cffc53b
Make sure Oracle always casts everything in the best way
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-07 15:57:46 +00:00
Joas Schilling
c71cc6824e
Use Query builder function
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-07 15:57:45 +00:00
Joas Schilling
d111e88d4c
Fix order of GREATEST for Oracle
...
As per https://docs.oracle.com/cd/B19306_01/server.102/b14200/functions060.htm
Oracle uses the first value to cast the rest or the values.
So when the first value is a plain int, instead of doing the math,
it will cast the expression to int and continue with a potential 0.
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-07 15:57:44 +00:00
Roeland Jago Douma
71de05f775
Merge pull request #23951 from nextcloud/backport/23922/stable20
...
[stable20] Improve query type detection
2020-11-07 10:49:06 +01:00
Roeland Jago Douma
bac92bb814
Merge pull request #23954 from nextcloud/backport/23943/stable20
...
[stable20] Fix iLike() falsely turning escaped % and _ into wildcards
2020-11-07 09:18:23 +01:00
Roeland Jago Douma
a5c6abc93a
Merge pull request #23948 from nextcloud/backport/23940/stable20
...
[stable20] Skip already loaded apps in loadApps
2020-11-07 07:59:52 +01:00
Joas Schilling
73a09a4f54
Replace some usages of OC_DB in OC\Share\* with query builder
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-06 21:43:46 +00:00
Joas Schilling
3a7e2fbff1
Fix iLike() falsely turning escaped % and _ into wildcards
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-06 21:29:48 +00:00
Morris Jobke
f8b550dab7
Merge pull request #23935 from nextcloud/backport/23921/stable20
...
[stable20] Fix casting of integer and boolean on Oracle
2020-11-06 22:24:31 +01:00
Joas Schilling
3ffd31353c
Improve query type detection
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-06 21:20:44 +00:00
Morris Jobke
a2c9915ca4
Merge pull request #23924 from nextcloud/backport/23920/stable20
...
[stable20] Bearer must be in the start of the auth header
2020-11-06 22:10:01 +01:00