sqldsl 1.3.2 → 1.4.0

data/README

@@ -21,12 +21,13 @@ See the tests for more examples
 === Test Helper
 
     require 'test/unit'
+    require File.dirname(__FILE__) + '/../lib/sqldsl'
     unless File.directory? File.dirname(__FILE__) + '/../vendor/mocha-0.4.0/'
       raise "mocha 4.0 is required to run the test suite. create the 'vendor' directory as a sibling of test and 'gem unpack mocha' in 'vendor'"
     end
     $:.unshift File.dirname(__FILE__) + '/../vendor/mocha-0.4.0/lib/'
     require File.dirname(__FILE__) + '/../vendor/mocha-0.4.0/lib/mocha'
-    require File.dirname(__FILE__) + '/../lib/sqldsl'
+
 
 === Insert Example
 
@@ -101,7 +102,7 @@ See the tests for more examples
       
       def test_select_with_receive_any_objects_and_operators
         statement = Select[:column1, 'book', 10].from[:table1, :table2].where do
-          table1.column1 = 99
+          column1 == 99
           column1 <=> 100
           column2 < 'foo'
           column3 <= column4
@@ -112,7 +113,7 @@ See the tests for more examples
           column2 << [3, 4]
         end
         expected = "select column1, 'book', 10 from table1, table2
-                      where table1.column1 = 99 and column1 <> 100 and column2 < 'foo' 
+                      where column1 = 99 and column1 <> 100 and column2 < 'foo' 
                       and column3 <= column4 and column1 > 0 and column2 >= 'bar' 
                       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
@@ -147,10 +148,23 @@ See the tests for more examples
         assert_equal expected, statement.to_sql
       end
       
+      def test_select_with_inner_join
+        expected = "select * from t1 a inner join t2 b on a.id = b.id inner join t3 c on b.id2 = c.id where c.attr1 = 'foo' and b.attr1 = 'foo2'"
+        statement = Select.all.from[:t1.as(:a)].inner_join[:t2.as(:b)].on do
+          a.id == b.id
+        end.inner_join[:t3.as(:c)].on do
+          b.id2 == c.id
+        end.where do
+          c.attr1 == 'foo'
+          b.attr1 == 'foo2'
+        end
+        assert_equal expected, statement.to_sql
+      end
+      
       def test_columns_in_inner_where_are_validated_against_outer_tables
         statement = Select.all.from[:table].where do
           exists(Select.all.from[:inner_table.as(:aliased)].where do
-            table.column1 = aliased.column1
+            table.column1 == aliased.column1
           end)
         end
         assert_equal 'select * from table where exists (select * from inner_table aliased where table.column1 = aliased.column1)', statement.to_sql

data/lib/blank_slate.rb

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

data/lib/inner_join_builder.rb

@@ -0,0 +1,9 @@
+class InnerJoinBuilder
+  def initialize(select_builder)
+    @select_builder = select_builder
+  end
+  
+  def [](table_name)
+    @select_builder.inner_join_table(table_name)
+  end
+end

data/lib/on_where_builder.rb

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

data/lib/receive_any.rb

@@ -1,4 +1,4 @@
-class ReceiveAny  #:nodoc:
+class ReceiveAny < BlankSlate #:nodoc:
   attr_reader :to_sql, :builder
   
   def initialize(identifier, builder)
@@ -9,6 +9,7 @@ class ReceiveAny  #:nodoc:
   def equal(arg)
     builder.equal self, arg
   end
+  alias == equal
   
   def not_equal(arg)
     builder.not_equal self, arg
@@ -52,8 +53,7 @@ class ReceiveAny  #:nodoc:
   
   def method_missing(sym, *args)
     raise ArgumentError.new("#{self.to_sql} is not specified as a table in your from statement") unless @builder.tables.include?(self.to_sql.to_sym)
-    @to_sql << ".#{sym.to_s}".chomp("=")
-    self.equal args.first if sym.to_s =~ /=$/
+    @to_sql << ".#{sym.to_s}"
     self
   end
 end

data/lib/select.rb

@@ -68,4 +68,24 @@ class Select < SqlStatement
     self
   end
   
+  def inner_join
+    InnerJoinBuilder.new(self)
+  end
+  
+  def inner_join_table(table_name)
+    @to_sql << " inner join "
+    if table_name.to_s =~ / as /
+      @tables << table_name.to_s.split(/ as /).last.to_sym
+      @to_sql << table_name.to_s.gsub(/ as /, " ")
+    else
+      @tables << table_name
+      @to_sql << table_name.to_s
+    end
+    self
+  end
+  
+  def on(&block)
+    @to_sql += OnWhereBuilder.new(self.tables, &block).to_sql
+    self
+  end
 end

data/lib/sqldsl.rb

@@ -1,3 +1,4 @@
+require File.dirname(__FILE__) + '/blank_slate.rb'
 require File.dirname(__FILE__) + '/receive_any.rb'
 require File.dirname(__FILE__) + '/symbol.rb'
 require File.dirname(__FILE__) + '/array.rb'
@@ -5,8 +6,10 @@ require File.dirname(__FILE__) + '/string.rb'
 require File.dirname(__FILE__) + '/numeric.rb'
 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__) + '/or_where_builder.rb'
+require File.dirname(__FILE__) + '/on_where_builder.rb'
 require File.dirname(__FILE__) + '/select.rb'
 require File.dirname(__FILE__) + '/distinct_select.rb'
 require File.dirname(__FILE__) + '/insert.rb'

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

data/test/inner_join_builder_test.rb

@@ -0,0 +1,9 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+class InnerJoinBuilderTest < Test::Unit::TestCase
+  def test_add_tables
+    ij = InnerJoinBuilder.new(s_builder = mock)
+    s_builder.expects(:inner_join_table).with(:"table1 as foo")
+    ij[:table1.as(:foo)]
+  end
+end

data/test/receive_any_test.rb

@@ -27,8 +27,7 @@ class ReceiveAnyTest < Test::Unit::TestCase
     builder.expects(:equal).with do |lval, rval|
       lval.class == ReceiveAny && rval == 1
     end
-    builder.expects(:tables).returns [:foo]
-    ReceiveAny.new(:foo, builder).bar = 1
+    ReceiveAny.new(:foo, builder) == 1
   end
   
   def test_not_equal

data/test/select_acceptance_test.rb

@@ -25,7 +25,7 @@ class SelectAcceptanceTest < Test::Unit::TestCase
   
   def test_select_with_receive_any_objects_and_operators
     statement = Select[:column1, 'book', 10].from[:table1, :table2].where do
-      table1.column1 = 99
+      column1 == 99
       column1 <=> 100
       column2 < 'foo'
       column3 <= column4
@@ -36,7 +36,7 @@ class SelectAcceptanceTest < Test::Unit::TestCase
       column2 << [3, 4]
     end
     expected = "select column1, 'book', 10 from table1, table2
-                  where table1.column1 = 99 and column1 <> 100 and column2 < 'foo' 
+                  where column1 = 99 and column1 <> 100 and column2 < 'foo' 
                   and column3 <= column4 and column1 > 0 and column2 >= 'bar' 
                   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
@@ -71,10 +71,23 @@ class SelectAcceptanceTest < Test::Unit::TestCase
     assert_equal expected, statement.to_sql
   end
   
+  def test_select_with_inner_join
+    expected = "select * from t1 a inner join t2 b on a.id = b.id inner join t3 c on b.id2 = c.id where c.attr1 = 'foo' and b.attr1 = 'foo2'"
+    statement = Select.all.from[:t1.as(:a)].inner_join[:t2.as(:b)].on do
+      a.id == b.id
+    end.inner_join[:t3.as(:c)].on do
+      b.id2 == c.id
+    end.where do
+      c.attr1 == 'foo'
+      b.attr1 == 'foo2'
+    end
+    assert_equal expected, statement.to_sql
+  end
+  
   def test_columns_in_inner_where_are_validated_against_outer_tables
     statement = Select.all.from[:table].where do
       exists(Select.all.from[:inner_table.as(:aliased)].where do
-        table.column1 = aliased.column1
+        table.column1 == aliased.column1
       end)
     end
     assert_equal 'select * from table where exists (select * from inner_table aliased where table.column1 = aliased.column1)', statement.to_sql

data/test/select_test.rb

@@ -57,5 +57,20 @@ class SelectTest < Test::Unit::TestCase
   def test_table_array
     assert_equal [:table1, :table2], Select.all.from[:table1, :table2].instance_variable_get("@tables")
   end
+
+  def test_inner_join
+    assert_equal InnerJoinBuilder, Select.all.inner_join.class
+  end
+  
+  def test_inner_join_with_table
+    assert_equal "select * from table1 inner join table2", Select.all.from[:table1].inner_join[:table2].to_sql
+  end
+
+  def test_inner_join_with_table_with_on
+    statement = Select.all.from[:table1].inner_join[:table2].on do
+      table2.column == 1
+    end
+    assert_equal "select * from table1 inner join table2 on table2.column = 1", statement.to_sql
+  end
   
 end 

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 require 'test/unit'
+require File.dirname(__FILE__) + '/../lib/sqldsl'
 unless File.directory? File.dirname(__FILE__) + '/../vendor/mocha-0.4.0/'
   raise "mocha 4.0 is required to run the test suite. create the 'vendor' directory as a sibling of test and 'gem unpack mocha' in 'vendor'"
 end
 $:.unshift File.dirname(__FILE__) + '/../vendor/mocha-0.4.0/lib/'
 require File.dirname(__FILE__) + '/../vendor/mocha-0.4.0/lib/mocha'
-require File.dirname(__FILE__) + '/../lib/sqldsl'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: sqldsl
 version: !ruby/object:Gem::Version 
-  version: 1.3.2
-date: 2007-03-16 00:00:00 -04:00
+  version: 1.4.0
+date: 2007-03-17 00:00:00 -04:00
 summary: A DSL for creating SQL Statements
 require_paths: 
 - lib
@@ -29,10 +29,13 @@ authors:
 - Jay Fields
 files: 
 - lib/array.rb
+- lib/blank_slate.rb
 - lib/delete.rb
 - lib/distinct_select.rb
+- lib/inner_join_builder.rb
 - lib/insert.rb
 - lib/numeric.rb
+- lib/on_where_builder.rb
 - lib/or_where_builder.rb
 - lib/receive_any.rb
 - lib/select.rb
@@ -47,6 +50,7 @@ files:
 - test/array_test.rb
 - test/delete_acceptance_test.rb
 - test/delete_test.rb
+- test/inner_join_builder_test.rb
 - test/insert_acceptance_test.rb
 - test/insert_test.rb
 - test/numeric_test.rb