mini_sql 0.2.2 → 1.0

data/lib/mini_sql/mysql/deserializer_cache.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module MiniSql
+  module Mysql
+    class DeserializerCache
+
+      DEFAULT_MAX_SIZE = 500
+
+      def initialize(max_size = nil)
+        @cache = {}
+        @max_size = max_size || DEFAULT_MAX_SIZE
+      end
+
+      def materialize(result, decorator_module = nil)
+        key = result.fields
+
+        # trivial fast LRU implementation
+        materializer = @cache.delete(key)
+        if materializer
+          @cache[key] = materializer
+        else
+          materializer = @cache[key] = new_row_matrializer(result)
+          @cache.shift if @cache.length > @max_size
+        end
+
+        if decorator_module
+          materializer = materializer.decorated(decorator_module)
+        end
+
+        result.map do |data|
+          materializer.materialize(data)
+        end
+      end
+
+      private
+
+      def new_row_matrializer(result)
+        fields = result.fields
+
+        Class.new do
+          extend MiniSql::Decoratable
+          include MiniSql::Result
+
+          attr_accessor(*fields)
+
+          instance_eval <<~RUBY
+            def materialize(data)
+              r = self.new
+              #{col = -1; fields.map { |f| "r.#{f} = data[#{col += 1}]" }.join("; ")}
+              r
+            end
+          RUBY
+        end
+      end
+    end
+  end
+end

data/lib/mini_sql/postgres/coders.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MiniSql
   module Postgres
     module Coders

data/lib/mini_sql/postgres/connection.rb

@@ -39,6 +39,7 @@ module MiniSql
         @raw_connection = raw_connection
         @deserializer_cache = (args && args[:deserializer_cache]) || self.class.default_deserializer_cache
         @param_encoder = (args && args[:param_encoder]) || InlineParamEncoder.new(self)
+        @type_map = args && args[:type_map]
       end
 
       def type_map
@@ -78,6 +79,14 @@ module MiniSql
         result.clear if result
       end
 
+      def query_array(sql, *params)
+        result = run(sql, params)
+        result.type_map = type_map
+        result.values
+      ensure
+        result.clear if result
+      end
+
       def query(sql, *params)
         result = run(sql, params)
         result.type_map = type_map
@@ -86,6 +95,76 @@ module MiniSql
         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)
+
+        raw_connection.send_query(sql)
+        raw_connection.set_single_row_mode
+
+        loop do
+          result = raw_connection.get_result
+          break if !result
+
+          result.check
+
+          if result.ntuples == 0
+            # skip, this happens at the end when we get totals
+          else
+            materializer ||= @deserializer_cache.materializer(result)
+            result.type_map = type_map
+            i = 0
+            # technically we should only get 1 row here
+            # but protect against future batching changes
+            while i < result.ntuples
+              yield materializer.materialize(result, i)
+              i += 1
+            end
+          end
+
+          result.clear
+        end
+      end
+
+      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)
+
+        raw_connection.send_query(sql)
+        raw_connection.set_single_row_mode
+
+        loop do
+          result = raw_connection.get_result
+          break if !result
+
+          result.check
+
+          if result.ntuples == 0
+            # skip, this happens at the end when we get totals
+          else
+            result.type_map = type_map
+            i = 0
+
+            # technically we should only get 1 row here
+            # but protect against future batching changes
+            while i < result.ntuples
+              yield result[i]
+              i += 1
+            end
+          end
+
+          result.clear
+        end
+      end
+
+      def query_decorator(decorator, sql, *params)
+        result = run(sql, params)
+        result.type_map = type_map
+        @deserializer_cache.materialize(result, decorator)
+      ensure
+        result.clear if result
+      end
+
       def exec(sql, *params)
         result = run(sql, params)
         result.cmd_tuples
@@ -112,9 +191,7 @@ module MiniSql
       private
 
       def run(sql, params)
-        if params && params.length > 0
-          sql = param_encoder.encode(sql, *params)
-        end
+        sql = param_encoder.encode(sql, *params)
         raw_connection.async_exec(sql)
       end
 

data/lib/mini_sql/postgres/deserializer_cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MiniSql
   module Postgres
     class DeserializerCache
@@ -9,8 +11,21 @@ module MiniSql
         @max_size = max_size || DEFAULT_MAX_SIZE
       end
 
-      def materialize(result)
+      def materializer(result)
+        key = result.fields
+
+        materializer = @cache.delete(key)
+        if materializer
+          @cache[key] = materializer
+        else
+          materializer = @cache[key] = new_row_matrializer(result)
+          @cache.shift if @cache.length > @max_size
+        end
+
+        materializer
+      end
 
+      def materialize(result, decorator_module = nil)
         return [] if result.ntuples == 0
 
         key = result.fields
@@ -24,6 +39,10 @@ module MiniSql
           @cache.shift if @cache.length > @max_size
         end
 
+        if decorator_module
+          materializer = materializer.decorated(decorator_module)
+        end
+
         i = 0
         r = []
         # quicker loop
@@ -39,24 +58,25 @@ module MiniSql
       def new_row_matrializer(result)
         fields = result.fields
 
-        Class.new do
-          attr_accessor(*fields)
+        i = 0
+        while i < fields.length
+          # special handling for unamed column
+          if fields[i] == "?column?"
+            fields[i] = "column#{i}"
+          end
+          i += 1
+        end
 
-          # AM serializer support
-          alias :read_attribute_for_serialization :send
+        Class.new do
+          extend MiniSql::Decoratable
+          include MiniSql::Result
 
-          def to_h
-            r = {}
-            instance_variables.each do |f|
-              r[f.to_s.sub('@','').to_sym] = instance_variable_get(f)
-            end
-            r
-          end
+          attr_accessor(*fields)
 
           instance_eval <<~RUBY
             def materialize(pg_result, index)
               r = self.new
-              #{col=-1; fields.map{|f| "r.#{f} = pg_result.getvalue(index, #{col+=1})"}.join("; ")}
+              #{col = -1; fields.map { |f| "r.#{f} = pg_result.getvalue(index, #{col += 1})" }.join("; ")}
               r
             end
           RUBY

data/lib/mini_sql/postgres_jdbc/connection.rb

@@ -60,6 +60,11 @@ module MiniSql
         @deserializer_cache.materialize(result)
       end
 
+      def query_decorator(decorator, sql, *params)
+        result = run(sql, params)
+        @deserializer_cache.materialize(result, decorator)
+      end
+
       def exec(sql, *params)
         result = run(sql, params)
         if result.kind_of? Integer
@@ -84,7 +89,7 @@ module MiniSql
       private
 
       def run(sql, params)
-        sql = param_encoder.encode(sql, *params) if params && params.length > 0
+        sql = param_encoder.encode(sql, *params)
         conn = raw_connection
         conn.typemap = self.class.typemap
         conn.execute(sql)

data/lib/mini_sql/postgres_jdbc/deserializer_cache.rb

@@ -1,67 +1,67 @@
+# frozen_string_literal: true
+
 module MiniSql
   module Postgres
     class DeserializerCache
 
-    DEFAULT_MAX_SIZE = 500
+      DEFAULT_MAX_SIZE = 500
 
-    def initialize(max_size = nil)
-      @cache = {}
-      @max_size = max_size || DEFAULT_MAX_SIZE
-    end
+      def initialize(max_size = nil)
+        @cache = {}
+        @max_size = max_size || DEFAULT_MAX_SIZE
+      end
 
-    def materialize(result)
+      def materialize(result, decorator_module = nil)
 
-      return [] if result.ntuples == 0
+        return [] if result.ntuples == 0
 
-      key = result.fields
+        key = result.fields
 
-      # trivial fast LRU implementation
-      materializer = @cache.delete(key)
-      if materializer
-        @cache[key] = materializer
-      else
-        materializer = @cache[key] = new_row_matrializer(result)
-        @cache.shift if @cache.length > @max_size
-      end
+        # trivial fast LRU implementation
+        materializer = @cache.delete(key)
+        if materializer
+          @cache[key] = materializer
+        else
+          materializer = @cache[key] = new_row_matrializer(result)
+          @cache.shift if @cache.length > @max_size
+        end
 
-      i = 0
-      r = []
-      # quicker loop
-      while i < result.ntuples
-        r << materializer.materialize(result, i)
-        i += 1
-      end
-      r
-    end
+        materializer.include(decorator_module) if decorator_module
 
-    private
+        if decorator_module
+          materializer = materializer.decorated(decorator_module)
+        end
+
+        i = 0
+        r = []
+        # quicker loop
+        while i < result.ntuples
+          r << materializer.materialize(result, i)
+          i += 1
+        end
+        r
+      end
 
-    def new_row_matrializer(result)
-      fields = result.fields
+      private
 
-      Class.new do
-        attr_accessor(*fields)
+      def new_row_matrializer(result)
+        fields = result.fields
 
-        # AM serializer support
-        alias :read_attribute_for_serialization :send
+        Class.new do
+          extend MiniSql::Decoratable
+          include MiniSql::Result
 
-        def to_h
-          r = {}
-          instance_variables.each do |f|
-            r[f.to_s.sub('@','').to_sym] = instance_variable_get(f)
-          end
-          r
-        end
+          attr_accessor(*fields)
 
-        instance_eval <<~RUBY
+          instance_eval <<~RUBY
             def materialize(pg_result, index)
               r = self.new
-              #{col=-1; fields.map{|f| "r.#{f} = pg_result.getvalue(index, #{col+=1})"}.join("; ")}
+              #{col = -1; fields.map { |f| "r.#{f} = pg_result.getvalue(index, #{col += 1})" }.join("; ")}
               r
             end
-        RUBY
+          RUBY
+        end
       end
     end
   end
 end
-end

data/lib/mini_sql/result.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module MiniSql
+  module Result
+    # AM serializer support
+    alias :read_attribute_for_serialization :send
+
+    def to_h
+      r = {}
+      instance_variables.each do |f|
+        r[f.to_s.delete_prefix('@').to_sym] = instance_variable_get(f)
+      end
+      r
+    end
+
+    def values
+      instance_variables.map { |f| instance_variable_get(f) }
+    end
+  end
+end

data/lib/mini_sql/serializer.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module MiniSql
+  module Serializer
+    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
+
+      JSON.generate(wrapper)
+    end
+
+    def self.from_json(json)
+      wrapper = JSON.parse(json)
+      if !wrapper["data"]
+        []
+      else
+        materializer = cached_materializer(wrapper['fields'], wrapper['decorator'])
+        wrapper["data"].map do |row|
+          materializer.materialize(row)
+        end
+      end
+    end
+
+    def self.cached_materializer(fields, decorator_module = nil)
+      @cache ||= {}
+      key = fields
+      m = @cache.delete(key)
+      if m
+        @cache[key] = m
+      else
+        m = @cache[key] = materializer(fields)
+        @cache.shift if @cache.length > MAX_CACHE_SIZE
+      end
+
+      if decorator_module && decorator_module.length > 0
+        decorator = Kernel.const_get(decorator_module)
+        m = m.decorated(decorator)
+      end
+
+      m
+    end
+
+    def self.materializer(fields)
+      Class.new do
+        extend MiniSql::Decoratable
+        include MiniSql::Result
+
+        attr_accessor(*fields)
+
+        instance_eval <<~RUBY
+          def materialize(values)
+            r = self.new
+            #{col = -1; fields.map { |f| "r.#{f} = values[#{col += 1}]" }.join("; ")}
+            r
+          end
+        RUBY
+      end
+    end
+  end
+end