sqlstmt 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8e202212e915440115055758efa3257e882ed20
-  data.tar.gz: 71e4949bdfb5a805ddccfdb3144e2d4ad34c4f2e
+  metadata.gz: 0c0c075a57960cfa09c3f617d9a435a356240fe0
+  data.tar.gz: 97465a965088a0a908e91c6c5aa2bca069421dab
 SHA512:
-  metadata.gz: 1dae3089dc0fead05dab42f9a1b476d9fc47c5685929de3409de9a1d8a27d9c35d48636221f884fc198f368c556539ef914d1fe9901281d18f36d3a18d8c3984
-  data.tar.gz: 89675faf3fab1b72de81c9cfe2feab309415562eaefa2c59f1ce48985c1bf4e85d18b9a0767730d4ee8fc725466aeb54c53e936db50d3c5ae9db763eb59aec5c
+  metadata.gz: 4fc17869d8634ee334dc4f361619d52ac0ba30807e51aa4b86b042a4194868b342eaaeaa956e83fe991caf9e0402b0e199a0416444ac8514359a344ea890c8ed
+  data.tar.gz: 39003adffb3527cffbc444adbbf62473c995688ded90ae42d997483772824ae5a85d5fe96917787fa86cbefdbfbcc36913f71ec2abc23c2ddf558a3e98838cd7

data/lib/sqlstmt/query.rb

@@ -26,7 +26,7 @@ class Query
   end
 
   def optional_join(table, expr)
-    unless find_join(table)
+    unless has_join_or_table?(table)
       join(table, expr)
     end
   end
@@ -67,7 +67,8 @@ class Query
   end
 
 private
-  def find_join(table_to_find)
+  def has_join_or_table?(table_to_find)
+    return true if @tables.include?(table_to_find)
     @joins.find do |_, table, _|
       table_to_find == table
     end

data/test/insert_select.dt.rb

@@ -4,18 +4,18 @@ module SqlStmt
 
 class TestInsertSelect < DohTest::TestGroup
   def test_minimum_requirements
-    assert_raises(SqlStmt::Error) { InsertSelect.new.into('target').to_s }
-    assert_raises(SqlStmt::Error) { InsertSelect.new.into('target').no_where.to_s }
-    assert_raises(SqlStmt::Error) { InsertSelect.new.into('target').no_where.field('blah', 'blee').to_s }
+    assert_raises(SqlStmt::Error) { InsertSelect.new.insert_into('target').to_s }
+    assert_raises(SqlStmt::Error) { InsertSelect.new.insert_into('target').no_where.to_s }
+    assert_raises(SqlStmt::Error) { InsertSelect.new.insert_into('target').no_where.field('blah', 'blee').to_s }
   end
 
   def test_simple
-    assert_equal('INSERT INTO target (blah) SELECT blee FROM source', InsertSelect.new.into('target').table('source').field('blah', 'blee').no_where.to_s)
-    assert_equal('INSERT INTO target (blah) SELECT blee FROM source WHERE source_id = 1', InsertSelect.new.into('target').table('source').field('blah', 'blee').where('source_id = 1').to_s)
+    assert_equal('INSERT INTO target (blah) SELECT blee FROM source', InsertSelect.new.insert_into('target').table('source').field('blah', 'blee').no_where.to_s)
+    assert_equal('INSERT INTO target (blah) SELECT blee FROM source WHERE source_id = 1', InsertSelect.new.insert_into('target').table('source').field('blah', 'blee').where('source_id = 1').to_s)
   end
 
   def test_dup
-    shared_builder = SqlStmt::InsertSelect.new.into('target')
+    shared_builder = SqlStmt::InsertSelect.new.insert_into('target')
     first_builder = shared_builder
     other_builder = shared_builder.dup
 
@@ -33,7 +33,7 @@ class TestInsertSelect < DohTest::TestGroup
   end
 
   def test_complex
-    shared_builder = SqlStmt::InsertSelect.new.into('target')
+    shared_builder = SqlStmt::InsertSelect.new.insert_into('target')
     shared_builder.table('shared_tbl')
     shared_builder.field('created_at', 'NOW()').field('duration', 5).fieldq('is_bad', 'b')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlstmt
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Makani Mason
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2013-10-28 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.3
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: build SQL statements in a modular fashion, one piece at a time