sequel-activerecord_connection 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fba99c145ebf98ed9c3e26fdc96afc3bc5fa7820e01d466ab10320c72765c8ae
-  data.tar.gz: ae36bef3a63280cf54f1a92e814c1bf4928dc8050f572694aac4340389115f9b
+  metadata.gz: ee4a6a5b6dcfceb9856ca13e48cd47ce2573f9d5f4d8923518854eb0651c1cb9
+  data.tar.gz: 18fd0ce3a56b87b102e6534eef4ae478d1a2df10a4aac8ae984fa4069c477493
 SHA512:
-  metadata.gz: 073babf3f4e9d60dcb439eb0d9a7b801b9cf23b9be53366382cdd9e18234de66c329d0a975e68fb57d78cbf80f26ddafcd3f1bc90e8282a9a24b90cd1f8c0a43
-  data.tar.gz: 420a6326c6c0e0b85874b52c89e747a59702280e763d9f6a090dd649b17718771cefaa1d9d72d4244a92bcfbee7ff2c186480ad0005d17685abcd0a595ccb97c
+  metadata.gz: dd33df7445d400b75b29782c99f83d1afc8fc93338eeab4fd0196c4281e34fc1df21d12a0e1a8ccd130995527bef95d7b3ca1b9b16f47a33623b750842b68732
+  data.tar.gz: c4e26c97e37efd8f8415c7c03799bdde385a478384531948b60837d43bb1f09e7a9feb899b2d080aa20d41f6fb152adfe236aaf0447a1140637696baecd1b1a7

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.2.0 (2020-11-15)
+
+* Attempt support for [activerecord-sqlserver-adapter](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter) (@janko)
+
+* Attempt support for [oracle-enhanced](https://github.com/rsim/oracle-enhanced) Active Record adapter (@janko)
+
 ## 1.1.0 (2020-11-08)
 
 * Drop support for Ruby 2.2 (@janko)

data/README.md

@@ -9,8 +9,10 @@ separate database connection. Or if you're transitioning from ActiveRecord to
 Sequel, and want the database connection to be shared.
 
 It works on ActiveRecord 4.2+ and fully supports PostgresSQL, MySQL and SQLite
-adapters, both the native ones and JDBC (JRuby). Other adapters might work too,
-but their integration hasn't been tested.
+adapters, both the native ones and JDBC (JRuby). There is attempted suppport
+for [Oracle enhanced] and [SQL Server] Active Record adapters (`oracle` and
+`tinytds` in Sequel). Other adapters might work too, but their integration
+hasn't been tested.
 
 ## Installation
 
@@ -109,8 +111,9 @@ DB.transaction(isolation: :serializable) do
 end
 ```
 
-When combining Active Record and Sequel transactions, Sequel transaction hook
-functionality will be utilized when possible.
+When registering transaction hooks, they will be registered on Sequel
+transactions when possible, in which case they will behave as described in the
+[Sequel docs][sequel transaction hooks].
 
 ```rb
 # Sequel: An after_commit transaction hook will always get executed if the outer
@@ -223,3 +226,6 @@ Everyone interacting in this project's codebases, issue trackers, chat rooms and
 [Sequel]: https://github.com/jeremyevans/sequel
 [Rodauth]: https://github.com/jeremyevans/rodauth
 [rom-sql]: https://github.com/rom-rb/rom-sql
+[sequel transaction hooks]: http://sequel.jeremyevans.net/rdoc/files/doc/transactions_rdoc.html#label-Transaction+Hooks
+[Oracle enhanced]: https://github.com/rsim/oracle-enhanced
+[SQL Server]: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter

data/lib/sequel/extensions/activerecord_connection.rb

@@ -152,25 +152,6 @@ module Sequel
         &block
       )
     end
-
-    module Utils
-      def self.set_value(object, name, new_value)
-        original_value = object.send(name)
-        object.send(:"#{name}=", new_value)
-        yield
-      ensure
-        object.send(:"#{name}=", original_value)
-      end
-
-      def self.add_prepared_statements_cache(conn)
-        return if conn.respond_to?(:prepared_statements)
-
-        class << conn
-          attr_accessor :prepared_statements
-        end
-        conn.prepared_statements = {}
-      end
-    end
   end
 
   Database.register_extension(:activerecord_connection, ActiveRecordConnection)

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

@@ -9,7 +9,11 @@ module Sequel
 
       def synchronize(*)
         super do |conn|
-          yield conn.connection
+          if database_type == :oracle
+            yield conn.raw_connection
+          else
+            yield conn.connection
+          end
         end
       end
     end

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

@@ -1,3 +1,5 @@
+require_relative "utils"
+
 module Sequel
   module ActiveRecordConnection
     module Mysql2

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

@@ -0,0 +1,16 @@
+require_relative "utils"
+
+module Sequel
+  module ActiveRecordConnection
+    module Oracle
+      def synchronize(*)
+        super do |conn|
+          # required for prepared statements
+          Utils.add_prepared_statements_cache(conn.raw_oci_connection)
+
+          yield conn.raw_oci_connection
+        end
+      end
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+require_relative "utils"
+
 module Sequel
   module ActiveRecordConnection
     module Postgres

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

@@ -1,3 +1,5 @@
+require_relative "utils"
+
 module Sequel
   module ActiveRecordConnection
     module Sqlite

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

@@ -0,0 +1,19 @@
+require_relative "utils"
+
+module Sequel
+  module ActiveRecordConnection
+    module Tinytds
+      def synchronize(*)
+        super do |conn|
+          conn.query_options.merge!(cache_rows: false)
+
+          begin
+            yield conn
+          ensure
+            conn.query_options.merge!(cache_rows: true)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+module Sequel
+  module ActiveRecordConnection
+    module Utils
+      def self.set_value(object, name, new_value)
+        original_value = object.send(name)
+        object.send(:"#{name}=", new_value)
+        yield
+      ensure
+        object.send(:"#{name}=", original_value)
+      end
+
+      def self.add_prepared_statements_cache(conn)
+        return if conn.respond_to?(:prepared_statements)
+
+        class << conn
+          attr_accessor :prepared_statements
+        end
+        conn.prepared_statements = {}
+      end
+    end
+  end
+end

data/sequel-activerecord_connection.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "sequel-activerecord_connection"
-  spec.version       = "1.1.0"
+  spec.version       = "1.2.0"
   spec.authors       = ["Janko Marohnić"]
   spec.email         = ["janko.marohnic@gmail.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel-activerecord_connection
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-08 00:00:00.000000000 Z
+date: 2020-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -113,8 +113,11 @@ files:
 - lib/sequel/extensions/activerecord_connection.rb
 - lib/sequel/extensions/activerecord_connection/jdbc.rb
 - lib/sequel/extensions/activerecord_connection/mysql2.rb
+- lib/sequel/extensions/activerecord_connection/oracle.rb
 - lib/sequel/extensions/activerecord_connection/postgres.rb
 - lib/sequel/extensions/activerecord_connection/sqlite.rb
+- lib/sequel/extensions/activerecord_connection/tinytds.rb
+- lib/sequel/extensions/activerecord_connection/utils.rb
 - sequel-activerecord_connection.gemspec
 homepage: https://github.com/janko/sequel-activerecord_connection
 licenses: