[PATCH core 6/7] Core: Re-use deltacloud-db-migrate in the Rake task

[mf...@redhat.com]

From: Michal Fojtik <mf...@redhat.com>


Signed-off-by: Michal fojtik <mf...@redhat.com>
---
 server/Rakefile | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/server/Rakefile b/server/Rakefile
index 2a52ec2..9ec9aa4 100644
--- a/server/Rakefile
+++ b/server/Rakefile
@@ -46,18 +46,16 @@ Gem::PackageTask.new(spec) do |pkg|
   pkg.need_tar = true
 end
 
+require 'require_relative' if RUBY_VERSION < '1.9'
+require_relative './lib/initializers/mock_initialize'
+
 namespace :db do
   desc 'Execute the database migrations'
   task 'migrate' do
-    ENV['API_VERBOSE'] = 'true'
-    load File.join(File.dirname(__FILE__), 'lib', 'db.rb')
-    db = Deltacloud.database
-    Sequel::Migrator.apply(db, File.join(File.dirname(__FILE__), 'db', 'migrations'))
+    load File.join(File.dirname(__FILE__), 'bin', 'deltacloud-db-upgrade')
   end
 end
 
-require 'require_relative' if RUBY_VERSION < '1.9'
-require_relative 'lib/initializers/mock_initialize'
 
 namespace :mock do
   namespace :fixtures do
-- 
1.8.1.2

Re: [PATCH core 6/7] Core: Re-use deltacloud-db-migrate in the Rake task

[David Lutterkort <lu...@redhat.com>]

On Mon, 2013-02-18 at 16:27 +0100, mfojtik@redhat.com wrote:
> From: Michal Fojtik <mf...@redhat.com>
> 
> 
> Signed-off-by: Michal fojtik <mf...@redhat.com>
> ---
>  server/Rakefile | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)

ACK; should also be squashed into something (1/7 ?)

David