mini_sql 0.2.2 → 1.0

data/bench/topic_perf.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/inline'
 
 gemfile do
@@ -12,6 +14,7 @@ gemfile do
   gem 'sequel', github: 'jeremyevans/sequel'
   gem 'sequel_pg', github: 'jeremyevans/sequel_pg', require: 'sequel'
   gem 'swift-db-postgres', github: 'deepfryed/swift-db-postgres'
+  gem 'draper'
 end
 
 require 'sequel'
@@ -89,7 +92,6 @@ end
 class TopicSequel < Sequel::Model(:topics)
 end
 
-
 Topic.transaction do
   topic = {
   }
@@ -148,7 +150,7 @@ def pg_title_id
   s
 end
 
-$mini_sql = MiniSql::Connection.new($conn)
+$mini_sql = MiniSql::Connection.get($conn)
 
 def mini_sql_title_id
   s = +""
@@ -184,7 +186,7 @@ def mini_sql_title_id_query_single
   r = $mini_sql.query_single(-"select id, title from topics order by id limit 1000")
   while i < r.length
     s << r[i].to_s
-    s << r[i+1]
+    s << r[i + 1]
     i += 2
   end
   s
@@ -193,8 +195,8 @@ end
 # connects over unix socket
 $swift = Swift::DB::Postgres.new(db: "test_db")
 
-def swift_select_title_id(l=1000)
-  s = ""
+def swift_select_title_id(l = 1000)
+  s = +''
   i = 0
   r = $swift.execute("select id, title from topics order by id limit 1000")
   while i < r.selected_rows
@@ -218,6 +220,174 @@ results = [
 
 exit(-1) unless results.uniq.length == 1
 
+# https://github.com/drapergem/draper
+class TopicDraper < Draper::Decorator
+  delegate :id
+
+  def title_bang
+    object.title + '!!!'
+  end
+end
+
+# https://ruby-doc.org/stdlib-2.5.1/libdoc/delegate/rdoc/SimpleDelegator.html
+class TopicSimpleDelegator < SimpleDelegator
+  def title_bang
+    title + '!!!'
+  end
+end
+
+class TopicDecoratorSequel < TopicSequel
+  def title_bang
+    title + '!!!'
+  end
+end
+
+class TopicArModel < Topic
+  def title_bang
+    title + '!!!'
+  end
+end
+
+module TopicDecorator
+  def title_bang
+    title + '!!!'
+  end
+end
+
+Benchmark.ips do |r|
+  r.report('query_decorator') do |n|
+    while n > 0
+      $mini_sql.query_decorator(TopicDecorator, 'select id, title from topics order by id limit 1000').each do |obj|
+        obj.title_bang
+        obj.id
+      end
+      n -= 1
+    end
+  end
+  r.report('extend') do |n|
+    while n > 0
+      $mini_sql.query('select id, title from topics order by id limit 1000').each do |obj|
+        d_obj = obj.extend(TopicDecorator)
+        d_obj.title_bang
+        d_obj.id
+      end
+      n -= 1
+    end
+  end
+  r.report('draper') do |n|
+    while n > 0
+      $mini_sql.query('select id, title from topics order by id limit 1000').each do |obj|
+        d_obj = TopicDraper.new(obj)
+        d_obj.title_bang
+        d_obj.id
+      end
+      n -= 1
+    end
+  end
+  r.report('simple_delegator') do |n|
+    while n > 0
+      $mini_sql.query('select id, title from topics order by id limit 1000').each do |obj|
+        d_obj = TopicSimpleDelegator.new(obj)
+        d_obj.title_bang
+        d_obj.id
+      end
+      n -= 1
+    end
+  end
+  r.report('query') do |n|
+    while n > 0
+      $mini_sql.query('select id, title from topics order by id limit 1000').each do |obj|
+        obj.title + '!!!'
+        obj.id
+      end
+      n -= 1
+    end
+  end
+  r.report('ar model') do |n|
+    while n > 0
+      TopicArModel.limit(1000).order(:id).select(:id, :title).each do |obj|
+        obj.title_bang
+        obj.id
+      end
+      n -= 1
+    end
+  end
+  r.report('sequel model') do |n|
+    while n > 0
+      TopicDecoratorSequel.limit(1000).order(:id).select(:id, :title).each do |obj|
+        obj.title_bang
+        obj.id
+      end
+      n -= 1
+    end
+  end
+
+  r.compare!
+end
+
+# Comparison:
+#                query:      828.4 i/s
+#      query_decorator:      819.3 i/s - same-ish: difference falls within error
+#         sequel model:      672.4 i/s - 1.23x  slower
+#               extend:      519.4 i/s - 1.59x  slower
+#     simple_delegator:      496.8 i/s - 1.67x  slower
+#               draper:      416.2 i/s - 1.99x  slower
+#             ar model:      113.4 i/s - 7.30x  slower
+
+Benchmark.ips do |r|
+  r.report('query_hash') do |n|
+    while n > 0
+      $mini_sql.query_hash('select id, title from topics order by id limit 1000').each do |hash|
+        [hash['id'], hash['title']]
+      end
+      n -= 1
+    end
+  end
+  r.report('query_array') do |n|
+    while n > 0
+      $mini_sql.query_array('select id, title from topics order by id limit 1000').each do |id, title|
+        [id, title]
+      end
+      n -= 1
+    end
+  end
+  r.report('query') do |n|
+    while n > 0
+      $mini_sql.query('select id, title from topics order by id limit 1000').each do |obj|
+        [obj.id, obj.title]
+      end
+      n -= 1
+    end
+  end
+
+  r.compare!
+end
+
+# Comparison:
+#         query_array:     1351.6 i/s
+#               query:      963.8 i/s - 1.40x  slower
+#          query_hash:      787.4 i/s - 1.72x  slower
+
+Benchmark.ips do |r|
+  r.report('query_single') do |n|
+    while n > 0
+      $mini_sql.query_single('select id from topics order by id limit 1000')
+      n -= 1
+    end
+  end
+  r.report('query_array') do |n|
+    while n > 0
+      $mini_sql.query_array('select id from topics order by id limit 1000').flatten
+      n -= 1
+    end
+  end
+
+  r.compare!
+end
+
+# Comparison:
+#        query_single:     2368.9 i/s
+#         query_array:     1350.1 i/s - 1.75x  slower
 
 Benchmark.ips do |r|
   r.report("ar select title id") do |n|
@@ -271,8 +441,6 @@ Benchmark.ips do |r|
   r.compare!
 end
 
-
-
 def wide_topic_ar
   Topic.first
 end
@@ -320,7 +488,6 @@ Benchmark.ips do |r|
   r.compare!
 end
 
-
 # Comparison:
 #   pg select title id:     1519.7 i/s
 # mini_sql query_single title id:     1335.0 i/s - 1.14x  slower
@@ -338,10 +505,7 @@ end
 #    wide topic sequel:     5696.8 i/s - 1.31x  slower
 #        wide topic ar:     2515.0 i/s - 2.97x  slower
 
-
-
 # to run deep analysis run
 # MemoryProfiler.report do
 #   ar
 # end.pretty_print
-

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "bundler/setup"
 require "mini_sql"

data/lib/mini_sql.rb

@@ -8,6 +8,9 @@ require_relative "mini_sql/connection"
 require_relative "mini_sql/deserializer_cache"
 require_relative "mini_sql/builder"
 require_relative "mini_sql/inline_param_encoder"
+require_relative "mini_sql/decoratable"
+require_relative "mini_sql/serializer"
+require_relative "mini_sql/result"
 
 module MiniSql
   if RUBY_ENGINE == 'jruby'
@@ -26,5 +29,10 @@ module MiniSql
       autoload :Connection, "mini_sql/sqlite/connection"
       autoload :DeserializerCache, "mini_sql/sqlite/deserializer_cache"
     end
+
+    module Mysql
+      autoload :Connection, "mini_sql/mysql/connection"
+      autoload :DeserializerCache, "mini_sql/mysql/deserializer_cache"
+    end
   end
 end

data/lib/mini_sql/builder.rb

@@ -57,7 +57,6 @@ class MiniSql::Builder
       def #{m}(hash_args = nil)
         hash_args = @args.merge(hash_args) if hash_args && @args
         hash_args ||= @args
-
         if hash_args
           @connection.#{m}(to_sql, hash_args)
         else
@@ -67,5 +66,14 @@ class MiniSql::Builder
     RUBY
   end
 
-end
+  def query_decorator(decorator, hash_args = nil)
+    hash_args = @args.merge(hash_args) if hash_args && @args
+    hash_args ||= @args
+    if hash_args
+      @connection.query_decorator(decorator, to_sql, hash_args)
+    else
+      @connection.query_decorator(decorator, to_sql)
+    end
+  end
 
+end

data/lib/mini_sql/connection.rb

@@ -4,12 +4,14 @@ module MiniSql
   class Connection
 
     def self.get(raw_connection, options = {})
-      if (defined? ::PG::Connection) && (PG::Connection === raw_connection) 
+      if (defined? ::PG::Connection) && (PG::Connection === raw_connection)
         Postgres::Connection.new(raw_connection, options)
       elsif (defined? ::ArJdbc)
         Postgres::Connection.new(raw_connection, options)
       elsif (defined? ::SQLite3::Database) && (SQLite3::Database === raw_connection)
         Sqlite::Connection.new(raw_connection, options)
+      elsif (defined? ::Mysql2::Client) && (Mysql2::Client === raw_connection)
+        Mysql::Connection.new(raw_connection, options)
       else
         raise ArgumentError, 'unknown connection type!'
       end
@@ -29,11 +31,23 @@ module MiniSql
       raise NotImplementedError, "must be implemented by child connection"
     end
 
-    def exec(sql, *params)
+    def query_hash(sql, *params)
       raise NotImplementedError, "must be implemented by child connection"
     end
 
-    def query_hash(sql, *params)
+    def query_decorator(sql, *params)
+      raise NotImplementedError, "must be implemented by child connection"
+    end
+
+    def query_each(sql, *params)
+      raise NotImplementedError, "must be implemented by child connection"
+    end
+
+    def query_each_hash(sql, *params)
+      raise NotImplementedError, "must be implemented by child connection"
+    end
+
+    def exec(sql, *params)
       raise NotImplementedError, "must be implemented by child connection"
     end
 

data/lib/mini_sql/decoratable.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module MiniSql
+  module Decoratable
+    def decorated(mod)
+      @decoratorated_classes ||= {}
+      @decoratorated_classes[mod] ||=
+        Class.new(self) do
+          include(mod)
+          instance_eval <<~RUBY
+            def decorator
+              #{mod}
+            end
+          RUBY
+        end
+    end
+
+    def decorator
+      nil
+    end
+  end
+end

data/lib/mini_sql/deserializer_cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MiniSql
   class DeserializerCache
     # method takes a raw result and converts to proper objects

data/lib/mini_sql/inline_param_encoder.rb

@@ -50,19 +50,19 @@ module MiniSql
 
     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 Date, Time then "'#{quoted_date(value)}'"
+      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
         value.map do |v|
           quote_val(v)
         end.join(', ')
-      when String
-        "'#{conn.escape_string(value.to_s)}'"
-      when true       then "true"
-      when false      then "false"
-      when nil        then "NULL"
-      when BigDecimal then value.to_s("F")
-      when Numeric then value.to_s
-      when Date, Time then "'#{quoted_date(value)}'"
-      when Symbol     then "'#{escape_string(value.to_s)}'"
       else raise TypeError, "can't quote #{value.class.name}"
       end
     end

data/lib/mini_sql/mysql/connection.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module MiniSql
+  module Mysql
+    class Connection < MiniSql::Connection
+      attr_reader :param_encoder, :raw_connection, :deserializer_cache
+
+      def initialize(raw_connection, args = nil)
+        @raw_connection = raw_connection
+        @param_encoder = (args && args[:param_encoder]) || InlineParamEncoder.new(self)
+        @deserializer_cache = (args && args[:deserializer_cache]) || DeserializerCache.new
+      end
+
+      def query_single(sql, *params)
+        run(sql, :array, params).to_a.flatten!
+      end
+
+      def query_hash(sql, *params)
+        result = run(sql, :hash, params)
+        result.to_a
+      end
+
+      def query_array(sql, *params)
+        run(sql, :array, params).to_a
+      end
+
+      def exec(sql, *params)
+        run(sql, :array, params)
+        raw_connection.affected_rows
+      end
+
+      def query(sql, *params)
+        result = run(sql, :array, params)
+        @deserializer_cache.materialize(result)
+      end
+
+      def query_decorator(decorator, sql, *params)
+        result = run(sql, :array, params)
+        @deserializer_cache.materialize(result, decorator)
+      end
+
+      def escape_string(str)
+        raw_connection.escape(str)
+      end
+
+      def build(sql)
+        Builder.new(self, sql)
+      end
+
+      private
+
+      def run(sql, as, params)
+        sql = param_encoder.encode(sql, *params)
+        raw_connection.query(
+          sql,
+          as: as,
+          database_timezone: :utc,
+          application_timezone: :utc,
+          cast_booleans: true,
+          cast: true,
+          cache_rows: true,
+          symbolize_keys: false
+        )
+      end
+    end
+  end
+end