sqldsl 1.4.4 → 1.4.6

data/README

@@ -141,6 +141,15 @@ See the tests for more examples
         assert_equal expected.delete("\n").squeeze(" "), statement.to_sql
       end
       
+      def test_add_clause
+        statement = Select[:column1].from[:table1].where do
+          like :column1, "any"
+          add_clause "(c2 = 'foo')"
+        end
+        assert_equal "select column1 from table1 where column1 like 'any' and (c2 = 'foo')", statement.to_sql
+      end
+      
+      
       def test_select_with_receive_any_objects_and_method_calls
         statement = Select[:column1, 'book', 10].from[:table1, :table2].where do
           column1.equal 0
@@ -196,4 +205,8 @@ See the tests for more examples
 === Contributors
 Matt[http://www.theagiledeveloper.com] Deiters[http://www.theagiledeveloper.com]
 
-Sergio[http://spejman-on-rails.blogspot.com/] Espeja[http://spejman-on-rails.blogspot.com/]
+Sergio[http://spejman-on-rails.blogspot.com/] Espeja[http://spejman-on-rails.blogspot.com/]
+
+Pat Farley (who contributed by being sqldsl's biggest skeptic)
+
+Clint Bishop

data/lib/sql_statement.rb

@@ -42,4 +42,18 @@ class SqlStatement
     self
   end
   
+  # call-seq: sql_statement.and_with_or_conditions { block } -> a_sql_statement
+  # 
+  # Creates a new AndWithOrConditionsWhereBuilder instance, passing the block as a parameter, 
+  # then executes to_sql on the AndWithOrConditionsWhereBuilder instance.
+  # The resulting string from the AndWithOrConditionsWhereBuilder instance is appended to the SQL statement.
+  # Returns self.
+  # 
+  #    Select[1].where { equal :column1, 1 }.and_with_or_conditions { equal :column2, 100 }.to_sql       
+  #      #=> "select 1 where column1 = 1 and (column2 = 100)"
+  def and_with_or_conditions(&block)
+    @to_sql += AndWithOrConditionsWhereBuilder.new(self.tables, &block).to_sql
+    self
+  end
+  
 end

data/lib/where_builder.rb

@@ -133,6 +133,15 @@ class WhereBuilder
     " where #{sql_parts.join(' and ')}"
   end
   
+  # call-seq: where.add_clause(clause)
+  # 
+  # Appends a text clause to the where SQL clause.
+  # 
+  #    where { add_clause '(any string)' }.to_sql       #=> " where (any string)"
+  def add_clause(arg)
+    sql_parts << arg
+  end
+  
   def add_condition(lval, operator, rval) #:nodoc:
     sql_parts << "#{lval.to_sql} #{operator} #{rval.to_sql}"
   end

data/rakefile.rb

@@ -27,7 +27,7 @@ Gem::manage_gems
 specification = Gem::Specification.new do |s|
 	s.name   = "sqldsl"
   s.summary = "A DSL for creating SQL Statements"
-	s.version = "1.4.4"
+	s.version = "1.4.6"
 	s.author = 'Jay Fields'
 	s.description = "A DSL for creating SQL Statements"
 	s.email = 'sqldsl-developer@rubyforge.org'

data/test/select_acceptance_test.rb

@@ -64,6 +64,15 @@ class SelectAcceptanceTest < Test::Unit::TestCase
     assert_equal expected.delete("\n").squeeze(" "), statement.to_sql
   end
   
+  def test_add_clause
+    statement = Select[:column1].from[:table1].where do
+      like :column1, "any"
+      add_clause "(c2 = 'foo')"
+    end
+    assert_equal "select column1 from table1 where column1 like 'any' and (c2 = 'foo')", statement.to_sql
+  end
+  
+  
   def test_select_with_receive_any_objects_and_method_calls
     statement = Select[:column1, 'book', 10].from[:table1, :table2].where do
       column1.equal 0

data/test/where_builder_test.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/test_helper'
 
 class WhereBuilderTest < Test::Unit::TestCase
-  
+
   def test_condition_calls_to_sql
     lval, rval = mock, mock
     lval.expects(:to_sql).returns "lval"
@@ -10,7 +10,7 @@ class WhereBuilderTest < Test::Unit::TestCase
     where.add_condition(lval, "op", rval)
     assert_equal "lval op rval", where.send(:sql_parts).first
   end
-  
+
   def test_parenthesis_condition_calls_to_sql
     lval, rval = mock, mock
     lval.expects(:to_sql).returns "lval"
@@ -19,24 +19,24 @@ class WhereBuilderTest < Test::Unit::TestCase
     where.add_parenthesis_condition(lval, "op", rval)
     assert_equal "lval op (rval)", where.send(:sql_parts).first
   end
-  
+
   def test_method_missing_for_receive_any_creation
     assert_equal ReceiveAny, WhereBuilder.new([], &lambda {}).missing_method.class
   end
-  
+
   def test_method_missing_when_method_call_is_likely_a_mistake
     assert_raises NoMethodError do
       WhereBuilder.new([], &lambda {}).missing_method(:with_args)
     end
   end
-  
+
   def test_equal
     statement = WhereBuilder.new [] do
       equal :column1, :column2
     end
     assert_equal ' where column1 = column2', statement.to_sql
   end
-  
+
   def test_not_equal
     statement = WhereBuilder.new [] do
       not_equal :column1, :column2
@@ -71,7 +71,7 @@ class WhereBuilderTest < Test::Unit::TestCase
     end
     assert_equal " where column1 < column2", statement.to_sql
   end
-  
+
   def test_less_than_or_equal
     statement = WhereBuilder.new [] do
       less_than_or_equal :column1, :column2
@@ -85,14 +85,14 @@ class WhereBuilderTest < Test::Unit::TestCase
     end
     assert_equal " where column1 > column2", statement.to_sql
   end
-  
+
   def test_greater_than_or_equal
     statement = WhereBuilder.new [] do
       greater_than_or_equal :column1, :column2
     end
     assert_equal " where column1 >= column2", statement.to_sql
   end
-  
+
   def test_where_clause_is_built_with_multiple_conditions
     statement = WhereBuilder.new [] do
       equal :column1, :column2
@@ -101,21 +101,21 @@ class WhereBuilderTest < Test::Unit::TestCase
     expected = " where column1 = column2 and column3 = column5"
     assert_equal expected, statement.to_sql
   end
-  
+
   def test_exists_evaluates_sql_statement_argument
     statement = WhereBuilder.new [] do
       exists Struct.new(:to_sql).new('select foo')
     end
     assert_equal ' where exists (select foo)', statement.to_sql
   end
-  
+
   def test_not_exists_evaluates_sql_statement_argument
     statement = WhereBuilder.new [] do
       not_exists Struct.new(:to_sql).new('select foo')
     end
     assert_equal ' where not exists (select foo)', statement.to_sql
   end
-  
+
   def test_is_not_null_where_criteria
     statement = WhereBuilder.new [] do
       is_not_null Struct.new(:to_sql).new('something')

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: sqldsl
 version: !ruby/object:Gem::Version 
-  version: 1.4.4
-date: 2007-05-25 00:00:00 -04:00
+  version: 1.4.6
+date: 2007-06-25 00:00:00 -04:00
 summary: A DSL for creating SQL Statements
 require_paths: 
 - lib