Skip to content
Browse files

Merge commit 'edc72a7337f6d856685745623900a4e24341434e'

  • Loading branch information...
2 parents 4b852ce + edc72a7 commit a28014143c69260a36ce2250db91d89a015283b6 @pk pk committed Feb 17, 2009
Showing with 7 additions and 0 deletions.
  1. +1 −0 merb_sequel/lib/merb/orms/sequel/connection.rb
  2. +6 −0 merb_sequel/lib/merb_sequel/merbtasks.rb
View
1 merb_sequel/lib/merb/orms/sequel/connection.rb
@@ -66,6 +66,7 @@ def config_options(config = {})
options[:database] = config[:database] || "hey_dude_configure_your_database"
# MSSQL support
options[:db_type] = config[:db_type] if config[:db_type]
+ options[:socket] = config[:socket] if config[:socket]
options[:logger] = Merb.logger
options
end
View
6 merb_sequel/lib/merb_sequel/merbtasks.rb
@@ -13,6 +13,12 @@
task :migrate => :sequel_env do
Sequel::Migrator.apply(Sequel::Model.db, "schema/migrations", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
end
+
+ desc "Drop all tables and perform migrations"
+ task :reset => :merb_start do
+ Sequel::Model.db.drop_table *Sequel::Model.db.tables
+ Sequel::Migrator.apply(Sequel::Model.db, "schema/migrations", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
+ end
desc "Drop all tables and perform migrations"
task :reset => :sequel_env do

0 comments on commit a280141

Please sign in to comment.
Something went wrong with that request. Please try again.