left_joins 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 33da27b6e6da1cea9aed88c993c7ab327f831331
-  data.tar.gz: dc0cf372cf8c4fb4d551e8710ad99ade145faae1
+SHA256:
+  metadata.gz: df7ca5a2313f0d5b956fa812dcf528646ffd79b60d28421d6abfd9cebafdb891
+  data.tar.gz: 48265e1cd3b79d43e0c399fe6a1420126fe14d71b0f7a028344e6d739fc53e6c
 SHA512:
-  metadata.gz: 5814d112df40ef96bface633fa7493cc69144eb6830a4c1d26be820a318abed1bbadfe216d2b2fbd3328cf42eac9a15e3e3e8013c7ebbb42577b36206a3f84b9
-  data.tar.gz: 809e8b6174b80093671bd7cdee59e996423a229777968da0711cddfd7d5b1f55008dd5b1fe4d8bfdbd1cb4c93bdc850d7295779ca527154bc41dbec8a8919a9e
+  metadata.gz: 7b81a965effac0c35447cbc05e4a28e9ba70a4db17899516e15af7933d8565e02f082a1dd59c7f44165127c176b33fed08866576b48d09b638fb1c82fa530984
+  data.tar.gz: 9b1a1901c4c9e2b8b79698932394801e42de7839950140c36d0c684ab77967313684561d7db87f7ec65d330bedc63d32432d2b8f60de05c108dbb720ecafa248

data/CHANGELOG.md

@@ -1,10 +1,13 @@
 ## Change Log
 
-### v1.0.2 2018/01/12
+### [v1.0.3](https://github.com/khiav223577/left_joins/compare/v1.0.2...v1.0.3) 2018/06/30
+- [#5](https://github.com/khiav223577/left_joins/pull/5) Fix: JoinDependency#make_constraints is not defined in Rails 4.0 (@khiav223577)
+
+### [v1.0.2](https://github.com/khiav223577/left_joins/compare/v1.0.1...v1.0.2) 2018/01/12
 - [#3](https://github.com/khiav223577/left_joins/pull/3) fix missing left joins when using in association condition (@khiav223577)
 
-### v1.0.1 2017/12/25
+### [v1.0.1](https://github.com/khiav223577/left_joins/compare/v1.0.0...v1.0.1) 2017/12/25
 - [#2](https://github.com/khiav223577/left_joins/pull/2)  Fix count which would sometimes force a DISTINCT (@khiav223577)
 
 ### v1.0.0 2017/12/25
-- [#1](https://github.com/khiav223577/left_joins/pull/1) implement left joins (@khiav223577)
+- [#1](https://github.com/khiav223577/left_joins/pull/1) implement left joins (@khiav223577)

data/lib/left_joins.rb

@@ -18,6 +18,7 @@ module ActiveRecord::QueryMethods
 
       args.compact!
       args.flatten!
+      self.distinct_value = false
 
       return (LeftJoins::IS_RAILS3_FLAG ? clone : spawn).left_outer_joins!(*args)
     end
@@ -39,10 +40,10 @@ module ActiveRecord::QueryMethods
     end
 
     alias_method :build_joins_without_join_type, :build_joins
-    def build_joins(manager, joins, join_type = Arel::Nodes::InnerJoin)
-      Thread.current.thread_variable_set :left_joins_join_type, join_type
+    def build_joins(manager, joins, join_type = nil)
+      Thread.current.thread_variable_set(:left_joins_join_type, join_type)
       result = build_joins_without_join_type(manager, joins)
-      Thread.current.thread_variable_set :left_joins_join_type, nil
+      Thread.current.thread_variable_set(:left_joins_join_type, nil)
       return result
     end
 
@@ -62,28 +63,36 @@ module ActiveRecord::QueryMethods
       if private_method_defined?(:make_constraints)
         alias_method :make_constraints_without_hooking_join_type, :make_constraints
         def make_constraints(*args, join_type)
-          join_type = Thread.current.thread_variable_get :left_joins_join_type || join_type
+          join_type = Thread.current.thread_variable_get(:left_joins_join_type) || join_type
           return make_constraints_without_hooking_join_type(*args, join_type)
         end
       else
         alias_method :build_without_hooking_join_type, :build
         def build(associations, parent = nil, join_type = Arel::Nodes::InnerJoin)
-          join_type = Thread.current.thread_variable_get :left_joins_join_type || join_type
+          join_type = Thread.current.thread_variable_get(:left_joins_join_type) || join_type
           return build_without_hooking_join_type(associations, parent, join_type)
         end
       end
     end
 
     module ActiveRecord::Calculations
+      # This method is copied from activerecord-4.2.10/lib/active_record/relation/calculations.rb
+      # and modified this line `distinct = true` to `distinct = true if distinct == nil`
       def perform_calculation(operation, column_name, options = {})
+        # TODO: Remove options argument as soon we remove support to
+        # activerecord-deprecated_finders.
         operation = operation.to_s.downcase
 
-        # If #count is used with #distinct (i.e. `relation.distinct.count`) it is
-        # considered distinct.
+        # If #count is used with #distinct / #uniq it is considered distinct. (eg. relation.distinct.count)
         distinct = options[:distinct] || self.distinct_value
 
         if operation == "count"
-          column_name ||= select_for_count
+          column_name ||= (select_for_count || :all)
+
+          unless arel.ast.grep(Arel::Nodes::OuterJoin).empty?
+            distinct = true if distinct == nil
+          end
+
           column_name = primary_key if column_name == :all && distinct
           distinct = nil if column_name =~ /\s*DISTINCT[\s(]+/i
         end

data/lib/left_joins/version.rb

@@ -1,3 +1,3 @@
 module LeftJoins
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/lib/left_joins_for_rails_3.rb

@@ -13,4 +13,8 @@ module ActiveRecord::Calculations
   def distinct_value
     uniq_value
   end
+
+  def distinct_value=(v)
+    self.uniq_value = v
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: left_joins
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-30 00:00:00.000000000 Z
+date: 2018-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Backport `left_joins` from Rails 5 for Rails 3 and 4.