sqldsl 1.4.1 → 1.4.2

data/README

@@ -154,10 +154,9 @@ See the tests for more examples
       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
+        expected = "select * from t1 a inner join t2 b, t3 c on a.id = b.id and b.id2 = c.id where c.attr1 = 'foo' and b.attr1 = 'foo2'"
+        statement = Select.all.from[:t1.as(:a)].inner_join[:t2.as(:b), :t3.as(:c)].on do
           a.id == b.id
-        end.inner_join[:t3.as(:c)].on do
           b.id2 == c.id
         end.where do
           c.attr1 == 'foo'
@@ -195,5 +194,6 @@ See the tests for more examples
     end
 
 === Contributors
-Matt Deiters[http://www.theagiledeveloper.com]
-Sergio Espeja[http://spejman-on-rails.blogspot.com/]
+Matt[http://www.theagiledeveloper.com] Deiters[http://www.theagiledeveloper.com]
+
+Sergio[http://spejman-on-rails.blogspot.com/] Espeja[http://spejman-on-rails.blogspot.com/]

data/lib/inner_join_builder.rb

@@ -3,7 +3,7 @@ class InnerJoinBuilder #:nodoc:
     @select_builder = select_builder
   end
   
-  def [](table_name)
-    @select_builder.inner_join_table(table_name)
+  def [](*table_names)
+    @select_builder.inner_join_table(table_names)
   end
 end

data/lib/select.rb

@@ -78,15 +78,18 @@ class Select < SqlStatement
     InnerJoinBuilder.new(self)
   end
   
-  def inner_join_table(table_name) #:nodoc:
+  def inner_join_table(*table_names) #:nodoc:
     @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
+    table_names.flatten!
+    @to_sql += table_names.inject([]) do |result, element|
+      if element.to_s =~ / as /
+        @tables << element.to_s.split(/ as /).last.to_sym
+        result << element.to_s.gsub(/ as /, " ").to_sym
+      else
+        @tables << element
+        result << element
+      end
+    end.to_sql
     self
   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.1"
+	s.version = "1.4.2"
 	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

@@ -3,7 +3,7 @@ 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")
+    s_builder.expects(:inner_join_table).with([:"table1 as foo"])
     ij[:table1.as(:foo)]
   end
 end

data/test/select_acceptance_test.rb

@@ -77,10 +77,9 @@ class SelectAcceptanceTest < Test::Unit::TestCase
   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
+    expected = "select * from t1 a inner join t2 b, t3 c on a.id = b.id and b.id2 = c.id where c.attr1 = 'foo' and b.attr1 = 'foo2'"
+    statement = Select.all.from[:t1.as(:a)].inner_join[:t2.as(:b), :t3.as(:c)].on do
       a.id == b.id
-    end.inner_join[:t3.as(:c)].on do
       b.id2 == c.id
     end.where do
       c.attr1 == 'foo'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: sqldsl
 version: !ruby/object:Gem::Version 
-  version: 1.4.1
-date: 2007-03-25 00:00:00 -04:00
+  version: 1.4.2
+date: 2007-03-26 00:00:00 -04:00
 summary: A DSL for creating SQL Statements
 require_paths: 
 - lib