Wrap connection with rescue to properly raise NoDatabaseError. Fix formatting

Author: keithdoggett

lib/active_record/connection_adapters/cockroachdb_adapter.rb

@@ -41,6 +41,14 @@ def cockroachdb_connection(config)
         conn_params,
         config
       )
+    # This rescue flow appears in new_client, but it is needed here as well
+    # since Cockroach will sometimes not raise until a query is made.
+    rescue ActiveRecord::StatementInvalid => error
+      if conn_params && conn_params[:dbname] && error.cause.message.include?(conn_params[:dbname])
+        raise ActiveRecord::NoDatabaseError
+      else
+        raise ActiveRecord::ConnectionNotEstablished, error.message
+      end
     end
   end
 end
@@ -234,6 +242,9 @@ def initialize_type_map(m = type_map)
             precision = extract_precision(sql_type)
             scale = extract_scale(sql_type)
 
+            # TODO(#178) this should never use DecimalWithoutScale since scale
+            # is assumed to be 0 if it is not explicitly defined.
+            #
             # If fmod is -1, that means that precision is defined but not
             # scale, or neither is defined.
             if fmod && fmod == -1

test/cases/adapters/postgresql/interval_test.rb

@@ -139,4 +139,4 @@ def test_schema_dump_with_default_value
       assert_match %r{t\.interval "default_term", default: "3 years 0 mons 0 days 0 hours 0 minutes 0 seconds"}, output
     end
   end
-end
+end

test/cases/adapters/postgresql/postgresql_adapter_test.rb

@@ -16,7 +16,8 @@ def setup
       end
 
       def test_database_exists_returns_false_when_the_database_does_not_exist
-        config = { database: "non_extant_database", adapter: "cockroach" }
+        db_config = ActiveRecord::Base.configurations.configs_for(env_name: "arunit", name: "primary")
+        config = db_config.configuration_hash.dup
         config[:database] = "non_extant_database"
         assert_not ActiveRecord::ConnectionAdapters::CockroachDBAdapter.database_exists?(config),
                    "expected database #{config[:database]} to not exist"

test/cases/adapters/postgresql/uuid_test.rb

@@ -53,4 +53,4 @@ def test_uuid_change_case_does_not_mark_dirty
       assert_not_predicate model, :changed?
     end
   end
-end
+end

test/cases/helper.rb

@@ -228,4 +228,4 @@ def in_time_zone(zone)
       Time.zone = old_zone
       ActiveRecord::Base.time_zone_aware_attributes = old_tz
     end
-end
+end

test/cases/marshal_serialization_test.rb

@@ -42,4 +42,4 @@ def marshal_fixture_path(file_name)
         )
       end
   end
-end
+end

test/cases/relation/merging_test.rb

@@ -35,4 +35,4 @@ def test_merge_doesnt_duplicate_same_clauses
       end
     end
   end
-end
+end

test/cases/relation_test.rb

@@ -23,4 +23,4 @@ def test_relation_with_annotation_filters_sql_comment_delimiters
       end
     end
   end
-end
+end

test/cases/sanitize_test.rb

@@ -22,4 +22,4 @@ def bind(statement, *vars)
       end
     end
   end
-end
+end

test/cases/strict_loading_test.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "cases/helper"
+require "models/developer"
+require "models/computer"
+require "models/mentor"
+require "models/project"
+require "models/ship"
+require "models/strict_zine"
+require "models/interest"
+
+module CockroachDB
+  class StrictLoadingFixturesTest < ActiveRecord::TestCase
+    # This test is identical to the ActiveRecord version except
+    # that transactional tests are disabled, so create_fixtures
+    # will work.
+    self.use_transactional_tests = false
+
+    fixtures :strict_zines
+
+    test "strict loading violations are ignored on fixtures" do
+      ActiveRecord::FixtureSet.reset_cache
+      create_fixtures("strict_zines")
+
+      assert_nothing_raised do
+        strict_zines(:going_out).interests.to_a
+      end
+
+      assert_raises(ActiveRecord::StrictLoadingViolationError) do
+        StrictZine.first.interests.to_a
+      end
+    end
+  end
+end