mini_sql 1.0 → 1.1.3

data/lib/mini_sql/mysql/deserializer_cache.rb

@@ -12,14 +12,14 @@ module MiniSql
       end
 
       def materialize(result, decorator_module = nil)
-        key = result.fields
+        key = result.fields.join(',')
 
         # trivial fast LRU implementation
         materializer = @cache.delete(key)
         if materializer
           @cache[key] = materializer
         else
-          materializer = @cache[key] = new_row_matrializer(result)
+          materializer = @cache[key] = new_row_materializer(result)
           @cache.shift if @cache.length > @max_size
         end
 
@@ -34,7 +34,7 @@ module MiniSql
 
       private
 
-      def new_row_matrializer(result)
+      def new_row_materializer(result)
         fields = result.fields
 
         Class.new do

data/lib/mini_sql/mysql/prepared_binds.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "mini_sql/abstract/prepared_binds"
+
+module MiniSql
+  module Mysql
+    class PreparedBinds < ::MiniSql::Abstract::PreparedBinds
+
+      def bind_output(i)
+        '?'
+      end
+
+    end
+  end
+end

data/lib/mini_sql/mysql/prepared_cache.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "mini_sql/abstract/prepared_cache"
+
+module MiniSql
+  module Mysql
+    class PreparedCache < ::MiniSql::Abstract::PreparedCache
+
+      private
+
+      def alloc(sql)
+        @connection.prepare(sql)
+      end
+
+      def dealloc(statement)
+        statement.close unless statement.closed?
+      end
+
+    end
+  end
+end

data/lib/mini_sql/mysql/prepared_connection.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module MiniSql
+  module Mysql
+    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
+      end
+
+      def build(_)
+        raise 'Builder can not be called on prepared connections, instead of `::MINI_SQL.prepared.build(sql).query` use `::MINI_SQL.build(sql).prepared.query`'
+      end
+
+      def prepared(condition = true)
+        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)
+        statement.execute(
+          *binds,
+          as: as,
+          database_timezone: :utc,
+          application_timezone: :utc,
+          cast_booleans: true,
+          cast: true,
+          cache_rows: true,
+          symbolize_keys: false
+        )
+      end
+
+    end
+  end
+end

data/lib/mini_sql/postgres/connection.rb

@@ -3,7 +3,7 @@
 module MiniSql
   module Postgres
     class Connection < MiniSql::Connection
-      attr_reader :raw_connection, :type_map, :param_encoder
+      attr_reader :raw_connection, :param_encoder, :deserializer_cache
 
       def self.default_deserializer_cache
         @deserializer_cache ||= DeserializerCache.new
@@ -46,6 +46,14 @@ module MiniSql
         @type_map ||= self.class.type_map(raw_connection)
       end
 
+      def prepared(condition = true)
+        if condition
+          @prepared ||= PreparedConnection.new(self)
+        else
+          self
+        end
+      end
+
       # Returns a flat array containing all results.
       # Note, if selecting multiple columns array will be flattened
       #
@@ -90,14 +98,16 @@ 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
 
       def query_each(sql, *params)
         raise StandardError, "Please supply a block when calling query_each" if !block_given?
-        sql = param_encoder.encode(sql, *params)
+        if params && params.length > 0
+          sql = param_encoder.encode(sql, *params)
+        end
 
         raw_connection.send_query(sql)
         raw_connection.set_single_row_mode
@@ -111,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
@@ -128,7 +138,9 @@ module MiniSql
 
       def query_each_hash(sql, *params)
         raise StandardError, "Please supply a block when calling query_each_hash" if !block_given?
-        sql = param_encoder.encode(sql, *params)
+        if params && params.length > 0
+          sql = param_encoder.encode(sql, *params)
+        end
 
         raw_connection.send_query(sql)
         raw_connection.set_single_row_mode
@@ -160,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
@@ -191,7 +203,9 @@ module MiniSql
       private
 
       def run(sql, params)
-        sql = param_encoder.encode(sql, *params)
+        if params && params.length > 0
+          sql = param_encoder.encode(sql, *params)
+        end
         raw_connection.async_exec(sql)
       end
 

data/lib/mini_sql/postgres/deserializer_cache.rb

@@ -12,13 +12,13 @@ module MiniSql
       end
 
       def materializer(result)
-        key = result.fields
+        key = result.fields.join(',')
 
         materializer = @cache.delete(key)
         if materializer
           @cache[key] = materializer
         else
-          materializer = @cache[key] = new_row_matrializer(result)
+          materializer = @cache[key] = new_row_materializer(result)
           @cache.shift if @cache.length > @max_size
         end
 
@@ -28,14 +28,14 @@ module MiniSql
       def materialize(result, decorator_module = nil)
         return [] if result.ntuples == 0
 
-        key = result.fields
+        key = result.fields.join(',')
 
         # trivial fast LRU implementation
         materializer = @cache.delete(key)
         if materializer
           @cache[key] = materializer
         else
-          materializer = @cache[key] = new_row_matrializer(result)
+          materializer = @cache[key] = new_row_materializer(result)
           @cache.shift if @cache.length > @max_size
         end
 
@@ -55,7 +55,7 @@ module MiniSql
 
       private
 
-      def new_row_matrializer(result)
+      def new_row_materializer(result)
         fields = result.fields
 
         i = 0

data/lib/mini_sql/postgres/prepared_binds.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "mini_sql/abstract/prepared_binds"
+
+module MiniSql
+  module Postgres
+    class PreparedBinds < ::MiniSql::Abstract::PreparedBinds
+
+      def bind_output(i)
+        "$#{i}"
+      end
+
+    end
+  end
+end

data/lib/mini_sql/postgres/prepared_cache.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require "mini_sql/abstract/prepared_cache"
+
+module MiniSql
+  module Postgres
+    class PreparedCache < ::MiniSql::Abstract::PreparedCache
+
+      private
+
+      def alloc(sql)
+        alloc_key = next_key
+        @connection.prepare(alloc_key, sql)
+
+        alloc_key
+      end
+
+      def dealloc(key)
+        @connection.query "DEALLOCATE #{key}" if @connection.status == PG::CONNECTION_OK
+      rescue PG::Error
+      end
+
+    end
+  end
+end

data/lib/mini_sql/postgres/prepared_connection.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module MiniSql
+  module Postgres
+    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
+      end
+
+      def build(_)
+        raise 'Builder can not be called on prepared connections, instead of `::MINI_SQL.prepared.build(sql).query` use `::MINI_SQL.build(sql).prepared.query`'
+      end
+
+      def prepared(condition = true)
+        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)
+        raw_connection.exec_prepared(prepare_statement_key, binds)
+      end
+
+    end
+  end
+end

data/lib/mini_sql/postgres_jdbc/connection.rb

@@ -89,7 +89,9 @@ module MiniSql
       private
 
       def run(sql, params)
-        sql = param_encoder.encode(sql, *params)
+        if params && params.length > 0
+          sql = param_encoder.encode(sql, *params)
+        end
         conn = raw_connection
         conn.typemap = self.class.typemap
         conn.execute(sql)

data/lib/mini_sql/postgres_jdbc/deserializer_cache.rb

@@ -15,14 +15,14 @@ module MiniSql
 
         return [] if result.ntuples == 0
 
-        key = result.fields
+        key = result.fields.join(',')
 
         # trivial fast LRU implementation
         materializer = @cache.delete(key)
         if materializer
           @cache[key] = materializer
         else
-          materializer = @cache[key] = new_row_matrializer(result)
+          materializer = @cache[key] = new_row_materializer(result)
           @cache.shift if @cache.length > @max_size
         end
 
@@ -44,7 +44,7 @@ module MiniSql
 
       private
 
-      def new_row_matrializer(result)
+      def new_row_materializer(result)
         fields = result.fields
 
         Class.new do

data/lib/mini_sql/result.rb

@@ -16,5 +16,15 @@ module MiniSql
     def values
       instance_variables.map { |f| instance_variable_get(f) }
     end
+
+    def ==(other_result)
+      self.class.decorator == other_result.class.decorator &&
+      self.instance_variables == other_result.instance_variables &&
+      self.values == other_result.values
+    end
+
+    def eql?(other_result)
+      self == other_result
+    end
   end
 end

data/lib/mini_sql/serializer.rb

@@ -1,26 +1,40 @@
 # frozen_string_literal: true
 
 module MiniSql
-  module Serializer
+  class Serializer < Array
     MAX_CACHE_SIZE = 500
 
-    def self.to_json(result)
-      wrapper =
-        if result.length == 0
-          {}
-        else
-          {
-            "decorator" => result[0].class.decorator.to_s,
-            "fields" => result[0].to_h.keys,
-            "data" => result.map(&:values),
-          }
-        end
+    def initialize(result)
+      replace(result)
+    end
+
+    def self.marshallable(result)
+      new(result)
+    end
+
+    def marshal_dump
+      serialize
+    end
 
-      JSON.generate(wrapper)
+    def marshal_load(wrapper)
+      replace self.class.materialize(wrapper)
+    end
+
+    private
+
+    def serialize
+      if length == 0
+        {}
+      else
+        {
+          "decorator" => first.class.decorator.to_s,
+          "fields" => first.to_h.keys,
+          "data" => map(&:values),
+        }
+      end
     end
 
-    def self.from_json(json)
-      wrapper = JSON.parse(json)
+    def self.materialize(wrapper)
       if !wrapper["data"]
         []
       else

data/lib/mini_sql/sqlite/connection.rb

@@ -11,6 +11,14 @@ module MiniSql
         @deserializer_cache = (args && args[:deserializer_cache]) || DeserializerCache.new
       end
 
+      def prepared(condition = true)
+        if condition
+          @prepared ||= PreparedConnection.new(self)
+        else
+          self
+        end
+      end
+
       def query_single(sql, *params)
         # a bit lazy can be optimized
         run(sql, *params).flatten!
@@ -63,10 +71,14 @@ module MiniSql
       private
 
       def run(sql, *params)
-        sql = param_encoder.encode(sql, *params)
+        if params && params.length > 0
+          sql = param_encoder.encode(sql, *params)
+        end
         if block_given?
           stmt = SQLite3::Statement.new(raw_connection, sql)
-          yield stmt.execute
+          result = yield stmt.execute
+          stmt.close
+          result
         else
           raw_connection.execute(sql)
         end