arel 6.0.0.beta1 → 6.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b103196a0f761d65ab71b2ac1e03d779de9e219d
-  data.tar.gz: 9cb4e0384586df861b130b6f64ad01c85235f1ac
+  metadata.gz: 574ad2e118c98249afe11b53301402b5147f4c30
+  data.tar.gz: 57ffac4daf00d333d7e7f7e892a1803e000d3c92
 SHA512:
-  metadata.gz: cdb5378f5ea5baf01ec44da940498565dadfb2b044047d9ec98f62b5aebe9bc802f79194dcd0936451d41f90238b265e0b534e3fce2ba94951913f9ebf0b9e5f
-  data.tar.gz: 651a4dba661f193f62c98af603e6a313a354ee772ba5e17e8830b653ac2ef794485f9a1f39ca8ca8702bfd74d66bb12d9b0f436873be5ca885de93033ce7b6d9
+  metadata.gz: 9a60726582ea96b9c18f1ffd0dac8930b54c970c1ba31c8f21e7ab52f8bdbc2fdf88b46cd3481b208abe62f5977520680604d13df5caca1568b79b519e8896e6
+  data.tar.gz: 70f4af33cc151ca020f80a95520914540f51c66bad7ff2c8dc06963cacda3aa34c2208a0fe88545d4206d5b6408aa69a4ab7c6f4c7ac1a39d58416d09702402b

data/.gitignore

@@ -0,0 +1,9 @@
+coverage/*
+config/database.yml
+spec/support/fixtures/*database*
+*.DS_Store
+debug.log
+pkg
+.bundle
+*.swp
+Gemfile.lock

data/.travis.yml

@@ -1,3 +1,4 @@
+language: ruby
 script: 
   - "rake test"
   - "gem build arel.gemspec"
@@ -6,7 +7,8 @@ rvm:
   - jruby
   - 1.9.3
   - 2.0.0
-  - 2.1.1
+  - 2.1
+  - ruby-head
 matrix:
   allow_failures:
     - rvm: rbx

data/Gemfile

@@ -1,12 +1,5 @@
-# -*- ruby -*-
-
-# DO NOT EDIT THIS FILE. Instead, edit Rakefile, and run `rake bundler:gemfile`.
-
 source "https://rubygems.org/"
 
+gemspec
 
-gem "minitest", "~>5.1", :group => [:development, :test]
-gem "rdoc", "~>4.0", :group => [:development, :test]
-gem "hoe", "~>3.5", :group => [:development, :test]
-
-# vim: syntax=ruby
+gem 'rake'

data/README.markdown

@@ -184,7 +184,7 @@ comments_with_replies = \
 
 This will return the reply for the first comment.
 
-[Common Table Expresssions(CTE)](https://en.wikipedia.org/wiki/Common_table_expressions#Common_table_expression) support via:
+[Common Table Expressions(CTE)](https://en.wikipedia.org/wiki/Common_table_expressions#Common_table_expression) support via:
 
 Create a `CTE`
 

data/Rakefile

@@ -1,20 +1,15 @@
-require "rubygems"
-gem 'hoe', '>= 3.3.1'
-require 'hoe'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-Hoe.plugins.delete :rubyforge
-Hoe.plugin :minitest
-Hoe.plugin :gemspec # `gem install hoe-gemspec`
-Hoe.plugin :git     # `gem install hoe-git`
-Hoe.plugin :bundler # `gem install hoe-bundler`
+specname = "arel.gemspec"
+deps = `git ls-files`.split("\n") - [specname]
 
-Hoe.spec 'arel' do
-  developer('Aaron Patterson', 'aaron@tenderlovemaking.com')
-  developer('Bryan Helmkamp', 'bryan@brynary.com')
-  developer('Emilio Tagua', 'miloops@gmail.com')
-  developer('Nick Kallen', 'nick@example.org') # FIXME: need Nick's email
+file specname => deps do
+  files       = `git ls-files`.split("\n") - ["#{specname}.erb"]
 
-  self.licenses         = ['MIT']
-  self.readme_file      = 'README.markdown'
-  self.extra_rdoc_files = FileList['README.markdown']
+  require 'erb'
+
+  File.open specname, 'w:utf-8' do |f|
+    f.write ERB.new(File.read("#{specname}.erb")).result(binding)
+  end
 end

data/arel.gemspec

@@ -1,40 +1,24 @@
-# -*- encoding: utf-8 -*-
-# stub: arel 6.0.0.beta1.20140817224534 ruby lib
+# # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "arel"
 
 Gem::Specification.new do |s|
-  s.name = "arel"
-  s.version = "6.0.0.beta1.20140817224534"
-
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Aaron Patterson", "Bryan Helmkamp", "Emilio Tagua", "Nick Kallen"]
-  s.date = "2014-08-18"
+  s.name        = "arel"
+  s.version     = Arel::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Aaron Patterson", "Bryan Helmkamp", "Emilio Tagua", "Nick Kallen"]
+  s.email       = ["aaron@tenderlovemaking.com", "bryan@brynary.com", "miloops@gmail.com"]
+  s.homepage    = "https://github.com/rails/arel"
   s.description = "Arel Really Exasperates Logicians\n\nArel is a SQL AST manager for Ruby. It\n\n1. Simplifies the generation of complex SQL queries\n2. Adapts to various RDBMSes\n\nIt is intended to be a framework framework; that is, you can build your own ORM\nwith it, focusing on innovative object and collection modeling as opposed to\ndatabase compatibility and query generation."
-  s.email = ["aaron@tenderlovemaking.com", "bryan@brynary.com", "miloops@gmail.com", "nick@example.org"]
-  s.extra_rdoc_files = ["History.txt", "MIT-LICENSE.txt", "Manifest.txt", "README.markdown"]
-  s.files = [".autotest", ".gemtest", ".travis.yml", "Gemfile", "History.txt", "MIT-LICENSE.txt", "Manifest.txt", "README.markdown", "Rakefile", "arel.gemspec", "lib/arel.rb", "lib/arel/alias_predication.rb", "lib/arel/attributes.rb", "lib/arel/attributes/attribute.rb", "lib/arel/collectors/bind.rb", "lib/arel/collectors/plain_string.rb", "lib/arel/collectors/sql_string.rb", "lib/arel/compatibility/wheres.rb", "lib/arel/crud.rb", "lib/arel/delete_manager.rb", "lib/arel/expressions.rb", "lib/arel/factory_methods.rb", "lib/arel/insert_manager.rb", "lib/arel/math.rb", "lib/arel/nodes.rb", "lib/arel/nodes/and.rb", "lib/arel/nodes/ascending.rb", "lib/arel/nodes/binary.rb", "lib/arel/nodes/count.rb", "lib/arel/nodes/delete_statement.rb", "lib/arel/nodes/descending.rb", "lib/arel/nodes/equality.rb", "lib/arel/nodes/extract.rb", "lib/arel/nodes/false.rb", "lib/arel/nodes/full_outer_join.rb", "lib/arel/nodes/function.rb", "lib/arel/nodes/grouping.rb", "lib/arel/nodes/in.rb", "lib/arel/nodes/infix_operation.rb", "lib/arel/nodes/inner_join.rb", "lib/arel/nodes/insert_statement.rb", "lib/arel/nodes/join_source.rb", "lib/arel/nodes/named_function.rb", "lib/arel/nodes/node.rb", "lib/arel/nodes/outer_join.rb", "lib/arel/nodes/over.rb", "lib/arel/nodes/right_outer_join.rb", "lib/arel/nodes/select_core.rb", "lib/arel/nodes/select_statement.rb", "lib/arel/nodes/sql_literal.rb", "lib/arel/nodes/string_join.rb", "lib/arel/nodes/table_alias.rb", "lib/arel/nodes/terminal.rb", "lib/arel/nodes/true.rb", "lib/arel/nodes/unary.rb", "lib/arel/nodes/unqualified_column.rb", "lib/arel/nodes/update_statement.rb", "lib/arel/nodes/values.rb", "lib/arel/nodes/window.rb", "lib/arel/nodes/with.rb", "lib/arel/order_predications.rb", "lib/arel/predications.rb", "lib/arel/select_manager.rb", "lib/arel/table.rb", "lib/arel/tree_manager.rb", "lib/arel/update_manager.rb", "lib/arel/visitors.rb", "lib/arel/visitors/bind_substitute.rb", "lib/arel/visitors/bind_visitor.rb", "lib/arel/visitors/depth_first.rb", "lib/arel/visitors/dot.rb", "lib/arel/visitors/ibm_db.rb", "lib/arel/visitors/informix.rb", "lib/arel/visitors/mssql.rb", "lib/arel/visitors/mysql.rb", "lib/arel/visitors/oracle.rb", "lib/arel/visitors/postgresql.rb", "lib/arel/visitors/reduce.rb", "lib/arel/visitors/sqlite.rb", "lib/arel/visitors/to_sql.rb", "lib/arel/visitors/visitor.rb", "lib/arel/visitors/where_sql.rb", "lib/arel/window_predications.rb", "test/attributes/test_attribute.rb", "test/collectors/test_bind_collector.rb", "test/collectors/test_sql_string.rb", "test/helper.rb", "test/nodes/test_and.rb", "test/nodes/test_as.rb", "test/nodes/test_ascending.rb", "test/nodes/test_bin.rb", "test/nodes/test_count.rb", "test/nodes/test_delete_statement.rb", "test/nodes/test_descending.rb", "test/nodes/test_distinct.rb", "test/nodes/test_equality.rb", "test/nodes/test_extract.rb", "test/nodes/test_false.rb", "test/nodes/test_grouping.rb", "test/nodes/test_infix_operation.rb", "test/nodes/test_insert_statement.rb", "test/nodes/test_named_function.rb", "test/nodes/test_node.rb", "test/nodes/test_not.rb", "test/nodes/test_or.rb", "test/nodes/test_over.rb", "test/nodes/test_select_core.rb", "test/nodes/test_select_statement.rb", "test/nodes/test_sql_literal.rb", "test/nodes/test_sum.rb", "test/nodes/test_table_alias.rb", "test/nodes/test_true.rb", "test/nodes/test_update_statement.rb", "test/nodes/test_window.rb", "test/support/fake_record.rb", "test/test_attributes.rb", "test/test_crud.rb", "test/test_delete_manager.rb", "test/test_factory_methods.rb", "test/test_insert_manager.rb", "test/test_select_manager.rb", "test/test_table.rb", "test/test_update_manager.rb", "test/visitors/test_bind_visitor.rb", "test/visitors/test_depth_first.rb", "test/visitors/test_dispatch_contamination.rb", "test/visitors/test_dot.rb", "test/visitors/test_ibm_db.rb", "test/visitors/test_informix.rb", "test/visitors/test_mssql.rb", "test/visitors/test_mysql.rb", "test/visitors/test_oracle.rb", "test/visitors/test_postgres.rb", "test/visitors/test_sqlite.rb", "test/visitors/test_to_sql.rb"]
-  s.homepage = "http://github.com/rails/arel"
-  s.licenses = ["MIT"]
+  s.summary     = "Arel Really Exasperates Logicians  Arel is a SQL AST manager for Ruby"
+  s.license     = %q{MIT}
+
   s.rdoc_options = ["--main", "README.markdown"]
-  s.rubygems_version = "2.2.2"
-  s.summary = "Arel Really Exasperates Logicians  Arel is a SQL AST manager for Ruby"
-  s.test_files = ["test/attributes/test_attribute.rb", "test/collectors/test_bind_collector.rb", "test/collectors/test_sql_string.rb", "test/nodes/test_and.rb", "test/nodes/test_as.rb", "test/nodes/test_ascending.rb", "test/nodes/test_bin.rb", "test/nodes/test_count.rb", "test/nodes/test_delete_statement.rb", "test/nodes/test_descending.rb", "test/nodes/test_distinct.rb", "test/nodes/test_equality.rb", "test/nodes/test_extract.rb", "test/nodes/test_false.rb", "test/nodes/test_grouping.rb", "test/nodes/test_infix_operation.rb", "test/nodes/test_insert_statement.rb", "test/nodes/test_named_function.rb", "test/nodes/test_node.rb", "test/nodes/test_not.rb", "test/nodes/test_or.rb", "test/nodes/test_over.rb", "test/nodes/test_select_core.rb", "test/nodes/test_select_statement.rb", "test/nodes/test_sql_literal.rb", "test/nodes/test_sum.rb", "test/nodes/test_table_alias.rb", "test/nodes/test_true.rb", "test/nodes/test_update_statement.rb", "test/nodes/test_window.rb", "test/test_attributes.rb", "test/test_crud.rb", "test/test_delete_manager.rb", "test/test_factory_methods.rb", "test/test_insert_manager.rb", "test/test_select_manager.rb", "test/test_table.rb", "test/test_update_manager.rb", "test/visitors/test_bind_visitor.rb", "test/visitors/test_depth_first.rb", "test/visitors/test_dispatch_contamination.rb", "test/visitors/test_dot.rb", "test/visitors/test_ibm_db.rb", "test/visitors/test_informix.rb", "test/visitors/test_mssql.rb", "test/visitors/test_mysql.rb", "test/visitors/test_oracle.rb", "test/visitors/test_postgres.rb", "test/visitors/test_sqlite.rb", "test/visitors/test_to_sql.rb"]
+  s.extra_rdoc_files = ["History.txt", "MIT-LICENSE.txt", "README.markdown"]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
+  s.files         = [".gitignore",".travis.yml","Gemfile","History.txt","MIT-LICENSE.txt","README.markdown","Rakefile","arel.gemspec","lib/arel.rb","lib/arel/alias_predication.rb","lib/arel/attributes.rb","lib/arel/attributes/attribute.rb","lib/arel/collectors/bind.rb","lib/arel/collectors/plain_string.rb","lib/arel/collectors/sql_string.rb","lib/arel/compatibility/wheres.rb","lib/arel/crud.rb","lib/arel/delete_manager.rb","lib/arel/expressions.rb","lib/arel/factory_methods.rb","lib/arel/insert_manager.rb","lib/arel/math.rb","lib/arel/nodes.rb","lib/arel/nodes/and.rb","lib/arel/nodes/ascending.rb","lib/arel/nodes/binary.rb","lib/arel/nodes/count.rb","lib/arel/nodes/delete_statement.rb","lib/arel/nodes/descending.rb","lib/arel/nodes/equality.rb","lib/arel/nodes/extract.rb","lib/arel/nodes/false.rb","lib/arel/nodes/full_outer_join.rb","lib/arel/nodes/function.rb","lib/arel/nodes/grouping.rb","lib/arel/nodes/in.rb","lib/arel/nodes/infix_operation.rb","lib/arel/nodes/inner_join.rb","lib/arel/nodes/insert_statement.rb","lib/arel/nodes/join_source.rb","lib/arel/nodes/matches.rb","lib/arel/nodes/named_function.rb","lib/arel/nodes/node.rb","lib/arel/nodes/outer_join.rb","lib/arel/nodes/over.rb","lib/arel/nodes/right_outer_join.rb","lib/arel/nodes/select_core.rb","lib/arel/nodes/select_statement.rb","lib/arel/nodes/sql_literal.rb","lib/arel/nodes/string_join.rb","lib/arel/nodes/table_alias.rb","lib/arel/nodes/terminal.rb","lib/arel/nodes/true.rb","lib/arel/nodes/unary.rb","lib/arel/nodes/unqualified_column.rb","lib/arel/nodes/update_statement.rb","lib/arel/nodes/values.rb","lib/arel/nodes/window.rb","lib/arel/nodes/with.rb","lib/arel/order_predications.rb","lib/arel/predications.rb","lib/arel/select_manager.rb","lib/arel/table.rb","lib/arel/tree_manager.rb","lib/arel/update_manager.rb","lib/arel/visitors.rb","lib/arel/visitors/bind_substitute.rb","lib/arel/visitors/bind_visitor.rb","lib/arel/visitors/depth_first.rb","lib/arel/visitors/dot.rb","lib/arel/visitors/ibm_db.rb","lib/arel/visitors/informix.rb","lib/arel/visitors/mssql.rb","lib/arel/visitors/mysql.rb","lib/arel/visitors/oracle.rb","lib/arel/visitors/postgresql.rb","lib/arel/visitors/reduce.rb","lib/arel/visitors/sqlite.rb","lib/arel/visitors/to_sql.rb","lib/arel/visitors/visitor.rb","lib/arel/visitors/where_sql.rb","lib/arel/window_predications.rb","test/attributes/test_attribute.rb","test/collectors/test_bind_collector.rb","test/collectors/test_sql_string.rb","test/helper.rb","test/nodes/test_and.rb","test/nodes/test_as.rb","test/nodes/test_ascending.rb","test/nodes/test_bin.rb","test/nodes/test_binary.rb","test/nodes/test_count.rb","test/nodes/test_delete_statement.rb","test/nodes/test_descending.rb","test/nodes/test_distinct.rb","test/nodes/test_equality.rb","test/nodes/test_extract.rb","test/nodes/test_false.rb","test/nodes/test_grouping.rb","test/nodes/test_infix_operation.rb","test/nodes/test_insert_statement.rb","test/nodes/test_named_function.rb","test/nodes/test_node.rb","test/nodes/test_not.rb","test/nodes/test_or.rb","test/nodes/test_over.rb","test/nodes/test_select_core.rb","test/nodes/test_select_statement.rb","test/nodes/test_sql_literal.rb","test/nodes/test_sum.rb","test/nodes/test_table_alias.rb","test/nodes/test_true.rb","test/nodes/test_update_statement.rb","test/nodes/test_window.rb","test/support/fake_record.rb","test/test_attributes.rb","test/test_crud.rb","test/test_delete_manager.rb","test/test_factory_methods.rb","test/test_insert_manager.rb","test/test_select_manager.rb","test/test_table.rb","test/test_update_manager.rb","test/visitors/test_bind_visitor.rb","test/visitors/test_depth_first.rb","test/visitors/test_dispatch_contamination.rb","test/visitors/test_dot.rb","test/visitors/test_ibm_db.rb","test/visitors/test_informix.rb","test/visitors/test_mssql.rb","test/visitors/test_mysql.rb","test/visitors/test_oracle.rb","test/visitors/test_postgres.rb","test/visitors/test_sqlite.rb","test/visitors/test_to_sql.rb"]
+  s.require_paths = ["lib"]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<minitest>, ["~> 5.4"])
-      s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
-      s.add_development_dependency(%q<hoe>, ["~> 3.12"])
-    else
-      s.add_dependency(%q<minitest>, ["~> 5.4"])
-      s.add_dependency(%q<rdoc>, ["~> 4.0"])
-      s.add_dependency(%q<hoe>, ["~> 3.12"])
-    end
-  else
-    s.add_dependency(%q<minitest>, ["~> 5.4"])
-    s.add_dependency(%q<rdoc>, ["~> 4.0"])
-    s.add_dependency(%q<hoe>, ["~> 3.12"])
-  end
+  s.add_development_dependency('minitest', '~> 5.4')
+  s.add_development_dependency('rdoc', '~> 4.0')
 end

data/lib/arel.rb

@@ -21,7 +21,7 @@ require 'arel/delete_manager'
 require 'arel/nodes'
 
 module Arel
-  VERSION = '6.0.0.beta1'
+  VERSION = '6.0.0.beta2'
 
   def self.sql raw_sql
     Arel::Nodes::SqlLiteral.new raw_sql

data/lib/arel/nodes.rb

@@ -28,6 +28,7 @@ require 'arel/nodes/delete_statement'
 require 'arel/nodes/table_alias'
 require 'arel/nodes/infix_operation'
 require 'arel/nodes/over'
+require 'arel/nodes/matches'
 
 # nary
 require 'arel/nodes/and'

data/lib/arel/nodes/binary.rb

@@ -16,7 +16,7 @@ module Arel
       end
 
       def hash
-        [@left, @right].hash
+        [self.class, @left, @right].hash
       end
 
       def eql? other
@@ -31,13 +31,11 @@ module Arel
       As
       Assignment
       Between
-      DoesNotMatch
       GreaterThan
       GreaterThanOrEqual
       Join
       LessThan
       LessThanOrEqual
-      Matches
       NotEqual
       NotIn
       NotRegexp

data/lib/arel/nodes/extract.rb

@@ -1,30 +1,23 @@
 module Arel
   module Nodes
     class Extract < Arel::Nodes::Unary
+      include Arel::AliasPredication
       include Arel::Predications
 
       attr_accessor :field
-      attr_accessor :alias
 
-      def initialize expr, field, aliaz = nil
+      def initialize expr, field
         super(expr)
         @field = field
-        @alias = aliaz && SqlLiteral.new(aliaz)
-      end
-
-      def as aliaz
-        self.alias = SqlLiteral.new(aliaz)
-        self
       end
 
       def hash
-        super ^ [@field, @alias].hash
+        super ^ @field.hash
       end
 
       def eql? other
         super &&
-          self.field == other.field &&
-          self.alias == other.alias
+          self.field == other.field
       end
       alias :== :eql?
     end

data/lib/arel/nodes/matches.rb

@@ -0,0 +1,14 @@
+module Arel
+  module Nodes
+    class Matches < Binary
+      attr_reader :escape
+
+      def initialize(left, right, escape = nil)
+        super(left, right)
+        @escape = escape && Nodes.build_quoted(escape)
+      end
+    end
+
+    class DoesNotMatch < Matches; end
+  end
+end

data/lib/arel/predications.rb

@@ -1,7 +1,7 @@
 module Arel
   module Predications
     def not_eq other
-      Nodes::NotEqual.new self, Nodes.build_quoted(other, self)
+      Nodes::NotEqual.new self, quoted_node(other)
     end
 
     def not_eq_any others
@@ -13,7 +13,7 @@ module Arel
     end
 
     def eq other
-      Nodes::Equality.new self, Nodes.build_quoted(other, self)
+      Nodes::Equality.new self, quoted_node(other)
     end
 
     def eq_any others
@@ -21,7 +21,27 @@ module Arel
     end
 
     def eq_all others
-      grouping_all :eq, others.map { |x| Nodes.build_quoted(x, self) }
+      grouping_all :eq, quoted_array(others)
+    end
+
+    def between other
+      if other.begin == -Float::INFINITY
+        if other.end == Float::INFINITY
+          not_in([])
+        elsif other.exclude_end?
+          lt(other.end)
+        else
+          lteq(other.end)
+        end
+      elsif other.end == Float::INFINITY
+        gteq(other.begin)
+      elsif other.exclude_end?
+        gteq(other.begin).and(lt(other.end))
+      else
+        left = quoted_node(other.begin)
+        right = quoted_node(other.end)
+        Nodes::Between.new(self, left.and(right))
+      end
     end
 
     def in other
@@ -29,27 +49,16 @@ module Arel
       when Arel::SelectManager
         Arel::Nodes::In.new(self, other.ast)
       when Range
-        if other.begin == -Float::INFINITY
-          if other.end == Float::INFINITY
-            Nodes::NotIn.new self, [] 
-          elsif other.exclude_end?
-            Nodes::LessThan.new(self, Nodes.build_quoted(other.end, self))
-          else
-            Nodes::LessThanOrEqual.new(self, Nodes.build_quoted(other.end, self))
-          end
-        elsif other.end == Float::INFINITY
-          Nodes::GreaterThanOrEqual.new(self, Nodes.build_quoted(other.begin, self))
-        elsif other.exclude_end?
-          left  = Nodes::GreaterThanOrEqual.new(self, Nodes.build_quoted(other.begin, self))
-          right = Nodes::LessThan.new(self, Nodes.build_quoted(other.end, self))
-          Nodes::And.new [left, right]
-        else
-          Nodes::Between.new(self, Nodes::And.new([Nodes.build_quoted(other.begin, self), Nodes.build_quoted(other.end, self)]))
+        if $VERBOSE
+          warn <<-eowarn
+Passing a range to `#in` is deprecated. Call `#between`, instead.
+          eowarn
         end
+        between(other)
       when Array
-        Nodes::In.new self, other.map { |x| Nodes.build_quoted(x, self) }
+        Nodes::In.new self, quoted_array(other)
       else
-        Nodes::In.new self, Nodes.build_quoted(other, self)
+        Nodes::In.new self, quoted_node(other)
       end
     end
 
@@ -61,34 +70,43 @@ module Arel
       grouping_all :in, others
     end
 
+    def not_between other
+      if other.begin == -Float::INFINITY # The range begins with negative infinity
+        if other.end == Float::INFINITY
+          self.in([])
+        elsif other.exclude_end?
+          gteq(other.end)
+        else
+          gt(other.end)
+        end
+      elsif other.end == Float::INFINITY
+        lt(other.begin)
+      else
+        left = lt(other.begin)
+        right = if other.exclude_end?
+          gteq(other.end)
+        else
+          gt(other.end)
+        end
+        left.or(right)
+      end
+    end
+
     def not_in other
       case other
       when Arel::SelectManager
         Arel::Nodes::NotIn.new(self, other.ast)
       when Range
-        if other.begin == -Float::INFINITY # The range begins with negative infinity
-          if other.end == Float::INFINITY 
-            Nodes::In.new self, [] # The range is infinite, so return an empty range
-          elsif other.exclude_end?
-            Nodes::GreaterThanOrEqual.new(self, Nodes.build_quoted(other.end, self))
-          else
-            Nodes::GreaterThan.new(self, Nodes.build_quoted(other.end, self))
-          end
-        elsif other.end == Float::INFINITY 
-          Nodes::LessThan.new(self, Nodes.build_quoted(other.begin, self))
-        else
-          left  = Nodes::LessThan.new(self, Nodes.build_quoted(other.begin, self))
-          if other.exclude_end?
-            right = Nodes::GreaterThanOrEqual.new(self, Nodes.build_quoted(other.end, self))
-          else 
-            right = Nodes::GreaterThan.new(self, Nodes.build_quoted(other.end, self))
-          end
-          Nodes::Or.new left, right
+        if $VERBOSE
+          warn <<-eowarn
+Passing a range to `#not_in` is deprecated. Call `#not_between`, instead.
+          eowarn
         end
+        not_between(other)
       when Array
-        Nodes::NotIn.new self, other.map { |x| Nodes.build_quoted(x, self) }
+        Nodes::NotIn.new self, quoted_array(other)
       else
-        Nodes::NotIn.new self, Nodes.build_quoted(other, self)
+        Nodes::NotIn.new self, quoted_node(other)
       end
     end
 
@@ -100,32 +118,32 @@ module Arel
       grouping_all :not_in, others
     end
 
-    def matches other
-      Nodes::Matches.new self, Nodes.build_quoted(other, self)
+    def matches other, escape = nil
+      Nodes::Matches.new self, quoted_node(other), escape
     end
 
-    def matches_any others
-      grouping_any :matches, others
+    def matches_any others, escape = nil
+      grouping_any :matches, others, escape
     end
 
-    def matches_all others
-      grouping_all :matches, others
+    def matches_all others, escape = nil
+      grouping_all :matches, others, escape
     end
 
-    def does_not_match other
-      Nodes::DoesNotMatch.new self, Nodes.build_quoted(other, self)
+    def does_not_match other, escape = nil
+      Nodes::DoesNotMatch.new self, quoted_node(other), escape
     end
 
-    def does_not_match_any others
-      grouping_any :does_not_match, others
+    def does_not_match_any others, escape = nil
+      grouping_any :does_not_match, others, escape
     end
 
-    def does_not_match_all others
-      grouping_all :does_not_match, others
+    def does_not_match_all others, escape = nil
+      grouping_all :does_not_match, others, escape
     end
 
     def gteq right
-      Nodes::GreaterThanOrEqual.new self, Nodes.build_quoted(right, self)
+      Nodes::GreaterThanOrEqual.new self, quoted_node(right)
     end
 
     def gteq_any others
@@ -137,7 +155,7 @@ module Arel
     end
 
     def gt right
-      Nodes::GreaterThan.new self, Nodes.build_quoted(right, self)
+      Nodes::GreaterThan.new self, quoted_node(right)
     end
 
     def gt_any others
@@ -149,7 +167,7 @@ module Arel
     end
 
     def lt right
-      Nodes::LessThan.new self, right
+      Nodes::LessThan.new self, quoted_node(right)
     end
 
     def lt_any others
@@ -161,7 +179,7 @@ module Arel
     end
 
     def lteq right
-      Nodes::LessThanOrEqual.new self, right
+      Nodes::LessThanOrEqual.new self, quoted_node(right)
     end
 
     def lteq_any others
@@ -174,15 +192,24 @@ module Arel
 
     private
 
-    def grouping_any method_id, others
-      nodes = others.map {|expr| send(method_id, expr)}
+    def grouping_any method_id, others, *extras
+      nodes = others.map {|expr| send(method_id, expr, *extras)}
       Nodes::Grouping.new nodes.inject { |memo,node|
         Nodes::Or.new(memo, node)
       }
     end
 
-    def grouping_all method_id, others
-      Nodes::Grouping.new Nodes::And.new(others.map {|expr| send(method_id, expr)})
+    def grouping_all method_id, others, *extras
+      nodes = others.map {|expr| send(method_id, expr, *extras)}
+      Nodes::Grouping.new Nodes::And.new(nodes)
+    end
+
+    def quoted_node(other)
+      Nodes.build_quoted(other, self)
+    end
+
+    def quoted_array(others)
+      others.map { |v| quoted_node(v) }
     end
   end
 end