Merge pull request #14579 from senny/pg/remove_string_limit

PostgreSQL, remove varchar limit.

Conflicts:
	activerecord/CHANGELOG.md
This commit is contained in:
Rafael Mendonça França 2014-04-04 19:51:35 -03:00
commit 8d1c703727
7 changed files with 19 additions and 5 deletions

View File

@ -1,3 +1,9 @@
* PostgreSQL and SQLite string columns no longer have a default limit of 255.
Fixes #13435, #9153.
*Vladimir Sazhin*, *Toms Mikoss*, *Yves Senn*
* Make possible to have an association called `records`.
Fixes #11645.

View File

@ -209,7 +209,7 @@ module ActiveRecord
NATIVE_DATABASE_TYPES = {
primary_key: "serial primary key",
string: { name: "character varying", limit: 255 },
string: { name: "character varying" },
text: { name: "text" },
integer: { name: "integer" },
float: { name: "float" },

View File

@ -63,7 +63,7 @@ module ActiveRecord
NATIVE_DATABASE_TYPES = {
primary_key: 'INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL',
string: { name: "varchar", limit: 255 },
string: { name: "varchar" },
text: { name: "text" },
integer: { name: "integer" },
float: { name: "float" },

View File

@ -25,7 +25,7 @@ class PostgresqlArrayTest < ActiveRecord::TestCase
def test_column
assert_equal :string, @column.type
assert_equal "character varying(255)", @column.sql_type
assert_equal "character varying", @column.sql_type
assert @column.array
assert_not @column.text?
assert_not @column.number?

View File

@ -35,6 +35,14 @@ module ActiveRecord
assert_no_column TestModel, :last_name
end
def test_add_column_without_limit
# TODO: limit: nil should work with all adapters.
skip "MySQL wrongly enforces a limit of 255" if current_adapter?(:MysqlAdapter, :Mysql2Adapter)
add_column :test_models, :description, :string, limit: nil
TestModel.reset_column_information
assert_nil TestModel.columns_hash["description"].limit
end
if current_adapter?(:MysqlAdapter, :Mysql2Adapter)
def test_unabstracted_database_dependent_types
add_column :test_models, :intelligence_quotient, :tinyint

View File

@ -63,7 +63,7 @@ class ReflectionTest < ActiveRecord::TestCase
def test_column_string_type_and_limit
assert_equal :string, @first.column_for_attribute("title").type
assert_equal 255, @first.column_for_attribute("title").limit
assert_equal 250, @first.column_for_attribute("title").limit
end
def test_column_null_not_null

View File

@ -677,7 +677,7 @@ ActiveRecord::Schema.define do
end
create_table :topics, force: true do |t|
t.string :title
t.string :title, limit: 250
t.string :author_name
t.string :author_email_address
if mysql_56?