aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-01-14 13:59:07 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2014-01-14 14:01:10 -0800
commitce95fb29919683bac9de4eb87dabeba1221262aa (patch)
tree45bbf8d34ae156de61d2e140c0c2ba1bb794efff /activerecord
parentb23330745bddd6729f95fb8487e3ec4857e4bb58 (diff)
downloadrails-ce95fb29919683bac9de4eb87dabeba1221262aa.tar.gz
rails-ce95fb29919683bac9de4eb87dabeba1221262aa.tar.bz2
rails-ce95fb29919683bac9de4eb87dabeba1221262aa.zip
"string" isn't a valid column type for ActiveRecord
Conflicts: activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
index 082fe3cde5..02834edf7b 100644
--- a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
@@ -189,7 +189,7 @@ module ActiveRecord
DualEncoding.connection.execute(<<-eosql)
CREATE TABLE dual_encodings (
id integer PRIMARY KEY AUTOINCREMENT,
- name string,
+ name varchar(255),
data binary
)
eosql