sqlstmt 0.1.7 → 0.1.8

data/lib/sqlstmt/query.rb

@@ -12,7 +12,7 @@ class Query
     @tables = []
     @joins = []
     @wheres = []
-    @use_wheres = true
+    @where_behavior = :require
   end
 
   def table(table)
@@ -46,7 +46,12 @@ class Query
   end
 
   def no_where
-    @use_wheres = false
+    @where_behavior = :exclude
+    self
+  end
+
+  def optional_where
+    @where_behavior = :optional
     self
   end
 
@@ -57,8 +62,11 @@ class Query
 
 private
   def verify_minimum_requirements
-    raise SqlStmt::Error, "unable to build sql - must call :where or :no_where" if @use_wheres && @wheres.empty?
-    raise SqlStmt::Error, "unable to build sql - :where and :no_where must not both be called" if !@use_wheres && !@wheres.empty?
+    if (@where_behavior == :require) && @wheres.empty?
+      raise SqlStmt::Error, "unable to build sql - must call :where, :no_where, or :optional_where"
+    elsif (@where_behavior == :exclude) && !@wheres.empty?
+      raise SqlStmt::Error, "unable to build sql - :where and :no_where must not both be called, consider :optional_where instead"
+    end
   end
 
   def build_table_list

data/test/select.dt.rb

@@ -6,6 +6,8 @@ class TestSelect < DohTest::TestGroup
   def test_minimum_requirements
     assert_raises(SqlStmt::Error) { Select.new.table('target').to_s }
     assert_raises(SqlStmt::Error) { Select.new.table('target').no_where.to_s }
+    assert_raises(SqlStmt::Error) { Select.new.table('target').optional_where.to_s }
+    assert_equal('SELECT blah FROM target', Select.new.table('target').optional_where.field('blah').to_s)
   end
 
   def test_stuff

metadata

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