sql_query_executor 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25f7708c09ade0472e649ff1dda4f6d3b42501a6
-  data.tar.gz: 85c07c4235dd569b5c5b3713ad4ae1523e392c7b
+  metadata.gz: 85f5db8b826ddf206caa93d7898facf5d76b1e9a
+  data.tar.gz: fc6bb235313fc23899480fbbd173d715fdc50a4f
 SHA512:
-  metadata.gz: b64b60611d73070e52eb98465afba8d414524637e6849a40a0007859810490ff02eeaf9c82bdf2755cbdeaf60fb0e38e3db11d59a33fbdf662ac4efeb218f72e
-  data.tar.gz: d7ef08257d169a250717d1e98a4b2e66e6cb5a38dc66afac2844b277845a437a8c35d850747fb12dc5653aac08a141c6ffd3eee9c62b32cec6921ec846a4853e
+  metadata.gz: da73194a3eba45142e6f0962005686403682b53029ae28fa9c5c6714c03554c5067936c5a9fc68ba8012e73d8b60dca2aadd172082dc0ad0a0749ec5bfae54a3
+  data.tar.gz: 3871cba563d907419574c950f2a7ed93b795a09662ca576d96e360461909df9fc5631812daa5748d2cc6da9777eb8b985f9195df641f0487169927c529a02aea

data/lib/sql_query_executor/base.rb

@@ -68,19 +68,6 @@ module SqlQueryExecutor #:nodoc:
       @collection = collection
     end
 
-    def convert_collection(collection=[])
-      @collection = []
-      collection.each do |object|
-        attributes = object.is_a?(Hash) ? object : object.attributes
-        register = OpenStruct.new(attributes)
-        @collection << register
-      end
-    end
-
-    def conforming_collection?(collection)
-      collection.first.respond_to?(:attributes)
-    end
-
     def check_query
       return if @query.empty?
 

data/lib/sql_query_executor/operators/base.rb

@@ -15,7 +15,14 @@ module SqlQueryExecutor
       def logic(is_hash=false)
         initialize_attributes(true)
 
-        "#{field(is_hash)} #{@operator} #{@value || 'nil'}"
+        field = field(is_hash)
+        value = @value || 'nil'
+
+        if value.is_a?(String) && is_a_number?(value.gsub(/[\"|\']/, ''))
+          "#{field} #{@operator} (#{field}.is_a?(Fixnum) ? #{value}.to_i : #{value})"
+        else
+          "#{field} #{@operator} #{value}"
+        end
       end
 
     protected
@@ -44,22 +51,26 @@ module SqlQueryExecutor
       end
 
       def convert_value(value, logic=false)
+        real_value = value.dup
         value.gsub!(/[\(\)\'\"]/, "")
-        return value.to_i if is_a_number?(value)
-        return value.to_f if is_a_number?(value, true)
-        return eval(value) if ['true', 'false'].include?(value)
 
         methods = {3 => "convert_date", 7 => "convert_time"}
 
         array = split(value)
 
         if methods.keys.include?(array.size)
-          value = (send(methods[array.size], array, logic) || (logic ? "'#{value}'" : value))
-        elsif logic
-          value = "'#{value}'" if value.is_a?(String)
+          date_value = send(methods[array.size], array, logic)
+
+          return date_value if date_value
+        end
+
+        unless logic && ["'", '"'].include?(real_value[0])
+          return value.to_i if is_a_number?(value)
+          return value.to_f if is_a_number?(value, true)
+          return eval(value) if ['true', 'false'].include?(value)
         end
 
-        value
+        logic ? "'#{value}'" : value 
       end
 
     private

data/lib/sql_query_executor/operators/in.rb

@@ -16,9 +16,14 @@ module SqlQueryExecutor
 
     private
       def get_value(logic=false)
-        value = super
+        values = []
+        value = @array.last.gsub(SqlQueryExecutor::Base::STRING_SPACE, ' ')
 
-        value.gsub(SqlQueryExecutor::Base::STRING_SPACE, '').split(',').map{ |v| convert_value(v, logic) }
+        value.split(',').each do |val|
+          values.push(convert_value(val, logic))
+        end
+
+        values
       end
     end
   end

data/lib/sql_query_executor/version.rb

@@ -1,3 +1,3 @@
 module SqlQueryExecutor
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sql_query_executor
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Caio Torres