diff options
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 12 | ||||
| -rw-r--r-- | activerecord/test/migration_test.rb | 40 |
3 files changed, 54 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index b8452543ca..17cb061d46 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* PostgreSQL: migrations support :limit with :integer columns by mapping limit < 4 to smallint, > 4 to bigint, and anything else to integer. #2900 [keegan@thebasement.org] + * Dates and times interpret empty strings as nil rather than 2000-01-01. #4830 [kajism@yahoo.com] * Allow :uniq => true with has_many :through associations. [Jeremy Kemper] diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index c3b076fe73..a9c140f27a 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -339,6 +339,18 @@ module ActiveRecord execute "DROP INDEX #{index_name(table_name, options)}" end + def type_to_sql(type, limit = nil) #:nodoc: + return super unless type.to_s == 'integer' + + if limit.nil? || limit == 4 + 'integer' + elsif limit < 4 + 'smallint' + else + 'bigint' + end + end + private BYTEA_COLUMN_TYPE_OID = 17 TIMESTAMPOID = 1114 diff --git a/activerecord/test/migration_test.rb b/activerecord/test/migration_test.rb index e238eab1a2..9f1f39736e 100644 --- a/activerecord/test/migration_test.rb +++ b/activerecord/test/migration_test.rb @@ -118,6 +118,46 @@ if ActiveRecord::Base.connection.supports_migrations? ensure Person.connection.drop_table :testings rescue nil end + + def test_create_table_with_limits + Person.connection.create_table :testings do |t| + t.column :foo, :string, :limit => 255 + + t.column :default_int, :integer + + t.column :one_int, :integer, :limit => 1 + t.column :four_int, :integer, :limit => 4 + t.column :eight_int, :integer, :limit => 8 + end + + columns = Person.connection.columns(:testings) + foo = columns.detect { |c| c.name == "foo" } + assert_equal 255, foo.limit + + default = columns.detect { |c| c.name == "default_int" } + one = columns.detect { |c| c.name == "one_int" } + four = columns.detect { |c| c.name == "four_int" } + eight = columns.detect { |c| c.name == "eight_int" } + + if current_adapter?(:PostgreSQLAdapter) + assert_equal 'integer', default.sql_type + assert_equal 'smallint', one.sql_type + assert_equal 'integer', four.sql_type + assert_equal 'bigint', eight.sql_type + elsif current_adapter?(:MysqlAdapter) + assert_equal 'int(11)', default.sql_type + assert_equal 'int(1)', one.sql_type + assert_equal 'int(4)', four.sql_type + assert_equal 'int(8)', eight.sql_type + else + assert_equal 'integer', default.sql_type + assert_equal 'integer(1)', one.sql_type + assert_equal 'integer(4)', four.sql_type + assert_equal 'integer(8)', eight.sql_type + end + ensure + Person.connection.drop_table :testings rescue nil + end # SQL Server and Sybase will not allow you to add a NOT NULL column # to a table without specifying a default value, so the |