aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2016-04-24 11:09:08 +0900
committerRyuta Kamizono <kamipo@gmail.com>2016-04-24 11:09:08 +0900
commit9c8a086863a9037f4fc936061642d312e4466096 (patch)
tree93e86716e452caa5a3f297a10a9a8489928f6842 /activerecord/lib/active_record/connection_adapters
parent39f1dac9a5700c6601f671fea2e9b68b785c94d2 (diff)
downloadrails-9c8a086863a9037f4fc936061642d312e4466096.tar.gz
rails-9c8a086863a9037f4fc936061642d312e4466096.tar.bz2
rails-9c8a086863a9037f4fc936061642d312e4466096.zip
Move `require 'ipaddr'` in `postgresql/oid/cidr.rb`
`IPAddr` is used in `OID::Cidr`.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql/oid/cidr.rb2
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/oid/cidr.rb b/activerecord/lib/active_record/connection_adapters/postgresql/oid/cidr.rb
index eeccb09bdf..838cb63281 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/oid/cidr.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/oid/cidr.rb
@@ -1,3 +1,5 @@
+require 'ipaddr'
+
module ActiveRecord
module ConnectionAdapters
module PostgreSQL
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 470e03b0ed..f52f27c84d 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -16,8 +16,6 @@ require "active_record/connection_adapters/postgresql/type_metadata"
require "active_record/connection_adapters/postgresql/utils"
require "active_record/connection_adapters/statement_pool"
-require 'ipaddr'
-
module ActiveRecord
module ConnectionHandling # :nodoc:
# Establishes a connection to the database that's used by all Active Record objects