added support for `attribute IN ...` and `attribute BETWEEN ...`

  - IN and BETWEEN are chosen depending on the type of the second operand
  - ranges (1..2), arrays ([1,2,3]), and relations ("SELECT * ...") are all supported

1 files changed, 12 insertions, 9 deletions

diff --git a/lib/active_relation/relations/relation.rb b/lib/active_relation/relations/relation.rb
index 8c93f948f7..1364911f0c 100644
--- a/lib/active_relation/relations/relation.rb
+++ b/lib/active_relation/relations/relation.rb
@@ -37,10 +37,6 @@ module ActiveRelation
         end
       end
 
-      def include?(attribute)
-        RelationInclusion.new(attribute, self)
-      end
-
       def select(*predicates)
         Selection.new(self, *predicates.collect {|p| p.bind(self)})
       end
@@ -94,13 +90,16 @@ module ActiveRelation
     end
     include Operations
     
-    def aggregation?
-      false
-    end
+    module Externalizable
+      def aggregation?
+        false
+      end
     
-    def alias?
-      false
+      def alias?
+        false
+      end
     end
+    include Externalizable
     
     def to_sql(formatter = Sql::SelectStatement.new(engine))
       formatter.select [
@@ -116,6 +115,10 @@ module ActiveRelation
     end
     alias_method :to_s, :to_sql
     
+    def predicate_sql
+      "IN"
+    end
+    
     def call(connection = engine.connection)
       connection.select_all(to_sql)
     end