sqlstmt 0.1.24 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3186df18978412482910248da3c0132f6a5e0ac
-  data.tar.gz: 43eda0436e5ffa469e9bd2abe2afe04e71d83951
+  metadata.gz: f5d47a52dd9ccf4606743734009c9f8ecce7d074
+  data.tar.gz: 672c9d20b75f2890796e487856dda30a82096415
 SHA512:
-  metadata.gz: a8ece4b732299a6c16621aa34455353ae174d74b25ddd74c4fb7d39da7a5c4f4123a8fae4287d057942c5d3a506b47e89419f664e2b176136ebf57fbaa00d8b6
-  data.tar.gz: ad04c575e78642c57687cbd77c11dfd77fc0dacbbb0775d29d5c7ef3bf9655cea1dbbc2136ca65038dc5749e66ec1e4cb34a03b3284de11a2f54f55e922fb990
+  metadata.gz: c45f5c3c9f4adbf18a9dddea300ff897028fb982697d7e89883cdfd90e1812b335638c55602ec30d85bcd2bcc7d04d7b26c6c1c310cba6deffe3dd716d3863a5
+  data.tar.gz: acb4c4d744a1d01da1ae6db10880e3b42a0d9d3f9226e60c904d80c448c7e006aada0018d6d174eef7025cdc3a0d7184c57fced07a6ce58638a8af0c9c25424a

data/lib/sqlstmt/from_query.rb

@@ -7,7 +7,6 @@ class FromQuery < Query
     super
     @group_by = nil
     @order_by = nil
-    @limit = nil
     @having = []
   end
 
@@ -21,11 +20,6 @@ class FromQuery < Query
     self
   end
 
-  def limit(clause)
-    @limit = clause
-    self
-  end
-
   def having(*sql)
     @having.concat(sql)
     self
@@ -38,10 +32,6 @@ private
     raise SqlStmt::Error, "unable to build sql - must call :table if using :join (or one if it's variants)" if @tables.empty? && !@joins.empty?
   end
 
-  def simple_clause(keywords, value)
-    if value then " #{keywords} #{value}" else '' end
-  end
-
   def having_clause
     if @having.empty?
       ''

data/lib/sqlstmt/query.rb

@@ -13,6 +13,7 @@ class Query
     @joins = []
     @wheres = []
     @where_behavior = :require
+    @limit = nil
   end
 
   def table(table)
@@ -31,21 +32,11 @@ class Query
     end
   end
 
-  def join_using(table, *fields)
-    @joins << ['JOIN', table, "USING (#{fields.join(',')})"]
-    self
-  end
-
   def left_join(table, *exprs)
     @joins << ['LEFT JOIN', table, "ON #{exprs.join(' AND ')}"]
     self
   end
 
-  def left_join_using(table, *fields)
-    @joins << ['LEFT JOIN', table, "USING (#{fields.join(',')})"]
-    self
-  end
-
   def where(*sql)
     @wheres.concat(sql)
     self
@@ -61,6 +52,11 @@ class Query
     self
   end
 
+  def limit(clause)
+    @limit = clause
+    self
+  end
+
   def to_s
     verify_minimum_requirements
     build_stmt
@@ -94,6 +90,10 @@ private
     @tables.join(',')
   end
 
+  def simple_clause(keywords, value)
+    if value then " #{keywords} #{value}" else '' end
+  end
+
   def build_join_clause
     if @joins.empty?
       ''

data/lib/sqlstmt/update.rb

@@ -28,7 +28,8 @@ private
   end
 
   def build_stmt
-    "UPDATE #{build_table_list}#{build_join_clause} SET #{build_set_clause}#{build_where_clause}"
+    limit_clause = simple_clause('LIMIT', @limit)
+    "UPDATE #{build_table_list}#{build_join_clause} SET #{build_set_clause}#{build_where_clause}#{limit_clause}"
   end
 end
 

data/test/select.dt.rb

@@ -23,24 +23,22 @@ class TestSelect < DohTest::TestGroup
     assert_equal('SELECT blah FROM source WHERE source_id = 1', Select.new.table('source').field('blah').where('source_id = 1').to_s)
     assert_equal('SELECT blah FROM source s', Select.new.table('source s').field('blah').no_where.to_s)
     assert_equal('SELECT blah FROM source s JOIN other o ON s.blah_id = o.blah_id', Select.new.table('source s').join('other o', 's.blah_id = o.blah_id').field('blah').no_where.to_s)
-    assert_equal('SELECT blah FROM source s JOIN other o USING (blah_id)', Select.new.table('source s').join_using('other o', 'blah_id').field('blah').no_where.to_s)
     assert_equal('SELECT blah FROM source s LEFT JOIN other o ON s.blah_id = o.blah_id', Select.new.table('source s').left_join('other o', 's.blah_id = o.blah_id').field('blah').no_where.to_s)
-    assert_equal('SELECT blah FROM source s LEFT JOIN other o USING (blah_id)', Select.new.table('source s').left_join_using('other o', 'blah_id').field('blah').no_where.to_s)
     assert_equal('SELECT blah,blee FROM source', Select.new.table('source').field('blah','blee').no_where.to_s)
     assert_equal('SELECT blah FROM source HAVING blee > 0', Select.new.table('source').field('blah').no_where.having('blee > 0').to_s)
   end
 
   def test_duplicate_joins
-    base_sqlb = Select.new.table('source s').field('frog').no_where
-
-    sqlb = base_sqlb.dup
+    sqlb = Select.new.table('source s').field('frog').no_where
     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)
+  end
 
-    sqlb = base_sqlb.dup
+  def test_optional_join
+    sqlb = Select.new.table('source s').field('frog').no_where
+    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 z.blee_id = o.blee_id', sqlb.to_s)
+    assert_equal('SELECT frog FROM source s JOIN other o ON s.blah_id = o.blah_id', sqlb.to_s)
   end
 
   def test_join_with_multiple_conditions

data/test/update.dt.rb

@@ -10,6 +10,7 @@ class TestUpdate < DohTest::TestGroup
 
   def test_simple
     assert_equal('UPDATE target SET blah = blee', Update.new.table('target').field('blah', 'blee').no_where.to_s)
+    assert_equal('UPDATE target SET blah = blee LIMIT 3', Update.new.table('target').field('blah', 'blee').no_where.limit(3).to_s)
     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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlstmt
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.25
 platform: ruby
 authors:
 - Makani Mason
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2014-12-17 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.6
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: build SQL statements in a modular fashion, one piece at a time