sequel-activerecord_connection 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c039d5e631eab07727b3ae6f451bc04656a5f5215a1c3389c64dead44a16f2e
-  data.tar.gz: 99402da40ca6bbbadc05dd1dfd24757368a6153a85922b705cd491c14ab54096
+  metadata.gz: c11ff9b3633981f462112bbbb844ec6033522314b6849d66b1f1868976521549
+  data.tar.gz: 6ef2ebc50251b4e0f894d95e4953afbabd9b1a955a226809053a664788c94bc9
 SHA512:
-  metadata.gz: 6312fad7666b13a9fb6d670ef5b1806edb4cda9843b008090f69a8f5472982673f1180a16b5e903f0e26eab7ef6cdba3d9d6a762024ef28842d17f61f9d5ac68
-  data.tar.gz: e80315a652b89d0cb13075dc72ade8d882f3a35038f998293bfbb8f3aeed8483457e80ed085fa850694e5694fbc10a7e6641ad35bd66f3df01bdb9b3e9dc21d8
+  metadata.gz: 867693e62bde77afd9ff107f73670b488dbdd3f53ab1665da27a59d560d2737c045446e1d1995c49f9f700cc215303167404349c4c275597b030c5b65637c7e8
+  data.tar.gz: 0ceb8dc99f066df61850fdd596d3dbb5543fa437ffe428a3722d2d77a89e9227edccb57023d0d83834c1b9d846f2d06ccbac20c9904d19ba79c9db8470a5cbb8

data/README.md

@@ -158,7 +158,7 @@ DB.activerecord_model = MyModel
 ### Timezone
 
 Sequel's database timezone will be automatically set to ActiveRecord's default
-timezone when the extension(`:utc` by default) when the extension is loaded.
+timezone (`:utc` by default) when the extension is loaded.
 
 If you happen to be changing ActiveRecord's default timezone after you've
 loaded the extension, make sure to reflect that in your Sequel database object,

data/lib/sequel/extensions/activerecord_connection.rb

@@ -57,7 +57,11 @@ module Sequel
 
     # Avoid calling Sequel's connection pool, instead use ActiveRecord.
     def synchronize(*)
-      activerecord_connection.lock.synchronize do
+      if ActiveRecord.version >= Gem::Version.new("5.1.0")
+        activerecord_connection.lock.synchronize do
+          yield activerecord_raw_connection
+        end
+      else
         yield activerecord_raw_connection
       end
     end

data/lib/sequel/extensions/activerecord_connection/sqlite.rb

@@ -10,9 +10,13 @@ module Sequel
       # ActiveRecord doesn't send SQLite methods Sequel expects, so we need to
       # try to replicate what ActiveRecord does around connection excecution.
       def _execute(type, sql, opts, &block)
-        activerecord_raw_connection.extended_result_codes = true
+        if activerecord_raw_connection.respond_to?(:extended_result_codes=)
+          activerecord_raw_connection.extended_result_codes = true
+        end
 
-        activerecord_connection.materialize_transactions
+        if ActiveRecord::VERSION::MAJOR >= 6
+          activerecord_connection.materialize_transactions
+        end
 
         activerecord_connection.send(:log, sql) do
           ActiveSupport::Dependencies.interlock.permit_concurrent_loads do

data/sequel-activerecord_connection.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "sequel-activerecord_connection"
-  spec.version       = "0.2.0"
+  spec.version       = "0.2.1"
   spec.authors       = ["Janko Marohnić"]
   spec.email         = ["janko.marohnic@gmail.com"]
 
@@ -11,12 +11,12 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = Gem::Requirement.new(">= 2.2.0")
 
-  spec.add_dependency "sequel", "~> 5.0"
+  spec.add_dependency "sequel", ">= 4.0", "< 6"
   spec.add_dependency "activerecord", ">= 5.0", "< 7"
 
   spec.add_development_dependency "pg",      "~> 1.0"
   spec.add_development_dependency "mysql2",  "~> 0.5"
-  spec.add_development_dependency "sqlite3", "~> 1.4"
+  spec.add_development_dependency "sqlite3", "~> 1.3"
   spec.add_development_dependency "minitest"
 
   spec.files         = Dir["README.md", "LICENSE.txt", "CHANGELOG.md", "lib/**/*.rb", "*.gemspec"]

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: sequel-activerecord_connection
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-29 00:00:00.000000000 Z
+date: 2020-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +84,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement