diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-04 19:51:35 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-04 19:51:35 -0300 |
| commit | 8d1c7037278f7f0ca94d47bca7de9922d5b8a4e9 (patch) | |
| tree | 65d6fe982d730dde9f54f5c16eda430121f38aa2 /activerecord/lib/active_record | |
| parent | f79881e2ad412b415cbf785ae505763e829687e7 (diff) | |
| parent | 80f4a65bbd2372c01cfdf174e6446cd232d81e44 (diff) | |
| download | rails-8d1c7037278f7f0ca94d47bca7de9922d5b8a4e9.tar.gz rails-8d1c7037278f7f0ca94d47bca7de9922d5b8a4e9.tar.bz2 rails-8d1c7037278f7f0ca94d47bca7de9922d5b8a4e9.zip | |
Merge pull request #14579 from senny/pg/remove_string_limit
PostgreSQL, remove varchar limit.
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index 9fe8e0497e..3510e4f3b0 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -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" }, diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb index 6e6a51dab8..cd1f7a16c6 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb @@ -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" }, |