sqlstmt 0.1.6 → 0.1.7

data/lib/sqlstmt/from_query.rb

@@ -3,36 +3,13 @@ require 'sqlstmt/query'
 module SqlStmt
 
 class FromQuery < Query
-  force_deep_copy :joins
-
   def initialize
     super
-    @joins = []
     @group_by = nil
     @order_by = nil
     @limit = nil
   end
 
-  def join(table, expr)
-    @joins.push("JOIN #{table} ON #{expr}")
-    self
-  end
-
-  def join_using(table, *fields)
-    @joins.push("JOIN #{table} USING (#{fields.join(',')})")
-    self
-  end
-
-  def left_join(table, expr)
-    @joins.push("LEFT JOIN #{table} ON #{expr}")
-    self
-  end
-
-  def left_join_using(table, *fields)
-    @joins.push("LEFT JOIN #{table} USING (#{fields.join(',')})")
-    self
-  end
-
   def group_by(clause)
     @group_by = clause
     self
@@ -60,7 +37,7 @@ private
   end
 
   def build_from_clause
-    join_clause = if @joins.empty? then '' else " #{@joins.join(' ')}" end
+    join_clause = build_join_clause
     group_clause = simple_clause('GROUP BY', @group_by)
     order_clause = simple_clause('ORDER BY', @order_by)
     limit_clause = simple_clause('LIMIT', @limit)

data/lib/sqlstmt/query.rb

@@ -4,12 +4,13 @@ require 'sqlstmt/error'
 module SqlStmt
 
 class Query
-  force_deep_copy :fields, :tables, :wheres
-  attr_reader :fields, :tables, :wheres
+  force_deep_copy :fields, :tables, :joins, :wheres
+  attr_reader :fields, :tables, :joins, :wheres
 
   def initialize
     @fields = []
     @tables = []
+    @joins = []
     @wheres = []
     @use_wheres = true
   end
@@ -19,6 +20,26 @@ class Query
     self
   end
 
+  def join(table, expr)
+    @joins.push("JOIN #{table} ON #{expr}")
+    self
+  end
+
+  def join_using(table, *fields)
+    @joins.push("JOIN #{table} USING (#{fields.join(',')})")
+    self
+  end
+
+  def left_join(table, expr)
+    @joins.push("LEFT JOIN #{table} ON #{expr}")
+    self
+  end
+
+  def left_join_using(table, *fields)
+    @joins.push("LEFT JOIN #{table} USING (#{fields.join(',')})")
+    self
+  end
+
   def where(*sql)
     @wheres.concat(sql)
     self
@@ -44,6 +65,14 @@ private
     @tables.join(',')
   end
 
+  def build_join_clause
+    if @joins.empty?
+      ''
+    else
+      " #{@joins.join(' ')}"
+    end
+  end
+
   def build_where_clause
     if @wheres.empty? then '' else " WHERE #{@wheres.join(' AND ')}" end
   end

data/lib/sqlstmt/update.rb

@@ -28,7 +28,7 @@ private
   end
 
   def build_stmt
-    "UPDATE #{build_table_list} SET #{build_set_clause}#{build_where_clause}"
+    "UPDATE #{build_table_list}#{build_join_clause} SET #{build_set_clause}#{build_where_clause}"
   end
 end
 

data/test/update.dt.rb

@@ -13,6 +13,13 @@ class TestUpdate < DohTest::TestGroup
     assert_equal('UPDATE target SET blah = blee WHERE target_id = 1', Update.new.table('target').field('blah', 'blee').where('target_id = 1').to_s)
   end
 
+  def test_join
+    builder = SqlStmt::Update.new.table('main m').join('other o', 'm.main_id = o.main_id')
+    builder.field('blah', 3)
+    builder.no_where
+    assert_equal('UPDATE main m JOIN other o ON m.main_id = o.main_id SET blah = 3', builder.to_s)
+  end
+
   def test_dup
     shared_builder = SqlStmt::Update.new.table('target')
     first_builder = shared_builder

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlstmt
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-08 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohutil