mini_sql 0.2.4 → 1.1.0

data/lib/mini_sql/serializer.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+module MiniSql
+  class Serializer < Array
+    MAX_CACHE_SIZE = 500
+
+    def initialize(result)
+      replace(result)
+    end
+
+    def self.marshallable(result)
+      new(result)
+    end
+
+    def marshal_dump
+      serialize
+    end
+
+    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.materialize(wrapper)
+      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

data/lib/mini_sql/sqlite/connection.rb

@@ -9,6 +9,12 @@ module MiniSql
         @raw_connection = raw_connection
         @param_encoder = (args && args[:param_encoder]) || InlineParamEncoder.new(self)
         @deserializer_cache = (args && args[:deserializer_cache]) || DeserializerCache.new
+
+        @prepared = PreparedConnection.new(self, @deserializer_cache)
+      end
+
+      def prepared(condition = true)
+        condition ? @prepared : self
       end
 
       def query_single(sql, *params)
@@ -26,6 +32,10 @@ module MiniSql
         r
       end
 
+      def query_array(sql, *params)
+        run(sql, *params)
+      end
+
       def exec(sql, *params)
 
         start = raw_connection.total_changes
@@ -46,8 +56,14 @@ module MiniSql
         end
       end
 
+      def query_decorator(decorator, sql, *params)
+        run(sql, *params) do |set|
+          deserializer_cache.materialize(set, decorator)
+        end
+      end
+
       def escape_string(str)
-        str.gsub("'","''")
+        str.gsub("'", "''")
       end
 
       private
@@ -58,7 +74,9 @@ module MiniSql
         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

data/lib/mini_sql/sqlite/deserializer_cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MiniSql
   module Sqlite
     class DeserializerCache
@@ -9,19 +11,23 @@ module MiniSql
         @max_size = max_size || DEFAULT_MAX_SIZE
       end
 
-      def materialize(result)
+      def materialize(result, decorator_module = nil)
 
-        key = result.columns
+        key = result.columns.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
 
+        if decorator_module
+          materializer = materializer.decorated(decorator_module)
+        end
+
         r = []
         # quicker loop
         while !result.eof?
@@ -35,27 +41,19 @@ module MiniSql
 
       private
 
-      def new_row_matrializer(result)
+      def new_row_materializer(result)
         fields = result.columns
 
         Class.new do
-          attr_accessor(*fields)
+          extend MiniSql::Decoratable
+          include MiniSql::Result
 
-          # AM serializer support
-          alias :read_attribute_for_serialization :send
-
-          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(data)
               r = self.new
-              #{col=-1; fields.map{|f| "r.#{f} = data[#{col+=1}]"}.join("; ")}
+              #{col = -1; fields.map { |f| "r.#{f} = data[#{col += 1}]" }.join("; ")}
               r
             end
           RUBY

data/lib/mini_sql/sqlite/prepared_binds.rb

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

data/lib/mini_sql/sqlite/prepared_cache.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "mini_sql/abstract/prepared_cache"
+
+module MiniSql
+  module Sqlite
+    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/sqlite/prepared_connection.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module MiniSql
+  module Sqlite
+    class PreparedConnection < Connection
+
+      attr_reader :unprepared
+
+      def initialize(unprepared_connection, deserializer_cache)
+        @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)
+        @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
+
+      private def run(sql, params)
+        prepared_sql, binds, _bind_names = @param_binder.bind(sql, params)
+        statement = @prepared_cache.prepare_statement(prepared_sql)
+        statement.bind_params(binds)
+        if block_given?
+          yield statement.execute
+        else
+          statement.execute.to_a
+        end
+      end
+
+    end
+  end
+end

data/lib/mini_sql/version.rb

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

data/mini_sql.gemspec

@@ -25,17 +25,22 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  # rubocop:disable Discourse/NoChdir
+  spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
+  # rubocop:enable Discourse/NoChdir
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "> 10"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-minitest", "~> 2.4"
   spec.add_development_dependency "activesupport", "~> 5.2"
+  spec.add_development_dependency 'rubocop', '~> 1.4.0'
+  spec.add_development_dependency 'rubocop-discourse', '~> 2.4.1'
+  spec.add_development_dependency 'm', '~> 1.5.1'
 
   if RUBY_ENGINE == 'jruby'
     spec.add_development_dependency "activerecord-jdbcpostgresql-adapter", "~> 52.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_sql
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Sam Saffron
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-16 00:00:00.000000000 Z
+date: 2021-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-discourse
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.1
+- !ruby/object:Gem::Dependency
+  name: m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -143,8 +185,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
+- ".rubocop-https---raw-githubusercontent-com-discourse-discourse-master--rubocop-yml"
+- ".rubocop.yml"
 - CHANGELOG
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -152,25 +196,45 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bench/builder_perf.rb
+- bench/decorator_perf.rb
+- bench/mini_sql_methods_perf.rb
+- bench/prepared_perf.rb
+- bench/shared/generate_data.rb
 - bench/timestamp_perf.rb
 - bench/topic_mysql_perf.rb
 - bench/topic_perf.rb
+- bench/topic_wide_perf.rb
 - bin/console
 - bin/setup
 - lib/mini_sql.rb
+- lib/mini_sql/abstract/prepared_binds.rb
+- lib/mini_sql/abstract/prepared_cache.rb
 - lib/mini_sql/builder.rb
 - lib/mini_sql/connection.rb
+- lib/mini_sql/decoratable.rb
 - lib/mini_sql/deserializer_cache.rb
 - lib/mini_sql/inline_param_encoder.rb
 - lib/mini_sql/mysql/connection.rb
 - lib/mini_sql/mysql/deserializer_cache.rb
+- lib/mini_sql/mysql/prepared_binds.rb
+- lib/mini_sql/mysql/prepared_cache.rb
+- lib/mini_sql/mysql/prepared_connection.rb
 - lib/mini_sql/postgres/coders.rb
 - lib/mini_sql/postgres/connection.rb
 - lib/mini_sql/postgres/deserializer_cache.rb
+- lib/mini_sql/postgres/prepared_binds.rb
+- lib/mini_sql/postgres/prepared_cache.rb
+- lib/mini_sql/postgres/prepared_connection.rb
 - lib/mini_sql/postgres_jdbc/connection.rb
 - lib/mini_sql/postgres_jdbc/deserializer_cache.rb
+- lib/mini_sql/result.rb
+- lib/mini_sql/serializer.rb
 - lib/mini_sql/sqlite/connection.rb
 - lib/mini_sql/sqlite/deserializer_cache.rb
+- lib/mini_sql/sqlite/prepared_binds.rb
+- lib/mini_sql/sqlite/prepared_cache.rb
+- lib/mini_sql/sqlite/prepared_connection.rb
 - lib/mini_sql/version.rb
 - mini_sql.gemspec
 homepage: https://github.com/discourse/mini_sql
@@ -180,7 +244,7 @@ metadata:
   bug_tracker_uri: https://github.com/discourse/mini_sql/issues
   source_code_uri: https://github.com/discourse/mini_sql
   changelog_uri: https://github.com/discourse/mini_sql/blob/master/CHANGELOG
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -195,8 +259,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.2
+signing_key:
 specification_version: 4
 summary: A fast, safe, simple direct SQL executor
 test_files: []