From 3bc4e9ebb765be8b7a649c8a7a17b880cc5f8e0c Mon Sep 17 00:00:00 2001
From: Sean Griffin <sean@thoughtbot.com>
Date: Tue, 3 Jun 2014 08:39:29 -0600
Subject: Respect limit for PG bit strings

---
 .../postgresql/schema_definitions.rb               | 38 +++++++++++-----------
 .../connection_adapters/postgresql_adapter.rb      | 10 +++---
 2 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'activerecord/lib/active_record/connection_adapters')

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/postgresql/schema_definitions.rb
index ca2966466c..cb8c0b6f93 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_definitions.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_definitions.rb
@@ -4,80 +4,80 @@ module ActiveRecord
       module ColumnMethods
         def xml(*args)
           options = args.extract_options!
-          column(args[0], 'xml', options)
+          column(args[0], :xml, options)
         end
 
         def tsvector(*args)
           options = args.extract_options!
-          column(args[0], 'tsvector', options)
+          column(args[0], :tsvector, options)
         end
 
         def int4range(name, options = {})
-          column(name, 'int4range', options)
+          column(name, :int4range, options)
         end
 
         def int8range(name, options = {})
-          column(name, 'int8range', options)
+          column(name, :int8range, options)
         end
 
         def tsrange(name, options = {})
-          column(name, 'tsrange', options)
+          column(name, :tsrange, options)
         end
 
         def tstzrange(name, options = {})
-          column(name, 'tstzrange', options)
+          column(name, :tstzrange, options)
         end
 
         def numrange(name, options = {})
-          column(name, 'numrange', options)
+          column(name, :numrange, options)
         end
 
         def daterange(name, options = {})
-          column(name, 'daterange', options)
+          column(name, :daterange, options)
         end
 
         def hstore(name, options = {})
-          column(name, 'hstore', options)
+          column(name, :hstore, options)
         end
 
         def ltree(name, options = {})
-          column(name, 'ltree', options)
+          column(name, :ltree, options)
         end
 
         def inet(name, options = {})
-          column(name, 'inet', options)
+          column(name, :inet, options)
         end
 
         def cidr(name, options = {})
-          column(name, 'cidr', options)
+          column(name, :cidr, options)
         end
 
         def macaddr(name, options = {})
-          column(name, 'macaddr', options)
+          column(name, :macaddr, options)
         end
 
         def uuid(name, options = {})
-          column(name, 'uuid', options)
+          column(name, :uuid, options)
         end
 
         def json(name, options = {})
-          column(name, 'json', options)
+          column(name, :json, options)
         end
 
         def citext(name, options = {})
-          column(name, 'citext', options)
+          column(name, :citext, options)
         end
 
         def point(name, options = {})
-          column(name, 'point', options)
+          column(name, :point, options)
         end
 
         def bit(name, options)
-          column(name, 'bit', options)
+          column(name, :bit, options)
         end
 
         def bit_varying(name, options)
-          column(name, 'bit varying', options)
+          column(name, :bit_varying, options)
         end
       end
 
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index c900d61390..b80d722916 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -104,9 +104,9 @@ module ActiveRecord
         json:        { name: "json" },
         ltree:       { name: "ltree" },
         citext:      { name: "citext" },
-        point:       { name: "point"},
-        bit:         { name: "bit"},
-        bit_varying: { name: "bit varying" }
+        point:       { name: "point" },
+        bit:         { name: "bit" },
+        bit_varying: { name: "bit varying" },
       }
 
       OID = PostgreSQL::OID #:nodoc:
@@ -435,8 +435,8 @@ module ActiveRecord
           m.alias_type 'name', 'varchar'
           m.alias_type 'bpchar', 'varchar'
           m.register_type 'bool', Type::Boolean.new
-          m.register_type 'bit', OID::Bit.new
-          m.register_type 'varbit', OID::BitVarying.new
+          register_class_with_limit m, 'bit', OID::Bit
+          register_class_with_limit m, 'varbit', OID::BitVarying
           m.alias_type 'timestamptz', 'timestamp'
           m.register_type 'date', OID::Date.new
           m.register_type 'time', OID::Time.new
-- 
cgit v1.2.3