Skip to content
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.

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

Support arbitrary number of arguments for d:or and d:and in search queries #7882

Merged
merged 1 commit into from
Jan 16, 2018

Conversation

icewind1991
Copy link
Member

The sabredav plugin already handles this case, just have to properly transform it to the db query

See #3360 (comment)

…eries

Signed-off-by: Robin Appelman <robin@icewind.nl>
@mario
Copy link
Contributor

mario commented Jan 16, 2018

@icewind1991 yey :D

@ghost
Copy link

ghost commented Jan 16, 2018

This fix works for me! Thanks very much to @icewind1991

ghost pushed a commit to Zimbra-Community/owncloud-zimlet that referenced this pull request Jan 16, 2018
Copy link
Member

@rullzer rullzer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works as expected!

@MorrisJobke
Copy link
Member

@MorrisJobke MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jan 16, 2018
@ghost
Copy link

ghost commented Jan 16, 2018 via email

@MorrisJobke
Copy link
Member

Or is there still a change that it will be sooner. I am not in a hurry,
but I am interested to understand how you guys plan the project around git.

There is already a backport to stable13 approved and will be included in 13.0.0 😉 See #7883 for the backport

@codecov
Copy link

codecov bot commented Jan 16, 2018

Codecov Report

Merging #7882 into master will decrease coverage by <.01%.
The diff coverage is 100%.

@@             Coverage Diff              @@
##             master    #7882      +/-   ##
============================================
- Coverage     51.24%   51.24%   -0.01%     
- Complexity    24931    24933       +2     
============================================
  Files          1604     1604              
  Lines         94970    95005      +35     
  Branches       1376     1376              
============================================
+ Hits          48668    48682      +14     
- Misses        46302    46323      +21
Impacted Files Coverage Δ Complexity Δ
lib/private/Files/Cache/QuerySearchHelper.php 62.88% <100%> (+1.83%) 33 <1> (-1) ⬇️
core/Controller/LoginController.php 78.47% <0%> (-0.26%) 39% <0%> (ø)
apps/systemtags/list.php 0% <0%> (ø) 0% <0%> (ø) ⬇️
core/templates/login.php 0% <0%> (ø) 0% <0%> (ø) ⬇️
lib/private/legacy/app.php 54.17% <0%> (+0.1%) 222% <0%> (ø) ⬇️
apps/files_trashbin/lib/Trashbin.php 72.53% <0%> (+0.24%) 136% <0%> (ø) ⬇️
lib/private/Security/CertificateManager.php 92.07% <0%> (+0.99%) 39% <0%> (ø) ⬇️
lib/private/Files/Cache/Propagator.php 96.2% <0%> (+1.26%) 16% <0%> (ø) ⬇️
lib/private/App/CodeChecker/DeprecationCheck.php 13.55% <0%> (+3.35%) 8% <0%> (+3%) ⬆️

@rullzer rullzer merged commit 2b70c70 into master Jan 16, 2018
@rullzer rullzer deleted the search-and branch January 16, 2018 18:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants