Query escape rebuild to support non Latin character sets

Author: pdphilip

src/Connection.php

@@ -8,48 +8,47 @@
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use InvalidArgumentException;
-use phpDocumentor\Reflection\Types\Scalar;
 use RuntimeException;
 
 
 class Connection extends BaseConnection
 {
-
+    
     protected $client;
     protected $index;
     protected $maxSize;
     protected $indexPrefix;
-
-
+    
+    
     public function __construct(array $config)
     {
         $this->config = $config;
-
+        
         if (!empty($config['index_prefix'])) {
             $this->indexPrefix = $config['index_prefix'];
         }
-
+        
         $this->client = $this->buildConnection();
-
+        
         $this->useDefaultPostProcessor();
-
+        
         $this->useDefaultSchemaGrammar();
-
+        
         $this->useDefaultQueryGrammar();
-
+        
     }
-
+    
     public function getIndexPrefix()
     {
         return $this->indexPrefix;
     }
-
-
+    
+    
     public function getTablePrefix()
     {
         return $this->getIndexPrefix();
     }
-
+    
     public function setIndex($index)
     {
         $this->index = $index;
@@ -58,98 +57,98 @@ public function setIndex($index)
                 $this->index = $this->indexPrefix.'_'.$index;
             }
         }
-
+        
         return $this->getIndex();
     }
-
+    
     public function getSchemaGrammar()
     {
         return new Schema\Grammar($this);
     }
-
+    
     public function getIndex()
     {
         return $this->index;
     }
-
+    
     public function setMaxSize($value)
     {
         $this->maxSize = $value;
     }
-
+    
     public function table($table, $as = null)
     {
         return $this->setIndex($table);
     }
-
-
+    
+    
     /**
      * @inheritdoc
      */
     public function getSchemaBuilder()
     {
         return new Schema\Builder($this);
     }
-
-
+    
+    
     /**
      * @inheritdoc
      */
     public function disconnect()
     {
         unset($this->connection);
     }
-
-
+    
+    
     /**
      * @inheritdoc
      */
     public function getDriverName()
     {
         return 'elasticsearch';
     }
-
+    
     /**
      * @inheritdoc
      */
     protected function getDefaultPostProcessor()
     {
         return new Query\Processor();
     }
-
+    
     /**
      * @inheritdoc
      */
     protected function getDefaultQueryGrammar()
     {
         return new Query\Grammar();
     }
-
+    
     /**
      * @inheritdoc
      */
     protected function getDefaultSchemaGrammar()
     {
         return new Schema\Grammar();
     }
-
-
+    
+    
     //----------------------------------------------------------------------
     // Connection Builder
     //----------------------------------------------------------------------
-
+    
     protected function buildConnection()
     {
         $type = config('database.connections.elasticsearch.auth_type') ?? null;
         $type = strtolower($type);
         if (!in_array($type, ['http', 'cloud', 'api'])) {
             throw new RuntimeException('Invalid [auth_type] in database config. Must be: http, cloud or api');
         }
-
+        
         return $this->{'_'.$type.'Connection'}();
-
+        
     }
-
+    
     protected function _httpConnection()
     {
         $hosts = config('database.connections.elasticsearch.hosts') ?? null;
@@ -163,10 +162,10 @@ protected function _httpConnection()
         if ($certPath) {
             $cb->setSSLVerification($certPath);
         }
-
+        
         return $cb->build();
     }
-
+    
     protected function _cloudConnection()
     {
         $cloudId = config('database.connections.elasticsearch.cloud_id') ?? null;
@@ -184,11 +183,11 @@ protected function _cloudConnection()
         if ($certPath) {
             $cb->setSSLVerification($certPath);
         }
-
+        
         return $cb->build();
     }
-
-
+    
+    
     protected function _apiConnection()
     {
         $apiId = config('database.connections.elasticsearch.api_id') ?? null;
@@ -198,19 +197,19 @@ protected function _apiConnection()
         if ($certPath) {
             $cb->setSSLVerification($certPath);
         }
-
+        
         return $cb->build();
     }
-
-
+    
+    
     //----------------------------------------------------------------------
     // Dynamic call routing to DSL bridge
     //----------------------------------------------------------------------
-
+    
     public function __call($method, $parameters)
     {
         $bridge = new Bridge($this->client, $this->index, $this->maxSize);
-
+        
         return $bridge->{'process'.Str::studly($method)}(...$parameters);
     }
 }

src/DSL/QueryBuilder.php

@@ -254,19 +254,14 @@ private static function _parseParams($key, $value): string
 
     }
 
-    public static function _escape($string): string
+    public static function _escape($value): string
     {
-        //+ - = && || > < ! ( ) { } [ ] ^ " ~ * ? : \ /
-        $stripped = preg_replace('/\W/', '\\\\$0', $string);
-        
-        //Put the spaces back;
-        $stripped = str_replace('\ ', ' ', $stripped);
-        //Edge cases
-        $stripped = str_replace('\&\&', '\&&', $stripped);
-        $stripped = str_replace('\|\|', '\||', $stripped);
-        
-        return $stripped;
+        $specialChars = ['"', '\\', '~', '^'];
+        foreach ($specialChars as $char) {
+            $value = str_replace($char, "\\".$char, $value);
+        }
 
+        return $value;
     }
 
     private function _buildQuery($wheres): array