ardb 0.28.3 → 0.30.0

data/test/unit/adapter/base_tests.rb

@@ -1,14 +1,16 @@
-require 'assert'
-require 'ardb/adapter/base'
+# frozen_string_literal: true
 
-require 'ardb'
+require "assert"
+require "ardb/adapter/base"
+
+require "active_record/migration"
+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 +23,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 +50,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 +58,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 +66,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 +91,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 +109,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|
+        @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 +239,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 +255,12 @@ 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]
@@ -279,14 +279,13 @@ class Ardb::Adapter::Base
     end
 
     should "dump a ruby schema file using `dump_ruby_schema`" do
-      assert_false File.exists?(subject.ruby_schema_path)
+      assert_false File.exist?(subject.ruby_schema_path)
       subject.dump_ruby_schema
-      assert_true File.exists?(subject.ruby_schema_path)
+      assert_true File.exist?(subject.ruby_schema_path)
       assert_equal @fake_connection, @schema_dumper_connection
       assert_instance_of File, @schema_dumper_file
       assert_equal subject.ruby_schema_path, @schema_dumper_file.path
     end
-
   end
 
   class FakeConnection; end
@@ -325,7 +324,33 @@ class Ardb::Adapter::Base
   end
 
   class FakeConnectionPool
-    def with_connection(&block); end
+    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,9 @@
-require 'assert'
-require 'ardb/adapter/mysql'
+# frozen_string_literal: true
 
-class 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 +12,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 +22,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,11 @@
-require 'assert'
-require 'ardb/adapter/postgresql'
+# frozen_string_literal: true
 
-require 'scmd'
+require "assert"
+require "ardb/adapter/postgresql"
 
-class Ardb::Adapter::Postgresql
+require "scmd"
 
+class Ardb::Adapter::Postgresql
   class UnitTests < Assert::Context
     desc "Ardb::Adapter::Postgresql"
     setup do
@@ -17,52 +18,42 @@ 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
+    should "complain if given a database name with non-word characters" do
+      @config.database = "#{Factory.string}-#{Factory.string}"
+      assert_raises(Ardb::ConfigurationError) do
+        Ardb::Adapter::Postgresql.new(@config)
+      end
     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
-    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
-
   end
 
   class LoadSQLSchemaTests < SQLSchemaTests
     setup do
       cmd_str = "psql -f \"#{@adapter.sql_schema_path}\" #{@adapter.database}"
       @cmd_spy = CmdSpy.new
-      Assert.stub(Scmd, :new).with(cmd_str, :env => @env){ @cmd_spy }
+      Assert.stub(Scmd, :new).with(cmd_str, env: @env){ @cmd_spy }
     end
 
     should "run a command for loading a SQL schema using `load_sql_schema`" do
       subject.load_sql_schema
       assert_true @cmd_spy.run_called
     end
-
   end
 
   class DumpSQLSchemaTests < SQLSchemaTests
@@ -70,14 +61,13 @@ class Ardb::Adapter::Postgresql
       cmd_str = "pg_dump -i -s -x -O -f " \
                 "\"#{@adapter.sql_schema_path}\" #{@adapter.database}"
       @cmd_spy = CmdSpy.new
-      Assert.stub(Scmd, :new).with(cmd_str, :env => @env){ @cmd_spy }
+      Assert.stub(Scmd, :new).with(cmd_str, env: @env){ @cmd_spy }
     end
 
     should "run a command for dumping a SQL schema using `dump_sql_schema`" do
       subject.dump_sql_schema
       assert_true @cmd_spy.run_called
     end
-
   end
 
   class CmdSpy
@@ -91,7 +81,8 @@ class Ardb::Adapter::Postgresql
       @run_called = true
     end
 
-    def success?; true; end
+    def success?
+      true
+    end
   end
-
 end

data/test/unit/adapter/sqlite_tests.rb

@@ -1,8 +1,9 @@
-require 'assert'
-require 'ardb/adapter/sqlite'
+# frozen_string_literal: true
 
-class Ardb::Adapter::Sqlite
+require "assert"
+require "ardb/adapter/sqlite"
 
+class Ardb::Adapter::Sqlite
   class UnitTests < Assert::Context
     desc "Ardb::Adapter::Sqlite"
     setup do
@@ -24,21 +25,14 @@ class Ardb::Adapter::Sqlite
       exp = File.expand_path(@config.database, @config.root_path)
       assert_equal exp, subject.db_file_path
 
-      @config.database = File.join(TMP_PATH, 'abs_sqlite_db_test')
+      @config.database = File.join(TMP_PATH, "abs_sqlite_db_test")
       adapter = Ardb::Adapter::Sqlite.new(@config)
       assert_equal @config.database, adapter.db_file_path
     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
-
     # not currently implemented, see: https://github.com/redding/ardb/issues/29
     should "not implement the drop tables method" do
       assert_raises(NotImplementedError){ subject.drop_tables }
     end
-
   end
-
 end

data/test/unit/adapter_spy_tests.rb

@@ -1,8 +1,9 @@
-require 'assert'
-require 'ardb/adapter_spy'
+# frozen_string_literal: true
 
-class Ardb::AdapterSpy
+require "assert"
+require "ardb/adapter_spy"
 
+class Ardb::AdapterSpy
   class UnitTests < Assert::Context
     desc "Ardb::AdapterSpy"
     setup do
@@ -13,7 +14,6 @@ class Ardb::AdapterSpy
     should "be a kind of ardb adapter" do
       assert subject < Ardb::Adapter::Base
     end
-
   end
 
   class InitTests < UnitTests
@@ -28,8 +28,8 @@ class Ardb::AdapterSpy
     should have_accessors :dump_schema_called_count, :load_schema_called_count
     should have_accessors :drop_db_called_count, :create_db_called_count
     should have_accessors :connect_db_called_count, :migrate_db_called_count
-    should have_imeths :foreign_key_add_sql, :foreign_key_drop_sql
-    should have_imeths :create_db_called?, :drop_db_called?, :drop_tables_called?
+    should have_imeths :create_db_called?, :drop_db_called?
+    should have_imeths :drop_tables_called?
     should have_imeths :connect_db_called?, :migrate_db_called?
     should have_imeths :dump_schema_called?, :load_schema_called?
     should have_imeths :create_db, :drop_db, :drop_tables
@@ -46,15 +46,6 @@ class Ardb::AdapterSpy
       assert_equal 0, subject.dump_schema_called_count
     end
 
-    should "know its add and drop foreign key sql" do
-      exp = "FAKE ADD FOREIGN KEY SQL :from_table :from_column " \
-            ":to_table :to_column :name"
-      assert_equal exp, subject.foreign_key_add_sql
-      exp = "FAKE DROP FOREIGN KEY SQL :from_table :from_column " \
-            ":to_table :to_column :name"
-      assert_equal exp, subject.foreign_key_drop_sql
-    end
-
     should "know if and how many times a method is called" do
       assert_equal false, subject.create_db_called?
       subject.create_db
@@ -91,7 +82,5 @@ class Ardb::AdapterSpy
       assert_equal 1, subject.load_schema_called_count
       assert_equal true, subject.load_schema_called?
     end
-
   end
-
 end