counter_culture 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed37e7ce1d391b9fc468d8a1638b78e6afb46bc764dd7fff6935d00e41dbf18b
-  data.tar.gz: 1a7d6b777a4065e214ebab7a25d271c4755eca109ca2907f71363450f329ff03
+  metadata.gz: c8c929583c30094df5eb38dce579819edf8e528fce64b06e3f5bddb95d5f2d13
+  data.tar.gz: 75a32b65babe86a8fef2d7aeb006b29db1c39210134b95c6854103eab72ee756
 SHA512:
-  metadata.gz: '092c9686853ad23dea228cdd32ecef385efeeb3a43f55778372faaf052359512eaf82c7d2f68b1898d419f6911646e2024fde2d75706cefb339b7e98a3c125ce'
-  data.tar.gz: cad2c4b3c7546d0a2098f3d738631712aaf80d26cf6244c7b27c53c3358fca7130e4e52c756e29c7b331549875cc063a7b28f1bc810f8556d73bb58ab4fd6cec
+  metadata.gz: 890a315177031dedb9d63ab8b2bb40887ec81ff240a11b323cf6bfb1287f16ab1c9cf479591a111562278e9e63fd840ea9751e486bbe7ef4ed58364c89bd7cd6
+  data.tar.gz: 8feec9380863959dbc3e362e31c0392d238508378f644335c6a10032fedb16641deaafea436442f231e9dc1b6bd917198251fb5bda85afc0aae2d1183b80f322

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.2.2 (May 5, 2019)
+
+Bugfixes:
+  - Don't fail reconciliation in PostgreSQL if the Rails-level primary key is not a DB primary key (#254)
+
 ## 2.2.1 (April 17, 2019)
 
 Improvements:

data/README.md

@@ -45,6 +45,8 @@ If you are adding counter caches to existing data, you must add code to [manuall
 
 ### Simple counter-cache
 
+#### Has many association
+
 ```ruby
 class Product < ActiveRecord::Base
   belongs_to :category
@@ -58,6 +60,30 @@ end
 
 Now, the ```Category``` model will keep an up-to-date counter-cache in the ```products_count``` column of the ```categories``` table.
 
+#### Many to many association
+
+```ruby
+class User < ActiveRecord::Base
+  has_many :group_memberships
+  has_many :groups, through: :group_memberships
+end
+
+class Group < ActiveRecord::Base
+  has_many :group_memberships
+  has_many :members, through: :group_memberships, class: "User"
+end
+
+class Membership < ActiveRecord::Base
+  belongs_to :group
+  belongs_to :member, class: "User"
+  counter_cuture :group, column: "members_count"
+  # If you'd like to also touch the group when `members_count` is updated
+  # counter_culture :group, column: "members_count", touch: true
+end
+```
+
+Now, the `Group` model will have an up to date count of its members in the `members_count` column
+
 ### Multi-level counter-cache
 
 ```ruby

data/VERSION

@@ -1 +1 @@
-2.2.1
+2.2.2

data/counter_culture.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: counter_culture 2.2.1 ruby lib
+# stub: counter_culture 2.2.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "counter_culture".freeze
-  s.version = "2.2.1"
+  s.version = "2.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Magnus von Koeller".freeze]
-  s.date = "2019-04-17"
+  s.date = "2019-05-05"
   s.description = "counter_culture provides turbo-charged counter caches that are kept up-to-date not just on create and destroy, that support multiple levels of indirection through relationships, allow dynamic column names and that avoid deadlocks by updating in the after_commit callback.".freeze
   s.email = "magnus@vonkoeller.de".freeze
   s.extra_rdoc_files = [
@@ -47,6 +47,7 @@ Gem::Specification.new do |s|
     "spec/models/conditional_dependent.rb",
     "spec/models/conditional_main.rb",
     "spec/models/conversation.rb",
+    "spec/models/has_non_pk_id.rb",
     "spec/models/has_string_id.rb",
     "spec/models/industry.rb",
     "spec/models/person.rb",

data/lib/counter_culture/reconciler.rb

@@ -87,7 +87,12 @@ module CounterCulture
           relation_class_table_name = quote_table_name(relation_class.table_name)
 
           # select join column and count (from above) as well as cache column ('column_name') for later comparison
-          counts_query = scope.select("#{relation_class_table_name}.#{relation_class.primary_key}, #{relation_class_table_name}.#{relation_reflect(relation).association_primary_key(relation_class)}, #{count_select} AS count, #{relation_class_table_name}.#{column_name}")
+          counts_query = scope.select(
+            "#{relation_class_table_name}.#{relation_class.primary_key}, " \
+            "#{relation_class_table_name}.#{relation_reflect(relation).association_primary_key(relation_class)}, " \
+            "#{count_select} AS count, " \
+            "MAX(#{relation_class_table_name}.#{column_name}) AS #{column_name}"
+          )
 
           # we need to join together tables until we get back to the table this class itself lives in
           join_clauses(where).each do |join|

data/spec/counter_culture_spec.rb

@@ -9,6 +9,7 @@ require 'models/twitter_review'
 require 'models/user'
 require 'models/category'
 require 'models/has_string_id'
+require 'models/has_non_pk_id'
 require 'models/simple_main'
 require 'models/simple_dependent'
 require 'models/conditional_main'
@@ -1272,6 +1273,31 @@ describe "CounterCulture" do
     expect(string_id.users_count).to eq(2)
   end
 
+  it "should fix a counter cache with no DB-level primary_key index correctly" do
+    non_pk_id = HasNonPkId.create(id: (HasNonPkId.maximum(:id) || 1) + 1)
+
+    user = User.create(has_non_pk_id_id: non_pk_id.id)
+
+    non_pk_id.reload
+    expect(non_pk_id.users_count).to eq(1)
+
+    user2 = User.create(has_non_pk_id_id: non_pk_id.id)
+
+    non_pk_id.reload
+    expect(non_pk_id.users_count).to eq(2)
+
+    non_pk_id.users_count = 123
+    non_pk_id.save!
+
+    non_pk_id.reload
+    expect(non_pk_id.users_count).to eq(123)
+
+    User.counter_culture_fix_counts
+
+    non_pk_id.reload
+    expect(non_pk_id.users_count).to eq(2)
+  end
+
   it "should fix a static delta magnitude column correctly" do
     user = User.create
     product = Product.create

data/spec/models/has_non_pk_id.rb

@@ -0,0 +1,4 @@
+class HasNonPkId < ActiveRecord::Base
+  self.primary_key = :id
+  has_many :users
+end

data/spec/models/user.rb

@@ -3,9 +3,13 @@ class User < ActiveRecord::Base
 
   belongs_to :manages_company, :class_name => "Company"
   counter_culture :manages_company, :column_name => "managers_count"
+
   belongs_to :has_string_id
   counter_culture :has_string_id
 
+  belongs_to :has_non_pk_id
+  counter_culture :has_non_pk_id
+
   has_many :reviews
   accepts_nested_attributes_for :reviews, :allow_destroy => true
 
@@ -15,7 +19,7 @@ class User < ActiveRecord::Base
 
   default_scope do
     if _default_scope_enabled
-      query = joins("LEFT OUTER JOIN companies")
+      query = joins("LEFT OUTER JOIN companies ON users.company_id = companies.id")
       if Rails.version < "5.0.0"
         query = query.uniq
       else

data/spec/schema.rb

@@ -79,6 +79,7 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
     t.integer  "custom_delta_count",         :default => 0, :null => false
     t.integer  "review_approvals_count",      :default => 0, :null => false
     t.string   "has_string_id_id"
+    t.integer  "has_non_pk_id_id"
     t.float    "review_value_sum",    :default => 0.0, :null => false
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -92,6 +93,15 @@ ActiveRecord::Schema.define(:version => 20120522160158) do
     t.datetime "updated_at"
   end
 
+  create_table "has_non_pk_ids", :force => true, :id => false do |t|
+    t.integer  "id", :default => '', :null => false
+    t.string   "something"
+    t.integer  "users_count",        :null => false, :default => 0
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+  add_index "has_non_pk_ids", :id, :unique => true
+
   create_table "has_string_ids", :force => true, :id => false do |t|
     t.string   "id", :default => '', :null => false
     t.string   "something"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Magnus von Koeller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-17 00:00:00.000000000 Z
+date: 2019-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_commit_action
@@ -245,6 +245,7 @@ files:
 - spec/models/conditional_dependent.rb
 - spec/models/conditional_main.rb
 - spec/models/conversation.rb
+- spec/models/has_non_pk_id.rb
 - spec/models/has_string_id.rb
 - spec/models/industry.rb
 - spec/models/person.rb