search_cop 1.0.2 → 1.0.3

data/.travis.yml

@@ -25,6 +25,7 @@ gemfile:
   - gemfiles/3.2.gemfile
   - gemfiles/4.0.gemfile
   - gemfiles/4.1.gemfile
+  - gemfiles/4.2.gemfile
 
 install:
   - "travis_retry bundle install"

data/Appraisals

@@ -12,3 +12,9 @@ appraise "4.1" do
   gem "activerecord", "~> 4.1.0.beta"
   gem "search_cop", :path => "../"
 end
+
+appraise "4.2" do
+  gem "activerecord", "~> 4.2.0.beta"
+  gem "search_cop", :path => "../"
+end
+

data/README.md

@@ -97,7 +97,7 @@ end
 
 ## How does it work
 
-SearchCop parses the query and maps it to an SQL Query using Arel.
+SearchCop parses the query and maps it to an SQL Query in a database agnostic way.
 Thus, SearchCop is not bound to a specific RDBMS.
 
 ```ruby

data/gemfiles/4.2.gemfile

@@ -0,0 +1,26 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 4.2.0.beta"
+gem "search_cop", :path => "../"
+
+platforms :jruby do
+  gem "activerecord-jdbcmysql-adapter"
+  gem "activerecord-jdbcsqlite3-adapter"
+  gem "activerecord-jdbcpostgresql-adapter"
+end
+
+platforms :ruby do
+  gem "sqlite3"
+  gem "mysql2"
+  gem "pg"
+end
+
+platforms :rbx do
+  gem "racc"
+  gem "rubysl", "~> 2.0"
+  gem "psych"
+end
+
+gemspec :path => "../"

data/lib/search_cop/query_builder.rb

@@ -9,7 +9,7 @@ module SearchCop
 
       arel = SearchCop::Parser.parse(query, query_info).optimize!
 
-      self.sql = model.connection.visitor.accept(arel)
+      self.sql = SearchCop::Visitors::Visitor.new(model.connection).visit(arel)
     end
 
     def associations

data/lib/search_cop/search_scope.rb

@@ -29,7 +29,7 @@ module SearchCop
     def attributes(*args)
       args.each do |arg|
         attributes_hash arg.is_a?(Hash) ? arg : { arg => arg }
-      end 
+      end
     end
 
     def options(key, options = {})
@@ -54,8 +54,8 @@ module SearchCop
           table, attribute = column.to_s =~ /\./ ? column.to_s.split(".") : [model.name.tableize, column]
 
           "#{table}.#{attribute}"
-        end 
-      end 
+        end
+      end
     end
   end
 end

data/lib/search_cop/version.rb

@@ -1,3 +1,3 @@
 module SearchCop
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/search_cop/visitors/mysql.rb

@@ -0,0 +1,43 @@
+
+module SearchCop
+  module Visitors
+    module Mysql
+      class FulltextQuery < Visitor
+        def visit_SearchCopGrammar_Nodes_MatchesFulltextNot(node)
+          node.right.split(/[\s+'"<>()~-]+/).collect { |word| "-#{word}" }.join(" ")
+        end
+
+        def visit_SearchCopGrammar_Nodes_MatchesFulltext(node)
+          words = node.right.split(/[\s+'"<>()~-]+/)
+
+          words.size > 1 ? "\"#{words.join " "}\"" : words.first
+        end
+
+        def visit_SearchCopGrammar_Nodes_And_Fulltext(node)
+          res = node.nodes.collect do |node|
+            if node.is_a?(SearchCopGrammar::Nodes::MatchesFulltextNot)
+              visit node
+            else
+              node.nodes.size > 1 ? "+(#{visit node})" : "+#{visit node}"
+            end
+          end
+
+          res.join " "
+        end
+
+        def visit_SearchCopGrammar_Nodes_Or_Fulltext(node)
+          node.nodes.collect { |node| "(#{visit node})" }.join(" ")
+        end
+      end
+
+      def visit_SearchCopGrammar_Attributes_Collection(node)
+        node.attributes.collect { |attribute| visit attribute }.join(", ")
+      end
+
+      def visit_SearchCopGrammar_Nodes_FulltextExpression(node)
+        "MATCH(#{visit node.collection}) AGAINST(#{visit FulltextQuery.new(connection).visit(node.node)} IN BOOLEAN MODE)"
+      end
+    end
+  end
+end
+

data/lib/search_cop/visitors/postgres.rb

@@ -0,0 +1,39 @@
+
+module SearchCop
+  module Visitors
+    module Postgres
+      class FulltextQuery < Visitor
+        def visit_SearchCopGrammar_Nodes_MatchesFulltextNot(node)
+          "!'#{node.right.gsub /[\s&|!:'"]+/, " "}'"
+        end
+
+        def visit_SearchCopGrammar_Nodes_MatchesFulltext(node)
+          "'#{node.right.gsub /[\s&|!:'"]+/, " "}'"
+        end
+
+        def visit_SearchCopGrammar_Nodes_And_Fulltext(node)
+          node.nodes.collect { |node| "(#{visit node})" }.join(" & ")
+        end
+
+        def visit_SearchCopGrammar_Nodes_Or_Fulltext(node)
+          node.nodes.collect { |node| "(#{visit node})" }.join(" | ")
+        end
+      end
+
+      def visit_SearchCopGrammar_Nodes_Matches(node)
+        "#{visit node.left} ILIKE #{visit node.right}"
+      end
+
+      def visit_SearchCopGrammar_Attributes_Collection(node)
+        node.attributes.collect { |attribute| visit attribute }.join(" || ' ' || ")
+      end
+
+      def visit_SearchCopGrammar_Nodes_FulltextExpression(node)
+        dictionary = node.collection.options[:dictionary] || "simple"
+
+        "to_tsvector(#{visit dictionary}, #{visit node.collection}) @@ to_tsquery(#{visit dictionary}, #{visit FulltextQuery.new(connection).visit(node.node)})"
+      end
+    end
+  end
+end
+

data/lib/search_cop/visitors/visitor.rb

@@ -0,0 +1,96 @@
+
+module SearchCop
+  module Visitors
+    class Visitor
+      attr_accessor :connection
+
+      def initialize(connection)
+        @connection = connection
+
+        extend(SearchCop::Visitors::Mysql) if @connection.class.name =~ /mysql/i
+        extend(SearchCop::Visitors::Postgres) if @connection.class.name =~ /postgres/i
+      end
+
+      def visit(visit_node = node)
+        send "visit_#{visit_node.class.name.gsub /::/, "_"}", visit_node
+      end
+
+      def visit_SearchCopGrammar_Nodes_And(node)
+        "(#{node.nodes.collect { |n| visit n }.join(" AND ")})"
+      end
+
+      def visit_SearchCopGrammar_Nodes_Or(node)
+        "(#{node.nodes.collect { |n| visit n }.join(" OR ")})"
+      end
+
+      def visit_SearchCopGrammar_Nodes_GreaterThan(node)
+        "#{visit node.left} > #{visit node.right}"
+      end
+
+      def visit_SearchCopGrammar_Nodes_GreaterThanOrEqual(node)
+        "#{visit node.left} >= #{visit node.right}"
+      end
+
+      def visit_SearchCopGrammar_Nodes_LessThan(node)
+        "#{visit node.left} < #{visit node.right}"
+      end
+
+      def visit_SearchCopGrammar_Nodes_LessThanOrEqual(node)
+        "#{visit node.left} <= #{visit node.right}"
+      end
+
+      def visit_SearchCopGrammar_Nodes_Equality(node)
+        "#{visit node.left} = #{visit node.right}"
+      end
+
+      def visit_SearchCopGrammar_Nodes_NotEqual(node)
+        "#{visit node.left} != #{visit node.right}"
+      end
+
+      def visit_SearchCopGrammar_Nodes_Matches(node)
+        "#{visit node.left} LIKE #{visit node.right}"
+      end
+
+      def visit_SearchCopGrammar_Nodes_Not(node)
+        "NOT (#{visit node.object})"
+      end
+
+      def quote_table_name(name)
+        connection.quote_table_name name
+      end
+
+      def quote_column_name(name)
+        connection.quote_column_name name
+      end
+
+      def visit_attribute(attribute)
+        "#{quote_table_name attribute.table_alias}.#{quote_column_name attribute.column_name}"
+      end
+
+      alias :visit_SearchCopGrammar_Attributes_String :visit_attribute
+      alias :visit_SearchCopGrammar_Attributes_Text :visit_attribute
+      alias :visit_SearchCopGrammar_Attributes_Float :visit_attribute
+      alias :visit_SearchCopGrammar_Attributes_Integer :visit_attribute
+      alias :visit_SearchCopGrammar_Attributes_Decimal :visit_attribute
+      alias :visit_SearchCopGrammar_Attributes_Datetime :visit_attribute
+      alias :visit_SearchCopGrammar_Attributes_Timestamp :visit_attribute
+      alias :visit_SearchCopGrammar_Attributes_Date :visit_attribute
+      alias :visit_SearchCopGrammar_Attributes_Time :visit_attribute
+      alias :visit_SearchCopGrammar_Attributes_Boolean :visit_attribute
+
+      def quote(value)
+        connection.quote value
+      end
+
+      alias :visit_TrueClass :quote
+      alias :visit_FalseClass :quote
+      alias :visit_String :quote
+      alias :visit_Time :quote
+      alias :visit_Date :quote
+      alias :visit_Float :quote
+      alias :visit_Fixnum :quote
+      alias :visit_Symbol :quote
+    end
+  end
+end
+

data/lib/search_cop/visitors.rb

@@ -0,0 +1,5 @@
+
+require "search_cop/visitors/visitor"
+require "search_cop/visitors/mysql"
+require "search_cop/visitors/postgres"
+

data/lib/search_cop.rb

@@ -1,11 +1,11 @@
 
 require "search_cop/version"
-require "search_cop/arel"
 require "search_cop/search_scope"
 require "search_cop/query_info"
 require "search_cop/query_builder"
 require "search_cop/grammar_parser"
 require "search_cop/hash_parser"
+require "search_cop/visitors"
 
 module SearchCop
   class SpecificationError < StandardError; end

data/lib/search_cop_grammar/attributes.rb

@@ -82,16 +82,18 @@ module SearchCopGrammar
 
         raise(SearchCop::UnknownAttribute, "Unknown attribute #{attribute_definition}") unless klass.columns_hash[column]
 
-        Attributes.const_get(klass.columns_hash[column].type.to_s.classify).new(klass.arel_table.alias(alias_for(table))[column], klass, options)
+        Attributes.const_get(klass.columns_hash[column].type.to_s.classify).new(klass, alias_for(table), column, options)
       end
     end
 
     class Base
-      attr_reader :attribute, :options
+      attr_reader :attribute, :table_alias, :column_name, :options
 
-      def initialize(attribute, klass, options = {})
-        @attribute = attribute
+      def initialize(klass, table_alias, column_name, options = {})
+        @attribute = klass.arel_table.alias(table_alias)[column_name]
         @klass = klass
+        @table_alias = table_alias
+        @column_name = column_name
         @options = (options || {})
       end
 
@@ -115,16 +117,16 @@ module SearchCopGrammar
         define_method method do |value|
           raise(SearchCop::IncompatibleDatatype, "Incompatible datatype for #{value}") unless compatible?(value)
 
-          SearchCopGrammar::Nodes.const_get(class_name).new(@attribute, map(value))
+          SearchCopGrammar::Nodes.const_get(class_name).new(self, map(value))
         end
       end
 
       def method_missing(name, *args, &block)
-        @attribute.send name, *args, &block
+        @attribute.send(name, *args, &block)
       end
 
       def respond_to?(*args)
-        @attribute.respond_to? *args
+        super(*args) || @attribute.respond_to?(*args)
       end
     end
 
@@ -154,9 +156,18 @@ module SearchCopGrammar
 
         false
       end
+
+      def map(value)
+        value.to_f
+      end
+    end
+
+    class Integer < Float
+      def map(value)
+        value.to_i
+      end
     end
 
-    class Integer < Float; end
     class Decimal < Float; end
 
     class Datetime < WithoutMatches

data/lib/search_cop_grammar/nodes.rb

@@ -159,7 +159,7 @@ module SearchCopGrammar
       def initialize(collection, *nodes)
         @collection = collection
 
-        super *nodes
+        super(*nodes)
       end
 
       def fulltext?

data/lib/search_cop_grammar.treetop

@@ -21,7 +21,7 @@ grammar SearchCopGrammar
   end
 
   rule parentheses_expression
-    '(' complex_expression ')' <ParenthesesExpression> 
+    '(' complex_expression ')' <ParenthesesExpression>
   end
 
   rule not_expression

data/test/test_helper.rb

@@ -146,5 +146,17 @@ class SearchCop::TestCase
   def assert_not_nil(value)
     assert value
   end
+
+  def quote_table_name(name)
+    ActiveRecord::Base.connection.quote_table_name name
+  end
+
+  def quote_column_name(name)
+    ActiveRecord::Base.connection.quote_column_name name
+  end
+
+  def quote(object)
+    ActiveRecord::Base.connection.quote object
+  end
 end
 

data/test/visitor_test.rb

@@ -0,0 +1,101 @@
+
+require File.expand_path("../test_helper", __FILE__)
+
+class VisitorTest < SearchCop::TestCase
+  def test_and
+    node = SearchCopGrammar::Attributes::Integer.new(Product, "products", "stock").gt(0).and(SearchCopGrammar::Attributes::Integer.new(Product, "products", "stock").lt(2))
+
+    assert_equal "(#{quote_table_name "products"}.#{quote_column_name "stock"} > 0 AND #{quote_table_name "products"}.#{quote_column_name "stock"} < 2)", SearchCop::Visitors::Visitor.new(ActiveRecord::Base.connection).visit(node)
+  end
+
+  def test_or
+    node = SearchCopGrammar::Attributes::Integer.new(Product, "products", "stock").gt(0).or(SearchCopGrammar::Attributes::Integer.new(Product, "products", "stock").lt(2))
+
+    assert_equal "(#{quote_table_name "products"}.#{quote_column_name "stock"} > 0 OR #{quote_table_name "products"}.#{quote_column_name "stock"} < 2)", SearchCop::Visitors::Visitor.new(ActiveRecord::Base.connection).visit(node)
+  end
+
+  def test_greater_than
+    node = SearchCopGrammar::Attributes::Integer.new(Product, "products", "stock").gt(1)
+
+    assert_equal "#{quote_table_name "products"}.#{quote_column_name "stock"} > 1", SearchCop::Visitors::Visitor.new(ActiveRecord::Base.connection).visit(node)
+  end
+
+  def test_greater_than_or_equal
+    node = SearchCopGrammar::Attributes::Integer.new(Product, "products", "stock").gteq(1)
+
+    assert_equal "#{quote_table_name "products"}.#{quote_column_name "stock"} >= 1", SearchCop::Visitors::Visitor.new(ActiveRecord::Base.connection).visit(node)
+  end
+
+  def test_less_than
+    node = SearchCopGrammar::Attributes::Integer.new(Product, "products", "stock").lt(1)
+
+    assert_equal "#{quote_table_name "products"}.#{quote_column_name "stock"} < 1", SearchCop::Visitors::Visitor.new(ActiveRecord::Base.connection).visit(node)
+  end
+
+  def test_less_than_or_equal
+    node = SearchCopGrammar::Attributes::Integer.new(Product, "products", "stock").lteq(1)
+
+    assert_equal "#{quote_table_name "products"}.#{quote_column_name "stock"} <= 1", SearchCop::Visitors::Visitor.new(ActiveRecord::Base.connection).visit(node)
+  end
+
+  def test_equality
+    node = SearchCopGrammar::Attributes::Integer.new(Product, "products", "stock").eq(1)
+
+    assert_equal "#{quote_table_name "products"}.#{quote_column_name "stock"} = 1", SearchCop::Visitors::Visitor.new(ActiveRecord::Base.connection).visit(node)
+  end
+
+  def test_not_equal
+    node = SearchCopGrammar::Attributes::Integer.new(Product, "products", "stock").not_eq(1)
+
+    assert_equal "#{quote_table_name "products"}.#{quote_column_name "stock"} != 1", SearchCop::Visitors::Visitor.new(ActiveRecord::Base.connection).visit(node)
+  end
+
+  def test_matches
+    node = SearchCopGrammar::Attributes::String.new(Product, "products", "notice").matches("Notice")
+
+    assert_equal("#{quote_table_name "products"}.#{quote_column_name "notice"} LIKE #{quote "%Notice%"}", SearchCop::Visitors::Visitor.new(ActiveRecord::Base.connection).visit(node)) if ENV["DATABASE"] != "postgres"
+    assert_equal("#{quote_table_name "products"}.#{quote_column_name "notice"} ILIKE #{quote "%Notice%"}", SearchCop::Visitors::Visitor.new(ActiveRecord::Base.connection).visit(node)) if ENV["DATABASE"] == "postgres"
+  end
+
+  def test_not
+    node = SearchCopGrammar::Attributes::Integer.new(Product, "products", "stock").eq(1).not
+
+    assert_equal "NOT (#{quote_table_name "products"}.#{quote_column_name "stock"} = 1)", SearchCop::Visitors::Visitor.new(ActiveRecord::Base.connection).visit(node)
+  end
+
+  def test_attribute
+    # Already tested
+  end
+
+  def test_quote
+    assert_equal quote("Test"), SearchCop::Visitors::Visitor.new(ActiveRecord::Base.connection).visit("Test")
+  end
+
+  def test_fulltext
+    node = SearchCopGrammar::Attributes::Collection.new(SearchCop::QueryInfo.new(Product, Product.search_scopes[:search]), "title").matches("Query").optimize!
+
+    assert_equal("MATCH(`products`.`title`) AGAINST('Query' IN BOOLEAN MODE)", SearchCop::Visitors::Visitor.new(ActiveRecord::Base.connection).visit(node)) if ENV["DATABASE"] == "mysql"
+    assert_equal("to_tsvector('english', \"products\".\"title\") @@ to_tsquery('english', '''Query''')", SearchCop::Visitors::Visitor.new(ActiveRecord::Base.connection).visit(node)) if ENV["DATABASE"] == "postgres"
+  end
+
+  def test_fulltext_and
+    query1 = SearchCopGrammar::Attributes::Collection.new(SearchCop::QueryInfo.new(Product, Product.search_scopes[:search]), "title").matches("Query1")
+    query2 = SearchCopGrammar::Attributes::Collection.new(SearchCop::QueryInfo.new(Product, Product.search_scopes[:search]), "title").matches("Query2")
+
+    node = query1.and(query2).optimize!
+
+    assert_equal("(MATCH(`products`.`title`) AGAINST('+Query1 +Query2' IN BOOLEAN MODE))", SearchCop::Visitors::Visitor.new(ActiveRecord::Base.connection).visit(node)) if ENV["DATABASE"] == "mysql"
+    assert_equal("(to_tsvector('english', \"products\".\"title\") @@ to_tsquery('english', '(''Query1'') & (''Query2'')'))", SearchCop::Visitors::Visitor.new(ActiveRecord::Base.connection).visit(node)) if ENV["DATABASE"] == "postgres"
+  end
+
+  def test_fulltext_or
+    query1 = SearchCopGrammar::Attributes::Collection.new(SearchCop::QueryInfo.new(Product, Product.search_scopes[:search]), "title").matches("Query1")
+    query2 = SearchCopGrammar::Attributes::Collection.new(SearchCop::QueryInfo.new(Product, Product.search_scopes[:search]), "title").matches("Query2")
+
+    node = query1.or(query2).optimize!
+
+    assert_equal("(MATCH(`products`.`title`) AGAINST('(Query1) (Query2)' IN BOOLEAN MODE))", SearchCop::Visitors::Visitor.new(ActiveRecord::Base.connection).visit(node)) if ENV["DATABASE"] == "mysql"
+    assert_equal("(to_tsvector('english', \"products\".\"title\") @@ to_tsquery('english', '(''Query1'') | (''Query2'')'))", SearchCop::Visitors::Visitor.new(ActiveRecord::Base.connection).visit(node)) if ENV["DATABASE"] == "postgres"
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: search_cop
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -142,15 +142,18 @@ files:
 - gemfiles/3.2.gemfile
 - gemfiles/4.0.gemfile
 - gemfiles/4.1.gemfile
+- gemfiles/4.2.gemfile
 - lib/search_cop.rb
-- lib/search_cop/arel.rb
-- lib/search_cop/arel/visitors.rb
 - lib/search_cop/grammar_parser.rb
 - lib/search_cop/hash_parser.rb
 - lib/search_cop/query_builder.rb
 - lib/search_cop/query_info.rb
 - lib/search_cop/search_scope.rb
 - lib/search_cop/version.rb
+- lib/search_cop/visitors.rb
+- lib/search_cop/visitors/mysql.rb
+- lib/search_cop/visitors/postgres.rb
+- lib/search_cop/visitors/visitor.rb
 - lib/search_cop_grammar.rb
 - lib/search_cop_grammar.treetop
 - lib/search_cop_grammar/attributes.rb
@@ -172,6 +175,7 @@ files:
 - test/search_cop_test.rb
 - test/string_test.rb
 - test/test_helper.rb
+- test/visitor_test.rb
 homepage: https://github.com/mrkamel/search_cop
 licenses:
 - MIT
@@ -215,3 +219,4 @@ test_files:
 - test/search_cop_test.rb
 - test/string_test.rb
 - test/test_helper.rb
+- test/visitor_test.rb

data/lib/search_cop/arel/visitors.rb

@@ -1,223 +0,0 @@
-
-module SearchCop
-  module Arel
-    module Visitors
-      module ToSql
-        if ::Arel::VERSION >= "4.0.1"
-          def visit_SearchCopGrammar_Nodes_And(o, a)
-            visit ::Arel::Nodes::Grouping.new(o.nodes.inject { |res, cur| ::Arel::Nodes::And.new [res, cur] }), a
-          end
-
-          def visit_SearchCopGrammar_Nodes_Or(o, a)
-            visit ::Arel::Nodes::Grouping.new(o.nodes.inject { |res, cur| ::Arel::Nodes::Or.new res, cur }), a
-          end
-
-          def visit_SearchCopGrammar_Nodes_Equality(o, a)
-            visit ::Arel::Nodes::Equality.new(o.left, o.right), a
-          end
-
-          def visit_SearchCopGrammar_Nodes_NotEqual(o, a)
-            visit ::Arel::Nodes::NotEqual.new(o.left, o.right), a
-          end
-
-          def visit_SearchCopGrammar_Nodes_LessThan(o, a)
-            visit ::Arel::Nodes::LessThan.new(o.left, o.right), a
-          end
-
-          def visit_SearchCopGrammar_Nodes_LessThanOrEqual(o, a)
-            visit ::Arel::Nodes::LessThanOrEqual.new(o.left, o.right), a
-          end
-
-          def visit_SearchCopGrammar_Nodes_GreaterThan(o, a)
-            visit ::Arel::Nodes::GreaterThan.new(o.left, o.right), a
-          end
-
-          def visit_SearchCopGrammar_Nodes_GreaterThanOrEqual(o, a)
-            visit ::Arel::Nodes::GreaterThanOrEqual.new(o.left, o.right), a
-          end
-
-          def visit_SearchCopGrammar_Nodes_Not(o, a)
-            visit ::Arel::Nodes::Not.new(o.object), a
-          end
-
-          def visit_SearchCopGrammar_Nodes_Matches(o, a)
-            visit ::Arel::Nodes::Matches.new(o.left, o.right), a
-          end
-        else
-          def visit_SearchCopGrammar_Nodes_And(o)
-            visit ::Arel::Nodes::Grouping.new(o.nodes.inject { |res, cur| ::Arel::Nodes::And.new [res, cur] })
-          end
-
-          def visit_SearchCopGrammar_Nodes_Or(o)
-            visit ::Arel::Nodes::Grouping.new(o.nodes.inject { |res, cur| ::Arel::Nodes::Or.new res, cur })
-          end
-
-          def visit_SearchCopGrammar_Nodes_Equality(o)
-            visit ::Arel::Nodes::Equality.new(o.left, o.right)
-          end
-
-          def visit_SearchCopGrammar_Nodes_NotEqual(o)
-            visit ::Arel::Nodes::NotEqual.new(o.left, o.right)
-          end
-
-          def visit_SearchCopGrammar_Nodes_LessThan(o)
-            visit ::Arel::Nodes::LessThan.new(o.left, o.right)
-          end
-
-          def visit_SearchCopGrammar_Nodes_LessThanOrEqual(o)
-            visit ::Arel::Nodes::LessThanOrEqual.new(o.left, o.right)
-          end
-
-          def visit_SearchCopGrammar_Nodes_GreaterThan(o)
-            visit ::Arel::Nodes::GreaterThan.new(o.left, o.right)
-          end
-
-          def visit_SearchCopGrammar_Nodes_GreaterThanOrEqual(o)
-            visit ::Arel::Nodes::GreaterThanOrEqual.new(o.left, o.right)
-          end
-
-          def visit_SearchCopGrammar_Nodes_Not(o)
-            visit ::Arel::Nodes::Not.new(o.object)
-          end
-
-          def visit_SearchCopGrammar_Nodes_Matches(o)
-            visit ::Arel::Nodes::Matches.new(o.left, o.right)
-          end
-        end
-      end
-
-      module MySQL
-        if ::Arel::VERSION >= "4.0.1"
-          def visit_SearchCopGrammar_Attributes_Collection(o, a)
-            o.attributes.collect { |attribute| visit attribute.attribute, a }.join(", ")
-          end
-
-          def visit_SearchCopGrammar_Nodes_FulltextExpression(o, a)
-            "MATCH(#{visit o.collection, a}) AGAINST(#{visit visit(o.node, a), a} IN BOOLEAN MODE)"
-          end
-
-          def visit_SearchCopGrammar_Nodes_MatchesFulltextNot(o, a)
-            o.right.split(/[\s+'"<>()~-]+/).collect { |word| "-#{word}" }.join(" ")
-          end
-
-          def visit_SearchCopGrammar_Nodes_MatchesFulltext(o, a)
-            words = o.right.split(/[\s+'"<>()~-]+/)
-
-            words.size > 1 ? "\"#{words.join " "}\"" : words.first
-          end
-
-          def visit_SearchCopGrammar_Nodes_And_Fulltext(o, a)
-            res = o.nodes.collect do |node|
-              if node.is_a?(SearchCopGrammar::Nodes::MatchesFulltextNot)
-                visit node, a
-              else
-                node.nodes.size > 1 ? "+(#{visit node, a})" : "+#{visit node, a}"
-              end
-            end
-
-            res.join " "
-          end
-
-          def visit_SearchCopGrammar_Nodes_Or_Fulltext(o, a)
-            o.nodes.collect { |node| "(#{visit node, a})" }.join(" ")
-          end
-        else
-          def visit_SearchCopGrammar_Attributes_Collection(o)
-            o.attributes.collect { |attribute| visit attribute.attribute }.join(", ")
-          end
-
-          def visit_SearchCopGrammar_Nodes_FulltextExpression(o)
-            "MATCH(#{visit o.collection}) AGAINST(#{visit visit(o.node)} IN BOOLEAN MODE)"
-          end
-
-          def visit_SearchCopGrammar_Nodes_MatchesFulltextNot(o)
-            o.right.split(/[\s+'"<>()~-]+/).collect { |word| "-#{word}" }.join(" ")
-          end
-
-          def visit_SearchCopGrammar_Nodes_MatchesFulltext(o)
-            words = o.right.split(/[\s+'"<>()~-]+/)
-
-            words.size > 1 ? "\"#{words.join " "}\"" : words.first
-          end
-
-          def visit_SearchCopGrammar_Nodes_And_Fulltext(o)
-            res = o.nodes.collect do |node|
-              if node.is_a?(SearchCopGrammar::Nodes::MatchesFulltextNot)
-                visit node
-              else
-                node.nodes.size > 1 ? "+(#{visit node})" : "+#{visit node}"
-              end
-            end
-
-            res.join " "
-          end
-
-          def visit_SearchCopGrammar_Nodes_Or_Fulltext(o)
-            o.nodes.collect { |node| "(#{visit node})" }.join(" ")
-          end
-        end
-      end
-
-      module PostgreSQL
-        if ::Arel::VERSION >= "4.0.1"
-          def visit_SearchCopGrammar_Attributes_Collection(o, a)
-            o.attributes.collect { |attribute| visit attribute.attribute, a }.join(" || ' ' || ")
-          end
-
-          def visit_SearchCopGrammar_Nodes_FulltextExpression(o, a)
-            dictionary = o.collection.options[:dictionary] || "simple"
-
-            "to_tsvector(#{visit dictionary, a}, #{visit o.collection, a}) @@ to_tsquery(#{visit dictionary, a}, #{visit visit(o.node, a), a})"
-          end
-
-          def visit_SearchCopGrammar_Nodes_MatchesFulltextNot(o, a)
-            "!'#{o.right}'"
-          end
-
-          def visit_SearchCopGrammar_Nodes_MatchesFulltext(o, a)
-            "'#{o.right.gsub /[\s&|!:'"]+/, " "}'"
-          end
-
-          def visit_SearchCopGrammar_Nodes_And_Fulltext(o, a)
-            o.nodes.collect { |node| "(#{visit node, a})" }.join(" & ")
-          end
-
-          def visit_SearchCopGrammar_Nodes_Or_Fulltext(o, a)
-            o.nodes.collect { |node| "(#{visit node, a})" }.join(" | ")
-          end
-        else
-          def visit_SearchCopGrammar_Attributes_Collection(o)
-            o.attributes.collect { |attribute| visit attribute.attribute }.join(" || ' ' || ")
-          end
-
-          def visit_SearchCopGrammar_Nodes_FulltextExpression(o)
-            dictionary = o.collection.options[:dictionary] || "simple"
-
-            "to_tsvector(#{visit dictionary.to_sym}, #{visit o.collection}) @@ to_tsquery(#{visit dictionary.to_sym}, #{visit visit(o.node)})" # to_sym fixes a 3.2 + postgres bug
-          end
-
-          def visit_SearchCopGrammar_Nodes_MatchesFulltextNot(o)
-            "!'#{o.right}'"
-          end
-
-          def visit_SearchCopGrammar_Nodes_MatchesFulltext(o)
-            "'#{o.right.gsub /[\s&|!:'"]+/, " "}'"
-          end
-
-          def visit_SearchCopGrammar_Nodes_And_Fulltext(o)
-            o.nodes.collect { |node| "(#{visit node})" }.join(" & ")
-          end
-
-          def visit_SearchCopGrammar_Nodes_Or_Fulltext(o)
-            o.nodes.collect { |node| "(#{visit node})" }.join(" | ")
-          end
-        end
-      end
-    end
-  end
-end
-
-Arel::Visitors::PostgreSQL.send :include, SearchCop::Arel::Visitors::PostgreSQL
-Arel::Visitors::MySQL.send :include, SearchCop::Arel::Visitors::MySQL
-Arel::Visitors::ToSql.send :include, SearchCop::Arel::Visitors::ToSql
-

data/lib/search_cop/arel.rb

@@ -1,4 +0,0 @@
-
-require "arel"
-require "search_cop/arel/visitors"
-