From bc8996c04df8edaf58c0f103e2f0fa4a9c9caa43 Mon Sep 17 00:00:00 2001 From: Konstantin Date: Wed, 14 Mar 2018 11:21:28 +0300 Subject: [PATCH] fix ActiveRecord ConnectionNotEstablished when ActiveRecord isnt required in a project --- lib/extensions/has_one.rb | 6 +----- spec/spec_helper.rb | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/extensions/has_one.rb b/lib/extensions/has_one.rb index 5d68f1b..2f83bc7 100644 --- a/lib/extensions/has_one.rb +++ b/lib/extensions/has_one.rb @@ -1,8 +1,6 @@ # frozen_string_literal: true -begin - require 'active_record' - +if defined?(::ActiveRecord) ::ActiveRecord::Associations::Builder::HasOne.class_eval do # Based on # https://github.com/rails/rails/blob/master/activerecord/lib/active_record/associations/builder/collection_association.rb#L50 @@ -17,6 +15,4 @@ begin CODE end end -rescue LoadError - # active_record can't be loaded so we shouldn't try to monkey-patch it. end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 9110674..67caaaa 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,3 +1,4 @@ +require 'active_record' require 'fast_jsonapi' require 'rspec-benchmark' require 'byebug'