From cb46b214c2e11933485059a6afd61f621b3a9cd0 Mon Sep 17 00:00:00 2001
From: Brendon Muir <brendon@spike.net.nz>
Date: Tue, 12 Mar 2024 14:12:04 +1300
Subject: [PATCH] Remove Transaction Fix in favour of configuration

---
 test/support/active_record.rb          |  1 -
 test/support/ci_database.yml           |  1 +
 test/support/database.yml              |  1 +
 test/support/sqlite_transaction_fix.rb | 31 --------------------------
 4 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 test/support/sqlite_transaction_fix.rb

diff --git a/test/support/active_record.rb b/test/support/active_record.rb
index 6a99c06..5ed2f3a 100644
--- a/test/support/active_record.rb
+++ b/test/support/active_record.rb
@@ -1,5 +1,4 @@
 require "active_record"
-require_relative "sqlite_transaction_fix"
 
 ENV["DB"] = "mysql" unless ENV["DB"]
 
diff --git a/test/support/ci_database.yml b/test/support/ci_database.yml
index 1db131a..dfddf7f 100644
--- a/test/support/ci_database.yml
+++ b/test/support/ci_database.yml
@@ -3,6 +3,7 @@ sqlite:
   database: db/test.sqlite3
   pool: 5
   timeout: 5000
+  default_transaction_mode: EXCLUSIVE
 
 mysql:
   adapter: mysql2
diff --git a/test/support/database.yml b/test/support/database.yml
index e2f0f87..2a6990c 100644
--- a/test/support/database.yml
+++ b/test/support/database.yml
@@ -3,6 +3,7 @@ sqlite:
   database: db/test.sqlite3
   pool: 5
   timeout: 5000
+  default_transaction_mode: EXCLUSIVE
 
 mysql:
   adapter: mysql2
diff --git a/test/support/sqlite_transaction_fix.rb b/test/support/sqlite_transaction_fix.rb
deleted file mode 100644
index 4cb95da..0000000
--- a/test/support/sqlite_transaction_fix.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-module SqliteTransactionFix
-  module Rails71
-    def begin_db_transaction # :nodoc:
-      log("begin transaction", "TRANSACTION") do
-        with_raw_connection(allow_retry: true, materialize_transactions: false) do |conn|
-          result = conn.transaction(:immediate)
-          verified!
-          result
-        end
-      end
-    end
-  end
-
-  module Rails61
-    def begin_db_transaction # :nodoc:
-      log("begin transaction", "TRANSACTION") { @connection.transaction(:immediate) }
-    end
-  end
-end
-
-module ActiveRecord
-  module ConnectionAdapters
-    class SQLiteAdapter < AbstractAdapter
-      if ActiveRecord.version >= Gem::Version.new("7.1")
-        prepend SqliteTransactionFix::Rails71
-      else
-        prepend SqliteTransactionFix::Rails61
-      end
-    end
-  end
-end