mini_sql 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 335047554a8bf88fb9f9c3152d5f7056806ee541667ca47ffdfe678d85d16f2e
-  data.tar.gz: fa574144f2ca9e8427b5d72292af8fbb67e8e89b799bd2ab550639edd6f0eca0
+  metadata.gz: 8d46350915a655a1692de9b775f879609f83ff068bf9b62be6498672b223ee03
+  data.tar.gz: 192596f2834a676f123afcfb969a32267b311fe20318527ae13b92dd95efc757
 SHA512:
-  metadata.gz: b5b92a31e176d19b2c006dfec04884c295e7e9d6eaf04d5222f777b2e4d012225efb8e46699b9be7ad1cd103e87cc1637096a0bbef6cae0dfec928545e5a2538
-  data.tar.gz: '0685f098c60980117f0278a0f0887b0bd95f6d06ace0aeeba520dd163a7422b686b7d7f4009e29de97f8b713900b206174d3765903f4b6e28c953cfd174f03c3'
+  metadata.gz: 9820695fc27ced3ce61b2a131201c6bb954eca9919cd49f29f2877ebccbbd33ef8e36b4a0284d0a04fde9ec92c1f33bbfe75780515cdec26bdf9493e676b631d
+  data.tar.gz: d2ba6adbdf07a1a3fb11192ad949c8f632035a357d792eb895350ee3af30f7977d6b8e64d5df59b1338e9349d213e4472099593c6296e39203fac7ee8147da7d

data/CHANGELOG

@@ -1,3 +1,7 @@
+2021-03-22 - 1.1.3
+
+- DEV: reduce coupling of internal interfaces and allow or cleaner override of prepared connections
+
 2021-03-22 - 1.1.2
 
 - FEATURE: improve compatability with clients overriding raw_connection

data/lib/mini_sql/mysql/connection.rb

@@ -13,7 +13,7 @@ module MiniSql
 
       def prepared(condition = true)
         if condition
-          @prepared ||= PreparedConnection.new(self, @deserializer_cache)
+          @prepared ||= PreparedConnection.new(self)
         else
           self
         end
@@ -39,12 +39,12 @@ module MiniSql
 
       def query(sql, *params)
         result = run(sql, :array, params)
-        @deserializer_cache.materialize(result)
+        deserializer_cache.materialize(result)
       end
 
       def query_decorator(decorator, sql, *params)
         result = run(sql, :array, params)
-        @deserializer_cache.materialize(result, decorator)
+        deserializer_cache.materialize(result, decorator)
       end
 
       def escape_string(str)

data/lib/mini_sql/mysql/prepared_connection.rb

@@ -6,10 +6,9 @@ module MiniSql
 
       attr_reader :unprepared
 
-      def initialize(unprepared_connection, deserializer_cache)
+      def initialize(unprepared_connection)
         @unprepared         = unprepared_connection
         @raw_connection     = unprepared_connection.raw_connection
-        @deserializer_cache = deserializer_cache
         @param_encoder      = unprepared_connection.param_encoder
 
         @prepared_cache     = PreparedCache.new(@raw_connection)
@@ -24,6 +23,10 @@ module MiniSql
         condition ? self : @unprepared
       end
 
+      def deserializer_cache
+        @unprepared.deserializer_cache
+      end
+
       private def run(sql, as, params)
         prepared_sql, binds, _bind_names = @param_binder.bind(sql, *params)
         statement = @prepared_cache.prepare_statement(prepared_sql)

data/lib/mini_sql/postgres/connection.rb

@@ -3,7 +3,7 @@
 module MiniSql
   module Postgres
     class Connection < MiniSql::Connection
-      attr_reader :raw_connection, :param_encoder
+      attr_reader :raw_connection, :param_encoder, :deserializer_cache
 
       def self.default_deserializer_cache
         @deserializer_cache ||= DeserializerCache.new
@@ -48,7 +48,7 @@ module MiniSql
 
       def prepared(condition = true)
         if condition
-          @prepared ||= PreparedConnection.new(self, @deserializer_cache)
+          @prepared ||= PreparedConnection.new(self)
         else
           self
         end
@@ -98,7 +98,7 @@ module MiniSql
       def query(sql, *params)
         result = run(sql, params)
         result.type_map = type_map
-        @deserializer_cache.materialize(result)
+        deserializer_cache.materialize(result)
       ensure
         result.clear if result
       end
@@ -121,7 +121,7 @@ module MiniSql
           if result.ntuples == 0
             # skip, this happens at the end when we get totals
           else
-            materializer ||= @deserializer_cache.materializer(result)
+            materializer ||= deserializer_cache.materializer(result)
             result.type_map = type_map
             i = 0
             # technically we should only get 1 row here
@@ -172,7 +172,7 @@ module MiniSql
       def query_decorator(decorator, sql, *params)
         result = run(sql, params)
         result.type_map = type_map
-        @deserializer_cache.materialize(result, decorator)
+        deserializer_cache.materialize(result, decorator)
       ensure
         result.clear if result
       end

data/lib/mini_sql/postgres/prepared_connection.rb

@@ -6,10 +6,9 @@ module MiniSql
 
       attr_reader :unprepared
 
-      def initialize(unprepared_connection, deserializer_cache)
+      def initialize(unprepared_connection)
         @unprepared         = unprepared_connection
         @raw_connection     = unprepared_connection.raw_connection
-        @deserializer_cache = deserializer_cache
         @type_map           = unprepared_connection.type_map
         @param_encoder      = unprepared_connection.param_encoder
 
@@ -25,6 +24,10 @@ module MiniSql
         condition ? self : @unprepared
       end
 
+      def deserializer_cache
+        @unprepared.deserializer_cache
+      end
+
       private def run(sql, params)
         prepared_sql, binds, _bind_names = @param_binder.bind(sql, *params)
         prepare_statement_key = @prepared_cache.prepare_statement(prepared_sql)

data/lib/mini_sql/sqlite/connection.rb

@@ -13,7 +13,7 @@ module MiniSql
 
       def prepared(condition = true)
         if condition
-          @prepared ||= PreparedConnection.new(self, @deserializer_cache)
+          @prepared ||= PreparedConnection.new(self)
         else
           self
         end

data/lib/mini_sql/sqlite/prepared_connection.rb

@@ -6,10 +6,9 @@ module MiniSql
 
       attr_reader :unprepared
 
-      def initialize(unprepared_connection, deserializer_cache)
+      def initialize(unprepared_connection)
         @unprepared         = unprepared_connection
         @raw_connection     = unprepared_connection.raw_connection
-        @deserializer_cache = deserializer_cache
         @param_encoder      = unprepared_connection.param_encoder
 
         @prepared_cache     = PreparedCache.new(@raw_connection)
@@ -24,6 +23,10 @@ module MiniSql
         condition ? self : @unprepared
       end
 
+      def deserializer_cache
+        @unprepared.deserializer_cache
+      end
+
       private def run(sql, params)
         prepared_sql, binds, _bind_names = @param_binder.bind(sql, params)
         statement = @prepared_cache.prepare_statement(prepared_sql)

data/lib/mini_sql/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_sql
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Sam Saffron