base.rb in ardb-0.27.0

- old
+ new
@@ -1,86 +1,93 @@
 module Ardb; end
-class Ardb::Adapter; end
-class Ardb::Adapter::Base
+class Ardb::Adapter
 
-  attr_reader :config_settings, :database
-  attr_reader :schema_format, :ruby_schema_path, :sql_schema_path
+  class Base
 
-  def initialize
-    @config_settings = Ardb.config.db_settings
-    @database = Ardb.config.db.database
-    @schema_format = Ardb.config.schema_format
-    schema_path = Ardb.config.schema_path
-    @ruby_schema_path = "#{schema_path}.rb"
-    @sql_schema_path  = "#{schema_path}.sql"
-  end
+    attr_reader :config_settings, :database
+    attr_reader :schema_format, :ruby_schema_path, :sql_schema_path
 
-  def foreign_key_add_sql(*args);  raise NotImplementedError; end
-  def foreign_key_drop_sql(*args); raise NotImplementedError; end
+    def initialize
+      @config_settings = Ardb.config.db_settings
+      @database = Ardb.config.db.database
+      @schema_format = Ardb.config.schema_format
+      schema_path = Ardb.config.schema_path
+      @ruby_schema_path = "#{schema_path}.rb"
+      @sql_schema_path  = "#{schema_path}.sql"
+    end
 
-  def create_db(*args); raise NotImplementedError; end
-  def drop_db(*args);   raise NotImplementedError; end
+    def foreign_key_add_sql(*args);  raise NotImplementedError; end
+    def foreign_key_drop_sql(*args); raise NotImplementedError; end
 
-  def migrate_db
-    verbose = ENV["MIGRATE_QUIET"].nil?
-    version = ENV["MIGRATE_VERSION"] ? ENV["MIGRATE_VERSION"].to_i : nil
-    migrations_path = Ardb.config.migrations_path
+    def create_db(*args); raise NotImplementedError; end
+    def drop_db(*args);   raise NotImplementedError; end
 
-    if defined?(ActiveRecord::Migration::CommandRecorder)
-      require 'ardb/migration_helpers'
-      ActiveRecord::Migration::CommandRecorder.class_eval do
-        include Ardb::MigrationHelpers::RecorderMixin
-      end
+    def connect_db
+      ActiveRecord::Base.connection
     end
 
-    ActiveRecord::Migrator.migrations_path = migrations_path
-    ActiveRecord::Migration.verbose = verbose
-    ActiveRecord::Migrator.migrate(migrations_path, version) do |migration|
-      ENV["MIGRATE_SCOPE"].blank? || (ENV["MIGRATE_SCOPE"] == migration.scope)
+    def migrate_db
+      verbose = ENV["MIGRATE_QUIET"].nil?
+      version = ENV["MIGRATE_VERSION"] ? ENV["MIGRATE_VERSION"].to_i : nil
+      migrations_path = Ardb.config.migrations_path
+
+      if defined?(ActiveRecord::Migration::CommandRecorder)
+        require 'ardb/migration_helpers'
+        ActiveRecord::Migration::CommandRecorder.class_eval do
+          include Ardb::MigrationHelpers::RecorderMixin
+        end
+      end
+
+      ActiveRecord::Migrator.migrations_path = migrations_path
+      ActiveRecord::Migration.verbose = verbose
+      ActiveRecord::Migrator.migrate(migrations_path, version) do |migration|
+        ENV["MIGRATE_SCOPE"].blank? || (ENV["MIGRATE_SCOPE"] == migration.scope)
+      end
     end
-  end
 
-  def drop_tables(*args); raise NotImplementedError; end
+    def drop_tables(*args); raise NotImplementedError; end
 
-  def load_schema
-    # silence STDOUT
-    current_stdout = $stdout.dup
-    $stdout = File.new('/dev/null', 'w')
-    load_ruby_schema if @schema_format == :ruby
-    load_sql_schema  if @schema_format == :sql
-    $stdout = current_stdout
-  end
+    def load_schema
+      # silence STDOUT
+      current_stdout = $stdout.dup
+      $stdout = File.new('/dev/null', 'w')
+      load_ruby_schema if @schema_format == :ruby
+      load_sql_schema  if @schema_format == :sql
+      $stdout = current_stdout
+    end
 
-  def load_ruby_schema
-    load @ruby_schema_path
-  end
+    def load_ruby_schema
+      load @ruby_schema_path
+    end
 
-  def load_sql_schema
-    raise NotImplementedError
-  end
+    def load_sql_schema
+      raise NotImplementedError
+    end
 
-  def dump_schema
-    # silence STDOUT
-    current_stdout = $stdout.dup
-    $stdout = File.new('/dev/null', 'w')
-    dump_ruby_schema
-    dump_sql_schema if @schema_format == :sql
-    $stdout = current_stdout
-  end
+    def dump_schema
+      # silence STDOUT
+      current_stdout = $stdout.dup
+      $stdout = File.new('/dev/null', 'w')
+      dump_ruby_schema
+      dump_sql_schema if @schema_format == :sql
+      $stdout = current_stdout
+    end
 
-  def dump_ruby_schema
-    require 'active_record/schema_dumper'
-    FileUtils.mkdir_p File.dirname(@ruby_schema_path)
-    File.open(@ruby_schema_path, 'w:utf-8') do |file|
-      ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
+    def dump_ruby_schema
+      require 'active_record/schema_dumper'
+      FileUtils.mkdir_p File.dirname(@ruby_schema_path)
+      File.open(@ruby_schema_path, 'w:utf-8') do |file|
+        ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
+      end
     end
-  end
 
-  def dump_sql_schema
-    raise NotImplementedError
-  end
+    def dump_sql_schema
+      raise NotImplementedError
+    end
 
-  def ==(other_adapter)
-    self.class == other_adapter.class
+    def ==(other_adapter)
+      self.class == other_adapter.class
+    end
+
   end
 
 end