A free, self-hostable news aggregator…
Fix SQL errors breaking regex search on MySQL / MariaDB (#9036)
TowyTowy8c5bd58808fe
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.phpindex 500a6f26c..5ed9a2c51 100644--- a/app/Models/EntryDAO.php+++ b/app/Models/EntryDAO.php@@ -1226,7 +1226,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {if ($filter->getIntextRegex() !== null) {if (static::isCompressed()) { // MySQL-onlyforeach ($filter->getIntextRegex() as $content) {- $sub_search .= 'AND ' . static::sqlRegex("UNCOMPRESS({$alias}content_bin)", $content, $values) . ') ';+ $sub_search .= 'AND ' . static::sqlRegex("UNCOMPRESS({$alias}content_bin)", $content, $values) . ' ';}} else {foreach ($filter->getIntextRegex() as $content) {@@ -1295,7 +1295,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {if ($filter->getNotIntextRegex() !== null) {if (static::isCompressed()) { // MySQL-onlyforeach ($filter->getNotIntextRegex() as $content) {- $sub_search .= 'AND NOT ' . static::sqlRegex("UNCOMPRESS({$alias}content_bin)", $content, $values) . ') ';+ $sub_search .= 'AND NOT ' . static::sqlRegex("UNCOMPRESS({$alias}content_bin)", $content, $values) . ' ';}} else {foreach ($filter->getNotIntextRegex() as $content) {@@ -1365,7 +1365,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {foreach ($filter->getNotSearchRegex() as $search_value) {if (static::isCompressed()) { // MySQL-only$sub_search .= 'AND NOT ' . static::sqlRegex($alias . 'title', $search_value, $values) .- ' ANT NOT ' . static::sqlRegex("UNCOMPRESS({$alias}content_bin)", $search_value, $values) . ' ';+ ' AND NOT ' . static::sqlRegex("UNCOMPRESS({$alias}content_bin)", $search_value, $values) . ' ';} else {$sub_search .= 'AND NOT ' . static::sqlRegex($alias . 'title', $search_value, $values) .' AND NOT ' . static::sqlRegex($alias . 'content', $search_value, $values) . ' ';diff --git a/tests/app/Models/SearchTest.php b/tests/app/Models/SearchTest.phpindex 1c8486032..01a23978c 100644--- a/tests/app/Models/SearchTest.php+++ b/tests/app/Models/SearchTest.php@@ -1007,9 +1007,19 @@ final class SearchTest extends \PHPUnit\Framework\TestCase {],['intext:/^ab$/m',- '(UNCOMPRESS(e.content_bin) REGEXP ?))',+ '(UNCOMPRESS(e.content_bin) REGEXP ?)',['(?-i)(?m)^ab$']],+ [+ '-intext:/^ab$/m',+ '(NOT UNCOMPRESS(e.content_bin) REGEXP ?)',+ ['(?-i)(?m)^ab$']+ ],+ [+ '-/^ab$/',+ '(NOT e.title REGEXP ? AND NOT UNCOMPRESS(e.content_bin) REGEXP ?)',+ ['(?-i)^ab$', '(?-i)^ab$']+ ],];}@@ -1045,9 +1055,19 @@ final class SearchTest extends \PHPUnit\Framework\TestCase {],['intext:/^ab$/m',- "(REGEXP_LIKE(UNCOMPRESS(e.content_bin),?,'mc')))",+ "(REGEXP_LIKE(UNCOMPRESS(e.content_bin),?,'mc'))",['^ab$']],+ [+ '-intext:/^ab$/m',+ "(NOT REGEXP_LIKE(UNCOMPRESS(e.content_bin),?,'mc'))",+ ['^ab$']+ ],+ [+ '-/^ab$/',+ "(NOT REGEXP_LIKE(e.title,?,'c') AND NOT REGEXP_LIKE(UNCOMPRESS(e.content_bin),?,'c'))",+ ['^ab$', '^ab$']+ ],];}