Merge pull request #5 from sql-rb/where-with-or

Where with or

Author: solnic

lib/sql/composer/nodes.rb

@@ -6,5 +6,6 @@
 require "sql/composer/nodes/where"
 require "sql/composer/nodes/order"
 require "sql/composer/nodes/operations/eql"
+require "sql/composer/nodes/operations/or"
 require "sql/composer/nodes/operations/order_direction"
 require "sql/composer/nodes/value"

lib/sql/composer/nodes/operations/eql.rb

@@ -11,6 +11,11 @@ def initialize(left, right)
             @left, @right = left, right
           end
 
+          def or(other)
+            Operations::Or.new(self, other)
+          end
+          alias_method :OR, :or
+
           def to_s
             "#{left.to_s} == #{right.to_s}"
           end

lib/sql/composer/nodes/operations/or.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module SQL
+  module Composer
+    module Nodes
+      module Operations
+        class Or
+          attr_reader :left, :right
+
+          def initialize(left, right)
+            @left, @right = left, right
+          end
+
+          def to_s
+            "(#{left.to_s}) OR (#{right.to_s})"
+          end
+        end
+      end
+    end
+  end
+end

spec/integration/sql/compose_spec.rb

@@ -57,6 +57,24 @@ def build(&block)
       end
     end
 
+    context "with WHERE and two conditions" do
+      specify do
+        result = build { |users|
+          SELECT users.id, users.name
+            FROM users.table
+            WHERE (users.name == "Jane").OR(users.name == "Jade")
+        }
+
+        expect(result.to_s).to eql(
+          <<~SQL.strip
+          SELECT "users"."id", "users"."name"
+          FROM "users"
+          WHERE ("users"."name" == 'Jane') OR ("users"."name" == 'Jade')
+          SQL
+        )
+      end
+    end
+
     context "without ORDER" do
       specify do
         result = build { |users|