sqlstmt 0.1.25 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5d47a52dd9ccf4606743734009c9f8ecce7d074
-  data.tar.gz: 672c9d20b75f2890796e487856dda30a82096415
+  metadata.gz: 86081cffce1fdbfb03ff8a64d72a171a71e2990e
+  data.tar.gz: db532da61dec6cef6743aa32f7b37937e7c33bf5
 SHA512:
-  metadata.gz: c45f5c3c9f4adbf18a9dddea300ff897028fb982697d7e89883cdfd90e1812b335638c55602ec30d85bcd2bcc7d04d7b26c6c1c310cba6deffe3dd716d3863a5
-  data.tar.gz: acb4c4d744a1d01da1ae6db10880e3b42a0d9d3f9226e60c904d80c448c7e006aada0018d6d174eef7025cdc3a0d7184c57fced07a6ce58638a8af0c9c25424a
+  metadata.gz: 40c54debde5bfc2691c9ea61266dbdcf7f781fc5a449e327f37173fdea5bb8f1e15a151e4284bbd7e706ef7ae2c85fcd661294e7c9a326bc4ca374d272b43074
+  data.tar.gz: 5b6a92b7477c601a4064fc3b999c0ad277821efdcea86ff3e829d4c809be171c2f70deebf3c1f426f1c7a2ae15d0b8062544b77250550fbac41747a0301b3b38

data/lib/sqlstmt/delete.rb

@@ -3,14 +3,15 @@ require 'sqlstmt/from_query'
 module SqlStmt
 
 class Delete < FromQuery
+  force_deep_copy :from_tables
+
   def initialize
     super
-    @from_table = nil
+    @from_tables = []
   end
 
   def from(table)
-    @from_table = table
-    @tables.push(table)
+    @from_tables << table
     self
   end
 
@@ -18,14 +19,14 @@ private
   def verify_minimum_requirements
     super
     combined_table_count = @tables.size + @joins.size
-    raise SqlStmt::Error, "unable to build sql - must call :from when including multiple tables" if @from_table.nil? && (combined_table_count > 1)
+    raise SqlStmt::Error, "unable to build sql - must call :from when including multiple tables" if @from_tables.empty? && (combined_table_count > 1)
   end
 
   def build_stmt
-    if @from_table
-      table_clause = " #@from_table"
-    else
+    if @from_tables.empty?
       table_clause = ''
+    else
+      table_clause = ' ' + @from_tables.join(',')
     end
     "DELETE#{table_clause}#{build_from_clause}"
   end

data/test/delete.dt.rb

@@ -8,7 +8,8 @@ class TestDelete < DohTest::TestGroup
   end
 
   def test_simple
-    assert_equal('DELETE target FROM target,other_table', Delete.new.from('target').table('other_table').no_where.to_s)
+    assert_equal('DELETE t FROM target t,other_table o', Delete.new.from('t').table('target t').table('other_table o').no_where.to_s)
+    assert_equal('DELETE t,o FROM t JOIN o ON t.id=o.id', Delete.new.from('t').from('o').table('t').join('o','t.id=o.id').no_where.to_s)
     assert_equal('DELETE FROM target', Delete.new.table('target').no_where.to_s)
     assert_equal('DELETE FROM target WHERE target_id = 1', Delete.new.table('target').where('target_id = 1').to_s)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlstmt
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.26
 platform: ruby
 authors:
 - Makani Mason
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohutil
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: build SQL statements in a modular fashion, one piece at a time