aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/lib/action_controller/session/active_record_store.rb1
-rw-r--r--railties/lib/tasks/databases.rake2
2 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/session/active_record_store.rb b/actionpack/lib/action_controller/session/active_record_store.rb
index 779ad9dcba..045232a07f 100644
--- a/actionpack/lib/action_controller/session/active_record_store.rb
+++ b/actionpack/lib/action_controller/session/active_record_store.rb
@@ -278,6 +278,5 @@ class CGI
end
end
end
-
end
end
diff --git a/railties/lib/tasks/databases.rake b/railties/lib/tasks/databases.rake
index c6dfefa965..7007b3d5d0 100644
--- a/railties/lib/tasks/databases.rake
+++ b/railties/lib/tasks/databases.rake
@@ -101,7 +101,7 @@ task :create_sessions_table => :environment do
raise "Task unavailable to this database (no migration support)" unless ActiveRecord::Base.connection.supports_migrations?
ActiveRecord::Base.connection.create_table :sessions do |t|
- t.column :sessid, :string
+ t.column :session_id, :string
t.column :data, :text
t.column :updated_at, :datetime
end