acts_as_multi_tenant 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7efff0258142b5081c4778a8626aceefd8d78cb
-  data.tar.gz: 6305edc6f12418e6ca9e02924c85efe276c1d18e
+  metadata.gz: 900858457990afa4c3972a78b8fadc624c22134d
+  data.tar.gz: 0a0fc2e1ac224944d60563be966d9818421a4789
 SHA512:
-  metadata.gz: f847b489613a624ee807987c4b83c44215ebb9cad639a98f62477e4570f4636cf14997577a97121ba5491983179a0bb5780fa5108722b468713ab3e33b6c3be4
-  data.tar.gz: 7a7600f3c384445fc3c7e513bed0525bcd90778c46c7afefd2a3934c5b5187072d45076b348370f1b2210c7e0395f46ae31da5f0e00da9e19971c43b2a2d0ac7
+  metadata.gz: b43d5b7c8e5eef9226b7c3f3ba7ea3618ee9d473de7dae3c59bcd4ae16be4225a1e5ff1cb29fdddb9c50fa54fdb7c05a275927a577837f0ac4d976a00a5673b0
+  data.tar.gz: 5072aac61f705c4a66d52579bce2efee8cc772f303177a617eaa97afe72c0334109def5469fd1b8d05746e99449ce5f7f8ae3280c0bdc58d0c69382604db4b4f

data/lib/multi_tenant/belongs_to_tenant.rb

@@ -25,7 +25,7 @@ module MultiTenant
       cattr_accessor :tenant_class, :tenant_foreign_key, :tenant_primary_key
       self.tenant_class = reflection.klass
       self.tenant_foreign_key = reflection.foreign_key.to_sym
-      self.tenant_primary_key = reflection.active_record_primary_key.to_sym
+      self.tenant_primary_key = reflection.association_primary_key.to_sym
 
       before_validation :assign_to_tenant
       validates_presence_of tenant_foreign_key

data/lib/multi_tenant/belongs_to_tenant_through.rb

@@ -29,7 +29,7 @@ module MultiTenant
 
           # Using straight sql so we can JOIN against two columns. Otherwise one must go into "WHERE", and Arel would mistakenly apply it to UPDATEs and DELETEs.
           quoted_tenant_id = connection.quote tenant.send delegate_class.tenant_primary_key
-          joins("INNER JOIN #{ref.klass.table_name} ON #{ref.klass.table_name}.#{ref.foreign_key}=#{table_name}.#{ref.active_record_primary_key} AND #{ref.klass.table_name}.#{ref.klass.tenant_foreign_key}=#{quoted_tenant_id}").
+          joins("INNER JOIN #{ref.klass.table_name} ON #{ref.klass.table_name}.#{ref.foreign_key}=#{table_name}.#{ref.association_primary_key} AND #{ref.klass.table_name}.#{ref.klass.tenant_foreign_key}=#{quoted_tenant_id}").
             readonly(false) # using "joins" makes records readonly, which we don't want
         }
       end

data/lib/multi_tenant/version.rb

@@ -1,4 +1,4 @@
 module MultiTenant
   # Gem version
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.5.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_multi_tenant
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Jordan Hollinger
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-18 00:00:00.000000000 Z
+date: 2017-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord