aliyun-log 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b389451492d70d3427b9a940de87c2166d862ac543f882b97a3924e31b51e92c
-  data.tar.gz: 6f8d17bad66ed46c0a8da7e514c10cfaa1198418e48e7d2f03be8f8de499d16d
+  metadata.gz: 0365cd8d407b5198a7e6ce3ea9e0aeac77f4af1954a7373a5817e3454a0d72ad
+  data.tar.gz: '0842353fac8ae79d4972e351437b8435137169eb41929085796bc70c30973d88'
 SHA512:
-  metadata.gz: 1c68ba2d18b987e36c96187a7007ede440af4f0beb36748e49ce213872f57dd5db78dfb82ed63c4f9ee5f87b558daa4fc0686b13e71533ba4d3dc6fdaa3333ae
-  data.tar.gz: 3ce13d9720545a7394a0b64b2b6adb78f196dd83a554f7b872a57460e29dac5dd2876a5a528c7c728c537ece778bc4913900b0487856dd65c7d563ff5f0045ee
+  metadata.gz: 91b72a67855c9850b9b21eb1930f4d1c1118cb8068e3172e9ffd6db15e214003592671f1b5705b2b60f32abe458b4843683946bc837de8118d075855a7ba2cbd
+  data.tar.gz: 5926791f61bb63e367337c4bb7b8c284d3aa04d4c94f4ba9966aa54317db53ce75e5dbc4953d804088ec0cd96bfca25af88d18f7e828b3712b06316d457e9cd5

data/lib/aliyun/log/record/relation.rb

@@ -10,9 +10,9 @@ module Aliyun
           @klass.auto_load_schema
         end
 
-        # def inspect
-        #   "#<#{self.class}>"
-        # end
+        def inspect
+          "#<#{self.class}>"
+        end
 
         def first(line = 1)
           find_offset(0, line, false)
@@ -93,7 +93,10 @@ module Aliyun
         end
 
         def sql(*statement)
-          ql = statement_ql(*statement)
+          unless statement[0].is_a?(String)
+            raise ParseStatementInvalid, 'Only support string statement'
+          end
+          ql = sanitize_array(*statement)
           @opts[:sql] = ql if ql.present?
           self
         end
@@ -151,11 +154,23 @@ module Aliyun
           return search_content unless search_content.is_a?(Hash)
 
           search_content.select { |_, v| v.present? }.map do |key, value|
-            unless @klass.attributes[:"#{key}"]
+            options = @klass.attributes[:"#{key}"]
+            unless options
               raise UnknownAttributeError, "unknown field '#{key}' for #{@klass.name}."
             end
 
-            "#{key}: #{value}"
+            raise_if_hash_quote(value)
+
+            cast_type = options[:cast_type]
+            if value.is_a?(Array)
+              values = value.uniq.map { |v| _quote(cast_type, v) }
+              str_values = values.map { |v| "#{key}: #{v}" }.join(' OR ')
+              values.size > 1 ? "(#{str_values})" : str_values
+            elsif value.is_a?(Range)
+              "#{key} in [#{value.begin} #{value.end}]"
+            else
+              "#{key}: #{_quote(cast_type, value)}"
+            end
           end.join(' AND ')
         end
 
@@ -165,7 +180,7 @@ module Aliyun
             replace_named_bind_variables(statement, values.first)
           elsif statement.include?('?')
             replace_bind_variables(statement, values)
-          elsif statement.blank?
+          elsif statement.blank? || values.blank?
             statement
           else
             statement % values.collect(&:to_s)
@@ -175,7 +190,14 @@ module Aliyun
         def replace_named_bind_variables(statement, bind_vars)
           statement.gsub(/(:?):([a-zA-Z]\w*)/) do |match|
             if bind_vars.include?(match = Regexp.last_match(2).to_sym)
-              "'#{bind_vars[match]}'"
+              match_value = bind_vars[match]
+              raise_if_hash_quote(match_value)
+              if match_value.is_a?(Array) || match_value.is_a?(Range)
+                values = match_value.map { |v| _quote_type_value(v) }
+                values.join(', ')
+              else
+                _quote_type_value(match_value)
+              end
             else
               raise ParseStatementInvalid, "missing value for :#{match} in #{statement}"
             end
@@ -191,7 +213,42 @@ module Aliyun
           end
           bound = values.dup
           statement.gsub(/\?/) do
-            "'#{bound.shift}'"
+            value = bound.shift
+            raise_if_hash_quote(value)
+            if value.is_a?(Array) || value.is_a?(Range)
+              values = value.map { |v| _quote_type_value(v) }
+              values.join(', ')
+            else
+              _quote_type_value(value)
+            end
+          end
+        end
+
+        def _quote(type, value)
+          v = TypeCasting.dump_field(value, cast_type: type || :string)
+          case type
+          when :string, nil then "'#{v.to_s}'"
+          when :bigdecimal  then v.to_s("F")
+          when :integer     then v.to_s.to_i
+          when :datetime, :date then "'#{v.iso8601}'"
+          else
+            value.to_s
+          end
+        end
+
+        def _quote_type_value(value)
+          case value.class.name
+          when 'String'                   then "'#{value.to_s}'"
+          when 'BigDecimal'               then value.to_s("F")
+          when 'Date', 'DateTime', 'Time' then "'#{value.iso8601}'"
+          else
+            value
+          end
+        end
+
+        def raise_if_hash_quote(value)
+          if value.is_a?(Hash) || value.is_a?(ActiveSupport::HashWithIndifferentAccess)
+            raise ParseStatementInvalid, "can't quote Hash"
           end
         end
 

data/lib/aliyun/version.rb

@@ -2,6 +2,6 @@
 
 module Aliyun
   module Log
-    VERSION = '0.2.8'
+    VERSION = '0.2.9'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aliyun-log
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Yingce Liu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-12 00:00:00.000000000 Z
+date: 2020-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel