diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-11-20 08:00:52 -0800 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-11-20 14:13:45 -0200 |
commit | 50f00463bd8348c35cc5dad40116e21323f6822f (patch) | |
tree | c749e764ce2832b095a448e800bb4fd27576d293 /activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | |
parent | bd87bd95646c2b94c602dff7d0a1f7e75c303e51 (diff) | |
download | rails-50f00463bd8348c35cc5dad40116e21323f6822f.tar.gz rails-50f00463bd8348c35cc5dad40116e21323f6822f.tar.bz2 rails-50f00463bd8348c35cc5dad40116e21323f6822f.zip |
Merge pull request #8276 from pwnall/pgsql_text_limits
Postgresql doesn't accepts limits on text columns
Conflicts:
activerecord/CHANGELOG.md
activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index 80a0c6d13c..afc363c9b2 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -1078,6 +1078,13 @@ module ActiveRecord when nil, 0..0x3fffffff; super(type) else raise(ActiveRecordError, "No binary type has byte size #{limit}.") end + when 'text' + # PostgreSQL doesn't support limits on text columns. + # The hard limit is 1Gb, according to section 8.3 in the manual. + case limit + when nil, 0..0x3fffffff; super(type) + else raise(ActiveRecordError, "The limit on text can be at most 1GB - 1byte.") + end when 'integer' return 'integer' unless limit |