File tree 3 files changed +5
-5
lines changed
lib/elasticsearch/model/adapters
3 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ def records
20
20
#
21
21
sql_records . instance_exec ( response [ 'hits' ] [ 'hits' ] ) do |hits |
22
22
define_singleton_method :to_a do
23
- if :: ActiveRecord . respond_to ?( :version ) && ::ActiveRecord . version . to_s > '4'
23
+ if defined ?( :: ActiveRecord ) && ::ActiveRecord :: VERSION :: MAJOR >= 4
24
24
self . load
25
25
else
26
26
self . __send__ ( :exec_queries )
@@ -47,7 +47,7 @@ def order(*args)
47
47
#
48
48
sql_records . instance_exec do
49
49
define_singleton_method ( :to_a ) do
50
- if :: ActiveRecord . respond_to ?( :version ) && ::ActiveRecord . version . to_s > '4'
50
+ if defined ?( :: ActiveRecord ) && ::ActiveRecord :: VERSION :: MAJOR >= 4
51
51
self . load
52
52
else
53
53
self . __send__ ( :exec_queries )
Original file line number Diff line number Diff line change @@ -230,7 +230,7 @@ class ActiveRecordAssociationsIntegrationTest < Elasticsearch::Test::Integration
230
230
231
231
assert_equal 3 , response . results . size
232
232
assert_equal 3 , response . records . size
233
- end if :: ActiveRecord . respond_to ?( :version ) && ::ActiveRecord . version . to_s > '4'
233
+ end if defined ?( :: ActiveRecord ) && ::ActiveRecord :: VERSION :: MAJOR >= 4
234
234
235
235
should "reindex a document after comments are added" do
236
236
# Create posts
@@ -272,7 +272,7 @@ class ActiveRecordAssociationsIntegrationTest < Elasticsearch::Test::Integration
272
272
}
273
273
274
274
assert_equal 1 , response . results . size
275
- end if :: ActiveRecord . respond_to ?( :version ) && ::ActiveRecord . version . to_s > '4'
275
+ end if defined ?( :: ActiveRecord ) && ::ActiveRecord :: VERSION :: MAJOR >= 4
276
276
277
277
should "reindex a document after Post#touch" do
278
278
# Create categories
Original file line number Diff line number Diff line change @@ -126,7 +126,7 @@ class ::Article < ActiveRecord::Base
126
126
should "allow ordering response.records in SQL" do
127
127
response = Article . search query : { match : { title : { query : 'test' } } }
128
128
129
- if :: ActiveRecord . respond_to ?( :version ) && ::ActiveRecord . version . to_s > '4'
129
+ if defined ?( :: ActiveRecord ) && ::ActiveRecord :: VERSION :: MAJOR >= 4
130
130
assert_equal 'Testing Coding' , response . records . order ( title : :desc ) . first . title
131
131
else
132
132
assert_equal 'Testing Coding' , response . records . order ( 'title DESC' ) . first . title
You can’t perform that action at this time.
0 commit comments