diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-08-20 06:07:09 -0700 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-08-20 06:07:09 -0700 |
| commit | fab8aee5aee4601161334b2baecb1d66936253af (patch) | |
| tree | ac157f6f06c5f3bdddea36cf210d0400c75e69ae | |
| parent | 0d2793198fe0ca11429786aa95bf7abfd17aa9ca (diff) | |
| parent | f87d8c7146d6601c57db1f9f4ec1d04fdd0a3f4a (diff) | |
| download | rails-fab8aee5aee4601161334b2baecb1d66936253af.tar.gz rails-fab8aee5aee4601161334b2baecb1d66936253af.tar.bz2 rails-fab8aee5aee4601161334b2baecb1d66936253af.zip | |
Merge pull request #11922 from Empact/string-confusion
Stop interpreting SQL 'string' columns as :string type.
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/column.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/adapters/postgresql/quoting_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/column.rb b/activerecord/lib/active_record/connection_adapters/column.rb index bccfa41ad1..fb53090edc 100644 --- a/activerecord/lib/active_record/connection_adapters/column.rb +++ b/activerecord/lib/active_record/connection_adapters/column.rb @@ -272,7 +272,7 @@ module ActiveRecord :text when /blob/i, /binary/i :binary - when /char/i, /string/i + when /char/i :string when /boolean/i :boolean diff --git a/activerecord/test/cases/adapters/postgresql/quoting_test.rb b/activerecord/test/cases/adapters/postgresql/quoting_test.rb index b3429648ee..a534f0e56a 100644 --- a/activerecord/test/cases/adapters/postgresql/quoting_test.rb +++ b/activerecord/test/cases/adapters/postgresql/quoting_test.rb @@ -47,7 +47,7 @@ module ActiveRecord def test_quote_cast_numeric fixnum = 666 - c = Column.new(nil, nil, 'string') + c = Column.new(nil, nil, 'varchar') assert_equal "'666'", @conn.quote(fixnum, c) c = Column.new(nil, nil, 'text') assert_equal "'666'", @conn.quote(fixnum, c) |