tasks/database.rb in pact_broker-2.0.5 vs tasks/database.rb in pact_broker-2.1.0

@@ -1,9 +1,10 @@
 require 'pact_broker/project_root'
+require 'pact_broker/db/migrate'
+require 'pact_broker/db/version'
 require 'sequel'
 require 'yaml'
-require 'db'
 
 Sequel.extension :migration
 
 module PactBroker
   module Database
@@ -12,19 +13,15 @@
 
     extend self
 
     def migrate target = nil
       opts = target ? {target: target} : {}
-      Sequel::Migrator.run(database, migrations_dir, opts)
+      PactBroker::DB::Migrate.call(database, opts)
     end
 
     def version
-      if database.tables.include?(:schema_info)
-        database[:schema_info].first[:version]
-      else
-        0
-      end
+      PactBroker::DB::Version.call(database)
     end
 
     def delete_database_file
       ensure_not_production
       FileUtils.rm_rf database_file_path
@@ -59,11 +56,10 @@
         end
       end
     end
 
     def create
-      puts adapter
       if psql?
         system('psql postgres -c "create database pact_broker"')
         system('psql postgres -c "CREATE USER pact_broker WITH PASSWORD \'pact_broker\'"')
         system('psql postgres -c "GRANT ALL PRIVILEGES ON DATABASE pact_broker to pact_broker"')
       elsif sqlite?
@@ -89,10 +85,13 @@
     def database= database
       @@database = database
     end
 
     def database
-      @@database ||= ::DB.connection_for_env env
+      @@database ||= begin
+        require 'db'
+        ::DB.connection_for_env env
+      end
     end
 
     private
 
     def ensure_not_production