Skip to content

Commit 6164a7a

Browse files
committed
Remove onload stuff
Now that we are lazy loading the column check we don't need this stuff I believe.
1 parent 4af9614 commit 6164a7a

File tree

1 file changed

+22
-26
lines changed

1 file changed

+22
-26
lines changed

lib/flipper/adapters/active_record.rb

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,36 +8,33 @@ module Adapters
88
class ActiveRecord
99
include ::Flipper::Adapter
1010

11-
ActiveSupport.on_load(:active_record) do
12-
# Abstract base class for internal models
13-
class Model < ::ActiveRecord::Base
14-
self.abstract_class = true
15-
end
11+
class Model < ::ActiveRecord::Base
12+
self.abstract_class = true
13+
end
1614

17-
# Private: Do not use outside of this adapter.
18-
class Feature < Model
19-
self.table_name = [
20-
Model.table_name_prefix,
21-
"flipper_features",
22-
Model.table_name_suffix,
23-
].join
15+
# Private: Do not use outside of this adapter.
16+
class Feature < Model
17+
self.table_name = [
18+
Model.table_name_prefix,
19+
"flipper_features",
20+
Model.table_name_suffix,
21+
].join
2422

25-
has_many :gates, foreign_key: "feature_key", primary_key: "key"
23+
has_many :gates, foreign_key: "feature_key", primary_key: "key"
2624

27-
validates :key, presence: true
28-
end
25+
validates :key, presence: true
26+
end
2927

30-
# Private: Do not use outside of this adapter.
31-
class Gate < Model
32-
self.table_name = [
33-
Model.table_name_prefix,
34-
"flipper_gates",
35-
Model.table_name_suffix,
36-
].join
28+
# Private: Do not use outside of this adapter.
29+
class Gate < Model
30+
self.table_name = [
31+
Model.table_name_prefix,
32+
"flipper_gates",
33+
Model.table_name_suffix,
34+
].join
3735

38-
validates :feature_key, presence: true
39-
validates :key, presence: true
40-
end
36+
validates :feature_key, presence: true
37+
validates :key, presence: true
4138
end
4239

4340
VALUE_TO_TEXT_WARNING = <<-EOS
@@ -58,7 +55,6 @@ class Gate < Model
5855
# Allowing the overriding of the default feature/gate classes means you
5956
# can roll your own tables and what not, if you so desire.
6057
def initialize(options = {})
61-
::ActiveRecord::Base
6258
@name = options.fetch(:name, :active_record)
6359
@feature_class = options.fetch(:feature_class) { Flipper::Adapters::ActiveRecord::Feature }
6460
@gate_class = options.fetch(:gate_class) { Flipper::Adapters::ActiveRecord::Gate }

0 commit comments

Comments
 (0)