command_search 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ab70b519f399ddeeba1a8862085f8017d327b60a2cbfddaa4682363e56d2f38
-  data.tar.gz: 204fc638f22b3ffddef67f3065c551885c9b116b4fcadffb118f52d4d7ccffb2
+  metadata.gz: 647f1b1fa534c1187bd63333ae986e357fb122a777e9f56d9af2d7d6f34ee6c8
+  data.tar.gz: d070864c2e1bba273a8fa837b20c7732efcbb5768149046cf2e68ee666e6f0b3
 SHA512:
-  metadata.gz: 15beca3aa277baf873b57ff539b46c7dc966e357801ed69ed3818b17d89e021a6ead6bc233e119fd227bfc62615e2e0078e954cd92b9a32b216e3414cf6313e4
-  data.tar.gz: 34da12042bd8b24d8b83bdceb08454a8ec72517cd3cfca155072cc286d0b54c683bfa16fc65f8f579759ea1a8279576c989fbd7599fdd818e0a0d45b2a7cd646
+  metadata.gz: 3b37775511b9cb93c556c9ce766bc76b3df6f15fb8a2671c814fa0809d32c96a5ffff0371cce4f9fb53dd9de0123f477c233611be04280883c811635a0775208
+  data.tar.gz: e9a636dd33c9e53211e381a00e6af3cf2aa0901fdd5e6a12079053285465eb8b4775206f48b295146b2a2e08e4e440b3888e8bff0c1bd8270edff520ad00e0b5

data/lib/command_search.rb

@@ -7,6 +7,7 @@ load(__dir__ + '/command_search/optimizer.rb')
 load(__dir__ + '/command_search/backends/memory.rb')
 load(__dir__ + '/command_search/backends/mongoer.rb')
 load(__dir__ + '/command_search/backends/postgres.rb')
+load(__dir__ + '/command_search/backends/sqlite.rb')
 
 class Boolean; end
 
@@ -24,6 +25,10 @@ module CommandSearch
       Normalizer.normalize!(ast, fields, false)
       return Postgres.build_query(ast)
     end
+    if type == :sqlite
+      Normalizer.normalize!(ast, fields, false)
+      return Sqlite.build_query(ast)
+    end
     Normalizer.normalize!(ast, fields)
     return Mongoer.build_query(ast) if type == :mongo
     ast
@@ -38,6 +43,10 @@ module CommandSearch
       ast = CommandSearch.build(:postgres, query, options)
       return source.where(ast)
     end
+    if source.respond_to?(:sqlite3_connection)
+      ast = CommandSearch.build(:sqlite, query, options)
+      return source.where(ast)
+    end
     ast = CommandSearch.build(:other, query, options)
     source.select { |x| CommandSearch::Memory.check(x, ast) }
   end

data/lib/command_search/backends/postgres.rb

@@ -4,16 +4,15 @@ module CommandSearch
 
     def quote_string(str)
       # activerecord/lib/active_record/connection_adapters/abstract/quoting.rb:62
-      str.gsub!('\\', '\&\&')
-      str.gsub!("'", "''")
-      Regexp.escape(str)
+      str.gsub('\\', '\&\&').gsub("'", "''")
     end
 
     def build_quoted_regex(input)
       str = quote_string(input)
+      str = Regexp.escape(str)
       if str[/(^\W)|(\W$)/]
-        head_border = '(^|\s|[^:+\w])'
-        tail_border = '($|\s|[^:+\w])'
+        head_border = '(^|[^:+\w])'
+        tail_border = '($|[^:+\w])'
         return head_border + str + tail_border
       end
       '\m' + str + '\y'
@@ -36,14 +35,23 @@ module CommandSearch
       end
       if type == Time
         return '0 = 1' unless val
-        return "(#{field} >= '#{val[0]}') AND (#{field} < '#{val[1]}') AND (#{field} IS NOT NULL)"
+        return "
+          (
+            (#{field} >= '#{val[0]}') AND
+            (#{field} < '#{val[1]}') AND
+            (#{field} IS NOT NULL)
+          )
+        "
       end
       if type == :quote
         op = '~'
         val =  "'#{build_quoted_regex(val)}'"
       elsif type == :str
-        op = '~*'
-        val = "'#{quote_string(val)}'"
+        op = '~~*'
+        val = quote_string(val)
+        val.gsub!('%', '\%')
+        val.gsub!('_', '\_')
+        val = "'%#{val}%'"
       elsif type == :number
         op = '='
       end
@@ -58,7 +66,13 @@ module CommandSearch
       type = search_node[:type]
       op = node[:nest_op]
       if node[:compare_across_fields]
-        "(#{field} #{op} #{val}) AND (#{field} IS NOT NULL) AND (#{val} IS NOT NULL)"
+        "
+          (
+            (#{field} #{op} #{val}) AND
+            (#{field} IS NOT NULL) AND
+            (#{val} IS NOT NULL)
+          )
+        "
       elsif type == Time && val
         "(#{field} #{op} '#{val}') AND (#{field} IS NOT NULL)"
       elsif val.is_a?(Numeric) || val == val.to_i.to_s || val == val.to_f.to_s

data/lib/command_search/backends/sqlite.rb

@@ -0,0 +1,111 @@
+module CommandSearch
+  module Sqlite
+    module_function
+
+    def quote_string(str)
+      # activerecord/lib/active_record/connection_adapters/abstract/quoting.rb:62
+      str.gsub('\\', '\&\&').gsub("'", "''")
+    end
+
+    def command_search(node)
+      field_node = node[:value].first
+      field = field_node[:value]
+      search_node = node[:value].last
+      val = search_node[:value]
+      type = search_node[:type]
+      return '0 = 1' if field == '__CommandSearch_dummy_key__'
+      if type == Boolean || type == :existence
+        false_val = 'false'
+        false_val = 0 if field_node[:field_type] == Numeric
+        if val
+          return "NOT ((#{field} = #{false_val}) OR (#{field} IS NULL))"
+        end
+        return "((#{field} = #{false_val}) OR (#{field} IS NULL))"
+      end
+      if type == Time
+        return '0 = 1' unless val
+        return "
+          (
+            (#{field} > '#{val[0] - 1}') AND
+            (#{field} <= '#{val[1] - 1}') AND
+            (#{field} IS NOT NULL)
+          )
+        "
+      end
+      if type == :quote
+        val = quote_string(val)
+        val.gsub!('[', '[[]')
+        val.gsub!('*', '[*]')
+        val.gsub!('?', '[?]')
+        border = '[ .,()?"\'\']'
+        return "
+          (
+            (#{field} IS NOT NULL) AND
+            (
+              (#{field} GLOB '#{val}') OR
+              (#{field} GLOB '*#{border}#{val}#{border}*') OR
+              (#{field} GLOB '*#{border}#{val}') OR
+              (#{field} GLOB '#{val}#{border}*')
+            )
+          )
+        "
+      elsif type == :str
+        op = 'LIKE'
+        val = quote_string(val)
+        val.gsub!('%', '\%')
+        val.gsub!('_', '\_')
+        val = "'%#{val}%' ESCAPE '\\'"
+      elsif type == :number
+        op = '='
+      end
+      "((#{field} #{op} #{val}) AND (#{field} IS NOT NULL))"
+    end
+
+    def compare_search(node)
+      field_node = node[:value].first
+      field = field_node[:value]
+      search_node = node[:value].last
+      val = search_node[:value]
+      type = search_node[:type]
+      op = node[:nest_op]
+      if node[:compare_across_fields]
+        "
+          (
+            (#{field} #{op} #{val}) AND
+            (#{field} IS NOT NULL) AND
+            (#{val} IS NOT NULL)
+          )
+        "
+      elsif type == Time && val
+        "(#{field} #{op} '#{val}') AND (#{field} IS NOT NULL)"
+      elsif val.is_a?(Numeric) || val == val.to_i.to_s || val == val.to_f.to_s
+        "(#{field} #{op} #{val}) AND (#{field} IS NOT NULL)"
+      else
+        '0 = 1'
+      end
+    end
+
+    def build_query(ast)
+      out = []
+      ast = [ast] unless ast.is_a?(Array)
+      ast.each do |node|
+        type = node[:type]
+        if type == :colon
+          out.push(command_search(node))
+        elsif type == :compare
+          out.push(compare_search(node))
+        elsif type == :and
+          out.push(build_query(node[:value]))
+        elsif type == :or
+          clauses = node[:value].map { |x| build_query(x) }
+          clause = clauses.join(' OR ')
+          out.push("(#{clause})")
+        elsif type == :not
+          clause = build_query(node[:value])
+          out.push("NOT (#{clause})")
+        end
+      end
+      out.join(' AND ')
+    end
+  end
+end

data/lib/command_search/normalizer.rb

@@ -53,8 +53,8 @@ module CommandSearch
       str = Regexp.escape(raw)
       return node[:value] = /#{str}/i unless type == :quote
       return node[:value] = /\b#{str}\b/ unless raw[/(\A\W)|(\W\Z)/]
-      border_a = '(^|\s|[^:+\w])'
-      border_b = '($|\s|[^:+\w])'
+      border_a = '(^|[^:+\w])'
+      border_b = '($|[^:+\w])'
       node[:value] = Regexp.new(border_a + str + border_b)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: command_search
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - zumbalogy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-14 00:00:00.000000000 Z
+date: 2019-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -35,6 +35,7 @@ files:
 - lib/command_search/backends/memory.rb
 - lib/command_search/backends/mongoer.rb
 - lib/command_search/backends/postgres.rb
+- lib/command_search/backends/sqlite.rb
 - lib/command_search/lexer.rb
 - lib/command_search/normalizer.rb
 - lib/command_search/optimizer.rb