ardb 0.27.3 → 0.28.0

data/test/support/fake_schema.rb

@@ -0,0 +1,5 @@
+if !defined?(FAKE_SCHEMA)
+  fake_schema_class = Struct.new(:load_count)
+  FAKE_SCHEMA = fake_schema_class.new(0)
+end
+FAKE_SCHEMA.load_count += 1

data/test/support/postgresql/pg_json_migrations/20160519133432_create_pg_json_migrate_test.rb

@@ -0,0 +1,13 @@
+require 'ardb/migration_helpers'
+
+class CreatePgJsonMigrateTest < ActiveRecord::Migration
+  include Ardb::MigrationHelpers
+
+  def change
+    create_table :pg_json_test_records do |t|
+      t.json  :json_attribute
+    end
+    add_column :pg_json_test_records, :jsonb_attribute, :jsonb
+  end
+
+end

data/test/support/postgresql/schema.rb

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

data/test/support/postgresql/setup_test_db.rb

@@ -0,0 +1,51 @@
+require 'assert'
+require 'ardb'
+
+class PostgresqlDbTests < Assert::Context
+  setup do
+    @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')
+
+    @ardb_config = Ardb::Config.new.tap do |c|
+      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.schema_format   = :ruby
+    end
+    Assert.stub(Ardb, :config){ @ardb_config }
+
+    Ardb.init(false)
+
+    Ardb.adapter.drop_db
+    Ardb.adapter.create_db
+    Ardb.adapter.load_schema
+    Ardb.adapter.connect_db
+  end
+  teardown do
+    ActiveRecord::Base.logger = @orig_ar_logger
+    ENV['ARDB_DB_FILE']       = @orig_env_ardb_db_file
+  end
+
+  private
+
+  # useful when testing creating/dropping/migrating DBs
+  def silence_stdout
+    current_stdout = $stdout.dup
+    $stdout = File.new('/dev/null', 'w')
+    begin
+      yield
+    ensure
+      $stdout = current_stdout
+    end
+  end
+
+end

data/test/support/relative_require_test_db_file.rb

@@ -0,0 +1,2 @@
+# this file is used to test that Ardb will relatively require a db file when
+# init

data/test/support/require_test_db_file.rb

@@ -0,0 +1 @@
+# this file is used to test that Ardb will require a db file when init

data/test/system/pg_json_tests.rb

@@ -0,0 +1,85 @@
+require 'assert'
+require 'ardb/pg_json'
+
+require 'json'
+require 'test/support/postgresql/setup_test_db'
+
+module Ardb; end
+module Ardb::PgJson
+
+  class SystemTests < PostgresqlDbTests
+    desc "Ardb postgresql json shim"
+    setup do
+      @ardb_config.migrations_path = 'pg_json_migrations'
+    end
+
+    should "add support for postgresql json columns to migrations" do
+      # this should migrate the db, adding a record that has json/jsonb columns
+      assert_nothing_raised do
+        silence_stdout{ Ardb.adapter.migrate_db }
+      end
+
+      results = ActiveRecord::Base.connection.execute(
+        "SELECT column_name, data_type " \
+        "FROM INFORMATION_SCHEMA.COLUMNS " \
+        "WHERE table_name = 'pg_json_test_records'"
+      ).to_a
+      exp = {
+        'column_name' => 'json_attribute',
+        'data_type'   => 'json',
+      }
+      assert_includes exp, results
+      exp = {
+        'column_name' => 'jsonb_attribute',
+        'data_type'   => 'jsonb'
+      }
+      assert_includes exp, results
+    end
+
+  end
+
+  class WithMigratedTableTests < SystemTests
+    setup do
+      silence_stdout{ Ardb.adapter.migrate_db }
+      @record_class = Class.new(ActiveRecord::Base) do
+        self.table_name = 'pg_json_test_records'
+      end
+    end
+
+    should "add support for postgresql 'json' attributes on records" do
+      values = [Factory.string, Factory.integer, nil]
+
+      record = @record_class.new
+      assert_nil record.json_attribute
+      assert_nil record.jsonb_attribute
+
+      hash = Factory.integer(3).times.inject({}) do |h, n|
+        h.merge!(Factory.string => values.sample)
+      end
+      record.json_attribute  = JSON.dump(hash)
+      record.jsonb_attribute = JSON.dump(hash)
+      assert_nothing_raised{ record.save! }
+      record.reload
+      assert_equal hash, JSON.load(record.json_attribute)
+      assert_equal hash, JSON.load(record.jsonb_attribute)
+
+      array = Factory.integer(3).times.map{ values.sample }
+      record.json_attribute  = JSON.dump(array)
+      record.jsonb_attribute = JSON.dump(array)
+      assert_nothing_raised{ record.save! }
+      record.reload
+      assert_equal array, JSON.load(record.json_attribute)
+      assert_equal array, JSON.load(record.jsonb_attribute)
+
+      value = values.sample
+      record.json_attribute  = JSON.dump(value)
+      record.jsonb_attribute = JSON.dump(value)
+      assert_nothing_raised{ record.save! }
+      record.reload
+      assert_equal value, JSON.load(record.json_attribute)
+      assert_equal value, JSON.load(record.jsonb_attribute)
+    end
+
+  end
+
+end

data/test/unit/adapter/base_tests.rb

@@ -1,34 +1,46 @@
 require 'assert'
 require 'ardb/adapter/base'
 
+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'
+
 class Ardb::Adapter::Base
 
   class UnitTests < Assert::Context
     desc "Ardb::Adapter::Base"
     setup do
-      @adapter = Ardb::Adapter::Base.new
+      @config  = Factory.ardb_config
+      @adapter = Ardb::Adapter::Base.new(@config)
     end
     subject{ @adapter }
 
-    should have_readers :config_settings, :database
-    should have_readers :ruby_schema_path, :sql_schema_path
+    should have_readers :config
+    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, :connect_db, :migrate_db
+    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
     should have_imeths :dump_schema, :dump_ruby_schema, :dump_sql_schema
 
-    should "know its config settings " do
-      assert_equal Ardb.config.db_settings, subject.config_settings
+    should "know its config" do
+      assert_equal @config, subject.config
     end
 
-    should "know its database" do
-      assert_equal Ardb.config.db.database, subject.database
+    should "demeter its config" do
+      assert_equal @config.activerecord_connect_hash, subject.connect_hash
+      assert_equal @config.database,                  subject.database
+      assert_equal @config.migrations_path,           subject.migrations_path
+      assert_equal @config.schema_format,             subject.schema_format
     end
 
-    should "know its schema paths" do
-      assert_equal "#{Ardb.config.schema_path}.rb",  subject.ruby_schema_path
-      assert_equal "#{Ardb.config.schema_path}.sql", subject.sql_schema_path
+    should "know its ruby and sql schema paths" do
+      assert_equal "#{@config.schema_path}.rb",  subject.ruby_schema_path
+      assert_equal "#{@config.schema_path}.sql", subject.sql_schema_path
     end
 
     should "know how to escape like patterns" do
@@ -73,21 +85,38 @@ class Ardb::Adapter::Base
       assert_raises(NotImplementedError){ subject.dump_sql_schema }
     end
 
+    should "know if its equal to another adapter" do
+      matching_adapter = Ardb::Adapter::Base.new(@config)
+      assert_equal matching_adapter, subject
+
+      non_matching_adapter = Ardb::Adapter::Base.new(Factory.ardb_config)
+      assert_not_equal non_matching_adapter, subject
+    end
+
   end
 
   class ConnectDbTests < UnitTests
     desc "`connect_db`"
     setup do
-      @ar_base_conn_called = false
-      Assert.stub(ActiveRecord::Base, :connection) do |*args|
-        @ar_base_conn_called = true
+      @ar_establish_connection_called_with = nil
+      Assert.stub(ActiveRecord::Base, :establish_connection) do |options|
+        @ar_establish_connection_called_with = options
+      end
+
+      @ar_connection_pool = FakeConnectionPool.new
+      Assert.stub(ActiveRecord::Base, :connection_pool){ @ar_connection_pool }
+
+      @ar_with_connection_called = false
+      Assert.stub(@ar_connection_pool, :with_connection) do
+        @ar_with_connection_called = true
       end
 
       @adapter.connect_db
     end
 
-    should "call activerecord base's connection method" do
-      assert_true @ar_base_conn_called
+    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
@@ -95,6 +124,9 @@ class Ardb::Adapter::Base
   class MigrateDbTests < UnitTests
     desc "`migrate_db`"
     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
 
@@ -105,6 +137,10 @@ class Ardb::Adapter::Base
 
       @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
@@ -112,7 +148,7 @@ class Ardb::Adapter::Base
     end
 
     should "set the activerecord migrator's migrations path" do
-      exp = Ardb.config.migrations_path
+      exp = subject.migrations_path
       assert_equal exp, ActiveRecord::Migrator.migrations_path
     end
 
@@ -123,7 +159,7 @@ class Ardb::Adapter::Base
 
     should "call the activerecord migrator's migrate method" do
       version = ENV.key?("MIGRATE_VERSION") ? ENV["MIGRATE_VERSION"].to_i : nil
-      exp = [Ardb.config.migrations_path, version]
+      exp = [subject.migrations_path, version]
       assert_equal exp, @migrator_called_with
     end
 
@@ -135,18 +171,15 @@ class Ardb::Adapter::Base
       @captured_stdout = ""
       $stdout = StringIO.new(@captured_stdout)
 
-      @orig_schema_format = Ardb.config.schema_format
-
-      @adapter = SchemaSpyAdapter.new
+      @adapter = SchemaSpyAdapter.new(@config)
     end
     teardown do
-      Ardb.config.schema_format = @orig_schema_format
       $stdout = @orig_stdout
     end
 
     should "load a ruby schema using `load_schema` when the format is ruby" do
-      Ardb.config.schema_format = :ruby
-      adapter = SchemaSpyAdapter.new
+      @config.schema_format = Ardb::Config::RUBY_SCHEMA_FORMAT
+      adapter = SchemaSpyAdapter.new(@config)
 
       assert_false adapter.load_ruby_schema_called
       assert_false adapter.load_sql_schema_called
@@ -156,8 +189,8 @@ class Ardb::Adapter::Base
     end
 
     should "load a SQL schema using `load_schema` when the format is sql" do
-      Ardb.config.schema_format = :sql
-      adapter = SchemaSpyAdapter.new
+      @config.schema_format = Ardb::Config::SQL_SCHEMA_FORMAT
+      adapter = SchemaSpyAdapter.new(@config)
 
       assert_false adapter.load_ruby_schema_called
       assert_false adapter.load_sql_schema_called
@@ -172,8 +205,8 @@ class Ardb::Adapter::Base
     end
 
     should "always dump a ruby schema using `dump_schema`" do
-      Ardb.config.schema_format = :ruby
-      adapter = SchemaSpyAdapter.new
+      @config.schema_format = Ardb::Config::RUBY_SCHEMA_FORMAT
+      adapter = SchemaSpyAdapter.new(@config)
 
       assert_false adapter.dump_ruby_schema_called
       assert_false adapter.dump_sql_schema_called
@@ -181,8 +214,8 @@ class Ardb::Adapter::Base
       assert_true adapter.dump_ruby_schema_called
       assert_false adapter.dump_sql_schema_called
 
-      Ardb.config.schema_format = :sql
-      adapter = SchemaSpyAdapter.new
+      @config.schema_format = Ardb::Config::SQL_SCHEMA_FORMAT
+      adapter = SchemaSpyAdapter.new(@config)
 
       assert_false adapter.dump_ruby_schema_called
       adapter.dump_schema
@@ -190,8 +223,8 @@ class Ardb::Adapter::Base
     end
 
     should "dump a SQL schema using `dump_schema` when the format is sql" do
-      Ardb.config.schema_format = :sql
-      adapter = SchemaSpyAdapter.new
+      @config.schema_format = Ardb::Config::SQL_SCHEMA_FORMAT
+      adapter = SchemaSpyAdapter.new(@config)
 
       assert_false adapter.dump_ruby_schema_called
       adapter.dump_schema
@@ -207,13 +240,8 @@ class Ardb::Adapter::Base
 
   class LoadRubySchemaTests < UnitTests
     setup do
-      @orig_schema_path = Ardb.config.schema_path
-      Ardb.config.schema_path = 'fake_schema'
-
-      @adapter = Ardb::Adapter::Base.new
-    end
-    teardown do
-      Ardb.config.schema_path = @orig_schema_path
+      @config.schema_path = File.join(TEST_SUPPORT_PATH, 'fake_schema')
+      @adapter = Ardb::Adapter::Base.new(@config)
     end
 
     should "load a ruby schema file using `load_ruby_schema`" do
@@ -227,6 +255,39 @@ class Ardb::Adapter::Base
 
   end
 
+  class DumpRubySchemaTests < UnitTests
+    setup do
+      @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]
+      Assert.stub(ActiveRecord::SchemaDumper, :dump) do |connection, file|
+        @schema_dumper_connection = connection
+        @schema_dumper_file       = file
+      end
+
+      @fake_connection = FakeConnection.new
+      Assert.stub(ActiveRecord::Base, :connection){ @fake_connection }
+
+      @adapter = Ardb::Adapter::Base.new(@config)
+    end
+    teardown do
+      FileUtils.rm_rf(File.dirname(@config.schema_path))
+    end
+
+    should "dump a ruby schema file using `dump_ruby_schema`" do
+      assert_false File.exists?(subject.ruby_schema_path)
+      subject.dump_ruby_schema
+      assert_true File.exists?(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
+
   class SchemaSpyAdapter < Ardb::Adapter::Base
     attr_reader :load_ruby_schema_called, :dump_ruby_schema_called
     attr_reader :load_sql_schema_called, :dump_sql_schema_called
@@ -260,4 +321,8 @@ class Ardb::Adapter::Base
     end
   end
 
+  class FakeConnectionPool
+    def with_connection(&block); end
+  end
+
 end

data/test/unit/adapter/mysql_tests.rb

@@ -6,7 +6,8 @@ class Ardb::Adapter::Mysql
   class UnitTests < Assert::Context
     desc "Ardb::Adapter::Mysql"
     setup do
-      @adapter = Ardb::Adapter::Mysql.new
+      @config  = Factory.ardb_config
+      @adapter = Ardb::Adapter::Mysql.new(@config)
     end
     subject{ @adapter }