Skip to content

Commit

Permalink
select proper default database. fix transactional cleaner.
Browse files Browse the repository at this point in the history
  • Loading branch information
netskin-ci committed Mar 30, 2011
1 parent 29d70b7 commit c03ec11
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
5 changes: 3 additions & 2 deletions lib/database_cleaner/sequel/base.rb
Expand Up @@ -13,9 +13,10 @@ def db=(desired_db)
end

def db
@db || :default
return @db if @db && @db != :default
raise "As you have more than one active sequel database you have to specify the one to use manually!" if ::Sequel::DATABASES.count > 1
::Sequel::DATABASES.first
end

end
end
end
8 changes: 6 additions & 2 deletions lib/database_cleaner/sequel/transaction.rb
Expand Up @@ -5,11 +5,15 @@ class Transaction
include ::DatabaseCleaner::Sequel::Base

def start
db.begin_transaction
@transactions ||= []
db.send(:add_transaction)
@transactions << db.send(:begin_transaction, db)
end

def clean
db.rollback_transaction
transaction = @transactions.pop
db.send(:rollback_transaction, transaction)
db.send(:remove_transaction, transaction)
end
end
end
Expand Down

0 comments on commit c03ec11

Please sign in to comment.