rails 1.0.0 → 1.1.0

data/lib/rails_generator/commands.rb

@@ -61,7 +61,7 @@ module Rails
           end
 
           def existing_migrations(file_name)
-            Dir.glob("#{@migration_directory}/[0-9]*_#{file_name}.rb")
+            Dir.glob("#{@migration_directory}/[0-9]*_*.rb").grep(/[0-9]+_#{file_name}.rb$/)
           end
 
           def migration_exists?(file_name)
@@ -163,11 +163,13 @@ module Rails
 
         # Copy a file from source to destination with collision checking.
         #
-        # The file_options hash accepts :chmod and :shebang options.
+        # The file_options hash accepts :chmod and :shebang and :collision options.
         # :chmod sets the permissions of the destination file:
         #   file 'config/empty.log', 'log/test.log', :chmod => 0664
         # :shebang sets the #!/usr/bin/ruby line for scripts
         #   file 'bin/generate.rb', 'script/generate', :chmod => 0755, :shebang => '/usr/bin/env ruby'
+        # :collision sets the collision option only for the destination file: 
+        #   file 'settings/server.yml', 'config/server.yml', :collision => :skip
         #
         # Collisions are handled by checking whether the destination file
         # exists and either skipping the file, forcing overwrite, or asking
@@ -188,7 +190,7 @@ module Rails
 
             # Make a choice whether to overwrite the file.  :force and
             # :skip already have their mind made up, but give :ask a shot.
-            choice = case options[:collision].to_sym #|| :ask
+            choice = case (file_options[:collision] || options[:collision]).to_sym #|| :ask
               when :ask   then force_file_collision?(relative_destination)
               when :force then :force
               when :skip  then :skip
@@ -309,8 +311,9 @@ module Rails
         # When creating a migration, it knows to find the first available file in db/migrate and use the migration.rb template.
         def migration_template(relative_source, relative_destination, template_options = {})
           migration_directory relative_destination
-          raise "Another migration is already named #{file_name}: #{existing_migrations(file_name).first}" if migration_exists?(file_name)
-          template(relative_source, "#{relative_destination}/#{next_migration_string}_#{file_name}.rb", template_options)
+          migration_file_name = template_options[:migration_file_name] || file_name
+          raise "Another migration is already named #{migration_file_name}: #{existing_migrations(migration_file_name).first}" if migration_exists?(migration_file_name)
+          template(relative_source, "#{relative_destination}/#{next_migration_string}_#{migration_file_name}.rb", template_options)
         end
 
         private
@@ -423,8 +426,15 @@ end_message
         # When deleting a migration, it knows to delete every file named "[0-9]*_#{file_name}".
         def migration_template(relative_source, relative_destination, template_options = {})
           migration_directory relative_destination
-          raise "There is no migration named #{file_name}" unless migration_exists?(file_name)
-          existing_migrations(file_name).each do |file_path|
+
+          migration_file_name = template_options[:migration_file_name] || file_name
+          unless migration_exists?(migration_file_name)
+            puts "There is no migration named #{migration_file_name}"
+            return
+          end
+
+
+          existing_migrations(migration_file_name).each do |file_path|
             file(relative_source, file_path, template_options)
           end
         end

data/lib/rails_generator/generators/applications/app/app_generator.rb

@@ -4,15 +4,16 @@ class AppGenerator < Rails::Generator::Base
   DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
                               Config::CONFIG['ruby_install_name'])
   
-  default_options   :gem => true, :shebang => DEFAULT_SHEBANG
-  mandatory_options :source  => "#{File.dirname(__FILE__)}/../../../../.."
+  DATABASES = %w( mysql oracle postgresql sqlite2 sqlite3 )
+  
+  default_options   :db => "mysql", :shebang => DEFAULT_SHEBANG
+  mandatory_options :source => "#{File.dirname(__FILE__)}/../../../../.."
 
   def initialize(runtime_args, runtime_options = {})
     super
     usage if args.empty?
+    usage("Databases supported for preconfiguration are: #{DATABASES.join(", ")}") if (options[:db] && !DATABASES.include?(options[:db]))
     @destination_root = args.shift
-    @socket = MYSQL_SOCKET_LOCATIONS.find { |f| File.exists?(f) }
-    @socket = '/path/to/your/mysql.sock' if @socket.blank?
   end
 
   def manifest
@@ -34,9 +35,9 @@ class AppGenerator < Rails::Generator::Base
       m.template "helpers/test_helper.rb",        "test/test_helper.rb"
 
       # database.yml and .htaccess
-      m.template "configs/database.yml", "config/database.yml", :assigns => {
+      m.template "configs/databases/#{options[:db]}.yml", "config/database.yml", :assigns => {
         :app_name => File.basename(File.expand_path(@destination_root)),
-        :socket => @socket
+        :socket   => options[:db] == "mysql" ? mysql_socket_location : nil
       }
       m.template "configs/routes.rb",     "config/routes.rb"
       m.template "configs/apache.conf",   "public/.htaccess"
@@ -49,7 +50,7 @@ class AppGenerator < Rails::Generator::Base
       m.file "environments/test.rb",        "config/environments/test.rb"
 
       # Scripts
-      %w( about breakpointer console destroy generate performance/benchmarker performance/profiler process/reaper process/spawner process/spinner runner server plugin ).each do |file|
+      %w( about breakpointer console destroy generate performance/benchmarker performance/profiler process/reaper process/spawner runner server plugin ).each do |file|
         m.file "bin/#{file}", "script/#{file}", script_options
       end
 
@@ -63,15 +64,16 @@ class AppGenerator < Rails::Generator::Base
         m.template "html/#{file}.html", "public/#{file}.html"
       end
       
-      m.template "html/favicon.ico", "public/favicon.ico"
-      m.template "html/robots.txt", "public/robots.txt"
+      m.template "html/favicon.ico",  "public/favicon.ico"
+      m.template "html/robots.txt",   "public/robots.txt"
       m.file "html/images/rails.png", "public/images/rails.png"
 
       # Javascripts
-      m.file "html/javascripts/prototype.js",     "public/javascripts/prototype.js"
-      m.file "html/javascripts/effects.js",       "public/javascripts/effects.js"
-      m.file "html/javascripts/dragdrop.js",      "public/javascripts/dragdrop.js"
-      m.file "html/javascripts/controls.js",      "public/javascripts/controls.js"
+      m.file "html/javascripts/prototype.js",    "public/javascripts/prototype.js"
+      m.file "html/javascripts/effects.js",      "public/javascripts/effects.js"
+      m.file "html/javascripts/dragdrop.js",     "public/javascripts/dragdrop.js"
+      m.file "html/javascripts/controls.js",     "public/javascripts/controls.js"
+      m.file "html/javascripts/application.js",  "public/javascripts/application.js"
 
       # Docs
       m.file "doc/README_FOR_APP", "doc/README_FOR_APP"
@@ -91,11 +93,17 @@ class AppGenerator < Rails::Generator::Base
     def add_options!(opt)
       opt.separator ''
       opt.separator 'Options:'
-      opt.on("--ruby [#{DEFAULT_SHEBANG}]",
-             "Path to the Ruby binary of your choice.") { |options[:shebang]| }
-      opt.on("--without-gems",
-             "Don't use the Rails gems for your app.",
-             "WARNING: see note below.") { |options[:gem]| }
+      opt.on("-r", "--ruby", String,
+             "Path to the Ruby binary of your choice.",
+             "Default: #{DEFAULT_SHEBANG}") { |options[:shebang]| }
+
+      opt.on("-d", "--database=name", String,
+            "Preconfigure for selected database (options: mysql/oracle/postgresql/sqlite2/sqlite3).",
+            "Default: mysql") { |options[:db]| }
+    end
+    
+    def mysql_socket_location
+      RUBY_PLATFORM =~ /mswin32/ ? MYSQL_SOCKET_LOCATIONS.find { |f| File.exists?(f) } : nil
     end
 
 
@@ -120,11 +128,15 @@ class AppGenerator < Rails::Generator::Base
     script/process
     test/fixtures
     test/functional
+    test/integration
     test/mocks/development
     test/mocks/test
     test/unit
     vendor
     vendor/plugins
+    tmp/sessions
+    tmp/sockets
+    tmp/cache
   )
 
   MYSQL_SOCKET_LOCATIONS = [

data/lib/rails_generator/generators/components/integration_test/USAGE

@@ -0,0 +1,14 @@
+Description:
+    The model generator creates a stub for a new integration test.
+
+    The generator takes an integration test name as its argument.  The test
+    name may be given in CamelCase or under_score and should not be suffixed
+    with 'Test'.
+
+    The generator creates an integration test class in test/integration.
+
+Example:
+    ./script/generate integration_test GeneralStories
+
+    This will create a GeneralStores integration test:
+        test/integration/general_stories_test.rb

data/lib/rails_generator/generators/components/integration_test/integration_test_generator.rb

@@ -0,0 +1,16 @@
+class IntegrationTestGenerator < Rails::Generator::NamedBase
+  default_options :skip_migration => false
+
+  def manifest
+    record do |m|
+      # Check for class naming collisions.
+      m.class_collisions class_path, class_name, "#{class_name}Test"
+
+      # integration test directory
+      m.directory File.join('test/integration', class_path)
+
+      # integration test stub
+      m.template 'integration_test.rb', File.join('test/integration', class_path, "#{file_name}_test.rb")
+    end
+  end
+end

data/lib/rails_generator/generators/components/integration_test/templates/integration_test.rb

@@ -0,0 +1,10 @@
+require "#{File.dirname(__FILE__)}<%= '/..' * class_nesting_depth %>/../test_helper"
+
+class <%= class_name %>Test < ActionController::IntegrationTest
+  # fixtures :your, :models
+
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end

data/lib/rails_generator/generators/components/mailer/USAGE

@@ -13,6 +13,6 @@ Example:
     This will create a Notifications mailer class:
         Mailer:     app/models/notifications.rb
         Views:      app/views/notifications/signup.rhtml [...]
-        Test:       test/unit/credit_card_controller_test.rb
+        Test:       test/unit/test/unit/notifications_test.rb
         Fixtures:   test/fixtures/notifications/signup [...]
 

data/lib/rails_generator/generators/components/migration/USAGE

@@ -11,4 +11,4 @@ Example:
     ./script/generate migration AddSslFlag
 
     With 4 existing migrations, this will create an AddSslFlag migration in the
-    file db/migrate/5_add_ssl_flag.rb
+    file db/migrate/005_add_ssl_flag.rb

data/lib/rails_generator/generators/components/model/USAGE

@@ -5,7 +5,8 @@ Description:
     given in CamelCase or under_score and should not be suffixed with 'Model'.
 
     The generator creates a model class in app/models, a test suite in
-    test/unit, and test fixtures in test/fixtures/singular_name.yml.
+    test/unit, test fixtures in test/fixtures/singular_name.yml, and a migration
+    in db/migrate.
 
 Example:
     ./script/generate model Account
@@ -14,4 +15,5 @@ Example:
         Model:      app/models/account.rb
         Test:       test/unit/account_test.rb
         Fixtures:   test/fixtures/accounts.yml
+        Migration:  db/migrate/XXX_add_accounts.rb
 

data/lib/rails_generator/generators/components/model/model_generator.rb

@@ -1,4 +1,6 @@
 class ModelGenerator < Rails::Generator::NamedBase
+  default_options :skip_migration => false
+
   def manifest
     record do |m|
       # Check for class naming collisions.
@@ -13,6 +15,20 @@ class ModelGenerator < Rails::Generator::NamedBase
       m.template 'model.rb',      File.join('app/models', class_path, "#{file_name}.rb")
       m.template 'unit_test.rb',  File.join('test/unit', class_path, "#{file_name}_test.rb")
       m.template 'fixtures.yml',  File.join('test/fixtures', class_path, "#{table_name}.yml")
+
+      unless options[:skip_migration]
+        m.migration_template 'migration.rb', 'db/migrate', :assigns => {
+          :migration_name => "Create#{class_name.pluralize.gsub(/::/, '')}"
+        }, :migration_file_name => "create_#{file_path.gsub(/\//, '_').pluralize}"
+      end
     end
   end
+
+  protected
+    def add_options!(opt)
+      opt.separator ''
+      opt.separator 'Options:'
+      opt.on("--skip-migration", 
+             "Don't generate a migration file for this model") { |options[:skip_migration]| }
+    end
 end

data/lib/rails_generator/generators/components/model/templates/migration.rb

@@ -0,0 +1,11 @@
+class <%= migration_name %> < ActiveRecord::Migration
+  def self.up
+    create_table :<%= table_name %> do |t|
+      # t.column :name, :string
+    end
+  end
+
+  def self.down
+    drop_table :<%= table_name %>
+  end
+end

data/lib/rails_generator/generators/components/model/templates/unit_test.rb

@@ -5,6 +5,6 @@ class <%= class_name %>Test < Test::Unit::TestCase
 
   # Replace this with your real tests.
   def test_truth
-    assert_kind_of <%= class_name %>, <%= table_name %>(:first)
+    assert true
   end
 end

data/lib/rails_generator/generators/components/plugin/USAGE

@@ -16,6 +16,7 @@ Example:
     This will create:
         vendor/plugins/browser_filters/README
         vendor/plugins/browser_filters/init.rb
+        vendor/plugins/browser_filters/install.rb
         vendor/plugins/browser_filters/lib/browser_filters.rb
         vendor/plugins/browser_filters/test/browser_filters_test.rb
         vendor/plugins/browser_filters/tasks/browser_filters_tasks.rake
@@ -25,9 +26,10 @@ Example:
     This will create:
         vendor/plugins/browser_filters/README
         vendor/plugins/browser_filters/init.rb
+        vendor/plugins/browser_filters/install.rb
         vendor/plugins/browser_filters/lib/browser_filters.rb
         vendor/plugins/browser_filters/test/browser_filters_test.rb
         vendor/plugins/browser_filters/tasks/browser_filters_tasks.rake
         vendor/plugins/browser_filters/generators/browser_filters/browser_filters_generator.rb
         vendor/plugins/browser_filters/generators/browser_filters/USAGE
-        vendor/plugins/browser_filters/generators/browser_filters/templates/
+        vendor/plugins/browser_filters/generators/browser_filters/templates/

data/lib/rails_generator/generators/components/plugin/plugin_generator.rb

@@ -16,6 +16,7 @@ class PluginGenerator < Rails::Generator::NamedBase
       m.template 'README',        "#{plugin_path}/README"
       m.template 'Rakefile',      "#{plugin_path}/Rakefile"
       m.template 'init.rb',       "#{plugin_path}/init.rb"
+      m.template 'install.rb',    "#{plugin_path}/install.rb"
       m.template 'plugin.rb',     "#{plugin_path}/lib/#{file_name}.rb"
       m.template 'tasks.rake',    "#{plugin_path}/tasks/#{file_name}_tasks.rake"
       m.template 'unit_test.rb',  "#{plugin_path}/test/#{file_name}_test.rb"

data/lib/rails_generator/generators/components/plugin/templates/Rakefile

@@ -16,7 +16,7 @@ desc 'Generate documentation for the <%= file_name %> plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = '<%= class_name %>'
-  rdoc.options << '--line-numbers --inline-source'
+  rdoc.options << '--line-numbers' << '--inline-source'
   rdoc.rdoc_files.include('README')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/lib/rails_generator/generators/components/plugin/templates/install.rb

@@ -0,0 +1 @@
+# Install hook code here

data/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb

@@ -73,7 +73,7 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
       m.directory File.join('test/functional', controller_class_path)
 
       # Depend on model generator but skip if the model exists.
-      m.dependency 'model', [singular_name], :collision => :skip
+      m.dependency 'model', [singular_name], :collision => :skip, :skip_migration => true
 
       # Scaffolded forms.
       m.complex_template "form.rhtml",

data/lib/rails_generator/generators/components/scaffold/templates/controller.rb

@@ -11,6 +11,10 @@ class <%= controller_class_name %>Controller < ApplicationController
   end
 
 <% end -%>
+  # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
+  verify :method => :post, :only => [ :destroy<%= suffix %>, :create<%= suffix %>, :update<%= suffix %> ],
+         :redirect_to => { :action => :list<%= suffix %> }
+
   def list<%= suffix %>
     @<%= singular_name %>_pages, @<%= plural_name %> = paginate :<%= plural_name %>, :per_page => 10
   end

data/lib/rails_generator/generators/components/scaffold/templates/style.css

@@ -22,7 +22,7 @@ a:hover { color: #fff; background-color:#000; }
   display: table;
 }
 
-#ErrorExplanation {
+#errorExplanation {
   width: 400px;
   border: 2px solid red;
   padding: 7px;
@@ -31,7 +31,7 @@ a:hover { color: #fff; background-color:#000; }
   background-color: #f0f0f0;
 }
 
-#ErrorExplanation h2 {
+#errorExplanation h2 {
   text-align: left;
   font-weight: bold;
   padding: 5px 5px 5px 15px;
@@ -41,13 +41,13 @@ a:hover { color: #fff; background-color:#000; }
   color: #fff;
 }
 
-#ErrorExplanation p {
+#errorExplanation p {
   color: #333;
   margin-bottom: 0;
   padding: 5px;
 }
 
-#ErrorExplanation ul li {
+#errorExplanation ul li {
   font-size: 12px;
   list-style: square;
 }

data/lib/rails_generator/generators/components/scaffold/templates/view_list.rhtml

@@ -14,7 +14,7 @@
   <%% end %>
     <td><%%= link_to 'Show', :action => 'show<%= suffix %>', :id => <%= singular_name %> %></td>
     <td><%%= link_to 'Edit', :action => 'edit<%= suffix %>', :id => <%= singular_name %> %></td>
-    <td><%%= link_to 'Destroy', { :action => 'destroy<%= suffix %>', :id => <%= singular_name %> }, :confirm => 'Are you sure?' %></td>
+    <td><%%= link_to 'Destroy', { :action => 'destroy<%= suffix %>', :id => <%= singular_name %> }, :confirm => 'Are you sure?', :post => true %></td>
   </tr>
 <%% end %>
 </table>

data/lib/rails_generator/generators/components/session_migration/USAGE

@@ -12,4 +12,4 @@ Example:
     ./script/generate session_migration AddSessionTable
 
     With 4 existing migrations, this will create an AddSessionTable migration in the
-    file db/migrate/5_add_session_table.rb
+    file db/migrate/005_add_session_table.rb

data/lib/rails_generator/options.rb

@@ -96,8 +96,8 @@ module Rails
 
         # Raise a usage error.  Override usage_message to provide a blurb
         # after the option parser summary.
-        def usage
-          raise UsageError, "#{@option_parser}\n#{usage_message}"
+        def usage(message = usage_message)
+          raise UsageError, "#{@option_parser}\n#{message}"
         end
 
         def usage_message

data/lib/rails_version.rb

@@ -1,7 +1,7 @@
 module Rails
   module VERSION #:nodoc:
     MAJOR = 1
-    MINOR = 0
+    MINOR = 1
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')

data/lib/ruby_version_check.rb

@@ -0,0 +1,17 @@
+min_release  = "1.8.2 (2004-12-25)"
+ruby_release = "#{RUBY_VERSION} (#{RUBY_RELEASE_DATE})"
+if ruby_release =~ /1\.8\.3/
+  abort <<-end_message
+
+    Rails does not work with Ruby version 1.8.3.
+    Please upgrade to version 1.8.4 or downgrade to 1.8.2.
+
+  end_message
+elsif ruby_release < min_release
+  abort <<-end_message
+
+    Rails requires Ruby version #{min_release} or later.
+    You're running #{ruby_release}; please upgrade to continue.
+
+  end_message
+end

data/lib/tasks/databases.rake

@@ -1,158 +1,160 @@
-desc "Migrate the database according to the migrate scripts in db/migrate (only supported on PG/MySQL). A specific version can be targetted with VERSION=x"
-task :migrate => :environment do
-  ActiveRecord::Migrator.migrate("db/migrate/", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
-  Rake::Task[:db_schema_dump].invoke if ActiveRecord::Base.schema_format == :ruby
-end
-
-desc "Load fixtures into the current environment's database"
-task :load_fixtures => :environment do
-  require 'active_record/fixtures'
-  ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym)
-  Dir.glob(File.join(RAILS_ROOT, 'test', 'fixtures', '*.{yml,csv}')).each do |fixture_file|
-    Fixtures.create_fixtures('test/fixtures', File.basename(fixture_file, '.*'))
+namespace :db do
+  desc "Migrate the database through scripts in db/migrate. Target specific version with VERSION=x"
+  task :migrate => :environment do
+    ActiveRecord::Migrator.migrate("db/migrate/", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
+    Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
   end
-end
 
-desc "Create a db/schema.rb file that can be portably used against any DB supported by AR."
-task :db_schema_dump => :environment do
-  require 'active_record/schema_dumper'
-  File.open(ENV['SCHEMA'] || "db/schema.rb", "w") do |file|
-    ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
-  end
-end
-
-desc "Import a schema.rb file into the database."
-task :db_schema_import => :environment do
-  file = ENV['SCHEMA'] || "db/schema.rb"
-  load file
-end
+	namespace :fixtures do
+	  desc "Load fixtures into the current environment's database.  Load specific fixtures using FIXTURES=x,y"
+	  task :load => :environment do
+	    require 'active_record/fixtures'
+	    ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym)
+	    (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(RAILS_ROOT, 'test', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
+	      Fixtures.create_fixtures('test/fixtures', File.basename(fixture_file, '.*'))
+	    end
+	  end
+	end
 
-desc "Recreate the test database from the current environment's database schema."
-task :clone_schema_to_test => :db_schema_dump do
-  ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations['test'])
-  Rake::Task[:db_schema_import].invoke
-end
-
-desc "Dump the database structure to a SQL file"
-task :db_structure_dump => :environment do
-  abcs = ActiveRecord::Base.configurations
-  case abcs[RAILS_ENV]["adapter"] 
-    when "mysql", "oci"
-      ActiveRecord::Base.establish_connection(abcs[RAILS_ENV])
-      File.open("db/#{RAILS_ENV}_structure.sql", "w+") { |f| f << ActiveRecord::Base.connection.structure_dump }
-    when "postgresql"
-      ENV['PGHOST']     = abcs[RAILS_ENV]["host"] if abcs[RAILS_ENV]["host"]
-      ENV['PGPORT']     = abcs[RAILS_ENV]["port"].to_s if abcs[RAILS_ENV]["port"]
-      ENV['PGPASSWORD'] = abcs[RAILS_ENV]["password"].to_s if abcs[RAILS_ENV]["password"]
-      search_path = abcs[RAILS_ENV]["schema_search_path"]
-      search_path = "--schema=#{search_path}" if search_path
-      `pg_dump -U "#{abcs[RAILS_ENV]["username"]}" -s -x -O -f db/#{RAILS_ENV}_structure.sql #{search_path} #{abcs[RAILS_ENV]["database"]}`
-    when "sqlite", "sqlite3"
-      dbfile = abcs[RAILS_ENV]["database"] || abcs[RAILS_ENV]["dbfile"]
-      `#{abcs[RAILS_ENV]["adapter"]} #{dbfile} .schema > db/#{RAILS_ENV}_structure.sql`
-    when "sqlserver"
-      `scptxfr /s #{abcs[RAILS_ENV]["host"]} /d #{abcs[RAILS_ENV]["database"]} /I /f db\\#{RAILS_ENV}_structure.sql /q /A /r`
-      `scptxfr /s #{abcs[RAILS_ENV]["host"]} /d #{abcs[RAILS_ENV]["database"]} /I /F db\ /q /A /r`
-    else 
-      raise "Task not supported by '#{abcs["test"]["adapter"]}'"
-  end
+  namespace :schema do
+    desc "Create a db/schema.rb file that can be portably used against any DB supported by AR"
+    task :dump => :environment do
+      require 'active_record/schema_dumper'
+      File.open(ENV['SCHEMA'] || "db/schema.rb", "w") do |file|
+        ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
+      end
+    end
 
-  if ActiveRecord::Base.connection.supports_migrations?
-    File.open("db/#{RAILS_ENV}_structure.sql", "a") { |f| f << ActiveRecord::Base.connection.dump_schema_information }
+    desc "Load a schema.rb file into the database"
+    task :load => :environment do
+      file = ENV['SCHEMA'] || "db/schema.rb"
+      load(file)
+    end
   end
-end
 
-desc "Recreate the test databases from the development structure"
-task :clone_structure_to_test => [ :db_structure_dump, :purge_test_database ] do
-  abcs = ActiveRecord::Base.configurations
-  case abcs["test"]["adapter"]
-    when "mysql"
-      ActiveRecord::Base.establish_connection(:test)
-      ActiveRecord::Base.connection.execute('SET foreign_key_checks = 0')
-      IO.readlines("db/#{RAILS_ENV}_structure.sql").join.split("\n\n").each do |table|
-        ActiveRecord::Base.connection.execute(table)
-      end
-    when "postgresql"
-      ENV['PGHOST']     = abcs["test"]["host"] if abcs["test"]["host"]
-      ENV['PGPORT']     = abcs["test"]["port"].to_s if abcs["test"]["port"]
-      ENV['PGPASSWORD'] = abcs["test"]["password"].to_s if abcs["test"]["password"]
-      `psql -U "#{abcs["test"]["username"]}" -f db/#{RAILS_ENV}_structure.sql #{abcs["test"]["database"]}`
-    when "sqlite", "sqlite3"
-      dbfile = abcs["test"]["database"] || abcs["test"]["dbfile"]
-      `#{abcs["test"]["adapter"]} #{dbfile} < db/#{RAILS_ENV}_structure.sql`
-    when "sqlserver"
-      `osql -E -S #{abcs["test"]["host"]} -d #{abcs["test"]["database"]} -i db\\#{RAILS_ENV}_structure.sql`
-    when "oci"
-      ActiveRecord::Base.establish_connection(:test)
-      IO.readlines("db/#{RAILS_ENV}_structure.sql").join.split(";\n\n").each do |ddl|
-        ActiveRecord::Base.connection.execute(ddl)
+  namespace :structure do
+    desc "Dump the database structure to a SQL file"
+    task :dump => :environment do
+      abcs = ActiveRecord::Base.configurations
+      case abcs[RAILS_ENV]["adapter"] 
+        when "mysql", "oci"
+          ActiveRecord::Base.establish_connection(abcs[RAILS_ENV])
+          File.open("db/#{RAILS_ENV}_structure.sql", "w+") { |f| f << ActiveRecord::Base.connection.structure_dump }
+        when "postgresql"
+          ENV['PGHOST']     = abcs[RAILS_ENV]["host"] if abcs[RAILS_ENV]["host"]
+          ENV['PGPORT']     = abcs[RAILS_ENV]["port"].to_s if abcs[RAILS_ENV]["port"]
+          ENV['PGPASSWORD'] = abcs[RAILS_ENV]["password"].to_s if abcs[RAILS_ENV]["password"]
+          search_path = abcs[RAILS_ENV]["schema_search_path"]
+          search_path = "--schema=#{search_path}" if search_path
+          `pg_dump -i -U "#{abcs[RAILS_ENV]["username"]}" -s -x -O -f db/#{RAILS_ENV}_structure.sql #{search_path} #{abcs[RAILS_ENV]["database"]}`
+        when "sqlite", "sqlite3"
+          dbfile = abcs[RAILS_ENV]["database"] || abcs[RAILS_ENV]["dbfile"]
+          `#{abcs[RAILS_ENV]["adapter"]} #{dbfile} .schema > db/#{RAILS_ENV}_structure.sql`
+        when "sqlserver"
+          `scptxfr /s #{abcs[RAILS_ENV]["host"]} /d #{abcs[RAILS_ENV]["database"]} /I /f db\\#{RAILS_ENV}_structure.sql /q /A /r`
+          `scptxfr /s #{abcs[RAILS_ENV]["host"]} /d #{abcs[RAILS_ENV]["database"]} /I /F db\ /q /A /r`
+        else 
+          raise "Task not supported by '#{abcs["test"]["adapter"]}'"
       end
-    else 
-      raise "Task not supported by '#{abcs["test"]["adapter"]}'"
-  end
-end
 
-desc "Empty the test database"
-task :purge_test_database => :environment do
-  abcs = ActiveRecord::Base.configurations
-  case abcs["test"]["adapter"]
-    when "mysql"
-      ActiveRecord::Base.establish_connection(:test)
-      ActiveRecord::Base.connection.recreate_database(abcs["test"]["database"])
-    when "postgresql"
-      ENV['PGHOST']     = abcs["test"]["host"] if abcs["test"]["host"]
-      ENV['PGPORT']     = abcs["test"]["port"].to_s if abcs["test"]["port"]
-      ENV['PGPASSWORD'] = abcs["test"]["password"].to_s if abcs["test"]["password"]
-      enc_option = "-E #{abcs["test"]["encoding"]}" if abcs["test"]["encoding"]
-      `dropdb -U "#{abcs["test"]["username"]}" #{abcs["test"]["database"]}`
-      `createdb #{enc_option} -U "#{abcs["test"]["username"]}" #{abcs["test"]["database"]}`
-    when "sqlite","sqlite3"
-      dbfile = abcs["test"]["database"] || abcs["test"]["dbfile"]
-      File.delete(dbfile) if File.exist?(dbfile)
-    when "sqlserver"
-      dropfkscript = "#{abcs["test"]["host"]}.#{abcs["test"]["database"]}.DP1".gsub(/\\/,'-')
-      `osql -E -S #{abcs["test"]["host"]} -d #{abcs["test"]["database"]} -i db\\#{dropfkscript}`
-      `osql -E -S #{abcs["test"]["host"]} -d #{abcs["test"]["database"]} -i db\\#{RAILS_ENV}_structure.sql`
-    when "oci"
-      ActiveRecord::Base.establish_connection(:test)
-      ActiveRecord::Base.connection.structure_drop.split(";\n\n").each do |ddl|
-        ActiveRecord::Base.connection.execute(ddl)
+      if ActiveRecord::Base.connection.supports_migrations?
+        File.open("db/#{RAILS_ENV}_structure.sql", "a") { |f| f << ActiveRecord::Base.connection.dump_schema_information }
       end
-    else
-      raise "Task not supported by '#{abcs["test"]["adapter"]}'"
+    end
   end
-end
 
-def prepare_test_database_task
-  {:sql  => :clone_structure_to_test, 
-   :ruby => :clone_schema_to_test}[ActiveRecord::Base.schema_format]
-end
+  namespace :test do
+    desc "Recreate the test database from the current environment's database schema"
+    task :clone => "db:schema:dump" do
+      ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations['test'])
+      ActiveRecord::Schema.verbose = false
+      Rake::Task["db:schema:load"].invoke
+    end
 
-desc 'Prepare the test database and load the schema'
-task :prepare_test_database => :environment do
-  Rake::Task[prepare_test_database_task].invoke
-end
+  
+    desc "Recreate the test databases from the development structure"
+    task :clone_structure => [ "db:structure:dump", "db:test:purge" ] do
+      abcs = ActiveRecord::Base.configurations
+      case abcs["test"]["adapter"]
+        when "mysql"
+          ActiveRecord::Base.establish_connection(:test)
+          ActiveRecord::Base.connection.execute('SET foreign_key_checks = 0')
+          IO.readlines("db/#{RAILS_ENV}_structure.sql").join.split("\n\n").each do |table|
+            ActiveRecord::Base.connection.execute(table)
+          end
+        when "postgresql"
+          ENV['PGHOST']     = abcs["test"]["host"] if abcs["test"]["host"]
+          ENV['PGPORT']     = abcs["test"]["port"].to_s if abcs["test"]["port"]
+          ENV['PGPASSWORD'] = abcs["test"]["password"].to_s if abcs["test"]["password"]
+          `psql -U "#{abcs["test"]["username"]}" -f db/#{RAILS_ENV}_structure.sql #{abcs["test"]["database"]}`
+        when "sqlite", "sqlite3"
+          dbfile = abcs["test"]["database"] || abcs["test"]["dbfile"]
+          `#{abcs["test"]["adapter"]} #{dbfile} < db/#{RAILS_ENV}_structure.sql`
+        when "sqlserver"
+          `osql -E -S #{abcs["test"]["host"]} -d #{abcs["test"]["database"]} -i db\\#{RAILS_ENV}_structure.sql`
+        when "oci"
+          ActiveRecord::Base.establish_connection(:test)
+          IO.readlines("db/#{RAILS_ENV}_structure.sql").join.split(";\n\n").each do |ddl|
+            ActiveRecord::Base.connection.execute(ddl)
+          end
+        else 
+          raise "Task not supported by '#{abcs["test"]["adapter"]}'"
+      end
+    end
 
-desc "Creates a sessions table for use with CGI::Session::ActiveRecordStore"
-task :create_sessions_table => :environment do
-  raise "Task unavailable to this database (no migration support)" unless ActiveRecord::Base.connection.supports_migrations?
+    desc "Empty the test database"
+    task :purge => :environment do
+      abcs = ActiveRecord::Base.configurations
+      case abcs["test"]["adapter"]
+        when "mysql"
+          ActiveRecord::Base.establish_connection(:test)
+          ActiveRecord::Base.connection.recreate_database(abcs["test"]["database"])
+        when "postgresql"
+          ENV['PGHOST']     = abcs["test"]["host"] if abcs["test"]["host"]
+          ENV['PGPORT']     = abcs["test"]["port"].to_s if abcs["test"]["port"]
+          ENV['PGPASSWORD'] = abcs["test"]["password"].to_s if abcs["test"]["password"]
+          enc_option = "-E #{abcs["test"]["encoding"]}" if abcs["test"]["encoding"]
+          `dropdb -U "#{abcs["test"]["username"]}" #{abcs["test"]["database"]}`
+          `createdb #{enc_option} -U "#{abcs["test"]["username"]}" #{abcs["test"]["database"]}`
+        when "sqlite","sqlite3"
+          dbfile = abcs["test"]["database"] || abcs["test"]["dbfile"]
+          File.delete(dbfile) if File.exist?(dbfile)
+        when "sqlserver"
+          dropfkscript = "#{abcs["test"]["host"]}.#{abcs["test"]["database"]}.DP1".gsub(/\\/,'-')
+          `osql -E -S #{abcs["test"]["host"]} -d #{abcs["test"]["database"]} -i db\\#{dropfkscript}`
+          `osql -E -S #{abcs["test"]["host"]} -d #{abcs["test"]["database"]} -i db\\#{RAILS_ENV}_structure.sql`
+        when "oci"
+          ActiveRecord::Base.establish_connection(:test)
+          ActiveRecord::Base.connection.structure_drop.split(";\n\n").each do |ddl|
+            ActiveRecord::Base.connection.execute(ddl)
+          end
+        else
+          raise "Task not supported by '#{abcs["test"]["adapter"]}'"
+      end
+    end
 
-  ActiveRecord::Base.connection.create_table :sessions do |t|
-    t.column :session_id, :string
-    t.column :data, :text
-    t.column :updated_at, :datetime
+    desc 'Prepare the test database and load the schema'
+    task :prepare => :environment do
+      Rake::Task[{ :sql  => "db:test:clone_structure", :ruby => "db:test:clone" }[ActiveRecord::Base.schema_format]].invoke
+    end
   end
-  
-  ActiveRecord::Base.connection.add_index :sessions, :session_id
-end
 
-desc "Drop the sessions table"
-task :drop_sessions_table => :environment do
-  raise "Task unavailable to this database (no migration support)" unless ActiveRecord::Base.connection.supports_migrations?
-  
-  ActiveRecord::Base.connection.drop_table :sessions
+  namespace :sessions do
+    desc "Creates a sessions table for use with CGI::Session::ActiveRecordStore"
+    task :create => :environment do
+      raise "Task unavailable to this database (no migration support)" unless ActiveRecord::Base.connection.supports_migrations?
+      require 'rails_generator'
+      require 'rails_generator/scripts/generate'
+      Rails::Generator::Scripts::Generate.new.run(["session_migration", ENV["MIGRATION"] || "AddSessions"])
+    end
+
+    desc "Clear the sessions table"
+    task :clear => :environment do
+      ActiveRecord::Base.connection.execute "DELETE FROM sessions"
+    end
+  end
 end
 
-desc "Drop and recreate the session table (much faster than 'DELETE * FROM sessions')"
-task :purge_sessions_table => [ :drop_sessions_table, :create_sessions_table ] do
+def session_table_name
+  ActiveRecord::Base.pluralize_table_names ? :sessions : :session
 end