sqlstmt 0.1.12 → 0.1.13

data/lib/sqlstmt/query.rb

@@ -16,27 +16,33 @@ class Query
   end
 
   def table(table)
-    @tables.push(table)
+    @tables << table
     self
   end
 
   def join(table, expr)
-    @joins.push("JOIN #{table} ON #{expr}")
+    @joins << ['JOIN', table, "ON #{expr}"]
     self
   end
 
+  def optional_join(table, expr)
+    unless find_join(table)
+      join(table, expr)
+    end
+  end
+
   def join_using(table, *fields)
-    @joins.push("JOIN #{table} USING (#{fields.join(',')})")
+    @joins << ['JOIN', table, "USING (#{fields.join(',')})"]
     self
   end
 
   def left_join(table, expr)
-    @joins.push("LEFT JOIN #{table} ON #{expr}")
+    @joins << ['LEFT JOIN', table, "ON #{expr}"]
     self
   end
 
   def left_join_using(table, *fields)
-    @joins.push("LEFT JOIN #{table} USING (#{fields.join(',')})")
+    @joins << ['LEFT JOIN', table, "USING (#{fields.join(',')})"]
     self
   end
 
@@ -61,6 +67,12 @@ class Query
   end
 
 private
+  def find_join(table_to_find)
+    @joins.find do |_, table, _|
+      table_to_find == table
+    end
+  end
+
   def verify_minimum_requirements
     if (@where_behavior == :require) && @wheres.empty?
       raise SqlStmt::Error, "unable to build sql - must call :where, :no_where, or :optional_where"
@@ -77,7 +89,7 @@ private
     if @joins.empty?
       ''
     else
-      " #{@joins.uniq.join(' ')}"
+      ' ' + @joins.collect{|ary| ary.join(' ')}.uniq.join(' ')
     end
   end
 

data/test/select.dt.rb

@@ -23,9 +23,16 @@ class TestSelect < DohTest::TestGroup
   end
 
   def test_duplicate_joins
-    sqlb = Select.new.table('source s').field('frog').no_where
+    base_sqlb = Select.new.table('source s').field('frog').no_where
+
+    sqlb = base_sqlb.dup
     4.times { sqlb.join('other o', 's.blah_id = o.blah_id') }
+    sqlb.optional_join('other o', 'z.blee_id = o.blee_id')
     assert_equal('SELECT frog FROM source s JOIN other o ON s.blah_id = o.blah_id', sqlb.to_s)
+
+    sqlb = base_sqlb.dup
+    sqlb.optional_join('other o', 'z.blee_id = o.blee_id')
+    assert_equal('SELECT frog FROM source s JOIN other o ON z.blee_id = o.blee_id', sqlb.to_s)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlstmt
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
   prerelease: 
 platform: ruby
 authors: