aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEileen M. Uchitelle <eileencodes@gmail.com>2014-10-25 14:52:15 -0400
committerEileen M. Uchitelle <eileencodes@gmail.com>2014-10-25 14:52:15 -0400
commit52f65f671a6b46bb1a8908bd3a5fb8dd4503547e (patch)
treef4a2f90ffd2130948c8de4a5630044ca291f4e18
parent8d7cf75684d5e76ef635f92125a51cb4c1c0fd3b (diff)
parent53df0c4ebba7f7021e193890ebcc2bddd4d5179b (diff)
downloadrails-52f65f671a6b46bb1a8908bd3a5fb8dd4503547e.tar.gz
rails-52f65f671a6b46bb1a8908bd3a5fb8dd4503547e.tar.bz2
rails-52f65f671a6b46bb1a8908bd3a5fb8dd4503547e.zip
Merge pull request #17391 from prathamesh-sonpatki/fix-oid-description-ci-skip
Fix description of OID in TypeMapInitializer
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb b/activerecord/lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb
index e396ff4a1e..35e699eeda 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb
@@ -4,7 +4,7 @@ module ActiveRecord
module OID # :nodoc:
# This class uses the data from PostgreSQL pg_type table to build
# the OID -> Type mapping.
- # - OID is and integer representing the type.
+ # - OID is an integer representing the type.
# - Type is an OID::Type object.
# This class has side effects on the +store+ passed during initialization.
class TypeMapInitializer # :nodoc: