Skip to content

Commit 245f033

Browse files
committed
[MODEL] Fixed the deprecation messages for raise_in_transactional_callbacks
See: http://edgeguides.rubyonrails.org/upgrading_ruby_on_rails.html#error-handling-in-transaction-callbacks
1 parent be5b44d commit 245f033

9 files changed

+18
-0
lines changed

elasticsearch-model/test/integration/active_record_associations_parent_child.rb

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
# Needed for ActiveRecord 3.x ?
55
ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => ":memory:" ) unless ActiveRecord::Base.connected?
66

7+
::ActiveRecord::Base.raise_in_transactional_callbacks = true if ::ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks) && ::ActiveRecord::VERSION::MAJOR.to_s < '5'
8+
79
class Question < ActiveRecord::Base
810
include Elasticsearch::Model
911

elasticsearch-model/test/integration/active_record_associations_test.rb

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
# Needed for ActiveRecord 3.x ?
55
ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => ":memory:" ) unless ActiveRecord::Base.connected?
66

7+
::ActiveRecord::Base.raise_in_transactional_callbacks = true if ::ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks) && ::ActiveRecord::VERSION::MAJOR.to_s < '5'
8+
79
module Elasticsearch
810
module Model
911
class ActiveRecordAssociationsIntegrationTest < Elasticsearch::Test::IntegrationTestCase

elasticsearch-model/test/integration/active_record_basic_test.rb

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
# Needed for ActiveRecord 3.x ?
77
ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => ":memory:" ) unless ActiveRecord::Base.connected?
88

9+
::ActiveRecord::Base.raise_in_transactional_callbacks = true if ::ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks) && ::ActiveRecord::VERSION::MAJOR.to_s < '5'
10+
911
module Elasticsearch
1012
module Model
1113
class ActiveRecordBasicIntegrationTest < Elasticsearch::Test::IntegrationTestCase

elasticsearch-model/test/integration/active_record_custom_serialization_test.rb

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
# Needed for ActiveRecord 3.x ?
55
ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => ":memory:" ) unless ActiveRecord::Base.connected?
66

7+
::ActiveRecord::Base.raise_in_transactional_callbacks = true if ::ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks) && ::ActiveRecord::VERSION::MAJOR.to_s < '5'
8+
79
module Elasticsearch
810
module Model
911
class ActiveRecordCustomSerializationTest < Elasticsearch::Test::IntegrationTestCase

elasticsearch-model/test/integration/active_record_import_test.rb

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
# Needed for ActiveRecord 3.x ?
55
ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => ":memory:" ) unless ActiveRecord::Base.connected?
66

7+
::ActiveRecord::Base.raise_in_transactional_callbacks = true if ::ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks) && ::ActiveRecord::VERSION::MAJOR.to_s < '5'
8+
79
module Elasticsearch
810
module Model
911
class ActiveRecordImportIntegrationTest < Elasticsearch::Test::IntegrationTestCase

elasticsearch-model/test/integration/active_record_namespaced_model_test.rb

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
# Needed for ActiveRecord 3.x ?
55
ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => ":memory:" ) unless ActiveRecord::Base.connected?
66

7+
::ActiveRecord::Base.raise_in_transactional_callbacks = true if ::ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks) && ::ActiveRecord::VERSION::MAJOR.to_s < '5'
8+
79
module Elasticsearch
810
module Model
911
class ActiveRecordNamespacedModelIntegrationTest < Elasticsearch::Test::IntegrationTestCase

elasticsearch-model/test/integration/active_record_pagination_test.rb

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
# Needed for ActiveRecord 3.x ?
55
ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => ":memory:" ) unless ActiveRecord::Base.connected?
66

7+
::ActiveRecord::Base.raise_in_transactional_callbacks = true if ::ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks) && ::ActiveRecord::VERSION::MAJOR.to_s < '5'
8+
79
module Elasticsearch
810
module Model
911
class ActiveRecordPaginationTest < Elasticsearch::Test::IntegrationTestCase

elasticsearch-model/test/integration/dynamic_index_name_test.rb

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
# Needed for ActiveRecord 3.x ?
55
ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => ":memory:" ) unless ActiveRecord::Base.connected?
66

7+
::ActiveRecord::Base.raise_in_transactional_callbacks = true if ::ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks) && ::ActiveRecord::VERSION::MAJOR.to_s < '5'
8+
79
module Elasticsearch
810
module Model
911
class DynamicIndexNameTest < Elasticsearch::Test::IntegrationTestCase

elasticsearch-model/test/integration/multiple_models_test.rb

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
# Needed for ActiveRecord 3.x ?
55
ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => ":memory:" ) unless ActiveRecord::Base.connected?
66

7+
::ActiveRecord::Base.raise_in_transactional_callbacks = true if ::ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks) && ::ActiveRecord::VERSION::MAJOR.to_s < '5'
8+
79
Mongo.setup!
810

911
module Elasticsearch

0 commit comments

Comments
 (0)