Skip to content

Commit f8b9324

Browse files
authored
Merge pull request citusdata#177 from mpantel/mpantel-patch-Rails-7.1-compatibility
Update model_extensions.rb
2 parents 8da5a40 + baf3a4d commit f8b9324

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

lib/activerecord-multi-tenant/model_extensions.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def partition_key
3030

3131
# Avoid primary_key errors when using composite primary keys (e.g. id, tenant_id)
3232
def primary_key
33-
return @primary_key if @primary_key
33+
return @primary_key if defined?(PRIMARY_KEY_NOT_SET) ? !PRIMARY_KEY_NOT_SET.equal?(@primary_key) : @primary_key
3434

3535
primary_object_keys = Array.wrap(connection.schema_cache.primary_keys(table_name)) - [partition_key]
3636

0 commit comments

Comments
 (0)