mini_sql 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e88eaeeb85de88eed3c83b12481b9682a1de4327ee433098a46932866884c1d3
-  data.tar.gz: eac737d3b6281392099675b6d3bcd25d6493d836d66204fa7de229583c2a3be8
+  metadata.gz: '00878f2e4f4b73c65e00aa20314193a4cd6626ff1cd43aa41d28aba5ccaa3d2f'
+  data.tar.gz: 48a868434abfc2aad3da5b5d40e74fca0763a0b712e43f4a606b0d8401329ac4
 SHA512:
-  metadata.gz: 166faf87640bb2a07fe7d2f4e146274f7229f8c56f61e4160c1296a7f5d9587a5e11be09168abd792807f3bc5a08cec21b835e2ae81dc978c175bec6e155d607
-  data.tar.gz: d43a73fa9abb29de17005b4e361c607509c7a34a82b88e07ad2a344820c3c1efe7bfced0358310c2286d1bf9cc63977c2159c8bbdc3df6233d028a3ca45dadec
+  metadata.gz: 9d25ce207be807b6b73d97df610a4a2a52ec442a2b3505709000ee551c9ccafc0a8131e05fc4f9320c6230d644137615fad2ca5138ce5d88590d9fa6f7400bf6
+  data.tar.gz: bc007f60d567966b17fae84e6b5b5275b39a8f6dde1e25ab2f7302a241f16cbf8397f10ab1ad365adacba6e60355f311c6b234dbff19b76f9f038dc10c919505

data/Gemfile.lock

@@ -1,12 +1,18 @@
 PATH
   remote: .
   specs:
-    mini_sql (0.1.2)
+    mini_sql (0.1.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (5.2.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
     coderay (1.1.2)
+    concurrent-ruby (1.0.5)
     ffi (1.9.25)
     formatador (0.2.5)
     guard (2.14.2)
@@ -22,6 +28,8 @@ GEM
     guard-minitest (2.4.6)
       guard-compat (~> 1.2)
       minitest (>= 3.0)
+    i18n (1.0.1)
+      concurrent-ruby (~> 1.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -44,11 +52,15 @@ GEM
     ruby_dep (1.5.0)
     shellany (0.0.1)
     thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport (~> 5.2)
   bundler (~> 1.16)
   guard (~> 2.14)
   guard-minitest (~> 2.4)

data/lib/mini_sql.rb

@@ -1,7 +1,13 @@
+# frozen_string_literal: true
+
+# we need this for a coder
+require "bigdecimal"
+
 require_relative "mini_sql/version"
 require_relative "mini_sql/connection"
 require_relative "mini_sql/deserializer_cache"
 require_relative "mini_sql/builder"
+require_relative "mini_sql/inline_param_encoder"
 
 module MiniSql
   autoload :Coders, "mini_sql/coders"

data/lib/mini_sql/builder.rb

@@ -1,7 +1,7 @@
 class MiniSql::Builder
 
   def initialize(connection, template)
-    @args = {}
+    @args = nil
     @sql = template
     @sections = {}
     @connection = connection
@@ -9,6 +9,7 @@ class MiniSql::Builder
 
   [:set, :where2, :where, :order_by, :limit, :left_join, :join, :offset, :select].each do |k|
     define_method k do |data, args = {}|
+      @args ||= {}
       @args.merge!(args)
       @sections[k] ||= []
       @sections[k] << data
@@ -50,7 +51,7 @@ class MiniSql::Builder
       @args.merge!(args)
     end
     sql = to_sql
-    @connection.query(sql, args)
+    @connection.query(sql, @args)
   end
 
   def exec(args = nil)
@@ -58,7 +59,7 @@ class MiniSql::Builder
       @args.merge!(args)
     end
     sql = to_sql
-    @connection.query(sql, args)
+    @connection.exec(sql, @args)
   end
 
 end

data/lib/mini_sql/coders.rb

@@ -2,7 +2,7 @@ module MiniSql
   module Coders
     class NumericCoder < PG::SimpleDecoder
       def decode(string, tuple = nil, field = nil)
-        string.to_f
+        BigDecimal.new(string)
       end
     end
     class IPAddrCoder < PG::SimpleDecoder

data/lib/mini_sql/connection.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 module MiniSql
   class Connection
+    attr_reader :raw_connection
 
     def self.default_deserializer_cache
       @deserializer_cache ||= DeserializerCache.new
@@ -14,22 +17,49 @@ module MiniSql
         end
     end
 
-    def initialize(conn, deserializer_cache = nil, type_map = nil)
+    # Initialize a new MiniSql::Connection object
+    #
+    # @param raw_connection [PG::Connection] an active connection to PG
+    # @param deserializer_cache [MiniSql::DeserializerCache] a cache of field names to deserializer, can be nil
+    # @param type_map [PG::TypeMap] a type mapper for all results returned, can be nil
+    def initialize(raw_connection, deserializer_cache: nil, type_map: nil, param_encoder: nil)
       # TODO adapter to support other databases
-      @conn = conn
+      @raw_connection = raw_connection
       @deserializer_cache = deserializer_cache || Connection.default_deserializer_cache
-      @type_map = type_map || Connection.type_map(conn)
+      @type_map = type_map || Connection.type_map(raw_connection)
+      @param_encoder = param_encoder || InlineParamEncoder.new(self)
     end
 
-    def query_single(sql, params=nil)
+    # Returns a flat array containing all results.
+    # Note, if selecting multiple columns array will be flattened
+    #
+    # @param sql [String] the query to run
+    # @param params [Array or Hash], params to apply to query
+    # @return [Object] a flat array containing all results
+    def query_single(sql, *params)
       result = run(sql, params)
       result.type_map = @type_map
-      result.column_values(0)
+      if result.nfields == 1
+        result.column_values(0)
+      else
+        array = []
+        f = 0
+        row = 0
+        while row < result.ntuples
+          while f < result.nfields
+            array << result.getvalue(row, f)
+            f += 1
+          end
+          f = 0
+          row += 1
+        end
+        array
+      end
     ensure
       result.clear if result
     end
 
-    def query(sql, params=nil)
+    def query(sql, *params)
       result = run(sql, params)
       result.type_map = @type_map
       @deserializer_cache.materialize(result)
@@ -37,7 +67,7 @@ module MiniSql
       result.clear if result
     end
 
-    def exec(sql, params=nil)
+    def exec(sql, *params)
       result = run(sql, params)
       result.cmd_tuples
     ensure
@@ -48,42 +78,17 @@ module MiniSql
       Builder.new(self, sql)
     end
 
-    private
-
-    def run(sql, params)
-      if params
-        @conn.async_exec(*process_params(sql, params))
-      else
-        @conn.async_exec(sql)
-      end
+    def escape_string(str)
+      raw_connection.escape_string(str)
     end
 
-    def process_params(sql, params)
-      sql = sql.dup
-      param_array = nil
+    private
 
-      if Hash === params
-        param_array = []
-        params.each do |k, v|
-          sql.gsub!(":#{k.to_s}", "$#{param_array.length + 1}")
-          param_array << v
-        end
-      elsif Array === params
-        i = 0
-        sql.gsub!("?") do
-          i += 1
-          case params[i-1]
-          when Integer then "$#{i}::bigint"
-          when Float then "$#{i}::float8"
-          when String then "$#{i}::text"
-          else "$#{i}::unknown"
-          end
-        end
-        param_array = params
+    def run(sql, params)
+      if params && params.length > 0
+        sql = @param_encoder.encode(sql, *params)
       end
-
-      [sql, param_array]
-
+      raw_connection.async_exec(sql)
     end
 
   end

data/lib/mini_sql/deserializer_cache.rb

@@ -40,6 +40,7 @@ module MiniSql
 
       Class.new do
         attr_accessor(*fields)
+        alias :read_attribute_for_serialization :send
 
         instance_eval <<~RUBY
         def materialize(pg_result, index)

data/lib/mini_sql/inline_param_encoder.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module MiniSql
+  class InlineParamEncoder
+    attr_reader :conn
+
+    def initialize(conn)
+      @conn = conn
+    end
+
+    def encode(sql, *params)
+      return sql unless params && params.length > 0
+
+      if Hash === (hash = params[0])
+        raise ArgumentError, "Only one hash param is allowed, multiple were sent" if params.length > 1
+        encode_hash(sql, hash)
+      else
+        encode_array(sql, params)
+      end
+    end
+
+    def encode_hash(sql, hash)
+      sql = sql.dup
+
+      hash.each do |k, v|
+        sql.gsub!(":#{k}") do
+          # ignore ::int and stuff like that
+          # $` is previous to match
+          if $` && $`[-1] != ":"
+            quote_val(v)
+          else
+            ":#{k}"
+          end
+        end
+      end
+      sql
+    end
+
+    def encode_array(sql, array)
+      i = -1
+      sql.gsub("?") do |p|
+        i += 1
+        quote_val(array[i])
+      end
+    end
+
+    def quoted_date(value)
+      value.utc.iso8601
+    end
+
+    def quote_val(value)
+      case value
+      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
+  end
+end

data/lib/mini_sql/version.rb

@@ -1,3 +1,3 @@
 module MiniSql
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/mini_sql.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pg", "~> 1.0.0"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-minitest", "~> 2.4"
+  spec.add_development_dependency "activesupport", "~> 5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_sql
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-16 00:00:00.000000000 Z
+date: 2018-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.2'
 description: A fast, safe, simple direct SQL executor for PG
 email:
 - sam.saffron@gmail.com
@@ -118,6 +132,7 @@ files:
 - lib/mini_sql/coders.rb
 - lib/mini_sql/connection.rb
 - lib/mini_sql/deserializer_cache.rb
+- lib/mini_sql/inline_param_encoder.rb
 - lib/mini_sql/version.rb
 - mini_sql.gemspec
 homepage: https://discourse.org