Skip to content

Commit

Permalink
Make the -L option take effect even if the -m, -C, -d, or -D options …
Browse files Browse the repository at this point in the history
…are used

Previously, the -L option would not be loaded if one of the above
options was used.
  • Loading branch information
jeremyevans committed Feb 14, 2011
1 parent 8ff96bc commit 7811c62
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions bin/sequel
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ end

begin
DB = connect_proc[db]
load_dirs.each{|d| Dir["#{d}/**/*.rb"].each{|f| load(f)}}
if migrate_dir
Sequel.extension :migration
Sequel::Migrator.apply(DB, migrate_dir, migrate_ver)
Expand Down Expand Up @@ -197,8 +198,6 @@ rescue => e
error_proc["Error: #{e.class}: #{e.message}#{e.backtrace.first}"]
end

load_dirs.each{|d| Dir["#{d}/**/*.rb"].each{|f| load(f)}}

require 'irb'
puts "Your database is stored in DB..."
IRB.start

0 comments on commit 7811c62

Please sign in to comment.