transaction_isolation_level 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bda34739fa7b6dfb410d613b18e7f325a685deab
-  data.tar.gz: edcca2f46a2bec03ea09a78d5aeb899ab40d5a81
+  metadata.gz: c51e2c4cd964967053705462a744b8d77dcb8058
+  data.tar.gz: c03c90b9c167fc596c75df50e31ef7a4362b5859
 SHA512:
-  metadata.gz: 356341c609d337aec229bb36aa0d2fa64178b80ff92a7ff0c21a02c05b135760ff81f19c270444f2bf1360f786739f7b8cd817d140ef93dac849087cd868d3b6
-  data.tar.gz: 7a3940a59b352252cbc82984d8c2a35ddc7e541ad1b29c24c919ebec49df4eeab32145cad5a705d3d4702f5077ecf592f5c4efad06ddd7adc5bcdaf942865e0f
+  metadata.gz: a03d54c3ec7bf025923b33022a260139025d0302fd89f7131303f23cd6c38e29b6f4daa4669f416643767c003906ba45ed12846ba30f899df460f845f508b410
+  data.tar.gz: 4892314111be7920d5111c8b9d80a96af5685fbc8cfb66ab8bdbc70b2b7d0eda2901b66930cdb3efd4733f08fe60d1c12a472ecdeb47755f959cd100446aefe4

data/Gemfile

@@ -10,6 +10,4 @@ gemspec
 # Git. Remember to move these dependencies to your gemspec before releasing
 # your gem to rubygems.org.
 
-# To use debugger
-# gem 'ruby-debug19', :require => 'ruby-debug'
-# gem 'ruby-debug'
+gem 'activerecord', ENV['RAILS_VERSION']

data/lib/transaction_isolation_level.rb

@@ -13,6 +13,13 @@ module ActiveRecord
       # uses the ConnectionHandler#establish_connection method we override here to load our patches once
       # ActiveRecord::Base#establish_connection has loaded the class to patch.
       def establish_connection_with_isolation_level_adapter_patches(*args)
+        # need to explicitly trigger load of the adapter for 5.1 and above, as from that point on its
+        # required only in establish_connection, and we don't have a way to insert our patches halfway
+        # through that method.
+        if (ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR > 0) || ActiveRecord::VERSION::MAJOR > 5
+          ConnectionSpecification::Resolver.new(Base.configurations).spec(args.last)
+        end
+
         require 'transaction_isolation_level/adapter_patches'
         establish_connection_without_isolation_level_adapter_patches(*args)
       end

data/lib/transaction_isolation_level/adapter_patches.rb

@@ -68,8 +68,23 @@ module ActiveRecord
         execute "BEGIN TRANSACTION #{transaction_isolation_level_sql(@transaction_isolation_level)}"
       end
 
+      # the postgresql adapter calls configure_connection part way through its #initialize.  after that point, it sets
+      # @type_map.  however, by calling execute, our overridden configure_connection will run a query, and this requires
+      # a type map, which needs to be the postgresql-specific type that #initialize would instantiate, not the default
+      # created by #type_map in the abstract adapter code.  so we override that default to be the same as #initialize
+      # will make.
       def type_map
-        @type_map ||= PostgreSQLAdapter::OID::TypeMap.new.tap {|type_map| initialize_type_map(type_map)}
+        return @type_map if instance_variable_defined?(:@type_map)
+        @type_map =
+          if PostgreSQLAdapter::OID.const_defined?(:TypeMap)
+            # 5.0 and below
+            PostgreSQLAdapter::OID::TypeMap.new
+          else
+            # 5.1 and above
+            Type::HashLookupTypeMap.new
+          end
+        initialize_type_map(type_map)
+        @type_map
       end
 
       def configure_connection

data/lib/transaction_isolation_level/version.rb

@@ -1,3 +1,3 @@
 module TransactionIsolationLevel
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/test_all.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+for version in 4.2.10 5.0.6 5.1.4 5.2.0.beta2
+do
+	RAILS_VERSION=$version bundle update activerecord
+	RAILS_ENV=postgresql bundle exec rake
+done

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transaction_isolation_level
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Will Bryant
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-24 00:00:00.000000000 Z
+date: 2018-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -69,6 +69,7 @@ files:
 - test/database.yml
 - test/test_helper.rb
 - test/transaction_isolation_level_test.rb
+- test_all.sh
 - transaction_isolation_level.gemspec
 homepage: http://github.com/willbryant/transaction_isolation_level
 licenses: []
@@ -89,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.2
 signing_key: 
 specification_version: 4
 summary: 'Adds :isolation_level option to ActiveRecord #transaction calls'