sqldsl 1.4.0 → 1.4.1

data/README

@@ -2,7 +2,7 @@
 
 SQL DSL is a library for creating SQL statements using ruby code.
 
-by Jay[http://jayfields.blogspot.com] Fields[http://jayfields.blogspot.com]
+by Jay[http://blog.jayfields.com] Fields[http://blog.jayfields.com]
 
 == Download and Installation
 
@@ -86,6 +86,7 @@ See the tests for more examples
           less_than_or_equal :column3, :column4
           greater_than :column1, 0
           greater_than_or_equal :column2, 'bar'
+          like :column1, 'any'
           is_not_null :column1
           is_in :column1, [1,2]
           is_not_in :column2, [3, 4]
@@ -94,7 +95,7 @@ See the tests for more examples
         end
         expected = "select column1, 'book', 10 from table1, table2
                       where column1 = 99 and column1 <> 100 and column2 < 'foo' 
-                      and column3 <= column4 and column1 > 0 and column2 >= 'bar' 
+                      and column3 <= column4 and column1 > 0 and column2 >= 'bar' and column1 like 'any' 
                       and column1 is not null and column1 in (1, 2) and column2 not in (3, 4) 
                       and exists (0) and not exists (0)"
         assert_equal expected.delete("\n").squeeze(" "), statement.to_sql
@@ -108,13 +109,14 @@ See the tests for more examples
           column3 <= column4
           column1 > 0
           column2 >= 'bar'
+          column1 =~ 'any'
           column1 ^ nil
           column1 >> [1,2]
           column2 << [3, 4]
         end
         expected = "select column1, 'book', 10 from table1, table2
                       where column1 = 99 and column1 <> 100 and column2 < 'foo' 
-                      and column3 <= column4 and column1 > 0 and column2 >= 'bar' 
+                      and column3 <= column4 and column1 > 0 and column2 >= 'bar' and column1 like 'any'
                       and column1 is not null and column1 in (1, 2) and column2 not in (3, 4)"
         assert_equal expected.delete("\n").squeeze(" "), statement.to_sql
       end
@@ -127,13 +129,14 @@ See the tests for more examples
           column3.less_than_or_equal column4
           column1.greater_than 0
           column2.greater_than_or_equal 'bar'
+          column1.like 'any'
           column1.is_not_null
           column1.is_in [1,2]
           column2.is_not_in [3, 4]
         end
         expected = "select column1, 'book', 10 from table1, table2
                       where column1 = 99 and column1 <> 100 and column2 < 'foo' 
-                      and column3 <= column4 and column1 > 0 and column2 >= 'bar' 
+                      and column3 <= column4 and column1 > 0 and column2 >= 'bar' and column1 like 'any'
                       and column1 is not null and column1 in (1, 2) and column2 not in (3, 4)"
         assert_equal expected.delete("\n").squeeze(" "), statement.to_sql
       end
@@ -143,8 +146,10 @@ See the tests for more examples
           column1.equal 0
         end.or do
           column1 > 100
+        end.and do
+          column2 == 15
         end
-        expected = "select column1, 'book', 10 from table1, table2 where column1 = 0 or (column1 > 100)"
+        expected = "select column1, 'book', 10 from table1, table2 where column1 = 0 or (column1 > 100) and (column2 = 15)"
         assert_equal expected, statement.to_sql
       end
       
@@ -190,4 +195,5 @@ See the tests for more examples
     end
 
 === Contributors
-Matt Deiters
+Matt Deiters[http://www.theagiledeveloper.com]
+Sergio Espeja[http://spejman-on-rails.blogspot.com/]

data/lib/and_where_builder.rb

@@ -0,0 +1,13 @@
+class AndWhereBuilder < WhereBuilder
+  # call-seq: and_where.to_sql -> a_string
+  # 
+  # Returns a string by collecting all the conditions and joins them with ' and '.
+  # 
+  #    AndWhereBuilder.new [] do 
+  #      equal :column1, 10
+  #      equal :column2, 'book'
+  #    end.to_sql         #=> " and (column1 = 10 and column2 = 'book')"
+  def to_sql
+    " and (#{sql_parts.join(' and ')})"
+  end
+end

data/lib/blank_slate.rb

@@ -1,3 +1,3 @@
-class BlankSlate
+class BlankSlate #:nodoc:
   instance_methods.each { |m| undef_method m unless m =~ /^__/ || m =~ /class/ }
 end

data/lib/inner_join_builder.rb

@@ -1,4 +1,4 @@
-class InnerJoinBuilder
+class InnerJoinBuilder #:nodoc:
   def initialize(select_builder)
     @select_builder = select_builder
   end

data/lib/receive_any.rb

@@ -45,6 +45,11 @@ class ReceiveAny < BlankSlate #:nodoc:
     builder.is_not_in self, arg
   end
   alias << is_not_in
+
+  def like(arg)
+    builder.like self, arg
+  end
+  alias =~ like
   
   def is_not_null(arg=nil)
     builder.is_not_null self

data/lib/select.rb

@@ -68,11 +68,17 @@ class Select < SqlStatement
     self
   end
   
+  # call-seq: select.inner_join -> an_inner_join_builder
+  # 
+  # Returns an InnerJoinBuilder instance.
+  # 
+  #    Select.all.from[:table1].inner_join
+  #      #=> #<InnerJoinBuilder:0x654f4 @select_builder=#<Select:0x65968 @tables=[:table1], @to_sql="select * from table1">>
   def inner_join
     InnerJoinBuilder.new(self)
   end
   
-  def inner_join_table(table_name)
+  def inner_join_table(table_name) #:nodoc:
     @to_sql << " inner join "
     if table_name.to_s =~ / as /
       @tables << table_name.to_s.split(/ as /).last.to_sym
@@ -84,6 +90,14 @@ class Select < SqlStatement
     self
   end
   
+  # call-seq: sql_statement.on { block } -> a_sql_statement
+  # 
+  # Creates a new OnWhereBuilder instance, passing the block as a parameter, then executes to_sql on the OnWhereBuilder instance.
+  # The resulting string from the OnWhereBuilder instance is appended to the SQL statement.
+  # Returns self.
+  # 
+  #    Select.all.from[:table1].inner_join[:table2].on { equal :table1.column1, :table2.column1 }.to_sql
+  #      #=> "select * from table1 inner join table2 on table1.column1 = table2.column2"
   def on(&block)
     @to_sql += OnWhereBuilder.new(self.tables, &block).to_sql
     self

data/lib/sql_statement.rb

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

data/lib/sqldsl.rb

@@ -8,6 +8,7 @@ require File.dirname(__FILE__) + '/time.rb'
 require File.dirname(__FILE__) + '/sql_statement.rb'
 require File.dirname(__FILE__) + '/inner_join_builder.rb'
 require File.dirname(__FILE__) + '/where_builder.rb'
+require File.dirname(__FILE__) + '/and_where_builder.rb'
 require File.dirname(__FILE__) + '/or_where_builder.rb'
 require File.dirname(__FILE__) + '/on_where_builder.rb'
 require File.dirname(__FILE__) + '/select.rb'

data/lib/where_builder.rb

@@ -93,6 +93,15 @@ class WhereBuilder
   def is_not_null(column)
     sql_parts << "#{column.to_sql} is not null"
   end
+  
+  # call-seq: where.like(arg1, arg2)
+  # 
+  # Appends a like condition to the where SQL clause.
+  # 
+  #    where { like :column1, 'any' }.to_sql       #=> " where column1 like 'any'"
+  def like(lval, rval)
+    add_condition(lval, "like", rval)
+  end
     
   # call-seq: where.exists(clause)
   # 

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.0"
+	s.version = "1.4.1"
 	s.author = 'Jay Fields'
 	s.description = "A DSL for creating SQL Statements"
 	s.email = 'sqldsl-developer@rubyforge.org'

data/test/receive_any_test.rb

@@ -157,4 +157,20 @@ class ReceiveAnyTest < Test::Unit::TestCase
     end
     ReceiveAny.new(:foo, builder) ^ nil
   end
+  
+  def test_like
+    builder = mock
+    builder.expects(:like).with do |lval, rval|
+      lval.class == ReceiveAny && rval == "any"
+    end
+    ReceiveAny.new(:foo, builder).like "any"
+  end
+
+  def test_like
+    builder = mock
+    builder.expects(:like).with do |lval, rval|
+      lval.class == ReceiveAny && rval == "any"
+    end
+    ReceiveAny.new(:foo, builder) =~ "any"
+  end
 end

data/test/select_acceptance_test.rb

@@ -9,6 +9,7 @@ class SelectAcceptanceTest < Test::Unit::TestCase
       less_than_or_equal :column3, :column4
       greater_than :column1, 0
       greater_than_or_equal :column2, 'bar'
+      like :column1, 'any'
       is_not_null :column1
       is_in :column1, [1,2]
       is_not_in :column2, [3, 4]
@@ -17,7 +18,7 @@ class SelectAcceptanceTest < Test::Unit::TestCase
     end
     expected = "select column1, 'book', 10 from table1, table2
                   where column1 = 99 and column1 <> 100 and column2 < 'foo' 
-                  and column3 <= column4 and column1 > 0 and column2 >= 'bar' 
+                  and column3 <= column4 and column1 > 0 and column2 >= 'bar' and column1 like 'any' 
                   and column1 is not null and column1 in (1, 2) and column2 not in (3, 4) 
                   and exists (0) and not exists (0)"
     assert_equal expected.delete("\n").squeeze(" "), statement.to_sql
@@ -31,13 +32,14 @@ class SelectAcceptanceTest < Test::Unit::TestCase
       column3 <= column4
       column1 > 0
       column2 >= 'bar'
+      column1 =~ 'any'
       column1 ^ nil
       column1 >> [1,2]
       column2 << [3, 4]
     end
     expected = "select column1, 'book', 10 from table1, table2
                   where column1 = 99 and column1 <> 100 and column2 < 'foo' 
-                  and column3 <= column4 and column1 > 0 and column2 >= 'bar' 
+                  and column3 <= column4 and column1 > 0 and column2 >= 'bar' and column1 like 'any'
                   and column1 is not null and column1 in (1, 2) and column2 not in (3, 4)"
     assert_equal expected.delete("\n").squeeze(" "), statement.to_sql
   end
@@ -50,13 +52,14 @@ class SelectAcceptanceTest < Test::Unit::TestCase
       column3.less_than_or_equal column4
       column1.greater_than 0
       column2.greater_than_or_equal 'bar'
+      column1.like 'any'
       column1.is_not_null
       column1.is_in [1,2]
       column2.is_not_in [3, 4]
     end
     expected = "select column1, 'book', 10 from table1, table2
                   where column1 = 99 and column1 <> 100 and column2 < 'foo' 
-                  and column3 <= column4 and column1 > 0 and column2 >= 'bar' 
+                  and column3 <= column4 and column1 > 0 and column2 >= 'bar' and column1 like 'any'
                   and column1 is not null and column1 in (1, 2) and column2 not in (3, 4)"
     assert_equal expected.delete("\n").squeeze(" "), statement.to_sql
   end
@@ -66,8 +69,10 @@ class SelectAcceptanceTest < Test::Unit::TestCase
       column1.equal 0
     end.or do
       column1 > 100
+    end.and do
+      column2 == 15
     end
-    expected = "select column1, 'book', 10 from table1, table2 where column1 = 0 or (column1 > 100)"
+    expected = "select column1, 'book', 10 from table1, table2 where column1 = 0 or (column1 > 100) and (column2 = 15)"
     assert_equal expected, statement.to_sql
   end
   

data/test/where_builder_test.rb

@@ -51,6 +51,13 @@ class WhereBuilderTest < Test::Unit::TestCase
     assert_equal " where column1 in (1, 2)", statement.to_sql
   end
 
+  def test_like
+    statement = WhereBuilder.new [] do
+      like :column1, "any"
+    end
+    assert_equal " where column1 like 'any'", statement.to_sql
+  end
+
   def test_is_not_in_where_criteria
     statement = WhereBuilder.new [] do
       is_not_in :column1, [1,2]

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: sqldsl
 version: !ruby/object:Gem::Version 
-  version: 1.4.0
-date: 2007-03-17 00:00:00 -04:00
+  version: 1.4.1
+date: 2007-03-25 00:00:00 -04:00
 summary: A DSL for creating SQL Statements
 require_paths: 
 - lib
@@ -28,6 +28,7 @@ cert_chain:
 authors: 
 - Jay Fields
 files: 
+- lib/and_where_builder.rb
 - lib/array.rb
 - lib/blank_slate.rb
 - lib/delete.rb