mini_sql 0.2.4 → 0.2.5

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 "'#{conn.escape_string(value.to_s)}'"
       else raise TypeError, "can't quote #{value.class.name}"
       end
     end

data/lib/mini_sql/mysql/connection.rb

@@ -20,6 +20,10 @@ module MiniSql
         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
@@ -30,6 +34,11 @@ module MiniSql
         @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
@@ -45,9 +54,9 @@ module MiniSql
           sql = param_encoder.encode(sql, *params)
         end
         raw_connection.query(
-          sql, 
-          as: as, 
-          database_timezone: :utc, 
+          sql,
+          as: as,
+          database_timezone: :utc,
           application_timezone: :utc,
           cast_booleans: true,
           cast: true,

data/lib/mini_sql/mysql/deserializer_cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MiniSql
   module Mysql
     class DeserializerCache
@@ -9,7 +11,7 @@ module MiniSql
         @max_size = max_size || DEFAULT_MAX_SIZE
       end
 
-      def materialize(result)
+      def materialize(result, decorator_module = nil)
         key = result.fields
 
         # trivial fast LRU implementation
@@ -21,6 +23,8 @@ module MiniSql
           @cache.shift if @cache.length > @max_size
         end
 
+        materializer.include(decorator_module) if decorator_module
+
         result.map do |data|
           materializer.materialize(data)
         end
@@ -40,7 +44,7 @@ module MiniSql
           def to_h
             r = {}
             instance_variables.each do |f|
-              r[f.to_s.sub('@','').to_sym] = instance_variable_get(f)
+              r[f.to_s.sub('@', '').to_sym] = instance_variable_get(f)
             end
             r
           end
@@ -48,7 +52,7 @@ module MiniSql
           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/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,14 @@ module MiniSql
         result.clear if result
       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

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,7 @@ module MiniSql
         @max_size = max_size || DEFAULT_MAX_SIZE
       end
 
-      def materialize(result)
-
+      def materialize(result, decorator_module = nil)
         return [] if result.ntuples == 0
 
         key = result.fields
@@ -24,6 +25,8 @@ module MiniSql
           @cache.shift if @cache.length > @max_size
         end
 
+        materializer.include(decorator_module) if decorator_module
+
         i = 0
         r = []
         # quicker loop
@@ -48,7 +51,7 @@ module MiniSql
           def to_h
             r = {}
             instance_variables.each do |f|
-              r[f.to_s.sub('@','').to_sym] = instance_variable_get(f)
+              r[f.to_s.sub('@', '').to_sym] = instance_variable_get(f)
             end
             r
           end
@@ -56,7 +59,7 @@ module MiniSql
           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

data/lib/mini_sql/postgres_jdbc/deserializer_cache.rb

@@ -1,67 +1,71 @@
+# 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
+
+        materializer.include(decorator_module) if decorator_module
 
-      i = 0
-      r = []
-      # quicker loop
-      while i < result.ntuples
-        r << materializer.materialize(result, i)
-        i += 1
+        i = 0
+        r = []
+        # quicker loop
+        while i < result.ntuples
+          r << materializer.materialize(result, i)
+          i += 1
+        end
+        r
       end
-      r
-    end
 
-    private
+      private
 
-    def new_row_matrializer(result)
-      fields = result.fields
+      def new_row_matrializer(result)
+        fields = result.fields
 
-      Class.new do
-        attr_accessor(*fields)
+        Class.new do
+          attr_accessor(*fields)
 
-        # AM serializer support
-        alias :read_attribute_for_serialization :send
+          # 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)
+          def to_h
+            r = {}
+            instance_variables.each do |f|
+              r[f.to_s.sub('@', '').to_sym] = instance_variable_get(f)
+            end
+            r
           end
-          r
-        end
 
-        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/sqlite/connection.rb

@@ -26,6 +26,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 +50,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

data/lib/mini_sql/sqlite/deserializer_cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MiniSql
   module Sqlite
     class DeserializerCache
@@ -9,7 +11,7 @@ module MiniSql
         @max_size = max_size || DEFAULT_MAX_SIZE
       end
 
-      def materialize(result)
+      def materialize(result, decorator_module = nil)
 
         key = result.columns
 
@@ -22,6 +24,8 @@ module MiniSql
           @cache.shift if @cache.length > @max_size
         end
 
+        materializer.include(decorator_module) if decorator_module
+
         r = []
         # quicker loop
         while !result.eof?
@@ -47,7 +51,7 @@ module MiniSql
           def to_h
             r = {}
             instance_variables.each do |f|
-              r[f.to_s.sub('@','').to_sym] = instance_variable_get(f)
+              r[f.to_s.sub('@', '').to_sym] = instance_variable_get(f)
             end
             r
           end
@@ -55,7 +59,7 @@ module MiniSql
           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/version.rb

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

data/mini_sql.gemspec

@@ -25,9 +25,11 @@ 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 DiscoruseCops/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 DiscoruseCops/NoChdir
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "> 1.16"
@@ -36,6 +38,8 @@ Gem::Specification.new do |spec|
   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', '~> 0.79.0'
+  spec.add_development_dependency 'rubocop-discourse', '~> 1.0.2'
 
   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: 0.2.5
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-16 00:00:00.000000000 Z
+date: 2020-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,34 @@ 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: 0.79.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.79.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-discourse
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +172,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop-https---raw-githubusercontent-com-discourse-discourse-master--rubocop-yml"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG
 - CODE_OF_CONDUCT.md