command_search 0.11.3 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c1b899c749aee5b7a81173484fb0fa69eaffd2ab96a26cc3bff7fb7293c5058
-  data.tar.gz: 95c7404d1176cbfb7db75b07323c2e51c13d449c7dc111f53db15db04982d5cf
+  metadata.gz: e1d615f992c4521f18821e9b3ee2d96fb800095abeadf549f59b8c24fb6419b6
+  data.tar.gz: df4378e2ab56dc1ee3299582f8a9aed11d4d64d5dd1d3d6d38a0d208a0d48f1f
 SHA512:
-  metadata.gz: bbcf93763eceef8ce66e809603557bf8a21273c41167fdbac2ab080138af2341dd1e98fb79aa66294e8d6bca32af163b88b38f888d80c929f73f0ec9b5aec3dd
-  data.tar.gz: c748c0a6c709c665c1028a46072c6536966d07f6d4e665ca55058e28d11f82253fdc94b3d5d78f594e0b3df2c65d55eff4e33ae865d34abc319e4e788a3d76c0
+  metadata.gz: 5707ed405d3f6133a6437821b5df18a076b67c299334a226639d8d9e62486f3f385a50907a2bcc57c63a86280125745f3a00975b880086539df899b1106a5acb
+  data.tar.gz: 312e172cc413d7f0d2efb127fd7858454b383b6eed72d1102a416f8d408eefaa831247caf5b27c67ae4959b7ac50871ccf5b05d6eb4abaa6cc6dea40d61425c7

data/lib/command_search.rb

@@ -9,6 +9,7 @@ load(__dir__ + '/command_search/backends/mongoer.rb')
 load(__dir__ + '/command_search/backends/postgres.rb')
 load(__dir__ + '/command_search/backends/sqlite.rb')
 load(__dir__ + '/command_search/backends/mysql.rb')
+load(__dir__ + '/command_search/backends/mysql_v5.rb')
 
 class Boolean; end
 
@@ -34,6 +35,10 @@ module CommandSearch
       Normalizer.normalize!(ast, fields, false)
       return Mysql.build_query(ast)
     end
+    if type == :mysqlV5
+      Normalizer.normalize!(ast, fields, false)
+      return MysqlV5.build_query(ast)
+    end
     Normalizer.normalize!(ast, fields)
     return Mongoer.build_query(ast) if type == :mongo
     ast

data/lib/command_search/backends/mysql.rb

@@ -1,3 +1,6 @@
+# NOTE: This module supports does not support MariaDB or eariler Mysql versions than 8.0, due to
+# changes in how word breaks are handled in regexes.
+
 module CommandSearch
   module Mysql
     module_function
@@ -42,16 +45,17 @@ module CommandSearch
         "
       end
       if type == :quote
-        op = 'RLIKE BINARY'
-        val = "'#{build_quoted_regex(val)}'"
-      elsif type == :str
+        val = build_quoted_regex(val)
+        return "(REGEXP_LIKE(#{field}, '#{val}', 'c') AND (#{field} IS NOT NULL))"
+      end
+      if type == :number
+        op = '='
+      else # type == :str
         op = 'LIKE'
         val = quote_string(val)
         val.gsub!('%', '\%')
         val.gsub!('_', '\_')
         val = "'%#{val}%'"
-      elsif type == :number
-        op = '='
       end
       "((#{field} #{op} #{val}) AND (#{field} IS NOT NULL))"
     end

data/lib/command_search/backends/mysql_v5.rb

@@ -0,0 +1,108 @@
+# NOTE: This module supports MariaDB and MySql 5 with its distinct word break regex rules.
+
+module CommandSearch
+  module MysqlV5
+    module_function
+
+    def quote_string(str)
+      # activerecord/lib/active_record/connection_adapters/abstract/quoting.rb:62
+      str.gsub('\\', '\&\&').gsub("'", "''")
+    end
+
+    def build_quoted_regex(str)
+      str = Regexp.escape(str)
+      str = quote_string(str)
+      if str[/(^\W)|(\W$)/]
+        head_border = '(^|[[:<:]]|\\\\()'
+        tail_border = '($|[[:>:]]|\\\\))'
+        return head_border + str + tail_border
+      end
+      '[[:<:]]' + str + '[[:>:]]'
+    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
+        if val
+          return "(NOT ((#{field} IS NULL) OR (#{field} LIKE '0')))"
+        end
+        return "((#{field} IS NULL) OR (#{field} LIKE '0'))"
+      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
+        op = 'RLIKE BINARY'
+        val = "'#{build_quoted_regex(val)}'"
+      elsif type == :number
+        op = '='
+      else # type == :str
+        op = 'LIKE'
+        val = quote_string(val)
+        val.gsub!('%', '\%')
+        val.gsub!('_', '\_')
+        val = "'%#{val}%'"
+      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/backends/sqlite.rb

@@ -15,12 +15,10 @@ module CommandSearch
       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))"
+          return "NOT ((#{field} = 0) OR (#{field} IS NULL))"
         end
-        return "((#{field} = #{false_val}) OR (#{field} IS NULL))"
+        return "((#{field} = 0) OR (#{field} IS NULL))"
       end
       if type == Time
         return '0 = 1' unless val

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: command_search
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.12.0
 platform: ruby
 authors:
 - zumbalogy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-10-22 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/mysql.rb
+- lib/command_search/backends/mysql_v5.rb
 - lib/command_search/backends/postgres.rb
 - lib/command_search/backends/sqlite.rb
 - lib/command_search/lexer.rb
@@ -60,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Let users query collections with ease.