fix ILIKE REGEXP workaround on oracle #26672
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
butonic
force-pushed
the
oracle-ilike-fix
branch
from
0d099da
to
95375f9
Compare
butonic
changed the title
butonic
force-pushed
the
oracle-ilike-fix
branch
from
95375f9
to
151db8e
Compare
|
These won't work: $statement = preg_replace('/`(\w+)` ILIKE \?/', 'REGEXP_LIKE(`$1`, \'^\' || REPLACE(REGEXP_REPLACE(?, \'([\\*+?|^$.[\](){}])\', \'\\\1\'), \'%\', \'.*\') || \'$\', \'i\')', $statement); // ORA-12726: unmatched bracket in regular expression
$statement = preg_replace('/`(\w+)` ILIKE \?/', 'REGEXP_LIKE(`$1`, \'^\' || REPLACE(REGEXP_REPLACE(?, \'(\]|[\\*+?|^$.[(){}])\', \'\\\1\'), \'%\', \'.*\') || \'$\', \'i\')', $statement); // ORA-12726: unmatched bracket in regular expressionbecause ... oracle ... for reference see
|
butonic
force-pushed
the
oracle-ilike-fix
branch
2 times, most recently
from
656247b
to
c9f6040
Compare
butonic
force-pushed
the
oracle-ilike-fix
branch
from
7a93e67
to
70ac9d3
Compare
|
@DeepDiver1975 do we know why jenkins sometimes fails with after successfully running the php testsuite? |
|
Afaik this warning is not causing the break .... at least not in the past |
butonic
force-pushed
the
oracle-ilike-fix
branch
from
70ac9d3
to
e59915e
Compare
butonic
force-pushed
the
oracle-ilike-fix
branch
from
e59915e
to
b288fff
Compare
|
|
unfinished, moving to backlog until there is time |
9 tasks
|
needs conflict resolution |
butonic
force-pushed
the
oracle-ilike-fix
branch
2 times, most recently
from
1548009
to
6bd1e61
Compare
Codecov Report
@@ Coverage Diff @@
## master #26672 +/- ##
==========================================
Coverage 62.63% 62.63%
- Complexity 18255 18416 +161
==========================================
Files 1145 1145
Lines 68472 68472
Branches 1234 1234
==========================================
Hits 42890 42890
Misses 25221 25221
Partials 361 361
Continue to review full report at Codecov.
|
|
Needs rebase. We have made Provisioning V2 tests as well as Provisioning V1. There are now 2 suites - Between git and drone they are too stupid and do not run your code from the point on |
butonic
force-pushed
the
oracle-ilike-fix
branch
2 times, most recently
from
45fa905
to
7d9da2d
Compare
|
switched from
|
butonic
changed the title
|
@ownclouders rebase |
|
Hey! I'm GitMate.io! This pull request is being rebased automatically. Please DO NOT push while rebase is in progress or your changes would be lost permanently |
|
Automated rebase with GitMate.io was successful! 🎉 |
ownclouders
force-pushed
the
oracle-ilike-fix
branch
from
7d9da2d
to
384eed3
Compare
tomneedham
approved these changes
May 9, 2018
|
backport? |
|
to oc10, yes. will do |
|
This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Analysis
It seems doctrine does not escape the regex parameter. An ILIKE becomes REGEXP_LIKE in https://github.com/owncloud/core/blob/master/lib/private/DB/AdapterOCI8.php#L44 or https://github.com/owncloud/core/blob/master/lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php#L161
The only ILIKE in OC\Files\Cache\Cache is https://github.com/owncloud/core/blob/master/lib/private/Files/Cache/Cache.php#L595
and the search pattern is normalized in https://github.com/owncloud/core/blob/master/lib/private/Files/Cache/Cache.php#L833:
Conclusion
add tests containingtracked in add tests containing[and]in path names and search patterns forsearch()[and]in path names and search patterns forsearch()#31394to fix escape regex chars on oracle?no longer using regexcheck other usages of ILIKE:no longer neededhttps://github.com/owncloud/core/blob/master/lib/private/Repair/RepairMimeTypes.php#L102https://github.com/owncloud/core/blob/master/apps/dav/lib/CardDAV/CardDavBackend.php#L778