fake_arel 1.3.0 → 1.3.1

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.3.1

data/fake_arel.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fake_arel}
-  s.version = "1.3.0"
+  s.version = "1.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Grant Ammons"]

data/lib/fake_arel/with_scope_replacement.rb

@@ -3,8 +3,22 @@ module WithScopeReplacement
     base.class_eval do
       class << self
         def to_sql
-          jd = JoinDependency.new(self, merge_includes(scope(:find, :include), nil), nil)
-          construct_finder_sql_with_included_associations(current_scoped_methods, jd)
+          options = current_scoped_methods
+          join_dependency = JoinDependency.new(self, merge_includes(scope(:find, :include), nil), nil)
+          scope = scope(:find)
+          sql  = "SELECT #{(scope && scope[:select]) || default_select(options[:joins] || (scope && scope[:joins]))} "
+          sql << join_dependency.join_associations.collect{|join| join.association_join }.join
+
+          add_joins!(sql, options[:joins], scope)
+          add_conditions!(sql, options[:conditions], scope)
+          add_limited_ids_condition!(sql, options, join_dependency) if !using_limitable_reflections?(join_dependency.reflections) && ((scope && scope[:limit]) || options[:limit])
+
+          add_group!(sql, options[:group], options[:having], scope)
+          add_order!(sql, options[:order], scope)
+          add_limit!(sql, options, scope) if using_limitable_reflections?(join_dependency.reflections)
+          add_lock!(sql, options, scope)
+
+          return sanitize_sql(sql)
         end
         
         def with_scope(method_scoping = {}, action = :merge, &block)

data/spec/fake_arel_spec.rb

@@ -51,9 +51,16 @@ describe "Fake Arel" do
     end
 
     it "should includes includes when including included includes" do
-      sql = Topic.includes(:replies, :author).where("replies.id = 1").to_sql
+      sql = Topic.includes(:replies).includes(:author).where("replies.id = 1").to_sql
       p sql
       sql.should =~ /JOIN "replies"/i
+      sql.should =~ /JOIN "authors"/i
+    end
+
+    it "should only include the selects we select" do
+     sql = Topic.select("topics.id").includes(:replies).where("replies.id = 1").to_sql
+     sql.should =~ /SELECT topics.id/
+
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fake_arel
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Grant Ammons