From afbfdb87cd5201483b2b19ad5ec733b100423397 Mon Sep 17 00:00:00 2001
From: Senad Uka <senaduka@gmail.com>
Date: Thu, 16 Apr 2020 10:04:13 +0200
Subject: [PATCH] Upstream sync

---
 coverage/.last_run.json            |   2 +-
 coverage/.resultset.json           | 430 +++++++++++++++++++---
 coverage/index.html                | 568 +++++++++++++++--------------
 lib/pg_searchable_regex.rb         |   7 +-
 lib/text_to_regex_query.rb         |  67 ----
 spec/lib/pg_searchable_new_spec.rb |  10 +
 spec/lib/pg_searchable_spec.rb     | 116 ------
 spec/lib/text_to_tsquery_spec.rb   |  82 -----
 version.rb                         |   2 +-
 9 files changed, 686 insertions(+), 598 deletions(-)
 delete mode 100644 lib/text_to_regex_query.rb
 delete mode 100644 spec/lib/pg_searchable_spec.rb
 delete mode 100644 spec/lib/text_to_tsquery_spec.rb

diff --git a/coverage/.last_run.json b/coverage/.last_run.json
index ec12727..8afec4c 100644
--- a/coverage/.last_run.json
+++ b/coverage/.last_run.json
@@ -1,5 +1,5 @@
 {
   "result": {
-    "covered_percent": 66.92
+    "covered_percent": 78.1
   }
 }
diff --git a/coverage/.resultset.json b/coverage/.resultset.json
index ef5ab35..cb0bf64 100644
--- a/coverage/.resultset.json
+++ b/coverage/.resultset.json
@@ -9,69 +9,73 @@
         1,
         1,
         null,
-        0,
-        0,
+        1,
+        1,
         null,
-        0,
+        1,
+        13,
+        null,
+        null,
+        null,
+        null,
+        null,
+        1,
+        1,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        13,
+        13,
+        13,
+        13,
+        13,
+        13,
+        13,
+        13,
+        13,
+        13,
+        null,
+        null,
+        1,
+        13,
+        13,
+        24,
+        23,
+        null,
+        null,
+        null,
+        null,
+        1,
+        24,
+        null,
+        24,
+        null,
+        null,
+        1,
         0,
         null,
         null,
+        1,
+        16,
         null,
         null,
+        1,
+        13,
         null,
-        0,
+        null,
+        1,
         0,
         null,
         null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        null,
-        null,
-        0,
-        0,
-        0,
-        null,
-        null,
-        null,
-        0,
-        0,
-        0,
-        null,
-        null,
-        0,
-        0,
-        null,
-        null,
-        0,
-        0,
-        null,
-        null,
-        0,
-        0,
-        null,
-        null,
-        0,
-        0,
-        null,
-        null,
-        0,
+        1,
         0,
         0,
         0,
@@ -181,57 +185,121 @@
         null
       ],
       "/home/hamo/projects/toptal/outfrontmedia/pg_searchable/lib/text_to_sql_query.rb": [
+        1,
         null,
+        1,
+        1,
+        44,
+        44,
+        44,
+        44,
+        114,
+        114,
+        114,
         null,
+        44,
+        13,
         null,
         null,
         null,
+        1,
+        44,
+        44,
+        44,
         null,
         null,
+        1,
         null,
+        1,
+        128,
+        128,
+        128,
         null,
+        23,
+        23,
         null,
+        22,
         null,
+        15,
         null,
+        10,
         null,
+        10,
+        0,
         null,
         null,
+        10,
+        10,
         null,
+        10,
         null,
         null,
         null,
+        58,
+        58,
+        58,
+        2,
         null,
+        56,
         null,
         null,
         null,
         null,
+        1,
+        37,
+        0,
         null,
         null,
+        37,
+        37,
         null,
+        37,
+        0,
         null,
         null,
+        37,
+        0,
         null,
         null,
+        37,
+        37,
         null,
+        37,
+        37,
         null,
+        37,
         null,
         null,
+        1,
+        81,
+        81,
+        81,
+        81,
+        81,
         null,
+        null
+      ],
+      "/home/hamo/projects/toptal/outfrontmedia/pg_searchable/lib/parser.rb": [
         null,
         null,
         null,
         null,
         null,
         null,
+        1,
         null,
+        1,
         null,
+        1,
         null,
+        1,
         null,
         null,
         null,
         null,
         null,
         null,
+        1,
         null,
         null,
         null,
@@ -240,6 +308,7 @@
         null,
         null,
         null,
+        1,
         null,
         null,
         null,
@@ -248,22 +317,29 @@
         null,
         null,
         null,
+        1,
         null,
         null,
         null,
+        1,
         null,
         null,
         null,
+        1,
         null,
         null,
         null,
+        1,
         null,
         null,
         null,
+        1,
         null,
         null,
+        1,
         null,
         null,
+        1,
         null,
         null,
         null,
@@ -273,9 +349,255 @@
         null,
         null,
         null,
+        null,
+        null,
+        null,
+        null,
+        1,
+        null,
+        1,
+        null,
+        1,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        1,
+        null,
+        1,
+        null,
+        1,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        1,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        1,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        1,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        1,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        1,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        1,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        1,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        1,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        1,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        1,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        1,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        1,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        1,
+        0,
+        null,
+        null,
+        null
+      ],
+      "/home/hamo/projects/toptal/outfrontmedia/pg_searchable/lib/lexer.rb": [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        1,
+        1,
+        1,
+        null,
+        1,
+        null,
+        1,
+        1,
+        1,
+        null,
+        1,
+        132,
+        132,
+        132,
+        null,
+        null,
+        1,
+        702,
+        null,
+        null,
+        1,
+        94,
+        94,
+        null,
+        1,
+        null,
+        1,
+        0,
+        0,
+        0,
+        null,
+        null,
+        null,
+        1,
+        0,
+        0,
+        null,
+        null,
+        null,
+        1,
+        834,
+        null,
+        null,
+        703,
+        703,
+        null,
+        null,
+        1,
+        939,
+        939,
+        939,
+        null,
+        null,
+        939,
+        null,
+        null,
+        702,
+        106,
+        null,
+        649,
+        106,
+        null,
+        596,
+        84,
+        null,
+        554,
+        84,
+        null,
+        512,
+        46,
+        null,
+        489,
+        132,
+        null,
+        423,
+        610,
+        null,
+        118,
+        236,
+        null,
+        null,
+        null,
+        0,
+        0,
+        939,
+        null,
+        null,
+        0,
+        null,
+        237,
+        null,
+        null,
+        1,
+        38,
+        38,
+        38,
+        174,
+        null,
+        38,
+        null,
         null
       ]
     },
-    "timestamp": 1580827025
+    "timestamp": 1583928139
   }
 }
diff --git a/coverage/index.html b/coverage/index.html
index 55faeff..5828793 100644
--- a/coverage/index.html
+++ b/coverage/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns='http://www.w3.org/1999/xhtml'>
   <head>
-    <title>Code coverage for Gem</title>
+    <title>Code coverage for Pg searchable</title>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
     <script src='./assets/0.10.2/application.js' type='text/javascript'></script>    
     <link href='./assets/0.10.2/application.css' media='screen, projection, print' rel='stylesheet' type='text/css'>
@@ -14,27 +14,27 @@
       <img src="./assets/0.10.2/loading.gif" alt="loading"/>
     </div>
     <div id="wrapper" style="display:none;">
-      <div class="timestamp">Generated <abbr class="timeago" title="2020-02-11T11:17:04+01:00">2020-02-11T11:17:04+01:00</abbr></div>
+      <div class="timestamp">Generated <abbr class="timeago" title="2020-03-11T13:02:19+01:00">2020-03-11T13:02:19+01:00</abbr></div>
       <ul class="group_tabs"></ul>
 
       <div id="content">
         <div class="file_list_container" id="AllFiles">
   <h2>
     <span class="group_name">All Files</span>
-    (<span class="covered_percent"><span class="red">74.27%</span></span>
+    (<span class="covered_percent"><span class="red">78.1%</span></span>
      covered at
      <span class="covered_strength">
        <span class="green">
-         15.07
+         69.62
        </span>
     </span> hits/line)
   </h2>
   <a name="AllFiles"></a>
   <div>
     <b>5</b> files in total.
-    <b>241</b> relevant lines. 
-    <span class="green"><b>179</b> lines covered</span> and
-    <span class="red"><b>62</b> lines missed </span>
+    <b>242</b> relevant lines. 
+    <span class="green"><b>189</b> lines covered</span> and
+    <span class="red"><b>53</b> lines missed </span>
   </div>
   <table class="file_list">
     <thead>
@@ -51,17 +51,17 @@
     <tbody>
       
       <tr>
-        <td class="strong"><a href="#8bdd1a7024327468611f78401de83c4595f3e68a" class="src_link" title="lib/lexer.rb">lib/lexer.rb</a></td>
-        <td class="red strong">78.33 %</td>
+        <td class="strong"><a href="#a29538796e1cb41001a28dcef0fd438a7ef047d5" class="src_link" title="lib/lexer.rb">lib/lexer.rb</a></td>
+        <td class="yellow strong">86.67 %</td>
         <td>107</td>
         <td>60</td>
-        <td>47</td>
-        <td>13</td>
-        <td>38.4</td>
+        <td>52</td>
+        <td>8</td>
+        <td>237.5</td>
       </tr>
       
       <tr>
-        <td class="strong"><a href="#c48f18b5f0fef3885a665cd1c7c0b9f56cb7ae3f" class="src_link" title="lib/parser.rb">lib/parser.rb</a></td>
+        <td class="strong"><a href="#0e10d086d9e94647296f9b86811e08309003f41c" class="src_link" title="lib/parser.rb">lib/parser.rb</a></td>
         <td class="green strong">96.97 %</td>
         <td>207</td>
         <td>33</td>
@@ -71,32 +71,32 @@
       </tr>
       
       <tr>
-        <td class="strong"><a href="#d117fe7f9c114ba1ed0747fdd07c52db5f9efd3d" class="src_link" title="lib/pg_searchable_regex.rb">lib/pg_searchable_regex.rb</a></td>
-        <td class="red strong">78.95 %</td>
-        <td>77</td>
-        <td>38</td>
-        <td>30</td>
-        <td>8</td>
-        <td>5.2</td>
+        <td class="strong"><a href="#753228502df7d7eba3c0631f5c2586671ab90064" class="src_link" title="lib/pg_searchable_regex.rb">lib/pg_searchable_regex.rb</a></td>
+        <td class="yellow strong">87.5 %</td>
+        <td>80</td>
+        <td>40</td>
+        <td>35</td>
+        <td>5</td>
+        <td>7.7</td>
       </tr>
       
       <tr>
-        <td class="strong"><a href="#144ef83f0f841a5129d4d73bb43ac96bb9379623" class="src_link" title="lib/text_to_sql_query.rb">lib/text_to_sql_query.rb</a></td>
+        <td class="strong"><a href="#ce19b53ff8fa35fd6a57aa6b7ede25d3648dd01c" class="src_link" title="lib/text_to_sql_query.rb">lib/text_to_sql_query.rb</a></td>
         <td class="green strong">92.86 %</td>
         <td>93</td>
         <td>56</td>
         <td>52</td>
         <td>4</td>
-        <td>19.3</td>
+        <td>40.0</td>
       </tr>
       
       <tr>
-        <td class="strong"><a href="#873beef35223be09fc913530f10925cade05c882" class="src_link" title="lib/text_to_tsquery.rb">lib/text_to_tsquery.rb</a></td>
-        <td class="red strong">33.33 %</td>
+        <td class="strong"><a href="#1f620dc5aa56fc59374eab391bb6c70e9b12c49b" class="src_link" title="lib/text_to_tsquery.rb">lib/text_to_tsquery.rb</a></td>
+        <td class="red strong">33.96 %</td>
         <td>99</td>
-        <td>54</td>
+        <td>53</td>
         <td>18</td>
-        <td>36</td>
+        <td>35</td>
         <td>0.3</td>
       </tr>
       
@@ -116,14 +116,14 @@
     
       <div class="source_files">
       
-        <div class="source_table" id="8bdd1a7024327468611f78401de83c4595f3e68a">
+        <div class="source_table" id="a29538796e1cb41001a28dcef0fd438a7ef047d5">
   <div class="header">
     <h3>lib/lexer.rb</h3>
-    <h4><span class="red">78.33 %</span> covered</h4>
+    <h4><span class="yellow">86.67 %</span> covered</h4>
     <div>
       <b>60</b> relevant lines. 
-      <span class="green"><b>47</b> lines covered</span> and
-      <span class="red"><b>13</b> lines missed.</span>
+      <span class="green"><b>52</b> lines covered</span> and
+      <span class="red"><b>8</b> lines missed.</span>
     </div>
   </div>
   
@@ -232,20 +232,20 @@
           <code class="ruby">      def scan_setup(str)</code>
         </li>
       
-        <li class="covered" data-hits="20" data-linenumber="18">
-          <span class="hits">20</span>
+        <li class="covered" data-hits="132" data-linenumber="18">
+          <span class="hits">132</span>
           
           <code class="ruby">        @ss = StringScanner.new(str)</code>
         </li>
       
-        <li class="covered" data-hits="20" data-linenumber="19">
-          <span class="hits">20</span>
+        <li class="covered" data-hits="132" data-linenumber="19">
+          <span class="hits">132</span>
           
           <code class="ruby">        @lineno =  1</code>
         </li>
       
-        <li class="covered" data-hits="20" data-linenumber="20">
-          <span class="hits">20</span>
+        <li class="covered" data-hits="132" data-linenumber="20">
+          <span class="hits">132</span>
           
           <code class="ruby">        @state  = nil</code>
         </li>
@@ -268,8 +268,8 @@
           <code class="ruby">      def action</code>
         </li>
       
-        <li class="covered" data-hits="113" data-linenumber="24">
-          <span class="hits">113</span>
+        <li class="covered" data-hits="702" data-linenumber="24">
+          <span class="hits">702</span>
           
           <code class="ruby">        yield</code>
         </li>
@@ -292,14 +292,14 @@
           <code class="ruby">      def scan_str(str)</code>
         </li>
       
-        <li class="covered" data-hits="20" data-linenumber="28">
-          <span class="hits">20</span>
+        <li class="covered" data-hits="94" data-linenumber="28">
+          <span class="hits">94</span>
           
           <code class="ruby">        scan_setup(str)</code>
         </li>
       
-        <li class="covered" data-hits="20" data-linenumber="29">
-          <span class="hits">20</span>
+        <li class="covered" data-hits="94" data-linenumber="29">
+          <span class="hits">94</span>
           
           <code class="ruby">        do_parse</code>
         </li>
@@ -406,8 +406,8 @@
           <code class="ruby">        def next_token</code>
         </li>
       
-        <li class="covered" data-hits="133" data-linenumber="47">
-          <span class="hits">133</span>
+        <li class="covered" data-hits="834" data-linenumber="47">
+          <span class="hits">834</span>
           
           <code class="ruby">          return if @ss.eos?</code>
         </li>
@@ -424,14 +424,14 @@
           <code class="ruby">          # skips empty actions</code>
         </li>
       
-        <li class="covered" data-hits="113" data-linenumber="50">
-          <span class="hits">113</span>
+        <li class="covered" data-hits="703" data-linenumber="50">
+          <span class="hits">703</span>
           
           <code class="ruby">          until token = _next_token or @ss.eos?; end</code>
         </li>
       
-        <li class="covered" data-hits="113" data-linenumber="51">
-          <span class="hits">113</span>
+        <li class="covered" data-hits="703" data-linenumber="51">
+          <span class="hits">703</span>
           
           <code class="ruby">          token</code>
         </li>
@@ -454,20 +454,20 @@
           <code class="ruby">        def _next_token</code>
         </li>
       
-        <li class="covered" data-hits="155" data-linenumber="55">
-          <span class="hits">155</span>
+        <li class="covered" data-hits="939" data-linenumber="55">
+          <span class="hits">939</span>
           
           <code class="ruby">          text = @ss.peek(1)</code>
         </li>
       
-        <li class="covered" data-hits="155" data-linenumber="56">
-          <span class="hits">155</span>
+        <li class="covered" data-hits="939" data-linenumber="56">
+          <span class="hits">939</span>
           
           <code class="ruby">          @lineno  +=  1  if text == &quot;\n&quot;</code>
         </li>
       
-        <li class="covered" data-hits="155" data-linenumber="57">
-          <span class="hits">155</span>
+        <li class="covered" data-hits="939" data-linenumber="57">
+          <span class="hits">939</span>
           
           <code class="ruby">          token = case @state</code>
         </li>
@@ -484,8 +484,8 @@
           <code class="ruby">          case</code>
         </li>
       
-        <li class="covered" data-hits="155" data-linenumber="60">
-          <span class="hits">155</span>
+        <li class="covered" data-hits="939" data-linenumber="60">
+          <span class="hits">939</span>
           
           <code class="ruby">                  when (text = @ss.scan(/ +/))</code>
         </li>
@@ -502,14 +502,14 @@
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="113" data-linenumber="63">
-          <span class="hits">113</span>
+        <li class="covered" data-hits="702" data-linenumber="63">
+          <span class="hits">702</span>
           
           <code class="ruby">                  when (text = @ss.scan(/\(/))</code>
         </li>
       
-        <li class="covered" data-hits="12" data-linenumber="64">
-          <span class="hits">12</span>
+        <li class="covered" data-hits="106" data-linenumber="64">
+          <span class="hits">106</span>
           
           <code class="ruby">                     action { return [:L_BRACKET, text] }</code>
         </li>
@@ -520,14 +520,14 @@
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="107" data-linenumber="66">
-          <span class="hits">107</span>
+        <li class="covered" data-hits="649" data-linenumber="66">
+          <span class="hits">649</span>
           
           <code class="ruby">                  when (text = @ss.scan(/\)/))</code>
         </li>
       
-        <li class="covered" data-hits="12" data-linenumber="67">
-          <span class="hits">12</span>
+        <li class="covered" data-hits="106" data-linenumber="67">
+          <span class="hits">106</span>
           
           <code class="ruby">                     action { return [:R_BRACKET, text] }</code>
         </li>
@@ -538,14 +538,14 @@
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="101" data-linenumber="69">
-          <span class="hits">101</span>
+        <li class="covered" data-hits="596" data-linenumber="69">
+          <span class="hits">596</span>
           
           <code class="ruby">                  when (text = @ss.scan(/(?i)\bor\b/))</code>
         </li>
       
-        <li class="covered" data-hits="14" data-linenumber="70">
-          <span class="hits">14</span>
+        <li class="covered" data-hits="84" data-linenumber="70">
+          <span class="hits">84</span>
           
           <code class="ruby">                     action { return [:OPERATOR_OR, text] }</code>
         </li>
@@ -556,14 +556,14 @@
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="94" data-linenumber="72">
-          <span class="hits">94</span>
+        <li class="covered" data-hits="554" data-linenumber="72">
+          <span class="hits">554</span>
           
           <code class="ruby">                  when (text = @ss.scan(/(?i)\band\b/))</code>
         </li>
       
-        <li class="covered" data-hits="16" data-linenumber="73">
-          <span class="hits">16</span>
+        <li class="covered" data-hits="84" data-linenumber="73">
+          <span class="hits">84</span>
           
           <code class="ruby">                     action { return [:OPERATOR_AND, text] }</code>
         </li>
@@ -574,14 +574,14 @@
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="86" data-linenumber="75">
-          <span class="hits">86</span>
+        <li class="covered" data-hits="512" data-linenumber="75">
+          <span class="hits">512</span>
           
           <code class="ruby">                  when (text = @ss.scan(/(?i)\bnot\b/))</code>
         </li>
       
-        <li class="covered" data-hits="10" data-linenumber="76">
-          <span class="hits">10</span>
+        <li class="covered" data-hits="46" data-linenumber="76">
+          <span class="hits">46</span>
           
           <code class="ruby">                     action { return [:OPERATOR_NOT, text] }</code>
         </li>
@@ -592,14 +592,14 @@
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="81" data-linenumber="78">
-          <span class="hits">81</span>
+        <li class="covered" data-hits="489" data-linenumber="78">
+          <span class="hits">489</span>
           
           <code class="ruby">                  when (text = @ss.scan(/&quot;([^&quot;]*)&quot;/))</code>
         </li>
       
-        <li class="covered" data-hits="18" data-linenumber="79">
-          <span class="hits">18</span>
+        <li class="covered" data-hits="132" data-linenumber="79">
+          <span class="hits">132</span>
           
           <code class="ruby">                     action { return [:TERM_WITH_QUOTES, text] }</code>
         </li>
@@ -610,14 +610,14 @@
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="72" data-linenumber="81">
-          <span class="hits">72</span>
+        <li class="covered" data-hits="423" data-linenumber="81">
+          <span class="hits">423</span>
           
           <code class="ruby">                  when (text = @ss.scan(/[a-zA-Z0-9\-_]+/))</code>
         </li>
       
-        <li class="covered" data-hits="104" data-linenumber="82">
-          <span class="hits">104</span>
+        <li class="covered" data-hits="610" data-linenumber="82">
+          <span class="hits">610</span>
           
           <code class="ruby">                     action { return [:TERM_WITHOUT_QUOTES, text] }</code>
         </li>
@@ -628,14 +628,14 @@
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="20" data-linenumber="84">
-          <span class="hits">20</span>
+        <li class="covered" data-hits="118" data-linenumber="84">
+          <span class="hits">118</span>
           
           <code class="ruby">                  when (text = @ss.scan(/\:/))</code>
         </li>
       
-        <li class="covered" data-hits="40" data-linenumber="85">
-          <span class="hits">40</span>
+        <li class="covered" data-hits="236" data-linenumber="85">
+          <span class="hits">236</span>
           
           <code class="ruby">                     action { return [:COLON, text] }</code>
         </li>
@@ -670,8 +670,8 @@
           <code class="ruby">            raise  ScanError, &quot;can not match: &#39;&quot; + text + &quot;&#39;&quot;</code>
         </li>
       
-        <li class="covered" data-hits="155" data-linenumber="91">
-          <span class="hits">155</span>
+        <li class="covered" data-hits="939" data-linenumber="91">
+          <span class="hits">939</span>
           
           <code class="ruby">          end  # if</code>
         </li>
@@ -700,8 +700,8 @@
           <code class="ruby">        end  # case state</code>
         </li>
       
-        <li class="covered" data-hits="42" data-linenumber="96">
-          <span class="hits">42</span>
+        <li class="covered" data-hits="237" data-linenumber="96">
+          <span class="hits">237</span>
           
           <code class="ruby">          token</code>
         </li>
@@ -724,26 +724,26 @@
           <code class="ruby">  def tokenize(code)</code>
         </li>
       
-        <li class="missed" data-hits="0" data-linenumber="100">
-          
+        <li class="covered" data-hits="38" data-linenumber="100">
+          <span class="hits">38</span>
           
           <code class="ruby">    scan_setup(code)</code>
         </li>
       
-        <li class="missed" data-hits="0" data-linenumber="101">
-          
+        <li class="covered" data-hits="38" data-linenumber="101">
+          <span class="hits">38</span>
           
           <code class="ruby">    tokens = []</code>
         </li>
       
-        <li class="missed" data-hits="0" data-linenumber="102">
-          
+        <li class="covered" data-hits="38" data-linenumber="102">
+          <span class="hits">38</span>
           
           <code class="ruby">    while token = next_token</code>
         </li>
       
-        <li class="missed" data-hits="0" data-linenumber="103">
-          
+        <li class="covered" data-hits="174" data-linenumber="103">
+          <span class="hits">174</span>
           
           <code class="ruby">      tokens &lt;&lt; token</code>
         </li>
@@ -754,8 +754,8 @@
           <code class="ruby">    end</code>
         </li>
       
-        <li class="missed" data-hits="0" data-linenumber="105">
-          
+        <li class="covered" data-hits="38" data-linenumber="105">
+          <span class="hits">38</span>
           
           <code class="ruby">    tokens</code>
         </li>
@@ -777,7 +777,7 @@
 </div>
 
       
-        <div class="source_table" id="c48f18b5f0fef3885a665cd1c7c0b9f56cb7ae3f">
+        <div class="source_table" id="0e10d086d9e94647296f9b86811e08309003f41c">
   <div class="header">
     <h3>lib/parser.rb</h3>
     <h4><span class="green">96.97 %</span> covered</h4>
@@ -2038,14 +2038,14 @@
 </div>
 
       
-        <div class="source_table" id="d117fe7f9c114ba1ed0747fdd07c52db5f9efd3d">
+        <div class="source_table" id="753228502df7d7eba3c0631f5c2586671ab90064">
   <div class="header">
     <h3>lib/pg_searchable_regex.rb</h3>
-    <h4><span class="red">78.95 %</span> covered</h4>
+    <h4><span class="yellow">87.5 %</span> covered</h4>
     <div>
-      <b>38</b> relevant lines. 
-      <span class="green"><b>30</b> lines covered</span> and
-      <span class="red"><b>8</b> lines missed.</span>
+      <b>40</b> relevant lines. 
+      <span class="green"><b>35</b> lines covered</span> and
+      <span class="red"><b>5</b> lines missed.</span>
     </div>
   </div>
   
@@ -2319,196 +2319,214 @@
         <li class="covered" data-hits="13" data-linenumber="45">
           <span class="hits">13</span>
           
-          <code class="ruby">        scope ts_scope_method, -&gt;(value) { ts_search(value) }</code>
+          <code class="ruby">        scope ts_scope_method, -&gt;(value) do</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="46">
+        <li class="covered" data-hits="24" data-linenumber="46">
+          <span class="hits">24</span>
           
-          
-          <code class="ruby">      end</code>
+          <code class="ruby">          resulting_ids = ts_search(value).map(&amp;:id)</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="47">
+        <li class="covered" data-hits="23" data-linenumber="47">
+          <span class="hits">23</span>
           
-          
-          <code class="ruby">    end</code>
+          <code class="ruby">          where(id: resulting_ids)</code>
         </li>
       
         <li class="never" data-hits="" data-linenumber="48">
           
           
+          <code class="ruby">        end</code>
+        </li>
+      
+        <li class="never" data-hits="" data-linenumber="49">
+          
+          
+          <code class="ruby">      end</code>
+        </li>
+      
+        <li class="never" data-hits="" data-linenumber="50">
+          
+          
+          <code class="ruby">    end</code>
+        </li>
+      
+        <li class="never" data-hits="" data-linenumber="51">
+          
+          
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="49">
+        <li class="covered" data-hits="1" data-linenumber="52">
           <span class="hits">1</span>
           
           <code class="ruby">    def ts_search(value)</code>
         </li>
       
-        <li class="missed" data-hits="0" data-linenumber="50">
-          
+        <li class="covered" data-hits="24" data-linenumber="53">
+          <span class="hits">24</span>
           
           <code class="ruby">      return if @ts_search_fields.blank? || value.blank?</code>
         </li>
       
-        <li class="missed" data-hits="0" data-linenumber="51">
-          
-          
-          <code class="ruby">      includes(@ts_joins).references(:all).where(</code>
-        </li>
-      
-        <li class="never" data-hits="" data-linenumber="52">
-          
-          
-          <code class="ruby">      TextToSqlQuery.new(value, @ts_search_fields, @default_field, @ts_search_fields_mappings).where_clause)</code>
-        </li>
-      
-        <li class="never" data-hits="" data-linenumber="53">
-          
-          
-          <code class="ruby">    end</code>
-        </li>
-      
         <li class="never" data-hits="" data-linenumber="54">
           
           
-          <code class="ruby"></code>
+          <code class="ruby">      includes(@ts_joins).references(:all).where(</code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="55">
-          <span class="hits">1</span>
+        <li class="covered" data-hits="24" data-linenumber="55">
+          <span class="hits">24</span>
           
-          <code class="ruby">    def should_update_cache_field?</code>
+          <code class="ruby">        TextToSqlQuery.new(value, @ts_search_fields, @default_field, @ts_search_fields_mappings).where_clause).distinct</code>
         </li>
       
-        <li class="missed" data-hits="0" data-linenumber="56">
+        <li class="never" data-hits="" data-linenumber="56">
           
           
-          <code class="ruby">      !@ts_skip_cache_update &amp;&amp; @ts_cache_field.present?</code>
+          <code class="ruby">    end</code>
         </li>
       
         <li class="never" data-hits="" data-linenumber="57">
           
           
-          <code class="ruby">    end</code>
-        </li>
-      
-        <li class="never" data-hits="" data-linenumber="58">
-          
-          
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="59">
+        <li class="covered" data-hits="1" data-linenumber="58">
           <span class="hits">1</span>
           
-          <code class="ruby">    def ts_cache_field</code>
+          <code class="ruby">    def should_update_cache_field?</code>
         </li>
       
-        <li class="missed" data-hits="0" data-linenumber="60">
+        <li class="missed" data-hits="0" data-linenumber="59">
           
           
-          <code class="ruby">      @ts_cache_field</code>
+          <code class="ruby">      !@ts_skip_cache_update &amp;&amp; @ts_cache_field.present?</code>
+        </li>
+      
+        <li class="never" data-hits="" data-linenumber="60">
+          
+          
+          <code class="ruby">    end</code>
         </li>
       
         <li class="never" data-hits="" data-linenumber="61">
           
           
-          <code class="ruby">    end</code>
-        </li>
-      
-        <li class="never" data-hits="" data-linenumber="62">
-          
-          
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="63">
+        <li class="covered" data-hits="1" data-linenumber="62">
           <span class="hits">1</span>
           
-          <code class="ruby">    def ts_scope_method</code>
+          <code class="ruby">    def ts_cache_field</code>
         </li>
       
-        <li class="covered" data-hits="13" data-linenumber="64">
-          <span class="hits">13</span>
+        <li class="covered" data-hits="16" data-linenumber="63">
+          <span class="hits">16</span>
           
-          <code class="ruby">      @ts_scope_method</code>
+          <code class="ruby">      @ts_cache_field</code>
+        </li>
+      
+        <li class="never" data-hits="" data-linenumber="64">
+          
+          
+          <code class="ruby">    end</code>
         </li>
       
         <li class="never" data-hits="" data-linenumber="65">
           
           
-          <code class="ruby">    end</code>
-        </li>
-      
-        <li class="never" data-hits="" data-linenumber="66">
-          
-          
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="67">
+        <li class="covered" data-hits="1" data-linenumber="66">
           <span class="hits">1</span>
           
-          <code class="ruby">    def ts_cache_method</code>
+          <code class="ruby">    def ts_scope_method</code>
         </li>
       
-        <li class="missed" data-hits="0" data-linenumber="68">
+        <li class="covered" data-hits="13" data-linenumber="67">
+          <span class="hits">13</span>
+          
+          <code class="ruby">      @ts_scope_method</code>
+        </li>
+      
+        <li class="never" data-hits="" data-linenumber="68">
           
           
-          <code class="ruby">      @ts_cache_method</code>
+          <code class="ruby">    end</code>
         </li>
       
         <li class="never" data-hits="" data-linenumber="69">
           
           
+          <code class="ruby"></code>
+        </li>
+      
+        <li class="covered" data-hits="1" data-linenumber="70">
+          <span class="hits">1</span>
+          
+          <code class="ruby">    def ts_cache_method</code>
+        </li>
+      
+        <li class="missed" data-hits="0" data-linenumber="71">
+          
+          
+          <code class="ruby">      @ts_cache_method</code>
+        </li>
+      
+        <li class="never" data-hits="" data-linenumber="72">
+          
+          
           <code class="ruby">    end</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="70">
+        <li class="never" data-hits="" data-linenumber="73">
           
           
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="71">
+        <li class="covered" data-hits="1" data-linenumber="74">
           <span class="hits">1</span>
           
           <code class="ruby">    def ts_fields_to_vector(extra_data = [])</code>
         </li>
       
-        <li class="missed" data-hits="0" data-linenumber="72">
+        <li class="missed" data-hits="0" data-linenumber="75">
           
           
           <code class="ruby">      field_to_vector = -&gt;(field) { &quot;to_tsvector(&#39;#{@ts_language}&#39;, coalesce(#{field}::text, &#39;&#39;))&quot; }</code>
         </li>
       
-        <li class="missed" data-hits="0" data-linenumber="73">
+        <li class="missed" data-hits="0" data-linenumber="76">
           
           
           <code class="ruby">      data_to_vector = -&gt;(data) { &quot;to_tsvector(&#39;#{@ts_language}&#39;, &#39;#{data}&#39;)&quot; }</code>
         </li>
       
-        <li class="missed" data-hits="0" data-linenumber="74">
+        <li class="missed" data-hits="0" data-linenumber="77">
           
           
           <code class="ruby">      (@ts_search_fields.map(&amp;field_to_vector) + extra_data.map(&amp;data_to_vector)).join(&#39; || &#39;)</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="75">
+        <li class="never" data-hits="" data-linenumber="78">
           
           
           <code class="ruby">    end</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="76">
+        <li class="never" data-hits="" data-linenumber="79">
           
           
           <code class="ruby">  end</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="77">
+        <li class="never" data-hits="" data-linenumber="80">
           
           
           <code class="ruby">end</code>
@@ -2519,7 +2537,7 @@
 </div>
 
       
-        <div class="source_table" id="144ef83f0f841a5129d4d73bb43ac96bb9379623">
+        <div class="source_table" id="ce19b53ff8fa35fd6a57aa6b7ede25d3648dd01c">
   <div class="header">
     <h3>lib/text_to_sql_query.rb</h3>
     <h4><span class="green">92.86 %</span> covered</h4>
@@ -2557,44 +2575,44 @@
           <code class="ruby">  def initialize(text, fields, default_field, fields_mappings = {})</code>
         </li>
       
-        <li class="covered" data-hits="20" data-linenumber="5">
-          <span class="hits">20</span>
+        <li class="covered" data-hits="44" data-linenumber="5">
+          <span class="hits">44</span>
           
           <code class="ruby">    @text = text.to_s.strip</code>
         </li>
       
-        <li class="covered" data-hits="20" data-linenumber="6">
-          <span class="hits">20</span>
+        <li class="covered" data-hits="44" data-linenumber="6">
+          <span class="hits">44</span>
           
           <code class="ruby">    @fields = fields.map(&amp;:to_sym)</code>
         </li>
       
-        <li class="covered" data-hits="20" data-linenumber="7">
-          <span class="hits">20</span>
+        <li class="covered" data-hits="44" data-linenumber="7">
+          <span class="hits">44</span>
           
           <code class="ruby">    @default_field = default_field.to_sym</code>
         </li>
       
-        <li class="covered" data-hits="20" data-linenumber="8">
-          <span class="hits">20</span>
+        <li class="covered" data-hits="44" data-linenumber="8">
+          <span class="hits">44</span>
           
           <code class="ruby">    @fields_mappings = fields_mappings.merge(@fields.reduce({}) do |mappings, field|</code>
         </li>
       
-        <li class="covered" data-hits="42" data-linenumber="9">
-          <span class="hits">42</span>
+        <li class="covered" data-hits="114" data-linenumber="9">
+          <span class="hits">114</span>
           
           <code class="ruby">      _table_name, field_name = field.to_s.split(&#39;.&#39;)</code>
         </li>
       
-        <li class="covered" data-hits="42" data-linenumber="10">
-          <span class="hits">42</span>
+        <li class="covered" data-hits="114" data-linenumber="10">
+          <span class="hits">114</span>
           
           <code class="ruby">      mappings[field_name.to_sym] = field</code>
         </li>
       
-        <li class="covered" data-hits="42" data-linenumber="11">
-          <span class="hits">42</span>
+        <li class="covered" data-hits="114" data-linenumber="11">
+          <span class="hits">114</span>
           
           <code class="ruby">      mappings</code>
         </li>
@@ -2605,14 +2623,14 @@
           <code class="ruby">    end)</code>
         </li>
       
-        <li class="covered" data-hits="20" data-linenumber="13">
-          <span class="hits">20</span>
+        <li class="covered" data-hits="44" data-linenumber="13">
+          <span class="hits">44</span>
           
           <code class="ruby">    fields_mappings.each do |field, value|</code>
         </li>
       
-        <li class="covered" data-hits="3" data-linenumber="14">
-          <span class="hits">3</span>
+        <li class="covered" data-hits="13" data-linenumber="14">
+          <span class="hits">13</span>
           
           <code class="ruby">      @fields_mappings[field] = value if @fields_mappings[field]</code>
         </li>
@@ -2641,20 +2659,20 @@
           <code class="ruby">  def where_clause</code>
         </li>
       
-        <li class="covered" data-hits="20" data-linenumber="19">
-          <span class="hits">20</span>
+        <li class="covered" data-hits="44" data-linenumber="19">
+          <span class="hits">44</span>
           
           <code class="ruby">    @parser = Query.new</code>
         </li>
       
-        <li class="covered" data-hits="20" data-linenumber="20">
-          <span class="hits">20</span>
+        <li class="covered" data-hits="44" data-linenumber="20">
+          <span class="hits">44</span>
           
           <code class="ruby">    @parsed_tree = @parser.parse(@text)</code>
         </li>
       
-        <li class="covered" data-hits="20" data-linenumber="21">
-          <span class="hits">20</span>
+        <li class="covered" data-hits="44" data-linenumber="21">
+          <span class="hits">44</span>
           
           <code class="ruby">    generate_sql @parsed_tree</code>
         </li>
@@ -2689,20 +2707,20 @@
           <code class="ruby">  def generate_sql(tree)</code>
         </li>
       
-        <li class="covered" data-hits="67" data-linenumber="27">
-          <span class="hits">67</span>
+        <li class="covered" data-hits="128" data-linenumber="27">
+          <span class="hits">128</span>
           
           <code class="ruby">    first_key = tree.keys.first</code>
         </li>
       
-        <li class="covered" data-hits="67" data-linenumber="28">
-          <span class="hits">67</span>
+        <li class="covered" data-hits="128" data-linenumber="28">
+          <span class="hits">128</span>
           
           <code class="ruby">    node_value = tree[first_key]</code>
         </li>
       
-        <li class="covered" data-hits="67" data-linenumber="29">
-          <span class="hits">67</span>
+        <li class="covered" data-hits="128" data-linenumber="29">
+          <span class="hits">128</span>
           
           <code class="ruby">    case first_key</code>
         </li>
@@ -2713,14 +2731,14 @@
           <code class="ruby">    when :DEFAULT_COLUMN</code>
         </li>
       
-        <li class="covered" data-hits="21" data-linenumber="31">
-          <span class="hits">21</span>
+        <li class="covered" data-hits="23" data-linenumber="31">
+          <span class="hits">23</span>
           
           <code class="ruby">      escaped_node_value = handle_special_chars node_value</code>
         </li>
       
-        <li class="covered" data-hits="21" data-linenumber="32">
-          <span class="hits">21</span>
+        <li class="covered" data-hits="23" data-linenumber="32">
+          <span class="hits">23</span>
           
           <code class="ruby">      [&quot;CAST(#{@default_field.to_s} AS TEXT) ILIKE ?&quot;, &quot;%#{escaped_node_value}%&quot;]</code>
         </li>
@@ -2731,8 +2749,8 @@
           <code class="ruby">    when :OPERATOR_OR</code>
         </li>
       
-        <li class="covered" data-hits="13" data-linenumber="34">
-          <span class="hits">13</span>
+        <li class="covered" data-hits="22" data-linenumber="34">
+          <span class="hits">22</span>
           
           <code class="ruby">      generate_expression_for_logical_operator(:OR, node_value)</code>
         </li>
@@ -2743,8 +2761,8 @@
           <code class="ruby">    when :OPERATOR_AND</code>
         </li>
       
-        <li class="covered" data-hits="8" data-linenumber="36">
-          <span class="hits">8</span>
+        <li class="covered" data-hits="15" data-linenumber="36">
+          <span class="hits">15</span>
           
           <code class="ruby">      generate_expression_for_logical_operator(:AND, node_value)</code>
         </li>
@@ -2755,8 +2773,8 @@
           <code class="ruby">    when :OPERATOR_NOT</code>
         </li>
       
-        <li class="covered" data-hits="5" data-linenumber="38">
-          <span class="hits">5</span>
+        <li class="covered" data-hits="10" data-linenumber="38">
+          <span class="hits">10</span>
           
           <code class="ruby">      not_array = generate_sql node_value</code>
         </li>
@@ -2767,8 +2785,8 @@
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="5" data-linenumber="40">
-          <span class="hits">5</span>
+        <li class="covered" data-hits="10" data-linenumber="40">
+          <span class="hits">10</span>
           
           <code class="ruby">      if not_array.length &lt; 2</code>
         </li>
@@ -2791,14 +2809,14 @@
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="5" data-linenumber="44">
-          <span class="hits">5</span>
+        <li class="covered" data-hits="10" data-linenumber="44">
+          <span class="hits">10</span>
           
           <code class="ruby">      not_expression = not_array.shift</code>
         </li>
       
-        <li class="covered" data-hits="5" data-linenumber="45">
-          <span class="hits">5</span>
+        <li class="covered" data-hits="10" data-linenumber="45">
+          <span class="hits">10</span>
           
           <code class="ruby">      not_params = not_array</code>
         </li>
@@ -2809,8 +2827,8 @@
           <code class="ruby">      </code>
         </li>
       
-        <li class="covered" data-hits="5" data-linenumber="47">
-          <span class="hits">5</span>
+        <li class="covered" data-hits="10" data-linenumber="47">
+          <span class="hits">10</span>
           
           <code class="ruby">      [&quot;NOT #{not_expression}&quot;] + not_params</code>
         </li>
@@ -2833,26 +2851,26 @@
           <code class="ruby">      # key is column name</code>
         </li>
       
-        <li class="covered" data-hits="20" data-linenumber="51">
-          <span class="hits">20</span>
+        <li class="covered" data-hits="58" data-linenumber="51">
+          <span class="hits">58</span>
           
           <code class="ruby">      escaped_node_value = handle_special_chars node_value</code>
         </li>
       
-        <li class="covered" data-hits="20" data-linenumber="52">
-          <span class="hits">20</span>
+        <li class="covered" data-hits="58" data-linenumber="52">
+          <span class="hits">58</span>
           
           <code class="ruby">      mapping = @fields_mappings[first_key.to_sym]</code>
         </li>
       
-        <li class="covered" data-hits="20" data-linenumber="53">
-          <span class="hits">20</span>
+        <li class="covered" data-hits="58" data-linenumber="53">
+          <span class="hits">58</span>
           
           <code class="ruby">      if mapping.nil?</code>
         </li>
       
-        <li class="covered" data-hits="1" data-linenumber="54">
-          <span class="hits">1</span>
+        <li class="covered" data-hits="2" data-linenumber="54">
+          <span class="hits">2</span>
           
           <code class="ruby">        raise &quot;Unknown field &#39;#{first_key.to_s}&#39;&quot;</code>
         </li>
@@ -2863,8 +2881,8 @@
           <code class="ruby">      else</code>
         </li>
       
-        <li class="covered" data-hits="19" data-linenumber="56">
-          <span class="hits">19</span>
+        <li class="covered" data-hits="56" data-linenumber="56">
+          <span class="hits">56</span>
           
           <code class="ruby">        [&quot;CAST(#{mapping.to_s} AS TEXT) ILIKE ?&quot;, &quot;%#{escaped_node_value}%&quot;]</code>
         </li>
@@ -2899,8 +2917,8 @@
           <code class="ruby">  def generate_expression_for_logical_operator(operator, operator_array)</code>
         </li>
       
-        <li class="covered" data-hits="21" data-linenumber="62">
-          <span class="hits">21</span>
+        <li class="covered" data-hits="37" data-linenumber="62">
+          <span class="hits">37</span>
           
           <code class="ruby">    if operator_array.length != 2</code>
         </li>
@@ -2923,14 +2941,14 @@
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="21" data-linenumber="66">
-          <span class="hits">21</span>
+        <li class="covered" data-hits="37" data-linenumber="66">
+          <span class="hits">37</span>
           
           <code class="ruby">    first_operand = generate_sql operator_array.first</code>
         </li>
       
-        <li class="covered" data-hits="21" data-linenumber="67">
-          <span class="hits">21</span>
+        <li class="covered" data-hits="37" data-linenumber="67">
+          <span class="hits">37</span>
           
           <code class="ruby">    second_operand = generate_sql operator_array.last</code>
         </li>
@@ -2941,8 +2959,8 @@
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="21" data-linenumber="69">
-          <span class="hits">21</span>
+        <li class="covered" data-hits="37" data-linenumber="69">
+          <span class="hits">37</span>
           
           <code class="ruby">    if first_operand.length &lt; 2</code>
         </li>
@@ -2965,8 +2983,8 @@
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="21" data-linenumber="73">
-          <span class="hits">21</span>
+        <li class="covered" data-hits="37" data-linenumber="73">
+          <span class="hits">37</span>
           
           <code class="ruby">    if second_operand.length &lt; 2</code>
         </li>
@@ -2989,14 +3007,14 @@
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="21" data-linenumber="77">
-          <span class="hits">21</span>
+        <li class="covered" data-hits="37" data-linenumber="77">
+          <span class="hits">37</span>
           
           <code class="ruby">    first_operand_expression = first_operand.shift</code>
         </li>
       
-        <li class="covered" data-hits="21" data-linenumber="78">
-          <span class="hits">21</span>
+        <li class="covered" data-hits="37" data-linenumber="78">
+          <span class="hits">37</span>
           
           <code class="ruby">    first_operand_params = first_operand</code>
         </li>
@@ -3007,14 +3025,14 @@
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="21" data-linenumber="80">
-          <span class="hits">21</span>
+        <li class="covered" data-hits="37" data-linenumber="80">
+          <span class="hits">37</span>
           
           <code class="ruby">    second_operand_expression = second_operand.shift</code>
         </li>
       
-        <li class="covered" data-hits="21" data-linenumber="81">
-          <span class="hits">21</span>
+        <li class="covered" data-hits="37" data-linenumber="81">
+          <span class="hits">37</span>
           
           <code class="ruby">    second_operand_params = second_operand</code>
         </li>
@@ -3025,8 +3043,8 @@
           <code class="ruby"></code>
         </li>
       
-        <li class="covered" data-hits="21" data-linenumber="83">
-          <span class="hits">21</span>
+        <li class="covered" data-hits="37" data-linenumber="83">
+          <span class="hits">37</span>
           
           <code class="ruby">    [&quot;(#{first_operand_expression} #{operator.to_s} #{second_operand_expression})&quot;] + first_operand_params + second_operand_params</code>
         </li>
@@ -3049,32 +3067,32 @@
           <code class="ruby">  def handle_special_chars(text)</code>
         </li>
       
-        <li class="covered" data-hits="41" data-linenumber="87">
-          <span class="hits">41</span>
+        <li class="covered" data-hits="81" data-linenumber="87">
+          <span class="hits">81</span>
           
           <code class="ruby">    result = text.gsub(/\&quot;/, &#39;&#39;)</code>
         </li>
       
-        <li class="covered" data-hits="41" data-linenumber="88">
-          <span class="hits">41</span>
+        <li class="covered" data-hits="81" data-linenumber="88">
+          <span class="hits">81</span>
           
           <code class="ruby">    result.gsub!(/\_/, &#39;\_&#39;)</code>
         </li>
       
-        <li class="covered" data-hits="41" data-linenumber="89">
-          <span class="hits">41</span>
+        <li class="covered" data-hits="81" data-linenumber="89">
+          <span class="hits">81</span>
           
           <code class="ruby">    result.tr!(&#39;\\&#39;, &#39;\\&#39;)</code>
         </li>
       
-        <li class="covered" data-hits="41" data-linenumber="90">
-          <span class="hits">41</span>
+        <li class="covered" data-hits="81" data-linenumber="90">
+          <span class="hits">81</span>
           
           <code class="ruby">    result.gsub!(/%/, &#39;\%&#39;)</code>
         </li>
       
-        <li class="covered" data-hits="41" data-linenumber="91">
-          <span class="hits">41</span>
+        <li class="covered" data-hits="81" data-linenumber="91">
+          <span class="hits">81</span>
           
           <code class="ruby">    result</code>
         </li>
@@ -3096,14 +3114,14 @@
 </div>
 
       
-        <div class="source_table" id="873beef35223be09fc913530f10925cade05c882">
+        <div class="source_table" id="1f620dc5aa56fc59374eab391bb6c70e9b12c49b">
   <div class="header">
     <h3>lib/text_to_tsquery.rb</h3>
-    <h4><span class="red">33.33 %</span> covered</h4>
+    <h4><span class="red">33.96 %</span> covered</h4>
     <div>
-      <b>54</b> relevant lines. 
+      <b>53</b> relevant lines. 
       <span class="green"><b>18</b> lines covered</span> and
-      <span class="red"><b>36</b> lines missed.</span>
+      <span class="red"><b>35</b> lines missed.</span>
     </div>
   </div>
   
@@ -3356,7 +3374,7 @@
           <code class="ruby">        acc + 1</code>
         </li>
       
-        <li class="missed" data-hits="0" data-linenumber="42">
+        <li class="never" data-hits="" data-linenumber="42">
           
           
           <code class="ruby">      elsif char == &#39;)&#39;</code>
diff --git a/lib/pg_searchable_regex.rb b/lib/pg_searchable_regex.rb
index dc1b18d..8c7374b 100644
--- a/lib/pg_searchable_regex.rb
+++ b/lib/pg_searchable_regex.rb
@@ -42,14 +42,17 @@ module PgSearchable
 
     def ts_add_scope
       class_eval do
-        scope ts_scope_method, ->(value) { ts_search(value) }
+        scope ts_scope_method, ->(value) do
+          resulting_ids = ts_search(value).map(&:id)
+          where(id: resulting_ids)
+        end
       end
     end
 
     def ts_search(value)
       return if @ts_search_fields.blank? || value.blank?
       includes(@ts_joins).references(:all).where(
-      TextToSqlQuery.new(value, @ts_search_fields, @default_field, @ts_search_fields_mappings).where_clause)
+        TextToSqlQuery.new(value, @ts_search_fields, @default_field, @ts_search_fields_mappings).where_clause).distinct
     end
 
     def should_update_cache_field?
diff --git a/lib/text_to_regex_query.rb b/lib/text_to_regex_query.rb
deleted file mode 100644
index 7b7c569..0000000
--- a/lib/text_to_regex_query.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-# frozen_string_literal: true
-
-# transforms "english like" text queries into a where clause with regex
-# https://www.postgresql.org/docs/9.5/textsearch-controls.html#TEXTSEARCH-PARSING-QUERIES
-
-class TextToRegexQuery
-  def initialize(text, fields, default_field, fields_mappings = {})
-    @text = text.to_s.strip
-    @fields = fields.map(&:to_sym)
-    @default_field = default_field.to_sym
-    @fields_mappings = fields_mappings.merge(@fields.reduce({}) do |mappings, field|
-      table_name, field_name = field.to_s.split(".")
-      mappings[field_name.to_sym] = field
-      mappings 
-    end)
-  end
-
-  def where_clause(query)
-    @cleared_text = @text.dup
-    @column_chunks = []
-    remove_duplicated_spaces
-    extract_columns
-    escape_special_characters
-    generate_where_clause(query)
-  end
-
-private
-
-  def remove_duplicated_spaces
-    @cleared_text.gsub!(/\s+/, ' ')
-  end
-
-  def escape_special_characters
-    @cleared_text.gsub!(/\_/, '\_')
-    @cleared_text.tr!('\\', '\\')
-    @cleared_text.gsub!(/%/, '\%')
-  end
-
-  def extract_columns
-    column_search_term_pairs = @cleared_text.scan(/([A-Za-z0-9_]+:[\w\_-]+)/)
-
-    @column_chunks = (column_search_term_pairs.flatten.map do |pair|
-      column, term = pair.split(':')
-      next unless @fields_mappings.include?(column.to_sym) 
-      @cleared_text.gsub!(pair, '')
-      { @fields_mappings[column.to_sym] => term }
-    end).compact
-    unless @cleared_text.strip.empty?
-      @column_chunks = [{ @default_field.to_s => @cleared_text.strip }] + @column_chunks
-    end
-    @column_chunks
-  end
-
-  def generate_where_clause(query)
-    where_clause = ''
-    columns = @column_chunks.map { |c| c.keys.first } 
-    values = @column_chunks.map { |c| c.values.first }
-
-    columns.each do |column|
-      quoted_column = '"' + column.to_s.gsub(".",'"."') + '"'
-      where_clause += "#{quoted_column} ILIKE ? OR "
-    end
-    where_clause += " 1<>1 "
-    regexed_values = values.map { |v| "%#{v}%" } 
-    query.where([where_clause] + regexed_values) 
-  end
-end
diff --git a/spec/lib/pg_searchable_new_spec.rb b/spec/lib/pg_searchable_new_spec.rb
index 1df925a..2bf7fd6 100644
--- a/spec/lib/pg_searchable_new_spec.rb
+++ b/spec/lib/pg_searchable_new_spec.rb
@@ -136,6 +136,16 @@ describe PgSearchable do
         expect(DynamicModelWithTagValues.scope_search('tag:red value:"not"')).to contain_exactly(record1, record2)
       end
 
+      it 'can find models without tags' do
+        record1 = DynamicModelWithTagValues.create name: 'something', value: 'amazing'
+        record2 = DynamicModelWithTagValues.create name: 'new record', value: 'not so amazing'
+        Tag.create(taggable: record1, value: 'green')
+
+        expect(DynamicModelWithTagValues.scope_search('tag:green or value:"not"')).to contain_exactly(record1, record2)
+      end
+
+
+
       it 'can search in referenced column and in model columns with multiple search terms connected with logical operators' do
         record1 = DynamicModelWithTagValues.create name: 'something', value: 'amazing'
         record2 = DynamicModelWithTagValues.create name: 'new record', value: 'not so amazing'
diff --git a/spec/lib/pg_searchable_spec.rb b/spec/lib/pg_searchable_spec.rb
deleted file mode 100644
index 08c67ff..0000000
--- a/spec/lib/pg_searchable_spec.rb
+++ /dev/null
@@ -1,116 +0,0 @@
-# frozen_string_literal: true
-require_relative '../../lib/pg_searchable_regex'
-
-describe PgSearchable do
-  include_examples 'pg_search', VectorModel
-  include_examples 'pg_search', VectorWithCustomPrimaryKeyModel
-  include_examples 'pg_search', VectorWithCustomCallback
-  include_examples 'pg_search', SimpleVectorModel
-  include_examples 'pg_search', VectorWithoutWildcardModel
-  include_examples 'pg_search', VectorModelWithCustomSearchScope, 'fulltext'
-  include_examples 'pg_search', VectorModelWithTagValues
-  include_examples 'pg_search', DynamicModel
-  include_examples 'pg_search', DynamicModelWithTagValues
-  include_examples 'pg_search', DynamicModelWithCategory
-  include_examples 'pg_search', DynamicModelWithSectionsTrhough
-
-  describe 'pg_search' do
-    describe 'joins' do
-      it 'can dynamically query compound relation' do
-        record = DynamicModelWithCategory.create(name: 'something', value: 'amazing')
-        category = Category.create(name: 'searchable')
-        Tag.create(value: 'impressive', category: category, taggable: record)
-        expect(DynamicModelWithCategory.scope_search('searchable')).to include(record)
-      end
-
-      it 'can use has_many :through relation' do
-        record = DynamicModelWithSectionsTrhough.create(name: 'something', value: 'amazing')
-        tag = Tag.create(value: 'impressive', taggable: record)
-        Section.create(name: 'searchable', tag: tag)
-        expect(DynamicModelWithSectionsTrhough.scope_search('searchable')).to include(record)
-      end
-    end
-
-    describe 'properties' do
-      describe 'skip_callback' do
-        context 'when enabled' do
-          let(:record) { VectorModel.create(name: 'something', value: 'amazing') }
-
-          it 'can find the record after it updates' do
-            record.update(name: 'cookie')
-            expect(VectorModel.scope_search('cookie')).to include(record)
-          end
-        end
-
-        context 'when disabled' do
-          let(:record) { VectorModelWithoutCallback.create(name: 'something', value: 'amazing') }
-
-          it 'cannot find the record after it updates' do
-            record.update(name: 'cookie')
-            expect(VectorModelWithoutCallback.scope_search('cookie')).not_to include(record)
-          end
-
-          it 'can find the record after manually calling .update_pg_search_cache' do
-            record.update(name: 'cookie')
-            record.update_pg_search_cache
-            expect(VectorModelWithoutCallback.scope_search('cookie')).to include(record)
-          end
-        end
-      end
-
-      describe 'scope' do
-        it 'defaults to "scope_search"' do
-          expect(VectorModel).to respond_to(:scope_search)
-        end
-
-        it 'can use a different scope name' do
-          expect(VectorModelWithCustomSearchScope).to respond_to(:fulltext)
-        end
-
-        it 'doesnt pollutes the default method name if customized' do
-          expect(VectorModelWithCustomSearchScope).not_to respond_to(:scope_search)
-        end
-      end
-
-      describe 'language' do
-        it 'defaults to english lexemes' do
-          record = VectorModel.create name: 'something', value: 'amazing'
-          expect(VectorModel.scope_search('amaz')).to include(record)
-        end
-
-        it 'can be changed to simple to avoid lexeme truncation' do
-          record = SimpleVectorModel.create name: 'something', value: 'amazing'
-          expect(SimpleVectorModel.scope_search('amazings')).not_to include(record)
-        end
-      end
-
-      describe 'wildcard' do
-        it 'by default uses it' do
-          record = VectorModel.create name: '12345', value: 'amazing'
-          expect(VectorModel.scope_search('123')).to include(record)
-        end
-
-        it 'can be set to false' do
-          record = VectorWithoutWildcardModel.create name: '12345', value: 'amazing'
-          expect(VectorWithoutWildcardModel.scope_search('123')).not_to include(record)
-        end
-      end
-
-      describe 'tags' do
-        it 'allow indexing fields of other associations' do
-          record = DynamicModelWithTagValues.create name: 'something', value: 'amazing'
-          Tag.create(taggable: record, value: 'red')
-          expect(DynamicModelWithTagValues.scope_search('red')).to include(record)
-        end
-      end
-
-      describe 'external_cache_data' do
-        it 'can index external data using a method' do
-          record = VectorModelWithTagValues.create name: 'something', value: 'amazing'
-          Tag.create(taggable: record, value: 'red')
-          expect(VectorModelWithTagValues.scope_search('red')).to include(record)
-        end
-      end
-    end
-  end
-end
diff --git a/spec/lib/text_to_tsquery_spec.rb b/spec/lib/text_to_tsquery_spec.rb
deleted file mode 100644
index 99e396a..0000000
--- a/spec/lib/text_to_tsquery_spec.rb
+++ /dev/null
@@ -1,82 +0,0 @@
-# frozen_string_literal: true
-require_relative '../../lib/text_to_tsquery'
-
-
-describe TextToTsquery do
-  describe '.new' do
-    # partial match
-    it { expect(described_class.new('A').tsquery).to eq('A:*') }
-    it { expect(described_class.new('A', wildcard: false).tsquery).to eq('A:') }
-    it { expect(described_class.new('  A  ').tsquery).to eq('A:*') }
-
-    # AND operations
-    it { expect(described_class.new('A B').tsquery).to eq('A:*&B:*') }
-    it { expect(described_class.new('A B C').tsquery).to eq('A:*&B:*&C:*') }
-    it { expect(described_class.new('A and B').tsquery).to eq('A:*&B:*') }
-    it { expect(described_class.new('A AND B').tsquery).to eq('A:*&B:*') }
-    it { expect(described_class.new('A & B').tsquery).to eq('A:*&B:*') }
-    it { expect(described_class.new('A && B').tsquery).to eq('A:*&B:*') }
-    it { expect(described_class.new('A & B && C and D AND E F').tsquery).to eq('A:*&B:*&C:*&D:*&E:*&F:*') }
-
-    # OR operations
-    it { expect(described_class.new('A or B').tsquery).to eq('A:*|B:*') }
-    it { expect(described_class.new('A or B', wildcard: false).tsquery).to eq('A:|B:') }
-    it { expect(described_class.new('A OR B').tsquery).to eq('A:*|B:*') }
-    it { expect(described_class.new('A OR B', wildcard: false).tsquery).to eq('A:|B:') }
-    it { expect(described_class.new('A | B').tsquery).to eq('A:*|B:*') }
-    it { expect(described_class.new('A | B', wildcard: false).tsquery).to eq('A:|B:') }
-    it { expect(described_class.new('A || B').tsquery).to eq('A:*|B:*') }
-    it { expect(described_class.new('A || B', wildcard: false).tsquery).to eq('A:|B:') }
-    it { expect(described_class.new('A or or B').tsquery).to eq('A:*|B:*') }
-    it { expect(described_class.new('A or or B', wildcard: false).tsquery).to eq('A:|B:') }
-    it { expect(described_class.new('A | B || C or D OR E').tsquery).to eq('A:*|B:*|C:*|D:*|E:*') }
-    it { expect(described_class.new('A | B || C or D OR E', wildcard: false).tsquery).to eq('A:|B:|C:|D:|E:') }
-
-    # () Precedence
-    it { expect(described_class.new('(A)').tsquery).to eq('(A:*)') }
-    it { expect(described_class.new('(A)', wildcard: false).tsquery).to eq('(A:)') }
-    it { expect(described_class.new('(A B)').tsquery).to eq('(A:*&B:*)') }
-    it { expect(described_class.new('(A B)', wildcard: false).tsquery).to eq('(A:&B:)') }
-    it { expect(described_class.new('A (B !C)').tsquery).to eq('A:*&(B:*&!C)') }
-    it { expect(described_class.new('A (B !C)', wildcard: false).tsquery).to eq('A:&(B:&!C)') }
-    it { expect(described_class.new('(A AND B) OR C').tsquery).to eq('(A:*&B:*)|C:*') }
-    it { expect(described_class.new('(A AND B) OR C', wildcard: false).tsquery).to eq('(A:&B:)|C:') }
-    it { expect(described_class.new('A AND (B OR C)').tsquery).to eq('A:*&(B:*|C:*)') }
-    it { expect(described_class.new('A AND (B OR C)', wildcard: false).tsquery).to eq('A:&(B:|C:)') }
-    it { expect(described_class.new('(A & B) || C').tsquery).to eq('(A:*&B:*)|C:*') }
-    it { expect(described_class.new('(A & B) || C', wildcard: false).tsquery).to eq('(A:&B:)|C:') }
-    it { expect(described_class.new('A && (B | C)').tsquery).to eq('A:*&(B:*|C:*)') }
-    it { expect(described_class.new('A && (B | C)', wildcard: false).tsquery).to eq('A:&(B:|C:)') }
-    it { expect(described_class.new('A && !D (B | C | !E)').tsquery).to eq('A:*&!D&(B:*|C:*|!E)') }
-    it { expect(described_class.new('A && !D (B | C | !E)', wildcard: false).tsquery).to eq('A:&!D&(B:|C:|!E)') }
-
-    # Exact Matches
-    it { expect(described_class.new('"A"').tsquery).to eq("'A'") }
-    it { expect(described_class.new('"A B"').tsquery).to eq("'A B'") }
-    it { expect(described_class.new('"A&B"').tsquery).to eq("'A&B'") }
-    it { expect(described_class.new('"-A|B"').tsquery).to eq("'-A|B'") }
-    it { expect(described_class.new('"A-B"').tsquery).to eq("'A-B'") }
-    it { expect(described_class.new('"A" B').tsquery).to eq("'A'&B:*") }
-    it { expect(described_class.new('"A" B', wildcard: false).tsquery).to eq("'A'&B:") }
-    it { expect(described_class.new('"A B" C').tsquery).to eq("'A B'&C:*") }
-    it { expect(described_class.new('"A B" C', wildcard: false).tsquery).to eq("'A B'&C:") }
-    it { expect(described_class.new('("A B" or C) and D').tsquery).to eq("('A B'|C:*)&D:*") }
-    it { expect(described_class.new('("A B" or C) and D', wildcard: false).tsquery).to eq("('A B'|C:)&D:") }
-
-    describe 'validations' do
-      it { expect { described_class.new('(') }.to raise_error(ArgumentError, /parenthesis/) }
-    end
-  end
-
-  describe '.valid_search_parenthesis?' do
-    it { expect(described_class.valid_search_parenthesis?('')).to eq true }
-    it { expect(described_class.valid_search_parenthesis?('()')).to eq true }
-    it { expect(described_class.valid_search_parenthesis?('()()')).to eq true }
-    it { expect(described_class.valid_search_parenthesis?('(()())')).to eq true }
-    it { expect(described_class.valid_search_parenthesis?('((())())')).to eq true }
-    it { expect(described_class.valid_search_parenthesis?('(')).to eq false }
-    it { expect(described_class.valid_search_parenthesis?(')(')).to eq false }
-    it { expect(described_class.valid_search_parenthesis?('())')).to eq false }
-    it { expect(described_class.valid_search_parenthesis?('((()())')).to eq false }
-  end
-end
diff --git a/version.rb b/version.rb
index f0966b2..7a7c437 100644
--- a/version.rb
+++ b/version.rb
@@ -3,7 +3,7 @@
 module Version
   MAJOR = 1
   MINOR = 0
-  PATCH = 24
+  PATCH = 27
 
   def self.to_s
     [MAJOR, MINOR, PATCH].compact.join('.')