rusql 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7de70ccbf6676684b58192eeb8801799bc4b045d
-  data.tar.gz: 67a793c131ce5ca49d099d8bbccccda3f8e5f9da
+  metadata.gz: bd5bc10f535f5916950818be427599c4a72f77f7
+  data.tar.gz: 9c9ef2ebc0988d47626bda36b7a4b842965f4b0a
 SHA512:
-  metadata.gz: 344a891cb2325191454bc29d05f18f963a17dbad7aad7e3875ab43cca71ab1512ca530a4a2ad8509301bdd48b98dbcddffb2a5b5a5889798ace858aa6636b87e
-  data.tar.gz: db12ee071da15bb594a64724cf72c3922c4df3f8ec0a3aed7f2e8ae44afa34df6bf9cf1dcae77479308d57bf954b6ba5a244476febd839b159c42e9ba88db7c0
+  metadata.gz: 5a8d38ce38493e46e2576843a809e5c384d577684a7b78fd348b364ff5bce76e0859a6f77648be5f7c819a8d1362b92781e9f315ddea5a7d7a9b34886bc65399
+  data.tar.gz: 6d1f2381cbf760af124abab5362272eedd02c2237252afb27a78165f090587c3537ff57308ac260085b2544c87a43867ebe9484358c7ea3b521be91bcd91a9aa

data/lib/rusql/basic_condition.rb

@@ -44,10 +44,14 @@ module Rusql
       c
     end
 
-    def to_s(indent_level: 1) # to make it compatible with complex condition to_s
+    def to_s(indent_level: 1, multiline: true) # dummy params to make it compatible with complex condition to_s
       case self.type
       when :equals
-        "#{left.to_s} = #{convert_value(self.right)}"
+        if self.right.nil?
+          "#{left.to_s} IS NULL" 
+        else
+          "#{left.to_s} = #{convert_value(self.right)}"
+        end
       when :greater_than
         "#{left.to_s} > #{convert_value(self.right)}"
       when :greater_than_or_equals
@@ -61,7 +65,11 @@ module Rusql
       when :like
         "#{left.to_s} LIKE #{convert_value(self.right)}"
       when :not_equals
-        "#{left.to_s} != #{convert_value(self.right)}"
+        if self.right.nil?
+          "#{left.to_s} IS NOT NULL"
+        else
+          "#{left.to_s} != #{convert_value(self.right)}"
+        end
       when :not_in
         "#{left.to_s} NOT IN (#{ self.right.map{|v| convert_value(v) }.join(", ") })"
       end

data/lib/rusql/complex_condition.rb

@@ -56,10 +56,14 @@ module Rusql
       new_condition
     end
 
-    def to_s(indent_level: 1)
-      indent = "  "*indent_level
-      indent_out = "  "*(indent_level-1)
-      "(\n" + indent + self.conditions.map{ |c| c.to_s(indent_level: indent_level+1) }.join("\n#{indent}#{self.type.to_s.upcase} ") + "\n#{indent_out})"
+    def to_s(indent_level: 1, multiline: true)
+      if multiline
+        indent = "  "*indent_level
+        indent_out = "  "*(indent_level-1)
+        "(\n" + indent + self.conditions.map{ |c| c.to_s(indent_level: indent_level+1, multiline: true) }.join("\n#{indent}#{self.type.to_s.upcase} ") + "\n#{indent_out})"
+      else
+        self.conditions.map{ |c| c.to_s(indent_level: indent_level, multiline: multiline) }.join(" #{self.type.to_s.upcase} ")
+      end
     end
   end
 end

data/lib/rusql/join.rb

@@ -15,7 +15,7 @@ module Rusql
 
       raise Exception.new("Expected type to be one of #{ TYPES.map(&:to_s).join(",") }") unless TYPES.include?(type)
       raise TypeException.new(Table, table.class) if final_table.nil?
-      raise TypeException.new(BasicCondition, condition.class) unless condition.is_a?(BasicCondition)
+      raise TypeException.new(Condition, condition.class) unless condition.is_a?(Condition)
 
       @type = type
       @table = final_table
@@ -23,7 +23,7 @@ module Rusql
     end
 
     def to_s
-      "#{ self.type.to_s.upcase.gsub("_"," ") } #{self.table.to_s_for_aliasing} ON #{self.condition.to_s}"
+      "#{ self.type.to_s.upcase.gsub("_"," ") } #{self.table.to_s_for_aliasing} ON #{self.condition.to_s(multiline: false) }"
     end
   end
 end

data/lib/rusql/version.rb

@@ -1,3 +1,3 @@
 module Rusql
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rusql
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Ajith Hussain