refactor: various changes (#274)

Fix console command. Allow for TEST_FILES and
TEST_FILES_AR env to coexist. Remove undocumented
envs and useless code.

Author: BuonOmo

Rakefile

@@ -26,7 +26,7 @@ end
 
 Rake::TestTask.new do |t|
   t.libs = ARTest::CockroachDB.test_load_paths
-  t.test_files = test_files
+  t.test_files = RakeHelpers.test_files
   t.warning = !!ENV["WARNING"]
   t.verbose = false
 end

bin/console

@@ -1,14 +1,49 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "activerecord/cockroachdb"
+$:.unshift(File.expand_path("../lib", __dir__))
 
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
+# require "bundler/setup"
+# Bundler.require :development
 
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
+require "active_record"
+# This allows playing with the rake task as well. Ex:
+#
+#     ActiveRecord::Tasks::DatabaseTasks.
+#       structure_load(Post.connection_db_config, "awesome-file.sql")
+require "active_record/connection_adapters/cockroachdb/database_tasks"
+
+begin
+  retried = false
+  ActiveRecord::Base.establish_connection(
+    adapter: "cockroachdb",
+    host: "localhost",
+    port: 26257,
+    user: "root",
+    database: "ar_crdb_console"
+  )
+  ActiveRecord::Base.connection
+rescue ActiveRecord::NoDatabaseError
+  raise if retried
+  system("cockroach sql --insecure --host=localhost:26257 --execute='create database ar_crdb_console'",
+    exception: true)
+  retried = true
+  retry
+end
+
+class Post < ActiveRecord::Base
+end
+
+unless Post.table_exists?
+  migration = Class.new(ActiveRecord::Migration::Current) do
+    def up
+      create_table("posts") do |t|
+        t.string :title
+        t.text :body
+      end
+    end
+  end
+  migration.migrate(:up)
+end
 
 require "irb"
 IRB.start(__FILE__)

build/teamcity-test.sh

@@ -70,12 +70,7 @@ run_cockroach
 
 if ! (RUBYOPT="-W0" TESTOPTS="-v" bundle exec rake test); then
     echo "Tests failed"
-    HAS_FAILED=1
-else
-    echo "Tests passed"
-    HAS_FAILED=0
+    exit 1
 fi
 
-if [ $HAS_FAILED -eq 1 ]; then
-  exit 1
-fi
+echo "Tests passed"

lib/activerecord-cockroachdb-adapter.rb

@@ -1,4 +1,4 @@
-if defined?(Rails)
+if defined?(Rails::Railtie)
   module ActiveRecord
     module ConnectionAdapters
       class CockroachDBRailtie < ::Rails::Railtie

test/support/rake_helpers.rb

@@ -1,52 +1,38 @@
-COCKROACHDB_TEST_HELPER = 'test/cases/helper_cockroachdb.rb'
-
-def test_files
-  env_activerecord_test_files ||
-    env_cockroachdb_test_files ||
-    only_activerecord_test_files ||
-    only_cockroachdb_test_files ||
-    all_test_files
-end
+# frozen_string_literal: true
 
-def env_activerecord_test_files
-  return unless ENV['TEST_FILES_AR'] && !ENV['TEST_FILES_AR'].empty?
+module RakeHelpers
+  COCKROACHDB_TEST_HELPER = 'test/cases/helper_cockroachdb.rb'
 
-  @env_ar_test_files ||= ENV['TEST_FILES_AR'].
-    split(',').
-    map { |file| File.join ARTest::CockroachDB.root_activerecord, file.strip }.
-    sort.
-    prepend(COCKROACHDB_TEST_HELPER)
-end
+  module_function
 
-def env_cockroachdb_test_files
-  return unless ENV['TEST_FILES'] && !ENV['TEST_FILES'].empty?
+  # Look for TEST_FILES_AR or TEST_FILES env variables
+  # to set specific tests, otherwise load every tests
+  # from active_record and this adapter.
+  def test_files
+    ar_test_files = ENV.fetch('TEST_FILES_AR', '')
+    cr_test_files = ENV.fetch('TEST_FILES', '')
 
-  @env_test_files ||= ENV['TEST_FILES'].split(',').map(&:strip)
-end
+    return all_test_file if ar_test_files.empty? && cr_test_files.empty?
 
-def only_activerecord_test_files
-  return unless ENV['ONLY_TEST_AR']
-  activerecord_test_files
-end
+    ar_test_files = ar_test_files.
+      split(',').
+      map { |file| File.join ARTest::CockroachDB.root_activerecord, file.strip }.
+      then { _1.prepend(COCKROACHDB_TEST_HELPER) unless _1.empty? }.
+      prepend(COCKROACHDB_TEST_HELPER)
 
-def only_cockroachdb_test_files
-  return unless ENV['ONLY_TEST_COCKROACHDB']
-  cockroachdb_test_files
-end
+    cr_test_files = cr_test_files.split(',').map(&:strip)
 
-def all_test_files
-  activerecord_test_files + cockroachdb_test_files
-end
+    ar_test_files + cr_test_files
+  end
 
-def activerecord_test_files
-  Dir.
-    glob("#{ARTest::CockroachDB.root_activerecord}/test/cases/**/*_test.rb").
-    reject{ |x| x =~ /\/adapters\/mysql2\// }.
-    reject{ |x| x =~ /\/adapters\/sqlite3\// }.
-    sort.
-    prepend(COCKROACHDB_TEST_HELPER)
-end
+  def all_test_files
+    activerecord_test_files = Dir.
+      glob("#{ARTest::CockroachDB.root_activerecord}/test/cases/**/*_test.rb").
+      reject { _1.match?(%r(/adapters/(?:mysql2|sqlite3)/) }.
+      prepend(COCKROACHDB_TEST_HELPER)
+
+    cockroachdb_test_files = Dir.glob('test/cases/**/*_test.rb')
 
-def cockroachdb_test_files
-  Dir.glob('test/cases/**/*_test.rb')
+    activerecord_test_files + cockroachdb_test_files
+  end
 end