arel 2.0.1 → 2.0.2

data/.autotest

@@ -0,0 +1,26 @@
+# -*- ruby -*-
+
+# require 'autotest/restart'
+
+ENV['GEM_PATH'] = "tmp/isolate/ruby-1.8"
+
+module Autotest::Restart
+  Autotest.add_hook :updated do |at, *args|
+    if args.flatten.include? ".autotest" then
+      warn "Detected change to .autotest, restarting"
+      cmd = %w(autotest)
+      cmd << " -v" if $v
+      cmd += ARGV
+
+      exec(*cmd)
+    end
+  end
+end
+
+Autotest.add_hook :initialize do |at|
+  at.add_exception 'tmp'
+  at.testlib = "minitest/autorun"
+
+  at.find_directories = ARGV unless ARGV.empty?
+end
+

data/History.txt

@@ -1,3 +1,21 @@
+== 2.0.2
+
+* Bug fixes
+
+  * MySQL selects from DUAL on empty FROM
+  * Visitor translates nil to NULL
+  * Visitor translates Bignum properly
+
+== 2.0.1
+
+* Bug fixes
+
+== 2.0.0 / 2010-08-01
+* Enhancements
+  
+  * Recreate library using the Visitor pattern.
+    http://en.wikipedia.org/wiki/Visitor_pattern
+
 == 0.3.0 / 2010-03-10
 
 * Enhancements

data/Manifest.txt

@@ -1,3 +1,4 @@
+.autotest
 History.txt
 MIT-LICENSE.txt
 Manifest.txt
@@ -58,6 +59,7 @@ lib/arel/nodes/table_alias.rb
 lib/arel/nodes/unqualified_column.rb
 lib/arel/nodes/update_statement.rb
 lib/arel/nodes/values.rb
+lib/arel/predications.rb
 lib/arel/relation.rb
 lib/arel/select_manager.rb
 lib/arel/sql/engine.rb
@@ -72,35 +74,34 @@ lib/arel/visitors/mysql.rb
 lib/arel/visitors/oracle.rb
 lib/arel/visitors/order_clauses.rb
 lib/arel/visitors/postgresql.rb
+lib/arel/visitors/sqlite.rb
 lib/arel/visitors/to_sql.rb
+lib/arel/visitors/visitor.rb
 lib/arel/visitors/where_sql.rb
-spec/activerecord_compat_spec.rb
-spec/attributes/attribute_spec.rb
-spec/attributes_spec.rb
-spec/crud_spec.rb
-spec/delete_manager_spec.rb
-spec/insert_manager_spec.rb
-spec/nodes/count_spec.rb
-spec/nodes/delete_statement_spec.rb
-spec/nodes/equality_spec.rb
-spec/nodes/insert_statement_spec.rb
-spec/nodes/or_spec.rb
-spec/nodes/select_core_spec.rb
-spec/nodes/select_statement_spec.rb
-spec/nodes/sql_literal_spec.rb
-spec/nodes/sum_spec.rb
-spec/nodes/update_statement_spec.rb
-spec/select_manager_spec.rb
-spec/spec.opts
-spec/spec_helper.rb
-spec/support/check.rb
-spec/support/fake_record.rb
-spec/support/matchers.rb
-spec/support/matchers/be_like.rb
-spec/support/shared/tree_manager_shared.rb
-spec/table_spec.rb
-spec/update_manager_spec.rb
-spec/visitors/join_sql_spec.rb
-spec/visitors/oracle_spec.rb
-spec/visitors/postgres_spec.rb
-spec/visitors/to_sql_spec.rb
+test/attributes/test_attribute.rb
+test/helper.rb
+test/nodes/test_count.rb
+test/nodes/test_delete_statement.rb
+test/nodes/test_equality.rb
+test/nodes/test_insert_statement.rb
+test/nodes/test_or.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_update_statement.rb
+test/support/fake_record.rb
+test/test_activerecord_compat.rb
+test/test_attributes.rb
+test/test_crud.rb
+test/test_delete_manager.rb
+test/test_insert_manager.rb
+test/test_select_manager.rb
+test/test_table.rb
+test/test_update_manager.rb
+test/visitors/test_join_sql.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

data/README.markdown

@@ -8,9 +8,7 @@ Arel is a Relational Algebra for Ruby. It 1) simplifies the generation complex o
 
 ## Status
 
-For the moment, Arel uses ActiveRecord's connection adapters to connect to the various engines, connection pooling, perform quoting, and do type conversion. On the horizon is the use of DataObjects instead.
-
-The long term goal, following both LINQ and DataMapper, is to have Arel adapt to engines beyond RDBMS, including XML, IMAP, YAML, etc.
+For the moment, Arel uses ActiveRecord's connection adapters to connect to the various engines, connection pooling, perform quoting, and do type conversion.
 
 ## A Gentle Introduction
 
@@ -20,19 +18,10 @@ Generating a query with ARel is simple. For example, in order to produce
 
 you construct a table relation and convert it to sql:
 
-    users = Table(:users)
+    users = Arel::Table.new(:users)
+    users.project(Arel.sql('*'))
     users.to_sql
 
-In fact, you will probably never call `#to_sql`. Rather, you'll work with data from the table directly. You can iterate through all rows in the `users` table like this:
-
-    users.each { |user| ... }
-
-In other words, Arel relations implement Ruby's Enumerable interface. Let's have a look at a concrete example:
-
-    users.first # => { users[:id] => 1, users[:name] => 'bob' }
-
-As you can see, Arel converts the rows from the database into a hash, the values of which are sublimated to the appropriate Ruby primitive (integers, strings, and so forth).
-
 ### More Sophisticated Queries
 
 Here is a whirlwind tour through the most common relational operators. These will probably cover 80% of all interaction with the database.
@@ -75,19 +64,11 @@ Of course, many of the operators take multiple arguments, so the last example ca
 
     users.where(users[:name].eq('bob'), users[:age].lt(25))
 
-The `OR` operator is not yet supported. It will work like this:
+The `OR` operator works like this:
 
     users.where(users[:name].eq('bob').or(users[:age].lt(25)))
 
-The `AND` operator will behave similarly.
-
-Finally, most operations take a block form. For example:
-
-    Table(:users)                    \
-      .where   { |u| u[:id].eq(1) } \
-      .project { |u| u[:id] }
-
-This provides a (sometimes) convenient alternative syntax.
+The `AND` operator behaves similarly.
 
 ### The Crazy Features
 
@@ -97,11 +78,11 @@ The examples above are fairly simple and other libraries match or come close to
 
 Where Arel really shines in its ability to handle complex joins and aggregations. As a first example, let's consider an "adjacency list", a tree represented in a table. Suppose we have a table `comments`, representing a threaded discussion:
 
-    comments = Table(:comments)
+    comments = Arel::Table.new(:comments)
 
 And this table has the following attributes:
 
-    comments.attributes # => [comments[:id], comments[:body], comments[:parent_id]]
+    comments.columns # => [comments[:id], comments[:body], comments[:parent_id]]
 
 The `parent_id` column is a foreign key from the `comments` table to itself. Now, joining a table to itself requires aliasing in SQL. In fact, you may alias in Arel as well:
 
@@ -110,77 +91,4 @@ The `parent_id` column is a foreign key from the `comments` table to itself. Now
       comments.join(replies).on(replies[:parent_id].eq(comments[:id]))
     # => SELECT * FROM comments INNER JOIN comments AS comments_2 WHERE comments_2.parent_id = comments.id
 
-The call to `#alias` is actually optional: Arel will always produce a unique name for every table joined in the relation, and it will always do so deterministically to exploit query caching. Explicit aliasing is more common, however. When you want to extract specific slices of data, aliased tables are a necessity. For example to get just certain columns from the row, treat a row like a hash:
-
-    comments_with_replies.first[replies[:body]]
-
 This will return the first comment's reply's body.
-
-If you don't need to extract the data later (for example, you're simply doing a join to find comments that have replies, you don't care what the content of the replies are), the block form may be preferable:
-
-    comments.join(comments) { |comments, replies| replies[:parent_id].eq(comments[:id]) }
-    # => SELECT * FROM comments INNER JOIN comments AS comments_2 WHERE comments_2.parent_id = comments.id
-
-Note that you do NOT want to do something like:
-
-    comments.join(comments, comments[:parent_id].eq(comments[:id]))
-    # => SELECT * FROM comments INNER JOIN comments AS comments_2 WHERE comments.parent_id = comments.id
-
-This does NOT have the same meaning as the previous query, since the comments[:parent_id] reference is effectively ambiguous.
-
-#### Complex Aggregations
-
-My personal favorite feature of Arel, certainly the most difficult to implement, and possibly only of marginal value, is **closure under joining even in the presence of aggregations**. This is a feature where the Relational Algebra is fundamentally easier to use than SQL. Think of this as a preview of the kind of radical functionality that is to come, stuff no other "ORM" is doing.
-
-The easiest way to introduce this is in SQL. Your task is to get all users and the **count** of their associated photos. Let's start from the inside out:
-
-    SELECT count(*)
-    FROM photos
-    GROUP BY user_id
-
-Now, we'd like to join this with the user table. Naively, you might try to do this:
-
-    SELECT users.*, count(photos.id)
-    FROM users
-    LEFT OUTER JOIN photos
-      ON users.id = photos.user_id
-    GROUP BY photos.user_id
-
-Of course, this has a slightly different meaning than our intended query. This is actually a fairly advanced topic in SQL so let's see why this doesn't work *step by step*. Suppose we have these records in our `users` table:
-
-    mysql> select * from users;
-    +------+--------+
-    | id   | name   |
-    +------+--------+
-    |    1 | hai    |
-    |    2 | bai    |
-    |    3 | dumpty |
-    +------+--------+
-
-And these in the photos table:
-
-    mysql> select * from photos;
-    +------+---------+-----------+
-    | id   | user_id | camera_id |
-    +------+---------+-----------+
-    |    1 |       1 |         1 |
-    |    2 |       1 |         1 |
-    |    3 |       1 |         1 |
-    +------+---------+-----------+
-
-If we perform the above, incorrect query, we get the following:
-
-    mysql> select users.*, count(photos.id) from users left outer join photos on users.id = photos.user_id limit 3 group by user_id;
-    +------+------+------------------+
-    | id   | name | count(photos.id) |
-    +------+------+------------------+
-    |    2 | bai  |                0 |
-    |    1 | hai  |                3 |
-    +------+------+------------------+
-
-As you can see, we're completely missing data for user with id 3. `dumpty` has no photos, neither does `bai`. But strangely `bai` appeared and `dumpty` didn't! The reason is that the `GROUP BY` clause is aggregating on both tables, not just the `photos` table. All users without photos have a `photos.id` of `null` (thanks to the left outer join). These are rolled up together and an arbitrary user wins. In this case, `bai` not `dumpty`.
-
-    SELECT users.*, photos_aggregation.cnt
-    FROM users
-    LEFT OUTER JOIN (SELECT user_id, count(*) as cnt FROM photos GROUP BY user_id) AS photos_aggregation
-      ON photos_aggregation.user_id = users.id

data/Rakefile

@@ -2,6 +2,7 @@ require "rubygems"
 gem 'hoe', '>= 2.1.0'
 require 'hoe'
 
+Hoe.plugin :minitest
 Hoe.plugin :gemspec # `gem install hoe-gemspec`
 
 Hoe.spec 'arel' do
@@ -12,6 +13,6 @@ Hoe.spec 'arel' do
 
   self.readme_file      = 'README.markdown'
   self.extra_rdoc_files = FileList['README.markdown']
-  self.extra_dev_deps << ['rspec', '~> 1.3.0']
-  self.testlib = :rspec
+  self.extra_dev_deps << [ 'hoe', '>= 2.1.0' ]
+  self.extra_dev_deps << [ 'minitest', '>= 1.6.0' ]
 end

data/arel.gemspec

@@ -2,21 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = %q{arel}
-  s.version = "2.0.0.dev.20100924164835"
+  s.version = "2.0.1.20101111105523"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Patterson", "Bryan Halmkamp", "Emilio Tagua", "Nick Kallen"]
-  s.date = %q{2010-09-24}
+  s.date = %q{2010-11-11}
   s.description = %q{Arel is a Relational Algebra for Ruby. It 1) simplifies the generation complex of SQL queries and it 2) adapts to various RDBMS systems. It is intended to be a framework framework; that is, you can build your own ORM with it, focusing on innovative object and collection modeling as opposed to database compatibility and query generation.}
   s.email = ["aaron@tenderlovemaking.com", "bryan@brynary.com", "miloops@gmail.com", "nick@example.org"]
-  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.markdown"]
-  s.files = ["History.txt", "Manifest.txt", "README.markdown", "Rakefile", "arel.gemspec", "lib/arel.rb", "lib/arel/attributes.rb", "lib/arel/attributes/attribute.rb", "lib/arel/compatibility/wheres.rb", "lib/arel/crud.rb", "lib/arel/delete_manager.rb", "lib/arel/deprecated.rb", "lib/arel/expression.rb", "lib/arel/expressions.rb", "lib/arel/insert_manager.rb", "lib/arel/nodes.rb", "lib/arel/nodes/and.rb", "lib/arel/nodes/assignment.rb", "lib/arel/nodes/avg.rb", "lib/arel/nodes/between.rb", "lib/arel/nodes/binary.rb", "lib/arel/nodes/count.rb", "lib/arel/nodes/delete_statement.rb", "lib/arel/nodes/equality.rb", "lib/arel/nodes/exists.rb", "lib/arel/nodes/function.rb", "lib/arel/nodes/greater_than.rb", "lib/arel/nodes/greater_than_or_equal.rb", "lib/arel/nodes/group.rb", "lib/arel/nodes/grouping.rb", "lib/arel/nodes/having.rb", "lib/arel/nodes/in.rb", "lib/arel/nodes/inner_join.rb", "lib/arel/nodes/insert_statement.rb", "lib/arel/nodes/join.rb", "lib/arel/nodes/less_than.rb", "lib/arel/nodes/less_than_or_equal.rb", "lib/arel/nodes/lock.rb", "lib/arel/nodes/max.rb", "lib/arel/nodes/min.rb", "lib/arel/nodes/node.rb", "lib/arel/nodes/not_equal.rb", "lib/arel/nodes/offset.rb", "lib/arel/nodes/on.rb", "lib/arel/nodes/or.rb", "lib/arel/nodes/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/sum.rb", "lib/arel/nodes/table_alias.rb", "lib/arel/nodes/unqualified_column.rb", "lib/arel/nodes/update_statement.rb", "lib/arel/nodes/values.rb", "lib/arel/relation.rb", "lib/arel/select_manager.rb", "lib/arel/sql/engine.rb", "lib/arel/sql_literal.rb", "lib/arel/table.rb", "lib/arel/tree_manager.rb", "lib/arel/update_manager.rb", "lib/arel/visitors.rb", "lib/arel/visitors/dot.rb", "lib/arel/visitors/join_sql.rb", "lib/arel/visitors/mysql.rb", "lib/arel/visitors/oracle.rb", "lib/arel/visitors/order_clauses.rb", "lib/arel/visitors/postgresql.rb", "lib/arel/visitors/to_sql.rb", "spec/activerecord_compat_spec.rb", "spec/attributes/attribute_spec.rb", "spec/attributes_spec.rb", "spec/crud_spec.rb", "spec/delete_manager_spec.rb", "spec/insert_manager_spec.rb", "spec/nodes/count_spec.rb", "spec/nodes/delete_statement_spec.rb", "spec/nodes/equality_spec.rb", "spec/nodes/insert_statement_spec.rb", "spec/nodes/or_spec.rb", "spec/nodes/select_core_spec.rb", "spec/nodes/select_statement_spec.rb", "spec/nodes/sql_literal_spec.rb", "spec/nodes/sum_spec.rb", "spec/nodes/update_statement_spec.rb", "spec/select_manager_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "spec/support/check.rb", "spec/support/fake_record.rb", "spec/support/matchers.rb", "spec/support/matchers/be_like.rb", "spec/support/shared/tree_manager_shared.rb", "spec/table_spec.rb", "spec/update_manager_spec.rb", "spec/visitors/join_sql_spec.rb", "spec/visitors/oracle_spec.rb", "spec/visitors/to_sql_spec.rb"]
+  s.extra_rdoc_files = ["History.txt", "MIT-LICENSE.txt", "Manifest.txt", "README.markdown"]
+  s.files = [".autotest", "History.txt", "MIT-LICENSE.txt", "Manifest.txt", "README.markdown", "Rakefile", "arel.gemspec", "lib/arel.rb", "lib/arel/attributes.rb", "lib/arel/attributes/attribute.rb", "lib/arel/compatibility/wheres.rb", "lib/arel/crud.rb", "lib/arel/delete_manager.rb", "lib/arel/deprecated.rb", "lib/arel/expression.rb", "lib/arel/expressions.rb", "lib/arel/insert_manager.rb", "lib/arel/nodes.rb", "lib/arel/nodes/and.rb", "lib/arel/nodes/assignment.rb", "lib/arel/nodes/avg.rb", "lib/arel/nodes/between.rb", "lib/arel/nodes/binary.rb", "lib/arel/nodes/count.rb", "lib/arel/nodes/delete_statement.rb", "lib/arel/nodes/does_not_match.rb", "lib/arel/nodes/equality.rb", "lib/arel/nodes/exists.rb", "lib/arel/nodes/function.rb", "lib/arel/nodes/greater_than.rb", "lib/arel/nodes/greater_than_or_equal.rb", "lib/arel/nodes/group.rb", "lib/arel/nodes/grouping.rb", "lib/arel/nodes/having.rb", "lib/arel/nodes/in.rb", "lib/arel/nodes/inner_join.rb", "lib/arel/nodes/insert_statement.rb", "lib/arel/nodes/join.rb", "lib/arel/nodes/less_than.rb", "lib/arel/nodes/less_than_or_equal.rb", "lib/arel/nodes/lock.rb", "lib/arel/nodes/matches.rb", "lib/arel/nodes/max.rb", "lib/arel/nodes/min.rb", "lib/arel/nodes/node.rb", "lib/arel/nodes/not_equal.rb", "lib/arel/nodes/not_in.rb", "lib/arel/nodes/offset.rb", "lib/arel/nodes/on.rb", "lib/arel/nodes/or.rb", "lib/arel/nodes/ordering.rb", "lib/arel/nodes/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/sum.rb", "lib/arel/nodes/table_alias.rb", "lib/arel/nodes/unqualified_column.rb", "lib/arel/nodes/update_statement.rb", "lib/arel/nodes/values.rb", "lib/arel/predications.rb", "lib/arel/relation.rb", "lib/arel/select_manager.rb", "lib/arel/sql/engine.rb", "lib/arel/sql_literal.rb", "lib/arel/table.rb", "lib/arel/tree_manager.rb", "lib/arel/update_manager.rb", "lib/arel/visitors.rb", "lib/arel/visitors/dot.rb", "lib/arel/visitors/join_sql.rb", "lib/arel/visitors/mysql.rb", "lib/arel/visitors/oracle.rb", "lib/arel/visitors/order_clauses.rb", "lib/arel/visitors/postgresql.rb", "lib/arel/visitors/sqlite.rb", "lib/arel/visitors/to_sql.rb", "lib/arel/visitors/visitor.rb", "lib/arel/visitors/where_sql.rb", "test/attributes/test_attribute.rb", "test/helper.rb", "test/nodes/test_count.rb", "test/nodes/test_delete_statement.rb", "test/nodes/test_equality.rb", "test/nodes/test_insert_statement.rb", "test/nodes/test_or.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_update_statement.rb", "test/support/fake_record.rb", "test/test_activerecord_compat.rb", "test/test_attributes.rb", "test/test_crud.rb", "test/test_delete_manager.rb", "test/test_insert_manager.rb", "test/test_select_manager.rb", "test/test_table.rb", "test/test_update_manager.rb", "test/visitors/test_join_sql.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 = %q{http://github.com/rails/arel}
   s.rdoc_options = ["--main", "README.markdown"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{arel}
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Arel is a Relational Algebra for Ruby}
+  s.test_files = ["test/attributes/test_attribute.rb", "test/nodes/test_count.rb", "test/nodes/test_delete_statement.rb", "test/nodes/test_equality.rb", "test/nodes/test_insert_statement.rb", "test/nodes/test_or.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_update_statement.rb", "test/test_activerecord_compat.rb", "test/test_attributes.rb", "test/test_crud.rb", "test/test_delete_manager.rb", "test/test_insert_manager.rb", "test/test_select_manager.rb", "test/test_table.rb", "test/test_update_manager.rb", "test/visitors/test_join_sql.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"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -24,16 +25,22 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rubyforge>, [">= 2.0.4"])
-      s.add_development_dependency(%q<rspec>, ["~> 1.3.0"])
-      s.add_development_dependency(%q<hoe>, [">= 2.6.0"])
+      s.add_development_dependency(%q<minitest>, [">= 2.0.0.beta"])
+      s.add_development_dependency(%q<hoe>, [">= 2.1.0"])
+      s.add_development_dependency(%q<minitest>, [">= 1.6.0"])
+      s.add_development_dependency(%q<hoe>, [">= 2.6.2"])
     else
       s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
-      s.add_dependency(%q<rspec>, ["~> 1.3.0"])
-      s.add_dependency(%q<hoe>, [">= 2.6.0"])
+      s.add_dependency(%q<minitest>, [">= 2.0.0.beta"])
+      s.add_dependency(%q<hoe>, [">= 2.1.0"])
+      s.add_dependency(%q<minitest>, [">= 1.6.0"])
+      s.add_dependency(%q<hoe>, [">= 2.6.2"])
     end
   else
     s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
-    s.add_dependency(%q<rspec>, ["~> 1.3.0"])
-    s.add_dependency(%q<hoe>, [">= 2.6.0"])
+    s.add_dependency(%q<minitest>, [">= 2.0.0.beta"])
+    s.add_dependency(%q<hoe>, [">= 2.1.0"])
+    s.add_dependency(%q<minitest>, [">= 1.6.0"])
+    s.add_dependency(%q<hoe>, [">= 2.6.2"])
   end
 end

data/lib/arel.rb

@@ -1,6 +1,7 @@
 require 'arel/crud'
 
 require 'arel/expressions'
+require 'arel/predications'
 require 'arel/table'
 require 'arel/attributes'
 require 'arel/compatibility/wheres'
@@ -27,7 +28,7 @@ require 'arel/sql_literal'
 ####
 
 module Arel
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 
   def self.sql raw_sql
     Arel::Nodes::SqlLiteral.new raw_sql

data/lib/arel/attributes/attribute.rb

@@ -2,180 +2,7 @@ module Arel
   module Attributes
     class Attribute < Struct.new :relation, :name, :column
       include Arel::Expressions
-
-      def not_eq other
-        Nodes::NotEqual.new self, other
-      end
-
-      def not_eq_any others
-        grouping_any :not_eq, others
-      end
-
-      def not_eq_all others
-        grouping_all :not_eq, others
-      end
-
-      def eq other
-        Nodes::Equality.new self, other
-      end
-
-      def eq_any others
-        grouping_any :eq, others
-      end
-
-      def eq_all others
-        grouping_all :eq, others
-      end
-
-      def in other
-        case other
-        when Arel::SelectManager
-          Nodes::In.new self, other.to_a.map { |x| x.id }
-        when Range
-          if other.exclude_end?
-            left  = Nodes::GreaterThanOrEqual.new(self, other.min)
-            right = Nodes::LessThan.new(self, other.max + 1)
-            Nodes::And.new left, right
-          else
-            Nodes::Between.new(self, Nodes::And.new(other.min, other.max))
-          end
-        else
-          Nodes::In.new self, other
-        end
-      end
-
-      def in_any others
-        grouping_any :in, others
-      end
-
-      def in_all others
-        grouping_all :in, others
-      end
-
-      def not_in other
-        case other
-        when Arel::SelectManager
-          Nodes::NotIn.new self, other.to_a.map { |x| x.id }
-        when Range
-          if other.exclude_end?
-            left  = Nodes::LessThan.new(self, other.min)
-            right = Nodes::GreaterThanOrEqual.new(self, other.max)
-            Nodes::Or.new left, right
-          else
-            left  = Nodes::LessThan.new(self, other.min)
-            right = Nodes::GreaterThan.new(self, other.max)
-            Nodes::Or.new left, right
-          end
-        else
-          Nodes::NotIn.new self, other
-        end
-      end
-
-      def not_in_any others
-        grouping_any :not_in, others
-      end
-
-      def not_in_all others
-        grouping_all :not_in, others
-      end
-
-      def matches other
-        Nodes::Matches.new self, other
-      end
-
-      def matches_any others
-        grouping_any :matches, others
-      end
-
-      def matches_all others
-        grouping_all :matches, others
-      end
-
-      def does_not_match other
-        Nodes::DoesNotMatch.new self, other
-      end
-
-      def does_not_match_any others
-        grouping_any :does_not_match, others
-      end
-
-      def does_not_match_all others
-        grouping_all :does_not_match, others
-      end
-
-      def gteq right
-        Nodes::GreaterThanOrEqual.new self, right
-      end
-
-      def gteq_any others
-        grouping_any :gteq, others
-      end
-
-      def gteq_all others
-        grouping_all :gteq, others
-      end
-
-      def gt right
-        Nodes::GreaterThan.new self, right
-      end
-
-      def gt_any others
-        grouping_any :gt, others
-      end
-
-      def gt_all others
-        grouping_all :gt, others
-      end
-
-      def lt right
-        Nodes::LessThan.new self, right
-      end
-
-      def lt_any others
-        grouping_any :lt, others
-      end
-
-      def lt_all others
-        grouping_all :lt, others
-      end
-
-      def lteq right
-        Nodes::LessThanOrEqual.new self, right
-      end
-
-      def lteq_any others
-        grouping_any :lteq, others
-      end
-
-      def lteq_all others
-        grouping_all :lteq, others
-      end
-
-      def asc
-        Nodes::Ordering.new self, :asc
-      end
-
-      def desc
-        Nodes::Ordering.new self, :desc
-      end
-
-      private
-
-      def grouping_any method_id, others
-        first = send method_id, others.shift
-
-        Nodes::Grouping.new others.inject(first) { |memo,expr|
-          Nodes::Or.new(memo, send(method_id, expr))
-        }
-      end
-
-      def grouping_all method_id, others
-        first = send method_id, others.shift
-
-        Nodes::Grouping.new others.inject(first) { |memo,expr|
-          Nodes::And.new(memo, send(method_id, expr))
-        }
-      end
+      include Arel::Predications
     end
 
     class String  < Attribute; end