diff options
| author | José Valim <jose.valim@gmail.com> | 2010-07-22 21:45:48 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-07-22 21:46:01 +0200 |
| commit | 64ca80e523d2ac2f304180a45168ee9ec3b7ff52 (patch) | |
| tree | 27460648aa2dfbad316c7d4957a0cf8da0fc3c6e /activerecord | |
| parent | ba8d89c4c8d1c038c0d6fc9dbfe22f6d528d0da9 (diff) | |
| parent | 24f303b677e4a8f0ecf8c335d95c63c3f7f1bdcc (diff) | |
| download | rails-64ca80e523d2ac2f304180a45168ee9ec3b7ff52.tar.gz rails-64ca80e523d2ac2f304180a45168ee9ec3b7ff52.tar.bz2 rails-64ca80e523d2ac2f304180a45168ee9ec3b7ff52.zip | |
Merge remote branch 'spastorino/master'
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/session_store.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/session_store.rb b/activerecord/lib/active_record/session_store.rb index c6cf91c15d..365fcd6222 100644 --- a/activerecord/lib/active_record/session_store.rb +++ b/activerecord/lib/active_record/session_store.rb @@ -82,9 +82,9 @@ module ActiveRecord def create_table! connection.execute <<-end_sql CREATE TABLE #{table_name} ( - id INTEGER PRIMARY KEY, - #{connection.quote_column_name(session_id_column)} TEXT UNIQUE, - #{connection.quote_column_name(data_column_name)} TEXT(255) + id #{connection.type_to_sql(:primary_key)}, + #{connection.quote_column_name(session_id_column)} VARCHAR(255) UNIQUE, + #{connection.quote_column_name(data_column_name)} VARCHAR(255) ) end_sql end @@ -219,8 +219,8 @@ module ActiveRecord def create_table! connection.execute <<-end_sql CREATE TABLE #{table_name} ( - id INTEGER PRIMARY KEY, - #{connection.quote_column_name(session_id_column)} TEXT UNIQUE, + id #{connection.type_to_sql(:primary_key)}, + #{connection.quote_column_name(session_id_column)} VARCHAR(255) UNIQUE, #{connection.quote_column_name(data_column)} TEXT ) end_sql |