activerecord 4.2.0 → 5.0.0

data/lib/active_record/connection_adapters/postgresql/schema_definitions.rb

@@ -2,90 +2,153 @@ module ActiveRecord
   module ConnectionAdapters
     module PostgreSQL
       module ColumnMethods
-        def xml(*args)
-          options = args.extract_options!
-          column(args[0], :xml, options)
+        # Defines the primary key field.
+        # Use of the native PostgreSQL UUID type is supported, and can be used
+        # by defining your tables as such:
+        #
+        #   create_table :stuffs, id: :uuid do |t|
+        #     t.string :content
+        #     t.timestamps
+        #   end
+        #
+        # By default, this will use the +uuid_generate_v4()+ function from the
+        # +uuid-ossp+ extension, which MUST be enabled on your database. To enable
+        # the +uuid-ossp+ extension, you can use the +enable_extension+ method in your
+        # migrations. To use a UUID primary key without +uuid-ossp+ enabled, you can
+        # set the +:default+ option to +nil+:
+        #
+        #   create_table :stuffs, id: false do |t|
+        #     t.primary_key :id, :uuid, default: nil
+        #     t.uuid :foo_id
+        #     t.timestamps
+        #   end
+        #
+        # You may also pass a different UUID generation function from +uuid-ossp+
+        # or another library.
+        #
+        # Note that setting the UUID primary key default value to +nil+ will
+        # require you to assure that you always provide a UUID value before saving
+        # 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)
+          options[:default] = options.fetch(:default, 'uuid_generate_v4()') if type == :uuid
+          super
+        end
+
+        def bigserial(*args, **options)
+          args.each { |name| column(name, :bigserial, options) }
+        end
+
+        def bit(*args, **options)
+          args.each { |name| column(name, :bit, options) }
+        end
+
+        def bit_varying(*args, **options)
+          args.each { |name| column(name, :bit_varying, options) }
+        end
+
+        def cidr(*args, **options)
+          args.each { |name| column(name, :cidr, options) }
+        end
+
+        def citext(*args, **options)
+          args.each { |name| column(name, :citext, options) }
         end
 
-        def tsvector(*args)
-          options = args.extract_options!
-          column(args[0], :tsvector, options)
+        def daterange(*args, **options)
+          args.each { |name| column(name, :daterange, options) }
         end
 
-        def int4range(name, options = {})
-          column(name, :int4range, options)
+        def hstore(*args, **options)
+          args.each { |name| column(name, :hstore, options) }
         end
 
-        def int8range(name, options = {})
-          column(name, :int8range, options)
+        def inet(*args, **options)
+          args.each { |name| column(name, :inet, options) }
         end
 
-        def tsrange(name, options = {})
-          column(name, :tsrange, options)
+        def int4range(*args, **options)
+          args.each { |name| column(name, :int4range, options) }
         end
 
-        def tstzrange(name, options = {})
-          column(name, :tstzrange, options)
+        def int8range(*args, **options)
+          args.each { |name| column(name, :int8range, options) }
         end
 
-        def numrange(name, options = {})
-          column(name, :numrange, options)
+        def json(*args, **options)
+          args.each { |name| column(name, :json, options) }
         end
 
-        def daterange(name, options = {})
-          column(name, :daterange, options)
+        def jsonb(*args, **options)
+          args.each { |name| column(name, :jsonb, options) }
         end
 
-        def hstore(name, options = {})
-          column(name, :hstore, options)
+        def ltree(*args, **options)
+          args.each { |name| column(name, :ltree, options) }
         end
 
-        def ltree(name, options = {})
-          column(name, :ltree, options)
+        def macaddr(*args, **options)
+          args.each { |name| column(name, :macaddr, options) }
         end
 
-        def inet(name, options = {})
-          column(name, :inet, options)
+        def money(*args, **options)
+          args.each { |name| column(name, :money, options) }
         end
 
-        def cidr(name, options = {})
-          column(name, :cidr, options)
+        def numrange(*args, **options)
+          args.each { |name| column(name, :numrange, options) }
         end
 
-        def macaddr(name, options = {})
-          column(name, :macaddr, options)
+        def point(*args, **options)
+          args.each { |name| column(name, :point, options) }
         end
 
-        def uuid(name, options = {})
-          column(name, :uuid, options)
+        def line(*args, **options)
+          args.each { |name| column(name, :line, options) }
         end
 
-        def json(name, options = {})
-          column(name, :json, options)
+        def lseg(*args, **options)
+          args.each { |name| column(name, :lseg, options) }
         end
 
-        def jsonb(name, options = {})
-          column(name, :jsonb, options)
+        def box(*args, **options)
+          args.each { |name| column(name, :box, options) }
         end
 
-        def citext(name, options = {})
-          column(name, :citext, options)
+        def path(*args, **options)
+          args.each { |name| column(name, :path, options) }
         end
 
-        def point(name, options = {})
-          column(name, :point, options)
+        def polygon(*args, **options)
+          args.each { |name| column(name, :polygon, options) }
         end
 
-        def bit(name, options)
-          column(name, :bit, options)
+        def circle(*args, **options)
+          args.each { |name| column(name, :circle, options) }
         end
 
-        def bit_varying(name, options)
-          column(name, :bit_varying, options)
+        def serial(*args, **options)
+          args.each { |name| column(name, :serial, options) }
         end
 
-        def money(name, options)
-          column(name, :money, options)
+        def tsrange(*args, **options)
+          args.each { |name| column(name, :tsrange, options) }
+        end
+
+        def tstzrange(*args, **options)
+          args.each { |name| column(name, :tstzrange, options) }
+        end
+
+        def tsvector(*args, **options)
+          args.each { |name| column(name, :tsvector, options) }
+        end
+
+        def uuid(*args, **options)
+          args.each { |name| column(name, :uuid, options) }
+        end
+
+        def xml(*args, **options)
+          args.each { |name| column(name, :xml, options) }
         end
       end
 
@@ -96,41 +159,6 @@ module ActiveRecord
       class TableDefinition < ActiveRecord::ConnectionAdapters::TableDefinition
         include ColumnMethods
 
-        # Defines the primary key field.
-        # Use of the native PostgreSQL UUID type is supported, and can be used
-        # by defining your tables as such:
-        #
-        #   create_table :stuffs, id: :uuid do |t|
-        #     t.string :content
-        #     t.timestamps
-        #   end
-        #
-        # By default, this will use the +uuid_generate_v4()+ function from the
-        # +uuid-ossp+ extension, which MUST be enabled on your database. To enable
-        # the +uuid-ossp+ extension, you can use the +enable_extension+ method in your
-        # migrations. To use a UUID primary key without +uuid-ossp+ enabled, you can
-        # set the +:default+ option to +nil+:
-        #
-        #   create_table :stuffs, id: false do |t|
-        #     t.primary_key :id, :uuid, default: nil
-        #     t.uuid :foo_id
-        #     t.timestamps
-        #   end
-        #
-        # You may also pass a different UUID generation function from +uuid-ossp+
-        # or another library.
-        #
-        # Note that setting the UUID primary key default value to +nil+ will
-        # require you to assure that you always provide a UUID value before saving
-        # 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
-        end
-
         def new_column_definition(name, type, options) # :nodoc:
           column = super
           column.array = options[:array]

data/lib/active_record/connection_adapters/postgresql/schema_dumper.rb

@@ -0,0 +1,47 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module PostgreSQL
+      module ColumnDumper
+        def column_spec_for_primary_key(column)
+          spec = super
+          if schema_type(column) == :uuid
+            spec[:default] ||= 'nil'
+          end
+          spec
+        end
+
+        # Adds +:array+ option to the default set
+        def prepare_column_options(column)
+          spec = super
+          spec[:array] = 'true' if column.array?
+          spec
+        end
+
+        # Adds +:array+ as a valid migration key
+        def migration_keys
+          super + [:array]
+        end
+
+        private
+
+        def default_primary_key?(column)
+          schema_type(column) == :serial
+        end
+
+        def schema_type(column)
+          return super unless column.serial?
+
+          if column.bigint?
+            :bigserial
+          else
+            :serial
+          end
+        end
+
+        def schema_expression(column)
+          super unless column.serial?
+        end
+      end
+    end
+  end
+end