Stop supporting blank arguments to AR#relation query methods

rails · Dec 25, 2009 · a73fa93 · a73fa93
1 parent 95274b2
commit a73fa93
Showing 1 changed file with 19 additions and 27 deletions.
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
@@ -57,56 +57,48 @@ def first
     end
 
     def select(selects)
-      selects.blank? ? self : create_new_relation(@relation.project(selects))
+      create_new_relation(@relation.project(selects))
     end
 
     def group(groups)
-      groups.blank? ? self : create_new_relation(@relation.group(groups))
+      create_new_relation(@relation.group(groups))
     end
 
     def order(orders)
-      orders.blank? ? self : create_new_relation(@relation.order(orders))
+      create_new_relation(@relation.order(orders))
     end
 
     def limit(limits)
-      limits.blank? ? self : create_new_relation(@relation.take(limits))
+      create_new_relation(@relation.take(limits))
     end
 
     def offset(offsets)
-      offsets.blank? ? self : create_new_relation(@relation.skip(offsets))
+      create_new_relation(@relation.skip(offsets))
     end
 
     def on(join)
-      join.blank? ? self : create_new_relation(@relation.on(join))
+      create_new_relation(@relation.on(join))
     end
 
     def joins(join, join_type = nil)
-      if join.blank?
+      join = case join
-        self
+        when String
-      else
+          @relation.join(join)
-        join = case join
+        when Hash, Array, Symbol
-          when String
+          if @klass.send(:array_of_strings?, join)
-            @relation.join(join)
+            @relation.join(join.join(' '))
-          when Hash, Array, Symbol
-            if @klass.send(:array_of_strings?, join)
-              @relation.join(join.join(' '))
-            else
-              @relation.join(@klass.send(:build_association_joins, join))
-            end
           else
-            @relation.join(join, join_type)
+            @relation.join(@klass.send(:build_association_joins, join))
-        end
+          end
-        create_new_relation(join)
+        else
+          @relation.join(join, join_type)
       end
+      create_new_relation(join)
     end
 
     def where(conditions)
-      if conditions.blank?
+      conditions = @klass.send(:merge_conditions, conditions) if [String, Hash, Array].include?(conditions.class)
-        self
+      create_new_relation(@relation.where(conditions))
-      else
-        conditions = @klass.send(:merge_conditions, conditions) if [String, Hash, Array].include?(conditions.class)
-        create_new_relation(@relation.where(conditions))
-      end
     end
 
     def respond_to?(method)