Skip to content

Commit cbaa20a

Browse files
authored
Merge pull request #413 from kbrock/pr_412
Fix primary_key integer check
2 parents b5ffb9c + 0ec8280 commit cbaa20a

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

lib/ancestry/class_methods.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ def primary_key_is_an_integer?
221221
if defined?(@primary_key_is_an_integer)
222222
@primary_key_is_an_integer
223223
else
224-
@primary_key_is_an_integer = !ANCESTRY_UNCAST_TYPES.include?(type_for_attribute(primary_key))
224+
@primary_key_is_an_integer = !ANCESTRY_UNCAST_TYPES.include?(type_for_attribute(primary_key).type)
225225
end
226226
end
227227
end

test/concerns/has_ancestry_test.rb

+12
Original file line numberDiff line numberDiff line change
@@ -123,4 +123,16 @@ def test_setup_test_nodes
123123
end
124124
end
125125
end
126+
127+
def test_primary_key_is_an_integer
128+
AncestryTestDatabase.with_model(extra_columns: { string_id: :string }) do |model|
129+
model.primary_key = :string_id
130+
131+
assert !model.primary_key_is_an_integer?
132+
end
133+
134+
AncestryTestDatabase.with_model do |model|
135+
assert model.primary_key_is_an_integer?
136+
end
137+
end
126138
end

0 commit comments

Comments
 (0)