mini_sql 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c805e0578de8d26ad5b1ab75e0a43e11fa87cfa7742f872405598d26194537d0
-  data.tar.gz: 26cc5f52280ef8fe6fd031f7aceb0fc696765259f81ce472353d127a9b216107
+  metadata.gz: abb973879fc47b098296d28aff0023d3c3a734acff63da3f59cde4c3129ea08d
+  data.tar.gz: 6283be1e1037e203a1c842e8371f6a0b4eef1b506c2ef1a7b260a6ffe89aa9ac
 SHA512:
-  metadata.gz: 3b420b642d7e64839037eeb9ba7204ff654ae536e097cbe9e02c510753d98cb06f4e6d811975bd400f6b8b28d7e29dfa7dbcd5aeee34bbec42133fc6c3c5e166
-  data.tar.gz: f505f8ec94c6bf04c977eddedaffdcd5dadb6825e49e09b9f8f37652bfc6846831c39b63bac913a9e70aea4cc50400a2c8b6d761fae9c415ae12e1f4f3f8fddf
+  metadata.gz: 2ef6234f201e71933e61fa965fa718fad2c4db88c70e9ef724b3de754105b519b45ffc415fe0df72a2c8dfb1e4c9f29fe9b0ae304a0c6658a6aa7ca9944ecbb0
+  data.tar.gz: 67a511de5b14d5b28265a273bf0a0cb706027c49da8d1885328eab9cbc6c8443ea69aacadb77dc2eba8a5159864b8f05be1ccdbd9586f97b2ae993128d39d1e9

data/lib/mini_sql/builder.rb

@@ -11,9 +11,9 @@ class MiniSql::Builder
 
   [:set, :where2, :where, :order_by, :limit, :left_join, :join, :offset, :select].each do |k|
     define_method k do |data, *args|
-      if Hash === args && args.length > 0
+      if args && (args.length == 1) && (Hash === args[0])
         @args ||= {}
-        @args.merge!(args)
+        @args.merge!(args[0])
       elsif args && args.length > 0
         data = @connection.param_encoder.encode(data, *args)
       end

data/lib/mini_sql/deserializer_cache.rb

@@ -40,14 +40,24 @@ module MiniSql
 
       Class.new do
         attr_accessor(*fields)
+
+        # AM serializer support
         alias :read_attribute_for_serialization :send
 
-        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("; ")}
+        def to_h
+          r = {}
+          instance_variables.each do |f|
+            r[f.to_s.sub('@','').to_sym] = instance_variable_get(f)
+          end
           r
         end
+
+        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("; ")}
+            r
+          end
         RUBY
       end
     end

data/lib/mini_sql/version.rb

@@ -1,3 +1,3 @@
 module MiniSql
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_sql
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Sam Saffron