fixes monkey patch load order for rake tasks #593

Gemfile.lock

@@ -67,7 +67,7 @@ GEM
     json_pure (1.6.1)
     launchy (2.0.5)
       addressable (~> 2.2.6)
-    linecache19 (0.5.12)
+    linecache19 (0.5.13)
       ruby_core_source (>= 0.1.4)
     log4r (1.1.10)
     mail (2.2.19)
@@ -148,19 +148,14 @@ GEM
       activesupport (~> 3.0)
       railties (~> 3.0)
       rspec (~> 2.7.0)
-    ruby-debug-base19 (0.11.25)
+    ruby-debug-base19 (0.11.26)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
       ruby_core_source (>= 0.1.4)
-    ruby-debug-base19x (0.11.30.pre10)
+    ruby-debug19 (0.11.6)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
-      rake (>= 0.8.1)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.5)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.15)
+      ruby-debug-base19 (>= 0.11.19)
     ruby-ole (1.2.11.2)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
@@ -219,7 +214,7 @@ DEPENDENCIES
   htmlentities
   launchy
   minitest (~> 2.0.2)
-  mocha
+  mocha (~> 0.10.0)
   oauth (= 0.4.5)
   oauth-plugin (= 0.4.0.pre4)
   pg (= 0.11)
@@ -233,8 +228,8 @@ DEPENDENCIES
   rgeo-geojson (= 0.2.1)
   roo (~> 1.9.7)
   rspec-rails
-  ruby-debug-base19x (~> 0.11.30.pre3)
-  ruby-debug19 (= 0.11.5)
+  ruby-debug-base19 (= 0.11.26)
+  ruby-debug19 (= 0.11.6)
   rubyzip (~> 0.9.6.1)
   sequel (= 3.29.0)
   sequel-rails (~> 0.1.8)

Rakefile

@@ -2,6 +2,10 @@
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
 require File.expand_path('../config/application', __FILE__)
+
+# this is required in the rakefile to ensure the monkey patch is correctly loaded
+require 'extensions/sequel_rails' 
+
 require 'rake/dsl_definition'
 require 'rake'
 require 'resque/tasks'

lib/extensions/sequel_rails.rb

@@ -14,7 +14,6 @@ module Rails
     def self.setup(environment=nil)
       environment ||= Rails.env
       puts "[sequel] Setting up the #{environment.inspect} environment:"
-
       @@connections[environment] ||= ::Sequel.connect({:logger => configuration.logger}.merge(::Rails::Sequel.configuration.environment_for(environment.to_s)))
       @@connections[environment]
     end
@@ -24,7 +23,7 @@ module Rails
       def host
         @host ||= config['host'] || 'localhost'
       end
-      
+                                    
       class Postgres < Storage
         def _create
           system(