left_joins 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5362727169b04c38c3b37c234c0b3715c2132286
-  data.tar.gz: becd033a2f61633f2de9b789b76663c2a8aa8650
+  metadata.gz: 9fe2a83d6cffc287bbf6724737c4e8dbfbe3ea6f
+  data.tar.gz: 2838cceb023ba1586a31efddc33aaac6349ad4f6
 SHA512:
-  metadata.gz: 24d64ceda8105b8766566cc76f12e2ef0d499489e5c3b45ae08e4c215b93918b7d5478056db1154c93a3967289ac5c4bc03c8212e6d660d29a91488285f404ac
-  data.tar.gz: 76bb7ab2512b61e17c061460a8d2d439fc346d290be078b0a954f2b509018a72f6c77e495d37965cd099828ec0efc3a3c42df74f7ddd6ea8885f98cc54b46342
+  metadata.gz: 655ca8dad040ed55ee43eab786bc935e27afd74c3dfc43a3462ba3ab98232bb5c0e85121ee66c739e51a92522672562de94bd4e60d5ec5867b03530edc7296ba
+  data.tar.gz: 0f55aa90871bd786842f941c3446dae67c221554d31c7f56ca850a2cf59f4024d7ce8e5f50b33ae1e98d8810a8819a67bdacf29c9c03b53700b4f9223c95852f

data/lib/left_joins.rb

@@ -4,7 +4,7 @@ require 'active_record/relation'
 
 module ActiveRecord::QueryMethods
   IS_RAILS3_FLAG = Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new('4.0.0')
-  if not method_defined?(:check_if_method_has_arguments!)
+  if IS_RAILS3_FLAG
     def check_if_method_has_arguments!(method_name, args)
       if args.blank?
         raise ArgumentError, "The method .#{method_name}() must contain arguments."
@@ -69,6 +69,28 @@ module ActiveRecord::QueryMethods
         end
       end
     end
+
+    module ActiveRecord::Calculations
+      def perform_calculation(operation, column_name, options = {})
+        operation = operation.to_s.downcase
+
+        # If #count is used with #distinct (i.e. `relation.distinct.count`) it is
+        # considered distinct.
+        distinct = IS_RAILS3_FLAG ? options[:distinct] || self.uniq_value : self.distinct_value
+
+        if operation == "count"
+          column_name ||= select_for_count
+          column_name = primary_key if column_name == :all && distinct
+          distinct = nil if column_name =~ /\s*DISTINCT[\s(]+/i
+        end
+
+        if group_values.any?
+          execute_grouped_calculation(operation, column_name, distinct)
+        else
+          execute_simple_calculation(operation, column_name, distinct)
+        end
+      end
+    end
   end
 end
 

data/lib/left_joins/version.rb

@@ -1,3 +1,3 @@
 module LeftJoins
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: left_joins
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - khiav reoy