[prepared statements] fix for auto_encode_arrays, refactoring

lib/mini_sql.rb

@@ -29,6 +29,7 @@ module Postgres
       autoload :PreparedConnection, "mini_sql/postgres/prepared_connection"
       autoload :PreparedCache,      "mini_sql/postgres/prepared_cache"
       autoload :PreparedBinds,      "mini_sql/postgres/prepared_binds"
+      autoload :PreparedBindsAutoArray, "mini_sql/postgres/prepared_binds_auto_array"
     end
 
     module ActiveRecordPostgres

lib/mini_sql/abstract/prepared_binds.rb

@@ -41,13 +41,12 @@ def bind_hash(sql, hash)
 
       def bind_array(sql, array)
         sql = sql.dup
-        param_i = 0
+        param_i = -1
         i = 0
         binds = []
         bind_names = []
         sql.gsub!("?") do
-          param_i += 1
-          array_wrap(array[param_i - 1]).map do |vv|
+          array_wrap(array[param_i += 1]).map do |vv|
             binds << vv
             i += 1
             bind_names << [BindName.new("$#{i}")]

lib/mini_sql/abstract/prepared_cache.rb

@@ -14,7 +14,7 @@ def initialize(connection, max_size = nil)
       end
 
       def prepare_statement(sql)
-        stm_key = "#{@connection.object_id}-#{sql}"
+        stm_key = "#{raw_connection.object_id}-#{sql}"
         statement = @cache.delete(stm_key)
         if statement
           @cache[stm_key] = statement
@@ -28,6 +28,10 @@ def prepare_statement(sql)
 
       private
 
+      def raw_connection
+        @connection.raw_connection
+      end
+
       def next_key
         "s#{@counter += 1}"
       end

lib/mini_sql/inline_param_encoder.rb

@@ -51,19 +51,21 @@ def quoted_time(value)
       value.utc.iso8601
     end
 
+    EMPTY_ARRAY = [].freeze
+
     def quote_val(value)
       case value
-      when String     then "'#{conn.escape_string(value.to_s)}'"
-      when Numeric    then value.to_s
-      when BigDecimal then value.to_s("F")
-      when Time       then "'#{quoted_time(value)}'"
-      when Date       then "'#{value.to_s}'"
-      when Symbol     then "'#{conn.escape_string(value.to_s)}'"
-      when true       then "true"
-      when false      then "false"
-      when nil        then "NULL"
-      when []         then "NULL"
-      when Array      then array_encoder ? "'#{array_encoder.encode(value)}'" : value.map { |v| quote_val(v) }.join(', ')
+      when String       then "'#{conn.escape_string(value.to_s)}'"
+      when Numeric      then value.to_s
+      when BigDecimal   then value.to_s("F")
+      when Time         then "'#{quoted_time(value)}'"
+      when Date         then "'#{value.to_s}'"
+      when Symbol       then "'#{conn.escape_string(value.to_s)}'"
+      when true         then "true"
+      when false        then "false"
+      when nil          then "NULL"
+      when EMPTY_ARRAY  then array_encoder ? "'{}'" : "NULL"
+      when Array        then array_encoder ? "'#{array_encoder.encode(value)}'" : value.map { |v| quote_val(v) }.join(', ')
       else raise TypeError, "can't quote #{value.class.name}"
       end
     end

lib/mini_sql/mysql/prepared_cache.rb

@@ -9,7 +9,7 @@ class PreparedCache < ::MiniSql::Abstract::PreparedCache
       private
 
       def alloc(sql)
-        @connection.prepare(sql)
+        raw_connection.prepare(sql)
       end
 
       def dealloc(statement)

lib/mini_sql/mysql/prepared_connection.rb

@@ -7,12 +7,8 @@ class PreparedConnection < Connection
       attr_reader :unprepared
 
       def initialize(unprepared_connection)
-        @unprepared         = unprepared_connection
-        @raw_connection     = unprepared_connection.raw_connection
-        @param_encoder      = unprepared_connection.param_encoder
-
-        @prepared_cache     = PreparedCache.new(@raw_connection)
-        @param_binder       = PreparedBinds.new
+        @unprepared    = unprepared_connection
+        @param_binder  = PreparedBinds.new
       end
 
       def build(_)
@@ -29,6 +25,8 @@ def deserializer_cache
 
       private def run(sql, as, params)
         prepared_sql, binds, _bind_names = @param_binder.bind(sql, *params)
+
+        @prepared_cache ||= PreparedCache.new(unprepared)
         statement = @prepared_cache.prepare_statement(prepared_sql)
         statement.execute(
           *binds,

lib/mini_sql/postgres/connection.rb

@@ -3,7 +3,7 @@
 module MiniSql
   module Postgres
     class Connection < MiniSql::Connection
-      attr_reader :raw_connection, :param_encoder, :deserializer_cache
+      attr_reader :raw_connection, :param_encoder, :deserializer_cache, :array_encoder
 
       def self.default_deserializer_cache
         @deserializer_cache ||= DeserializerCache.new
@@ -52,7 +52,7 @@ def self.type_map(conn)
       def initialize(raw_connection, args = nil)
         @raw_connection = raw_connection
         @deserializer_cache = (args && args[:deserializer_cache]) || self.class.default_deserializer_cache
-        array_encoder = PG::TextEncoder::Array.new if args && args[:auto_encode_arrays]
+        @array_encoder = PG::TextEncoder::Array.new if args && args[:auto_encode_arrays]
         @param_encoder = (args && args[:param_encoder]) || InlineParamEncoder.new(self, array_encoder)
         @type_map = args && args[:type_map]
       end

lib/mini_sql/postgres/prepared_binds_auto_array.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require "mini_sql/abstract/prepared_binds"
+
+module MiniSql
+  module Postgres
+    class PreparedBindsAutoArray < ::MiniSql::Abstract::PreparedBinds
+
+      attr_reader :array_encoder
+
+      def initialize(array_encoder)
+        @array_encoder = array_encoder
+      end
+
+      def bind_hash(sql, hash)
+        sql = sql.dup
+        binds = []
+        bind_names = []
+        i = 0
+
+        hash.each do |k, v|
+          binds << (v.is_a?(Array) ? array_encoder.encode(v) : v)
+          bind_names << [BindName.new(k)]
+          bind_outputs = bind_output(i += 1)
+
+          sql.gsub!(":#{k}") do
+            # ignore ::int and stuff like that
+            # $` is previous to match
+            if $` && $`[-1] != ":"
+              bind_outputs
+            else
+              ":#{k}"
+            end
+          end
+        end
+        [sql, binds, bind_names]
+      end
+
+      def bind_array(sql, array)
+        sql = sql.dup
+        param_i = -1
+        i = 0
+        binds = []
+        bind_names = []
+        sql.gsub!("?") do
+          v = array[param_i += 1]
+          binds << (v.is_a?(Array) ? array_encoder.encode(v) : v)
+          i += 1
+          bind_names << [BindName.new("$#{i}")]
+          bind_output(i)
+        end
+        [sql, binds, bind_names]
+      end
+
+      def bind_output(i)
+        "$#{i}"
+      end
+
+    end
+  end
+end

lib/mini_sql/postgres/prepared_cache.rb

@@ -10,13 +10,13 @@ class PreparedCache < ::MiniSql::Abstract::PreparedCache
 
       def alloc(sql)
         alloc_key = next_key
-        @connection.prepare(alloc_key, sql)
+        raw_connection.prepare(alloc_key, sql)
 
         alloc_key
       end
 
       def dealloc(key)
-        @connection.query "DEALLOCATE #{key}" if @connection.status == PG::CONNECTION_OK
+        raw_connection.query "DEALLOCATE #{key}" if raw_connection.status == PG::CONNECTION_OK
       rescue PG::Error
       end
 

lib/mini_sql/postgres/prepared_connection.rb

@@ -7,13 +7,9 @@ class PreparedConnection < Connection
       attr_reader :unprepared
 
       def initialize(unprepared_connection)
-        @unprepared         = unprepared_connection
-        @raw_connection     = unprepared_connection.raw_connection
-        @type_map           = unprepared_connection.type_map
-        @param_encoder      = unprepared_connection.param_encoder
-
-        @prepared_cache     = PreparedCache.new(@raw_connection)
-        @param_binder       = PreparedBinds.new
+        @unprepared    = unprepared_connection
+        @type_map      = unprepared_connection.type_map
+        @param_binder  = unprepared.array_encoder ? PreparedBindsAutoArray.new(unprepared.array_encoder) : PreparedBinds.new
       end
 
       def build(_)
@@ -30,8 +26,9 @@ def deserializer_cache
 
       private def run(sql, params)
         prepared_sql, binds, _bind_names = @param_binder.bind(sql, *params)
+        @prepared_cache ||= PreparedCache.new(unprepared)
         prepare_statement_key = @prepared_cache.prepare_statement(prepared_sql)
-        raw_connection.exec_prepared(prepare_statement_key, binds)
+        unprepared.raw_connection.exec_prepared(prepare_statement_key, binds)
       end
 
     end

lib/mini_sql/sqlite/prepared_cache.rb

@@ -9,7 +9,7 @@ class PreparedCache < MiniSql::Abstract::PreparedCache
       private
 
       def alloc(sql)
-        @connection.prepare(sql)
+        raw_connection.prepare(sql)
       end
 
       def dealloc(statement)

lib/mini_sql/sqlite/prepared_connection.rb

@@ -7,12 +7,8 @@ class PreparedConnection < Connection
       attr_reader :unprepared
 
       def initialize(unprepared_connection)
-        @unprepared         = unprepared_connection
-        @raw_connection     = unprepared_connection.raw_connection
-        @param_encoder      = unprepared_connection.param_encoder
-
-        @prepared_cache     = PreparedCache.new(@raw_connection)
-        @param_binder       = PreparedBinds.new
+        @unprepared    = unprepared_connection
+        @param_binder  = PreparedBinds.new
       end
 
       def build(_)
@@ -29,6 +25,7 @@ def deserializer_cache
 
       private def run(sql, params)
         prepared_sql, binds, _bind_names = @param_binder.bind(sql, *params)
+        @prepared_cache ||= PreparedCache.new(unprepared)
         statement = @prepared_cache.prepare_statement(prepared_sql)
         statement.bind_params(binds)
         if block_given?

test/mini_sql/connection_tests.rb

@@ -69,6 +69,8 @@ def test_can_query_single_multi
   end
 
   def test_can_deal_with_arrays
+    return if @connection.respond_to?(:array_encoder) && @connection.array_encoder
+
     r = @connection.query_single("select :array as array", array: [1, 2, 3])
     assert_equal([1, 2, 3], r)
 

test/mini_sql/mysql/prepared_connection_test.rb

@@ -7,9 +7,9 @@ class MiniSql::Mysql::TestPreparedConnection < Minitest::Test
 
   def setup
     @unprepared_connection = mysql_connection
-    @prepared_connection = @unprepared_connection.prepared
+    @connection = @unprepared_connection.prepared
 
-    super
+    setup_tables
 
     @unprepared_connection.exec("SET GLOBAL log_output = 'TABLE'")
     @unprepared_connection.exec("SET GLOBAL general_log = 'ON'")
@@ -28,7 +28,7 @@ def assert_last_stmt(statement_sql)
   end
 
   def test_boolean_param
-    r = @prepared_connection.query("SELECT * FROM posts WHERE active = ?", true)
+    r = @connection.query("SELECT * FROM posts WHERE active = ?", true)
 
     assert_last_stmt "SELECT * FROM posts WHERE active = $1"
     assert_equal 2, r[0].id

test/mini_sql/postgres/auto_encode_arrays_test.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require "test_helper"
+require_relative 'connection_test'
+require_relative 'prepared_connection_test'
+
+module MiniSql::Postgres::ArrayTests
+  def test_simple_params
+    nums, strings, empty_array = [1, 2, 3], %w[a b c], []
+
+    row = @connection.query_single("select ?::int[], ?::text[], ?::int[]", nums, strings, empty_array)
+
+    assert_equal(row, [nums, strings, empty_array])
+  end
+
+  def test_hash_params
+    nums, strings, empty_array = [1, 2, 3], %w[a b c], []
+
+    row = @connection.query_single("select :nums::int[], :strings::text[], :empty_array::int[]", nums: nums, strings: strings, empty_array: empty_array)
+
+    assert_equal(row, [nums, strings, empty_array])
+  end
+end
+
+class MiniSql::Postgres::TestAutoEncodeArraysPrepared < MiniSql::Postgres::TestPreparedConnection
+  include MiniSql::Postgres::ArrayTests
+
+  def setup
+    @unprepared_connection = pg_connection(auto_encode_arrays: true)
+    @connection = @unprepared_connection.prepared
+
+    setup_tables
+  end
+end
+
+class MiniSql::Postgres::TestAutoEncodeArraysUnprepared < MiniSql::Postgres::TestConnection
+  include MiniSql::Postgres::ArrayTests
+
+  def setup
+    @connection = pg_connection(auto_encode_arrays: true)
+  end
+end

test/mini_sql/postgres/connection_test.rb

@@ -155,15 +155,4 @@ def test_unamed_query
     assert_equal(row.column2, 3)
   end
 
-  def test_encode_array
-    connection = pg_connection(auto_encode_arrays: true)
-
-    ints = [1, 2, 3]
-    strings = %w[a b c]
-    row = connection.query("select ?::int[] ints, ?::text[] strings", ints, strings).first
-
-    assert_equal(row.ints, ints)
-    assert_equal(row.strings, strings)
-  end
-
 end