activerecord-precount 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c92657e5f11805aecb44010c1df4fe3974bf05da
-  data.tar.gz: 60838e0e6fcea0079f0d008ccc4424697675006f
+  metadata.gz: bf58363c7ce0affb2cbb1a39d19e348fc1d8924c
+  data.tar.gz: 2872afab02a9bc30db92dc0dacf225546109685a
 SHA512:
-  metadata.gz: b93b4d140152d202018ea73a66b80a34bc3c55ee38a81d3ee4bb2d721ddcbd509d45aff9446278b0513c4c925979b4eef2258d50524d44b4b5664a1aa827f960
-  data.tar.gz: 65a1f4826a8686dec6e64873e3b8760c55a3a8bed687ec906f3897d09116792cdec13578d8b5e6c4a531404e099cea8f7e37f7e8e2e1d8e771e18881acae7db3
+  metadata.gz: 796a87639f40c88f97d91c4f5f42b96870e81a14986faf0b0404367678cc827b4c6a9ea0422e43c502a5ee0b33880a741e74ec96fccf4194bb65c8fc3230cd60
+  data.tar.gz: bef1cc5f6a82d932a2d9560e483ecd2e8a31af762fa8df69eaff345b42c46eb638a8f90245893ad3505058dfee359fdb8034e56a02146e4a525e284cffed15d2

data/.travis.yml

@@ -10,22 +10,25 @@ matrix:
     - rvm: 2.1.10
       env: TASK=test ARCONN=mysql2
       gemfile: ci/Gemfile.activerecord-4.2.x
-    - rvm: 2.2.5
+    - rvm: 2.2.6
       env: TASK=test ARCONN=mysql2
       gemfile: ci/Gemfile.activerecord-5.0.x
-    - rvm: 2.3.1
+    - rvm: 2.3.3
+      env: TASK=test ARCONN=mysql2
+      gemfile: ci/Gemfile.activerecord-5.0.x
+    - rvm: 2.4.0
       env: TASK=test ARCONN=mysql2
       gemfile: ci/Gemfile.activerecord-4.2.x
-    - rvm: 2.3.1
+    - rvm: 2.4.0
       env: TASK=test ARCONN=sqlite3
       gemfile: ci/Gemfile.activerecord-5.0.x
-    - rvm: 2.3.1
+    - rvm: 2.4.0
       env: TASK=test ARCONN=mysql2
       gemfile: ci/Gemfile.activerecord-5.0.x
-    - rvm: 2.3.1
+    - rvm: 2.4.0
       env: TASK=test ARCONN=postgresql
       gemfile: ci/Gemfile.activerecord-5.0.x
-    - rvm: 2.3.1
+    - rvm: 2.4.0
       env: TASK=benchmark ARCONN=mysql2
       gemfile: ci/Gemfile.activerecord-5.0.x
   allow_failures:

data/CHANGELOG.md

@@ -1,25 +1,55 @@
 # Change Log
 
-## [v0.6.1](https://github.com/k0kubun/activerecord-precount/tree/v0.6.1) (2016-06-02)
+## [v0.6.2](https://github.com/k0kubun/activerecord-precount/tree/v0.6.2) (2016-11-02)
+[Full Changelog](https://github.com/k0kubun/activerecord-precount/compare/v0.6.1...v0.6.2)
+
+**Closed issues:**
+
+- NoMethodError: undefined method `destroyed?' on saving instance  [\#19](https://github.com/k0kubun/activerecord-precount/issues/19)
+- Support association's :class\_name option set to a constant [\#18](https://github.com/k0kubun/activerecord-precount/issues/18)
+
+**Merged pull requests:**
+
+- Add patch for ActiveRecord::AutosaveAssociation [\#20](https://github.com/k0kubun/activerecord-precount/pull/20) ([takashi](https://github.com/takashi))
+
+## [v0.6.1](https://github.com/k0kubun/activerecord-precount/tree/v0.6.1) (2016-06-04)
 [Full Changelog](https://github.com/k0kubun/activerecord-precount/compare/v0.6.0...v0.6.1)
 
-- Support polymorphic association for `precount` [\#17](https://github.com/k0kubun/activerecord-precount/pull/17)
+**Closed issues:**
+
+- Count method performance issue [\#9](https://github.com/k0kubun/activerecord-precount/issues/9)
+- Vendor ActiveRecord tests [\#2](https://github.com/k0kubun/activerecord-precount/issues/2)
+
+**Merged pull requests:**
+
+- Support polymorphic precount [\#17](https://github.com/k0kubun/activerecord-precount/pull/17) ([k0kubun](https://github.com/k0kubun))
+- Refactoring [\#16](https://github.com/k0kubun/activerecord-precount/pull/16) ([k0kubun](https://github.com/k0kubun))
 
 ## [v0.6.0](https://github.com/k0kubun/activerecord-precount/tree/v0.6.0) (2016-06-02)
 [Full Changelog](https://github.com/k0kubun/activerecord-precount/compare/v0.5.1...v0.6.0)
 
-- Support Rails 5.0 [\#14](https://github.com/k0kubun/activerecord-precount/pull/14) ([k0kubun](https://github.com/k0kubun))
-  - Drop Rails 4.1 support
+**Closed issues:**
+
+- Rails 5 support [\#13](https://github.com/k0kubun/activerecord-precount/issues/13)
+
+**Merged pull requests:**
+
+- Rails 5 [\#14](https://github.com/k0kubun/activerecord-precount/pull/14) ([k0kubun](https://github.com/k0kubun))
+- Support Ruby 2.3.0 [\#12](https://github.com/k0kubun/activerecord-precount/pull/12) ([k0kubun](https://github.com/k0kubun))
 
 ## [v0.5.1](https://github.com/k0kubun/activerecord-precount/tree/v0.5.1) (2015-09-09)
 [Full Changelog](https://github.com/k0kubun/activerecord-precount/compare/v0.5.0...v0.5.1)
 
+**Merged pull requests:**
+
 - Support an association with a scope [\#10](https://github.com/k0kubun/activerecord-precount/pull/10) ([tkawa](https://github.com/tkawa))
 
 ## [v0.5.0](https://github.com/k0kubun/activerecord-precount/tree/v0.5.0) (2015-02-01)
 [Full Changelog](https://github.com/k0kubun/activerecord-precount/compare/v0.4.3...v0.5.0)
 
-- Add `eager_count` method for eager loading by JOIN
+**Closed issues:**
+
+- Is it possible to eager\_load count\_loader association? [\#1](https://github.com/k0kubun/activerecord-precount/issues/1)
 
 ## [v0.4.3](https://github.com/k0kubun/activerecord-precount/tree/v0.4.3) (2015-01-31)
 [Full Changelog](https://github.com/k0kubun/activerecord-precount/compare/v0.4.2...v0.4.3)
@@ -84,4 +114,4 @@
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/lib/active_record/precount/preloader_extension.rb

@@ -25,7 +25,7 @@ module ActiveRecord
 
         def query_scope(ids)
           key = model.reflections[reflection.name.to_s.sub(/_count\z/, '')].foreign_key
-          scope.where(key => ids).group(key).count(key)
+          scope.reorder(nil).where(key => ids).group(key).count(key)
         end
 
         def build_scope

data/lib/active_record/precount/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Precount
-    VERSION = "0.6.2"
+    VERSION = "0.6.3"
   end
 end

data/test/cases/associations/precount_test.rb

@@ -50,6 +50,15 @@ class PrecountTest < ActiveRecord::CountLoader::TestCase
     assert_equal(expected, Tweet.precount(:my_favs).map(&:my_favs_count))
   end
 
+  def test_precount_has_many_with_ordered_association_conforms_to_mysql_only_full_group_by
+    with_mysql_sql_mode('ONLY_FULL_GROUP_BY') do
+      expected = Tweet.all.map { |t| t.ordered_favorites.count }
+      assert_equal(expected, Tweet.all.map(&:ordered_favorites_count))
+      assert_equal(expected, Tweet.precount(:ordered_favorites).map { |t| t.ordered_favorites.count })
+      assert_equal(expected, Tweet.precount(:ordered_favorites).map(&:ordered_favorites_count))
+    end
+  end
+
   def test_polymorphic_precount
     expected = Tweet.all.map { |t| t.notifications.count }
     assert_equal(expected, Tweet.precount(:notifications).map(&:notifications_count))

data/test/cases/test_case.rb

@@ -46,6 +46,23 @@ module ActiveRecord::CountLoader
       options.reverse_merge! ignore_none: true
       assert_queries(0, options, &block)
     end
+
+    def with_mysql_sql_mode(sql_mode)
+      connection = ActiveRecord::Base.connection
+
+      if connection.adapter_name == 'Mysql2'
+        original_sql_mode = connection.execute('SELECT @@SESSION.sql_mode').first.first
+        connection.execute("SET @@SESSION.sql_mode = '#{original_sql_mode},#{sql_mode}'")
+
+        begin
+          yield
+        ensure
+          connection.execute("SET @@SESSION.sql_mode = '#{original_sql_mode}'")
+        end
+      else
+        yield
+      end
+    end
   end
 
   class SQLCounter

data/test/models/tweet.rb

@@ -3,5 +3,6 @@ class Tweet < ActiveRecord::Base
   has_many :favs, class_name: 'Favorite'
   has_many :my_favorites, -> { where(user_id: 1) }, class_name: 'Favorite', count_loader: true
   has_many :my_favs, -> { where(user_id: 1) }, class_name: 'Favorite'
+  has_many :ordered_favorites, -> { order(:id) }, class_name: 'Favorite', count_loader: true
   has_many :notifications, as: :notifiable, foreign_key: :notifiable_id
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-precount
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-02 00:00:00.000000000 Z
+date: 2017-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -318,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: N+1 count query killer for ActiveRecord