ardb 0.28.3 → 0.29.0

data/lib/ardb/version.rb

@@ -1,3 +1,3 @@
 module Ardb
-  VERSION = "0.28.3"
+  VERSION = "0.29.0"
 end

data/script/determine_autoloaded_active_record_files.rb

@@ -1,8 +1,8 @@
-require 'active_record'
+require "active_record"
 
-# this can be slow, this is one of the reasons this shouldn't be done during
+# this can be slow, this is one of the reasons this shouldn"t be done during
 # the startup of our apps
-gemspec = Gem.loaded_specs['activerecord']
+gemspec = Gem.loaded_specs["activerecord"]
 
 puts "Looking at files in: "
 puts "  #{gemspec.lib_dirs_glob.inspect}"
@@ -11,15 +11,18 @@ paths = Dir["#{gemspec.lib_dirs_glob}/**/*.rb"]
 
 # these are regexs for files we want to ignore requiring. for example,
 # generators fail when we try to require them. the others are pieces of active
-# record we don't use in a production environment
+# record we don"t use in a production environment
 ignored_regexes = [
   /rails\/generators/,
   /active_record\/railtie/,
   /active_record\/migration/,
   /active_record\/fixtures/,
+  /active_record\/fixture_set/,
   /active_record\/schema/,
   /active_record\/connection_adapters/,
   /active_record\/test_case/,
+  /active_record\/test_databases/,
+  /active_record\/test_fixtures/,
   /active_record\/coders\/yaml_column/
 ]
 
@@ -31,12 +34,12 @@ ignored              = []
 errored              = []
 
 paths.sort.each do |full_path|
-  relative_path_with_rb = full_path.gsub("#{gemspec.lib_dirs_glob}/", '')
-  relative_path = relative_path_with_rb.gsub(/\.rb\z/, '')
+  relative_path_with_rb = full_path.gsub("#{gemspec.lib_dirs_glob}/", "")
+  relative_path = relative_path_with_rb.gsub(/\.rb\z/, "")
 
   result = Result.new(relative_path)
 
-  # see if it's ignored
+  # see if it"s ignored
   ignored_regexes.each do |regex|
     if relative_path =~ regex
       result.state  = :ignored
@@ -87,5 +90,5 @@ puts "\n"
 
 puts "Needs To Be Required:\n"
 needs_to_be_required.each do |result|
-  puts "require '#{result.file}'"
+  puts "require \"#{result.file}\""
 end

data/test/helper.rb

@@ -7,19 +7,10 @@ $LOAD_PATH.unshift(File.expand_path("../..", __FILE__))
 TEST_SUPPORT_PATH = File.expand_path("../support", __FILE__)
 TMP_PATH          = File.expand_path("../../tmp", __FILE__)
 
-require 'logger'
+require "logger"
 log_path = File.expand_path("../../log/test.log", __FILE__)
-TEST_LOGGER = Logger.new(File.open(log_path, 'w'))
+TEST_LOGGER = Logger.new(File.open(log_path, "w"))
 
 # require pry for debugging (`binding.pry`)
-require 'pry'
-require 'test/support/factory'
-
-# 1.8.7 backfills
-
-# Array#sample
-if !(a = Array.new).respond_to?(:sample) && a.respond_to?(:choice)
-  class Array
-    alias_method :sample, :choice
-  end
-end
+require "pry"
+require "test/support/factory"

data/test/support/factory.rb

@@ -1,10 +1,10 @@
-require 'assert/factory'
+require "assert/factory"
 
 module Factory
   extend Assert::Factory
 
   def self.migration_id
-    # identifiers need to be plural b/c af activesupport's pluralize
+    # identifiers need to be plural b/c af activesupport"s pluralize
     "#{Factory.string}_things"
   end
 

data/test/support/postgresql/schema.rb

@@ -1,3 +1,2 @@
 ActiveRecord::Schema.define(:version => 0) do
-
 end

data/test/support/postgresql/setup_test_db.rb

@@ -1,24 +1,24 @@
-require 'assert'
-require 'ardb'
+require "assert"
+require "ardb"
 
 class PostgresqlDbTests < Assert::Context
   setup do
-    @orig_env_ardb_db_file    = ENV['ARDB_DB_FILE']
+    @orig_env_ardb_db_file    = ENV["ARDB_DB_FILE"]
     ActiveRecord::Base.logger = @orig_ar_loggerF
 
-    # no-op, we're manually configuring ardb so we don't need this to do anything
-    ENV['ARDB_DB_FILE'] = File.join(TEST_SUPPORT_PATH, 'require_test_db_file')
+    # no-op, we"re manually configuring ardb so we don"t need this to do anything
+    ENV["ARDB_DB_FILE"] = File.join(TEST_SUPPORT_PATH, "require_test_db_file")
 
     @ardb_config = Ardb::Config.new.tap do |c|
-      c.adapter      = 'postgresql'
-      c.database     = 'redding_ardb_test'
-      c.encoding     = 'unicode'
-      c.min_messages = 'WARNING'
+      c.adapter      = "postgresql"
+      c.database     = "redding_ardb_test"
+      c.encoding     = "unicode"
+      c.min_messages = "WARNING"
 
       c.logger          = TEST_LOGGER
-      c.root_path       = File.join(TEST_SUPPORT_PATH, 'postgresql')
-      c.migrations_path = 'migrations'
-      c.schema_path     = 'schema'
+      c.root_path       = File.join(TEST_SUPPORT_PATH, "postgresql")
+      c.migrations_path = "migrations"
+      c.schema_path     = "schema"
       c.schema_format   = :ruby
     end
     Assert.stub(Ardb, :config){ @ardb_config }
@@ -33,7 +33,7 @@ class PostgresqlDbTests < Assert::Context
   teardown do
     Ardb.reset_adapter
     ActiveRecord::Base.logger = @orig_ar_logger
-    ENV['ARDB_DB_FILE']       = @orig_env_ardb_db_file
+    ENV["ARDB_DB_FILE"]       = @orig_env_ardb_db_file
   end
 
   private
@@ -41,12 +41,11 @@ class PostgresqlDbTests < Assert::Context
   # useful when testing creating/dropping/migrating DBs
   def silence_stdout
     current_stdout = $stdout.dup
-    $stdout = File.new('/dev/null', 'w')
+    $stdout = File.new("/dev/null", "w")
     begin
       yield
     ensure
       $stdout = current_stdout
     end
   end
-
 end

data/test/unit/adapter/base_tests.rb

@@ -1,14 +1,13 @@
-require 'assert'
-require 'ardb/adapter/base'
+require "assert"
+require "ardb/adapter/base"
 
-require 'ardb'
-# This is needed by the schema dumper but it doesn't handle requiring it so we
+require "ardb"
+# This is needed by the schema dumper but it doesn"t handle requiring it so we
 # have to manually, otherwise this errors when you try to run the adapter base
 # tests by themselves
-require 'active_support/core_ext/class/attribute_accessors'
+require "active_support/core_ext/class/attribute_accessors"
 
 class Ardb::Adapter::Base
-
   class UnitTests < Assert::Context
     desc "Ardb::Adapter::Base"
     setup do
@@ -21,7 +20,6 @@ class Ardb::Adapter::Base
     should have_imeths :connect_hash, :database, :migrations_path
     should have_imeths :schema_format, :ruby_schema_path, :sql_schema_path
     should have_imeths :escape_like_pattern
-    should have_imeths :foreign_key_add_sql, :foreign_key_drop_sql
     should have_imeths :create_db, :drop_db, :drop_tables
     should have_imeths :connect_db, :migrate_db
     should have_imeths :load_schema, :load_ruby_schema, :load_sql_schema
@@ -49,7 +47,7 @@ class Ardb::Adapter::Base
                 "#{Factory.string}\\" \
                 "#{Factory.string} " \
                 "#{Factory.string}"
-      exp = pattern.gsub("\\"){ "\\\\" }.gsub('%', "\\%").gsub('_', "\\_")
+      exp = pattern.gsub("\\"){ "\\\\" }.gsub("%", "\\%").gsub("_", "\\_")
       assert_equal exp, subject.escape_like_pattern(pattern)
 
       pattern = Factory.string
@@ -57,7 +55,7 @@ class Ardb::Adapter::Base
     end
 
     should "allow using a custom escape char when escaping like patterns" do
-      escape_char = '#'
+      escape_char = "#"
       pattern = "#{Factory.string}%" \
                 "#{Factory.string}_" \
                 "#{Factory.string}\\" \
@@ -65,15 +63,10 @@ class Ardb::Adapter::Base
                 "#{Factory.string} " \
                 "#{Factory.string}"
       exp = pattern.gsub(escape_char, "#{escape_char}#{escape_char}")
-      exp = exp.gsub('%', "#{escape_char}%").gsub('_', "#{escape_char}_")
+      exp = exp.gsub("%", "#{escape_char}%").gsub("_", "#{escape_char}_")
       assert_equal exp, subject.escape_like_pattern(pattern, escape_char)
     end
 
-    should "not implement the foreign key sql meths" do
-      assert_raises(NotImplementedError){ subject.foreign_key_add_sql }
-      assert_raises(NotImplementedError){ subject.foreign_key_drop_sql }
-    end
-
     should "not implement the create and drop db methods" do
       assert_raises(NotImplementedError){ subject.create_db }
       assert_raises(NotImplementedError){ subject.drop_db }
@@ -95,7 +88,6 @@ class Ardb::Adapter::Base
       non_matching_adapter = Ardb::Adapter::Base.new(Factory.ardb_config)
       assert_not_equal non_matching_adapter, subject
     end
-
   end
 
   class ConnectDbTests < UnitTests
@@ -114,58 +106,64 @@ class Ardb::Adapter::Base
         @ar_with_connection_called = true
       end
 
-      @adapter.connect_db
+      subject.connect_db
     end
 
     should "use activerecord to establish and then checkout a connection" do
       assert_equal subject.connect_hash, @ar_establish_connection_called_with
       assert_true @ar_with_connection_called
     end
-
   end
 
-  class MigrateDbTests < UnitTests
-    desc "`migrate_db`"
+  class MigrateTests < UnitTests
     setup do
-      @orig_migrate_version_env_var = ENV['MIGRATE_VERSION']
-      @orig_migrate_query_env_var   = ENV['MIGRATE_QUIET']
-
-      ENV["MIGRATE_VERSION"] = Factory.integer.to_s if Factory.boolean
-      ENV["MIGRATE_QUIET"]   = Factory.boolean.to_s if Factory.boolean
-
-      @migrator_called_with = []
-      Assert.stub(ActiveRecord::Migrator, :migrate) do |*args|
-        @migrator_called_with = args
+      Assert.stub(ActiveRecord::MigrationContext, :new) do |*args, &block|
+        @fake_migration_context ||= FakeMigrationContext.new(*args)
       end
-
-      @adapter.migrate_db
-    end
-    teardown do
-      ENV['MIGRATE_VERSION'] = @orig_migrate_version_env_var
-      ENV['MIGRATE_QUIET']   = @orig_migrate_query_env_var
     end
 
-    should "add the ardb migration helper recorder to activerecord's command recorder" do
-      exp = Ardb::MigrationHelpers::RecorderMixin
-      assert_includes exp, ActiveRecord::Migration::CommandRecorder
+    should "migrate the db with `migrate_db`" do
+      subject.migrate_db
+
+      assert_equal [subject.migrations_path], @fake_migration_context.init_with
+      assert_equal [nil], @fake_migration_context.up_called_with
     end
 
-    should "set the activerecord migrator's migrations path" do
-      exp = subject.migrations_path
-      assert_equal exp, ActiveRecord::Migrator.migrations_path
+    should "migrate the db with `migrate_db_up`" do
+      subject.migrate_db_up
+      assert_equal [nil], @fake_migration_context.up_called_with
+
+      target = Factory.string
+      subject.migrate_db_up(target)
+      assert_equal [target], @fake_migration_context.up_called_with
     end
 
-    should "set the activerecord migration's verbose attr" do
-      exp = ENV["MIGRATE_QUIET"].nil?
-      assert_equal exp, ActiveRecord::Migration.verbose
+    should "migrate the db with `migrate_db_down`" do
+      subject.migrate_db_down
+      assert_equal [nil], @fake_migration_context.down_called_with
+
+      target = Factory.string
+      subject.migrate_db_down(target)
+      assert_equal [target], @fake_migration_context.down_called_with
     end
 
-    should "call the activerecord migrator's migrate method" do
-      version = ENV.key?("MIGRATE_VERSION") ? ENV["MIGRATE_VERSION"].to_i : nil
-      exp = [subject.migrations_path, version]
-      assert_equal exp, @migrator_called_with
+    should "migrate the db with `migrate_db_forward`" do
+      subject.migrate_db_forward
+      assert_equal [1], @fake_migration_context.forward_called_with
+
+      steps = Factory.integer(3)
+      subject.migrate_db_forward(steps)
+      assert_equal [steps], @fake_migration_context.forward_called_with
     end
 
+    should "migrate the db with `migrate_db_backward`" do
+      subject.migrate_db_backward
+      assert_equal [1], @fake_migration_context.rollback_called_with
+
+      steps = Factory.integer(3)
+      subject.migrate_db_backward(steps)
+      assert_equal [steps], @fake_migration_context.rollback_called_with
+    end
   end
 
   class LoadAndDumpSchemaTests < UnitTests
@@ -238,12 +236,11 @@ class Ardb::Adapter::Base
       subject.load_schema
       assert_empty @captured_stdout
     end
-
   end
 
   class LoadRubySchemaTests < UnitTests
     setup do
-      @config.schema_path = File.join(TEST_SUPPORT_PATH, 'fake_schema')
+      @config.schema_path = File.join(TEST_SUPPORT_PATH, "fake_schema")
       @adapter = Ardb::Adapter::Base.new(@config)
     end
 
@@ -255,12 +252,11 @@ class Ardb::Adapter::Base
       subject.load_ruby_schema
       assert_equal 2, FAKE_SCHEMA.load_count
     end
-
   end
 
   class DumpRubySchemaTests < UnitTests
     setup do
-      @config.schema_path = File.join(TMP_PATH, 'testdb', 'test_dump_ruby_schema')
+      @config.schema_path = File.join(TMP_PATH, "testdb", "test_dump_ruby_schema")
       FileUtils.rm_rf(File.dirname(@config.schema_path))
 
       @schema_dumper_connection, @schema_dumper_file = [nil, nil]
@@ -286,7 +282,6 @@ class Ardb::Adapter::Base
       assert_instance_of File, @schema_dumper_file
       assert_equal subject.ruby_schema_path, @schema_dumper_file.path
     end
-
   end
 
   class FakeConnection; end
@@ -328,4 +323,29 @@ class Ardb::Adapter::Base
     def with_connection(&block); end
   end
 
+  class FakeMigrationContext
+    attr_reader :init_with
+    attr_reader :up_called_with, :down_called_with
+    attr_reader :forward_called_with, :rollback_called_with
+
+    def initialize(*args)
+      @init_with = args
+    end
+
+    def up(*args)
+      @up_called_with = args
+    end
+
+    def down(*args)
+      @down_called_with = args
+    end
+
+    def forward(*args)
+      @forward_called_with = args
+    end
+
+    def rollback(*args)
+      @rollback_called_with = args
+    end
+  end
 end

data/test/unit/adapter/mysql_tests.rb

@@ -1,8 +1,7 @@
-require 'assert'
-require 'ardb/adapter/mysql'
+require "assert"
+require "ardb/adapter/mysql"
 
 class Ardb::Adapter::Mysql
-
   class UnitTests < Assert::Context
     desc "Ardb::Adapter::Mysql"
     setup do
@@ -11,20 +10,6 @@ class Ardb::Adapter::Mysql
     end
     subject{ @adapter }
 
-    should "know its foreign key add sql" do
-      exp_add_sql = "ALTER TABLE :from_table"\
-                    " ADD CONSTRAINT :name"\
-                    " FOREIGN KEY (:from_column)"\
-                    " REFERENCES :to_table (:to_column)"
-      assert_equal exp_add_sql, subject.foreign_key_add_sql
-    end
-
-    should "know its foreign key drop sql" do
-      exp_drop_sql = "ALTER TABLE :from_table"\
-                     " DROP FOREIGN KEY :name"
-      assert_equal exp_drop_sql, subject.foreign_key_drop_sql
-    end
-
     # not currently implemented, see: https://github.com/redding/ardb/issues/13
     should "not implement the create and drop db methods" do
       assert_raises(NotImplementedError){ subject.create_db }
@@ -35,7 +20,5 @@ class Ardb::Adapter::Mysql
     should "not implement the drop tables method" do
       assert_raises(NotImplementedError){ subject.drop_tables }
     end
-
   end
-
 end

data/test/unit/adapter/postgresql_tests.rb

@@ -1,10 +1,9 @@
-require 'assert'
-require 'ardb/adapter/postgresql'
+require "assert"
+require "ardb/adapter/postgresql"
 
-require 'scmd'
+require "scmd"
 
 class Ardb::Adapter::Postgresql
-
   class UnitTests < Assert::Context
     desc "Ardb::Adapter::Postgresql"
     setup do
@@ -17,35 +16,27 @@ class Ardb::Adapter::Postgresql
 
     should "know its public connect hash" do
       exp = subject.connect_hash.merge({
-        'database' => 'postgres',
-        'schema_search_path' => 'public'
+        "database" => "postgres",
+        "schema_search_path" => "public"
       })
       assert_equal exp, subject.public_connect_hash
     end
 
-    should "know its foreign key add sql" do
-      exp_add_sql = "ALTER TABLE :from_table"\
-                    " ADD CONSTRAINT :name"\
-                    " FOREIGN KEY (:from_column)"\
-                    " REFERENCES :to_table (:to_column)"
-      assert_equal exp_add_sql, subject.foreign_key_add_sql
-    end
-
-    should "know its foreign key drop sql" do
-      exp_drop_sql = "ALTER TABLE :from_table"\
-                     " DROP CONSTRAINT :name"
-      assert_equal exp_drop_sql, subject.foreign_key_drop_sql
+    should "complain if given a database name with non-word characters" do
+      @config.database = "#{Factory.string}-#{Factory.string}"
+      assert_raises(Ardb::ConfigurationError){
+        Ardb::Adapter::Postgresql.new(@config)
+      }
     end
-
   end
 
   class SQLSchemaTests < UnitTests
     setup do
       @env = {
-        'PGHOST'     => @adapter.connect_hash['host'],
-        'PGPORT'     => @adapter.connect_hash['port'],
-        'PGUSER'     => @adapter.connect_hash['username'],
-        'PGPASSWORD' => @adapter.connect_hash['password']
+        "PGHOST"     => @adapter.connect_hash["host"],
+        "PGPORT"     => @adapter.connect_hash["port"],
+        "PGUSER"     => @adapter.connect_hash["username"],
+        "PGPASSWORD" => @adapter.connect_hash["password"]
       }
     end