diff --git a/lib/paper_trail/reifiers/belongs_to.rb b/lib/paper_trail/reifiers/belongs_to.rb index 3ff54b8b5..483f791f4 100644 --- a/lib/paper_trail/reifiers/belongs_to.rb +++ b/lib/paper_trail/reifiers/belongs_to.rb @@ -37,7 +37,7 @@ def load_record(assoc, id, options, version) # @api private def load_version(assoc, id, transaction_id, version_at) assoc.klass.paper_trail.version_class. - where("item_type = ?", assoc.class_name). + where("item_type = ?", assoc.klass.name). where("item_id = ?", id). where("created_at >= ? OR transaction_id = ?", version_at, transaction_id). order("id").limit(1).first diff --git a/lib/paper_trail/reifiers/has_many.rb b/lib/paper_trail/reifiers/has_many.rb index 486acb270..2c1c2c78d 100644 --- a/lib/paper_trail/reifiers/has_many.rb +++ b/lib/paper_trail/reifiers/has_many.rb @@ -98,7 +98,7 @@ def load_versions_for_hm_association(assoc, model, version_table, tx_id, version select("MIN(version_id)"). where("foreign_key_name = ?", assoc.foreign_key). where("foreign_key_id = ?", model.id). - where("#{version_table}.item_type = ?", assoc.class_name). + where("#{version_table}.item_type = ?", assoc.klass.name). where("created_at >= ? OR transaction_id = ?", version_at, tx_id). group("item_id"). to_sql diff --git a/lib/paper_trail/reifiers/has_many_through.rb b/lib/paper_trail/reifiers/has_many_through.rb index fac4ef986..af2420687 100644 --- a/lib/paper_trail/reifiers/has_many_through.rb +++ b/lib/paper_trail/reifiers/has_many_through.rb @@ -73,7 +73,7 @@ def collection_through_belongs_to(through_collection, assoc, options, tx_id) def load_versions_for_hmt_association(assoc, ids, tx_id, version_at) version_id_subquery = assoc.klass.paper_trail.version_class. select("MIN(id)"). - where("item_type = ?", assoc.class_name). + where("item_type = ?", assoc.klass.name). where("item_id IN (?)", ids). where( "created_at >= ? OR transaction_id = ?", diff --git a/lib/paper_trail/reifiers/has_one.rb b/lib/paper_trail/reifiers/has_one.rb index ad6611250..85b96b771 100644 --- a/lib/paper_trail/reifiers/has_one.rb +++ b/lib/paper_trail/reifiers/has_one.rb @@ -36,7 +36,7 @@ def load_version_for_has_one(assoc, model, transaction_id, version_at) model.class.paper_trail.version_class.joins(:version_associations). where("version_associations.foreign_key_name = ?", assoc.foreign_key). where("version_associations.foreign_key_id = ?", model.id). - where("#{version_table_name}.item_type = ?", assoc.class_name). + where("#{version_table_name}.item_type = ?", assoc.klass.name). where("created_at >= ? OR transaction_id = ?", version_at, transaction_id). order("#{version_table_name}.id ASC"). first