allow to use case sensitive regexp matching

atk4 · Apr 23, 2024 · 235b4ea · 235b4ea
1 parent b593f88
commit 235b4ea
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/src/Persistence/Sql/Mysql/Query.php b/src/Persistence/Sql/Mysql/Query.php
@@ -54,7 +54,7 @@ protected function _renderConditionLikeOperator(bool $negated, string $sqlLeft,
     }
 
     #[\Override]
-    protected function _renderConditionRegexpOperator(bool $negated, string $sqlLeft, string $sqlRight): string
+    protected function _renderConditionRegexpOperator(bool $negated, string $sqlLeft, string $sqlRight, ?bool $caseSensitive = null): string
     {
         $serverVersion = $this->connection->getConnection()->getWrappedConnection()->getServerVersion(); // @phpstan-ignore-line
         $isMysql5x = str_starts_with($serverVersion, '5.') && !str_contains($serverVersion, 'MariaDB');

diff --git a/src/Persistence/Sql/Oracle/Query.php b/src/Persistence/Sql/Oracle/Query.php
@@ -18,10 +18,10 @@ class Query extends BaseQuery
     protected string $expressionClass = Expression::class;
 
     #[\Override]
-    protected function _renderConditionRegexpOperator(bool $negated, string $sqlLeft, string $sqlRight): string
+    protected function _renderConditionRegexpOperator(bool $negated, string $sqlLeft, string $sqlRight, ?bool $caseSensitive = null): string
     {
         return ($negated ? 'not ' : '') . 'regexp_like(' . $sqlLeft . ', ' . $sqlRight
-            . ', ' . $this->escapeStringLiteral('in') . ')';
+            . ', ' . $this->escapeStringLiteral(($caseSensitive ? '' : 'i') . 'n') . ')';
     }
 
     #[\Override]

diff --git a/src/Persistence/Sql/Postgresql/Query.php b/src/Persistence/Sql/Postgresql/Query.php
@@ -33,9 +33,9 @@ protected function _renderConditionLikeOperator(bool $negated, string $sqlLeft,
 
     // needed for PostgreSQL v14 and lower
     #[\Override]
-    protected function _renderConditionRegexpOperator(bool $negated, string $sqlLeft, string $sqlRight): string
+    protected function _renderConditionRegexpOperator(bool $negated, string $sqlLeft, string $sqlRight, ?bool $caseSensitive = null): string
     {
-        return $sqlLeft . ' ' . ($negated ? '!' : '') . '~* ' . $sqlRight;
+        return $sqlLeft . ' ' . ($negated ? '!' : '') . '~' . ($caseSensitive ? '' : '*') . ' ' . $sqlRight;
     }
 
     #[\Override]

diff --git a/src/Persistence/Sql/Query.php b/src/Persistence/Sql/Query.php
@@ -572,10 +572,10 @@ protected function _renderConditionLikeOperator(bool $negated, string $sqlLeft,
             . ' escape ' . $this->escapeStringLiteral('\\');
     }
 
-    protected function _renderConditionRegexpOperator(bool $negated, string $sqlLeft, string $sqlRight): string
+    protected function _renderConditionRegexpOperator(bool $negated, string $sqlLeft, string $sqlRight, ?bool $caseSensitive = null): string
     {
         return ($negated ? 'not ' : '') . 'regexp_like(' . $sqlLeft . ', ' . $sqlRight
-            . ', ' . $this->escapeStringLiteral('is') . ')';
+            . ', ' . $this->escapeStringLiteral(($caseSensitive ? '' : 'i') . 's') . ')';
     }
 
     /**

diff --git a/src/Persistence/Sql/Sqlite/Query.php b/src/Persistence/Sql/Sqlite/Query.php
@@ -113,7 +113,7 @@ function ($sqlLeft, $sqlRight) {
                 $res = '('
                     . parent::_renderConditionLikeOperator(false, $sqlLeft, $sqlRight)
                     . ' and ((' . $sqlLeft . ' = lower(' . $sqlLeft . ') and ' . $sqlLeft . ' = upper(' . $sqlLeft . '))'
-                    . ' or ' . preg_replace('~(?<=\')i(?=s\'\)$)~', '', $this->_renderConditionRegexpOperator(
+                    . ' or ' . $this->_renderConditionRegexpOperator(
                         false,
                         $sqlLeft,
                         'concat(' . $this->escapeStringLiteral('^') . ',' . $regexReplaceSqlFx(
@@ -128,8 +128,9 @@ function ($sqlLeft, $sqlRight) {
                             ),
                             '(?<!\\\)(\\\\\\\)*\K\\\(?=[_%])',
                             ''
-                        ) . ', ' . $this->escapeStringLiteral('$') . ')'
-                    )) . '))';
+                        ) . ', ' . $this->escapeStringLiteral('$') . ')',
+                        true
+                    ) . '))';
 
                 return $res;
             }