Skip to content

Delegate primary_key to super in abstract class #240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dlwr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Delegate primary_key to super in abstract class #240

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions lib/activerecord-multi-tenant/model_extensions.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ def partition_key

# Avoid primary_key errors when using composite primary keys (e.g. id, tenant_id)
def primary_key
# If receiver is an abstract class, it doesn't have a table_name
# In this case, we don't care about the primary key, so delegate to super
return super unless table_name

if defined?(PRIMARY_KEY_NOT_SET) ? !PRIMARY_KEY_NOT_SET.equal?(@primary_key) : @primary_key
return @primary_key
end
Expand All @@ -52,8 +56,7 @@ def primary_key

@primary_key = if primary_object_keys.size == 1
primary_object_keys.first
elsif table_name &&
connection.schema_cache.columns_hash(table_name).include?(DEFAULT_ID_FIELD)
elsif connection.schema_cache.columns_hash(table_name).include?(DEFAULT_ID_FIELD)
DEFAULT_ID_FIELD
end
end
Expand Down