mini_sql 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc8d066cc7257d5601c5b75139172b58bb4ad7adc0b992d1ed9aa239fa8a9c55
-  data.tar.gz: 68b1a4714bb682c5cf49db9a2d6c70834dbce349cb04db949cb50c1cac73cd76
+  metadata.gz: 49e28eb6f0b011fa819621155a5f4507140035c5c4386d8dbcd297ea81981ad8
+  data.tar.gz: 0dd3f883623ab47c530ebdce212f32cd02a2eb76dd9b51a27e165425b1dad974
 SHA512:
-  metadata.gz: dc1ca8c2a28d0693bf691592d57b8cdc103461707823c1e113e54c17c067ccf2e35bc7666880f2d939701c68bf28588757dc48553222e411b67da2279aaa2384
-  data.tar.gz: 67419648795ff1999fe7ddef8dbf42e4e91dbb86eb27fa2d824ee8f1576647ef08b7b73570320870911633528ff9dfebbd9ed2fda16550f97defba6476ea418f
+  metadata.gz: e52ffd9133bd63060e6f5f7373958196ba56e5e1ffa38b910fe1119154f06bb076634aa18b5cad3c13045fcbf5cc6990f7966db258aea455dda62a67f2d608ee
+  data.tar.gz: a3d8370bd15bf01f150c58521da264bddfd4e766d370fa776d052d22a0b484513e2b8fa8b1588c352b4c87c023876b65cfa117655fc0c5390b5da9ea64f5751f

data/CHANGELOG

@@ -1,4 +1,9 @@
-2022-31-01 - 1.2.0
+2022-02-02 - 1.3.0
+
+- FEATURE: Add ActiveRecordPostgres connection
+  This is almost identical to the Postgres connection, but will acquire ActiveRecord's connection lock for each query
+
+2022-01-31 - 1.2.0
 
 - Ruby 2.6 is EOL support removed
 - FIX: when multiple params shared a prefix inline encoder may work in unexpected ways

data/README.md

@@ -241,6 +241,17 @@ builder.where("id IN (?)", ids)
 builder.prepared(ids.size == 1).query # most frequent query
 ```
 
+## Active Record Postgres
+
+When using alongside ActiveRecord, passing in the ActiveRecord connection rather than the raw Postgres connection will allow mini_sql to lock the connection, thereby preventing concurrent use in other threads.
+
+```ruby
+ar_conn = ActiveRecord::Base.connection
+conn = MiniSql::Connection.get(ar_conn)
+
+conn.query("select * from topics")
+```
+
 ## I want more features!
 
 MiniSql is designed to be very minimal. Even though the query builder and type materializer give you a lot of mileage, it is not intended to be a fully fledged ORM. If you are looking for an ORM I recommend investigating ActiveRecord or Sequel which provide significantly more features.

data/lib/mini_sql/active_record_postgres/connection.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module MiniSql
+  module ActiveRecordPostgres
+    class Connection < ::MiniSql::Postgres::Connection
+      attr_reader :active_record_connection
+
+      # Initialize a new MiniSql::Postgres::Connection object
+      #
+      # @param active_record_adapter [ActiveRecord::ConnectionAdapters::PostgresqlAdapter]
+      # @param deserializer_cache [MiniSql::DeserializerCache] a cache of field names to deserializer, can be nil
+      # @param type_map [PG::TypeMap] a type mapper for all results returned, can be nil
+      def initialize(active_record_adapter, args = nil)
+        @active_record_connection = active_record_adapter
+        super(nil, args)
+      end
+
+      def raw_connection
+        active_record_connection.raw_connection
+      end
+
+      # These two methods do not use `run`, so we need to apply
+      # the lock separately:
+      def query_each(sql, *params)
+        with_lock { super }
+      end
+      def query_each_hash(sql, *params)
+        with_lock { super }
+      end
+
+      private
+
+      def with_lock
+        active_record_connection.lock.synchronize { yield }
+      end
+
+      def run(sql, params)
+        with_lock { super }
+      end
+    end
+  end
+end

data/lib/mini_sql/connection.rb

@@ -6,6 +6,8 @@ module MiniSql
     def self.get(raw_connection, options = {})
       if (defined? ::PG::Connection) && (PG::Connection === raw_connection)
         Postgres::Connection.new(raw_connection, options)
+      elsif (defined? ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) && (ActiveRecord::ConnectionAdapters::PostgreSQLAdapter === raw_connection)
+        ActiveRecordPostgres::Connection.new(raw_connection, options)
       elsif (defined? ::ArJdbc)
         Postgres::Connection.new(raw_connection, options)
       elsif (defined? ::SQLite3::Database) && (SQLite3::Database === raw_connection)

data/lib/mini_sql/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module MiniSql
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/lib/mini_sql.rb

@@ -31,6 +31,10 @@ module MiniSql
       autoload :PreparedBinds,      "mini_sql/postgres/prepared_binds"
     end
 
+    module ActiveRecordPostgres
+      autoload :Connection, "mini_sql/active_record_postgres/connection"
+    end
+
     module Sqlite
       autoload :Connection,         "mini_sql/sqlite/connection"
       autoload :DeserializerCache,  "mini_sql/sqlite/deserializer_cache"

data/mini_sql.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "guard", "~> 2.18"
   spec.add_development_dependency "guard-minitest", "~> 2.4"
-  spec.add_development_dependency "activesupport", "~> 5.2"
+  spec.add_development_dependency "activesupport", "~> 7.0"
   spec.add_development_dependency 'rubocop', '~> 1.25.0'
   spec.add_development_dependency 'rubocop-discourse', '~> 2.5.0'
   spec.add_development_dependency 'm', '~> 1.6.0'
@@ -48,5 +48,6 @@ Gem::Specification.new do |spec|
     spec.add_development_dependency "pg", "> 1"
     spec.add_development_dependency "mysql2"
     spec.add_development_dependency "sqlite3", "~> 1.3"
+    spec.add_development_dependency "activerecord", "~> 7.0.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_sql
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Sam Saffron
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +178,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 7.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 7.0.0
 description: A fast, safe, simple direct SQL executor for PG
 email:
 - sam.saffron@gmail.com
@@ -210,6 +224,7 @@ files:
 - lib/mini_sql.rb
 - lib/mini_sql/abstract/prepared_binds.rb
 - lib/mini_sql/abstract/prepared_cache.rb
+- lib/mini_sql/active_record_postgres/connection.rb
 - lib/mini_sql/builder.rb
 - lib/mini_sql/connection.rb
 - lib/mini_sql/decoratable.rb