Add new exclusion JSONBTest. Tweak some comments/names of variables.

Author: keithdoggett

Rakefile

@@ -10,7 +10,7 @@ task default: [:test]
 namespace :db do
   task "create_test_template" do
     ENV['DEBUG_COCKROACHDB_ADAPTER'] = "1"
-    ENV['COCKROACH_SKIP_LOAD_SCHEMA'] = '1'
+    ENV['COCKROACH_SKIP_LOAD_SCHEMA'] = "1"
     ENV["ARCONN"] = "cockroachdb"
 
     TemplateCreator.connect

lib/active_record/connection_adapters/cockroachdb_adapter.rb

@@ -234,8 +234,8 @@ def initialize_type_map(m = type_map)
             precision = extract_precision(sql_type)
             scale = extract_scale(sql_type)
 
-            # If fmod is -1, that means that precision is defined, but not
-            # scale or neither is defined.
+            # If fmod is -1, that means that precision is defined but not
+            # scale, or neither is defined.
             if fmod && fmod == -1
               # Below comment is from ActiveRecord
               # FIXME: Remove this class, and the second argument to

test/excludes/PostgresqlJSONBTest.rb

@@ -24,3 +24,4 @@
 exclude :test_changes_in_place_with_ruby_object, "Skipping until we can triage further. See https://github.com/cockroachdb/activerecord-cockroachdb-adapter/issues/48"
 exclude :test_rewrite_array_json_value, "Skipping until we can triage further. See https://github.com/cockroachdb/activerecord-cockroachdb-adapter/issues/48"
 exclude :test_type_cast_json, "Skipping until we can triage further. See https://github.com/cockroachdb/activerecord-cockroachdb-adapter/issues/48"
+exclude :test_pretty_print, "Skipping until we can triage further. See https://github.com/cockroachdb/activerecord-cockroachdb-adapter/issues/48"

test/support/template_creator.rb

@@ -6,7 +6,7 @@
 module TemplateCreator
   # extend self
 
-  CONNECTION_HASH = {
+  DEFAULT_CONNECTION_HASH = {
     adapter: 'cockroachdb',
     database: 'defaultdb',
     port: 26257,
@@ -31,16 +31,12 @@ def template_db_name
   end
 
   def connect(connection_hash=nil)
-    connection_hash = CONNECTION_HASH if connection_hash.nil?
+    connection_hash = DEFAULT_CONNECTION_HASH if connection_hash.nil?
     ActiveRecord::Base.establish_connection(connection_hash)
   end
 
   def template_db_exists?
-    if ActiveRecord::Base.connection.select_value("SELECT 1 FROM pg_database WHERE datname='#{template_db_name}'")
-      true
-    else
-      false
-    end
+    ActiveRecord::Base.connection.select_value("SELECT 1 FROM pg_database WHERE datname='#{template_db_name}'") == 1
   end
 
   def drop_template_db
@@ -64,7 +60,7 @@ def create_test_template
     create_template_db
 
     # switch connection to template db
-    conn = CONNECTION_HASH.dup
+    conn = DEFAULT_CONNECTION_HASH.dup
     conn['database'] = template_db_name
     connect(conn)
 
@@ -75,8 +71,6 @@ def create_test_template
   end
 
   def restore_from_template
-    # first, BACKUP the template_db
-    # then RESTORE target from that backup.
     connect
     raise "The TemplateDB does not exist. Run 'rake db:create_test_template' first." unless template_db_exists?