ensql 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d67a62c833d6468ecbb753a54f592f2b9ecb295fb2db7eb943c25184c481e4c0
-  data.tar.gz: 32e9c5c68c6469bd1613e4b0881b22a7545616f63dffb08f4a6ba04d2ad28fb3
+  metadata.gz: 689e8e2af4e7e8c941ed6f14937288a3e080f822b71ee22938898ac0a15f5277
+  data.tar.gz: 9693bc5e2476794d9f60feb70e80c821596ec18a4e71993d45aee65a26a152f1
 SHA512:
-  metadata.gz: 563a4e08014aedec4c7a2321f78a22534e8250d6f1b4e5189ce1482b3348c5b8a25f411fcc059ece8984eece9cb53dcdc30d56691dde0856ef74aa14c61c18cc
-  data.tar.gz: 3e99489831703bb5aa978923fa2430bcab133ce8e2c4bcfbc84472a699aa09c70935f7d76945eee0cc5d90575c8ff2fe37a3268754e00f723143bdca2179c796
+  metadata.gz: 10c90d7568c1c6ed34b9cb04e4a2e4a9af0ed6bb788ea6ec88f206b807468091e9d541f6dfc79ae7eb3d5e90b92e33a12718aae1c4d7e6977352331a499fbee1
+  data.tar.gz: 6b945c42734e68a599b2d32d825fa6c9d8b61a7eb1175086afae237c21fb58d30d4753eb916a69716a2c0c3a43dd51da34d655fb6b145352814d5256aa137d9d

data/.github/workflows/lint.yml

@@ -15,9 +15,6 @@ name: Lint Code Base
 # Start the job on all push #
 #############################
 on:
-  push:
-    branches-ignore: [master]
-    # Remove the line above to run when pushing to master
   pull_request:
     branches: [master]
 

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## [0.6.4] - unreleased
+
+- Exposes `PostgresAdapter#query_type_map` to extend PG type mapping.
+- Defers building type maps for PostgreSQL connections, to avoid bugs with ActiveRecord.
+
 ## [0.6.3] - 2021-03-11
 
 - Supports transaction flow control using any flavour SQL with `Ensql.transaction` and `Ensql.rollback!`.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ensql (0.6.3)
+    ensql (0.6.4)
       connection_pool (>= 0.9.3, < 3)
 
 GEM

data/gemfiles/maintained.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    ensql (0.6.3)
+    ensql (0.6.4)
       connection_pool (>= 0.9.3, < 3)
 
 GEM

data/gemfiles/minimum.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    ensql (0.6.3)
+    ensql (0.6.4)
       connection_pool (>= 0.9.3, < 3)
 
 GEM

data/lib/ensql/postgres_adapter.rb

@@ -14,7 +14,8 @@ module Ensql
   # [connection_pool gem](https://github.com/mperham/connection_pool).
   #
   # This adapter is much faster and offers much better PostgreSQL specific
-  # parameter interpolation than the framework adapters.
+  # parameter interpolation than the framework adapters. See {query_type_map}
+  # for options.
   #
   # @example
   #     # Use with ActiveRecord's connection pool
@@ -49,8 +50,30 @@ module Ensql
     def initialize(pool)
       @pool = pool
       @quoter = PG::TextEncoder::QuotedLiteral.new
-      @result_type_map = @pool.with { |c| PG::BasicTypeMapForResults.new(c) }
-      @query_type_map = @pool.with { |c| build_query_type_map(c) }
+    end
+
+    # A map for encoding Ruby objects into PostgreSQL literals based on their
+    # class. You can add additional class mappings to suit your needs. See
+    # https://rubydoc.info/gems/pg/PG/BasicTypeRegistry for details of adding
+    # your own encoders and decoders.
+    #
+    #     # Encode any `IPAddr` objects for interpolation using the `InetEncoder`.
+    #     Ensql.adapter.query_type_map[IPAddr] = InetEncoder.new
+    #
+    #     # Deserialize `inet` columns as IPAddr objects.
+    #     PG::BasicTypeRegistry.register_type(0, 'inet', InetEncoder, InetDecoder)
+    #
+    # @return [PG::TypeMapByClass]
+    def query_type_map
+      @query_type_map ||= @pool.with do |connection|
+        map = PG::BasicTypeMapForQueries.new(connection)
+        # Ensure encoders are set up for old versions of the pg gem
+        map[Date] ||= PG::TextEncoder::Date.new
+        map[Time] ||= PG::TextEncoder::TimestampWithoutTimeZone.new
+        map[Hash] ||= PG::TextEncoder::JSON.new
+        map[BigDecimal] ||= NumericEncoder.new
+        map
+      end
     end
 
     # @visibility private
@@ -106,7 +129,7 @@ module Ensql
 
     def fetch_result(sql)
       execute(sql) do |res|
-        res.type_map = @result_type_map
+        res.type_map = result_type_map
         yield res
       end
     end
@@ -122,19 +145,13 @@ module Ensql
     end
 
     def encoder_for(value)
-      coder = @query_type_map[value.class]
+      coder = query_type_map[value.class]
       # Handle the weird case where coder can be a method name
-      coder.is_a?(Symbol) ? @query_type_map.send(coder, value) : coder
+      coder.is_a?(Symbol) ? query_type_map.send(coder, value) : coder
     end
 
-    # Ensure encoders are set up for old versions of the pg gem
-    def build_query_type_map(connection)
-      map = PG::BasicTypeMapForQueries.new(connection)
-      map[Date] ||= PG::TextEncoder::Date.new
-      map[Time] ||= PG::TextEncoder::TimestampWithoutTimeZone.new
-      map[Hash] ||= PG::TextEncoder::JSON.new
-      map[BigDecimal] ||= NumericEncoder.new
-      map
+    def result_type_map
+      @result_type_map ||= @pool.with { |c| PG::BasicTypeMapForResults.new(c) }
     end
   end
 

data/lib/ensql/version.rb

@@ -2,7 +2,7 @@
 
 module Ensql
   # Gem version
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
   # Versions of activerecord compatible with the {ActiveRecordAdapter}
   SUPPORTED_ACTIVERECORD_VERSIONS = [">= 5.0", "< 6.2"].freeze
   # Versions of sequel compatible with the {SequelAdapter}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ensql
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Daniel Fone
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2021-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool