1 files changed, 9 insertions, 9 deletions
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 0867e5ef54..a9522e152f 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_definitions.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_definitions.rb
@@ -64,6 +64,10 @@ module ActiveRecord
           column(name, :json, options)
         end
 
+        def jsonb(name, options = {})
+          column(name, :jsonb, options)
+        end
+
         def citext(name, options = {})
           column(name, :citext, options)
         end
@@ -121,18 +125,14 @@ module ActiveRecord
         # a record (as primary keys cannot be +nil+). This might be done via the
         # +SecureRandom.uuid+ method and a +before_save+ callback, for instance.
         def primary_key(name, type = :primary_key, options = {})
-          return super unless type == :uuid
-          options[:default] = options.fetch(:default, 'uuid_generate_v4()')
-          options[:primary_key] = true
-          column name, type, options
+          options[:default] = options.fetch(:default, 'uuid_generate_v4()') if type == :uuid
+          super
         end
 
-        def column(name, type = nil, options = {})
-          super
-          column = self[name]
+        def new_column_definition(name, type, options) # :nodoc:
+          column = super
           column.array = options[:array]
-
-          self
+          column
         end
 
         private