aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-09-12 17:35:17 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-09-12 17:35:17 +0000
commitc259ed9e029c9d75791d6f7258649d3174161286 (patch)
treec11984ac55b1bfb18205c3c82d2820c50a6df486
parent0d97f055c2f02fa4bc99ae39f138205967815a97 (diff)
downloadrails-c259ed9e029c9d75791d6f7258649d3174161286.tar.gz
rails-c259ed9e029c9d75791d6f7258649d3174161286.tar.bz2
rails-c259ed9e029c9d75791d6f7258649d3174161286.zip
Use session_id instead of deprecated sessid
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2221 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-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