Fix database_exists test

Author: rafiss

lib/active_record/connection_adapters/cockroachdb_adapter.rb

@@ -24,12 +24,9 @@ def cockroachdb_connection(config)
       valid_conn_param_keys = PG::Connection.conndefaults_hash.keys + [:sslmode, :application_name]
       conn_params.slice!(*valid_conn_param_keys)
 
-      # The postgres drivers don't allow the creation of an unconnected
-      # PG::Connection object, so just pass a nil connection object for the
-      # time being.
       conn = PG.connect(conn_params)
       ConnectionAdapters::CockroachDBAdapter.new(conn, logger, conn_params, config)
-    rescue ::PG::Error => error
+    rescue ::PG::Error, ActiveRecord::ActiveRecordError  => error
       if error.message.include?("does not exist")
         raise ActiveRecord::NoDatabaseError
       else
@@ -154,6 +151,12 @@ def initialize(connection, logger, conn_params, config)
         @crdb_version = version_num
       end
 
+      def self.database_exists?(config)
+        !!ActiveRecord::Base.cockroachdb_connection(config)
+      rescue ActiveRecord::NoDatabaseError
+        false
+      end
+
       private
 
         def initialize_type_map(m = type_map)

test/cases/adapters/postgresql/postgresql_adapter_test.rb

@@ -16,10 +16,12 @@ def setup
       end
 
       def test_database_exists_returns_false_when_the_database_does_not_exist
-        config = { database: "non_extant_database", adapter: "cockroachdb" }
-        assert_not ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.database_exists?(config),
-          "expected database #{config[:database]} to not exist"
+        config = ActiveRecord::Base.configurations["arunit"]
+        bad_config = config.dup
+        bad_config[:database] = "non_extant_database"
+        assert_not ActiveRecord::ConnectionAdapters::CockroachDBAdapter.database_exists?(bad_config),
+          "expected database #{bad_config[:database]} to not exist"
       end
     end
   end
-end
+end

test/excludes/ActiveRecord/ConnectionAdapters/PostgreSQLAdapterTest.rb

@@ -14,3 +14,4 @@
 exclude :test_exec_insert_default_values_quoted_schema_with_returning_disabled_and_no_sequence_name_given, "Skipping until we can triage further. See https://github.com/cockroachdb/activerecord-cockroachdb-adapter/issues/48"
 exclude :test_expression_index, "Skipping until we can triage further. See https://github.com/cockroachdb/activerecord-cockroachdb-adapter/issues/48"
 exclude :test_serial_sequence, "Skipping until we can triage further. See https://github.com/cockroachdb/activerecord-cockroachdb-adapter/issues/48"
+exclude :test_database_exists_returns_false_when_the_database_does_not_exist, "Test is reimplemented to use cockroachdb adapter"