sqldsl 1.4.2 → 1.4.4

data/lib/join_builder.rb

@@ -0,0 +1,10 @@
+class JoinBuilder #:nodoc:
+  def initialize(select_builder, join_type)
+    @select_builder = select_builder
+    @join_type = join_type
+  end
+  
+  def [](*table_names)    
+    @select_builder.join_table(@join_type, table_names)
+  end
+end

data/lib/select.rb

@@ -68,18 +68,39 @@ class Select < SqlStatement
     self
   end
   
-  # call-seq: select.inner_join -> an_inner_join_builder
+  # call-seq: select.inner_join -> a_join_builder
   # 
-  # Returns an InnerJoinBuilder instance.
+  # Returns a JoinBuilder instance.
   # 
   #    Select.all.from[:table1].inner_join
-  #      #=> #<InnerJoinBuilder:0x654f4 @select_builder=#<Select:0x65968 @tables=[:table1], @to_sql="select * from table1">>
+  #      #=> #<JoinBuilder:0x654f4 @select_builder=#<Select:0x65968 @tables=[:table1], @to_sql="select * from table1">>
   def inner_join
-    InnerJoinBuilder.new(self)
+    JoinBuilder.new(self, "inner")
   end
   
-  def inner_join_table(*table_names) #:nodoc:
-    @to_sql << " inner join "
+  # call-seq: select.left_join -> a_join_builder
+  # 
+  # Returns a JoinBuilder instance.
+  # 
+  #    Select.all.from[:table1].left_join
+  #      #=> #<JoinBuilder:0x654f4 @select_builder=#<Select:0x65968 @tables=[:table1], @to_sql="select * from table1">>
+  def left_join
+    JoinBuilder.new(self, "left")
+  end
+  
+  # call-seq: select.right_join -> a_join_builder
+  # 
+  # Returns a JoinBuilder instance.
+  # 
+  #    Select.all.from[:table1].right_join
+  #      #=> #<JoinBuilder:0x654f4 @select_builder=#<Select:0x65968 @tables=[:table1], @to_sql="select * from table1">>
+  def right_join
+    JoinBuilder.new(self, "right")
+  end
+  
+  def join_table(join_type, table_names) #:nodoc:
+    
+    @to_sql << " #{join_type} join "
     table_names.flatten!
     @to_sql += table_names.inject([]) do |result, element|
       if element.to_s =~ / as /
@@ -92,7 +113,6 @@ class Select < SqlStatement
     end.to_sql
     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.

data/lib/sqldsl.rb

@@ -6,7 +6,7 @@ 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__) + '/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'

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.2"
+	s.version = "1.4.4"
 	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

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

data/test/select_test.rb

@@ -58,10 +58,14 @@ class SelectTest < Test::Unit::TestCase
     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
+  def test_left_join_with_table
+    assert_equal "select * from table1 left join table2", Select.all.from[:table1].left_join[:table2].to_sql
   end
-  
+
+  def test_right_join_with_table
+    assert_equal "select * from table1 right join table2", Select.all.from[:table1].right_join[:table2].to_sql
+  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

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.2
 specification_version: 1
 name: sqldsl
 version: !ruby/object:Gem::Version 
-  version: 1.4.2
-date: 2007-03-26 00:00:00 -04:00
+  version: 1.4.4
+date: 2007-05-25 00:00:00 -04:00
 summary: A DSL for creating SQL Statements
 require_paths: 
 - lib
@@ -25,6 +25,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Jay Fields
 files: 
@@ -33,8 +34,8 @@ files:
 - lib/blank_slate.rb
 - lib/delete.rb
 - lib/distinct_select.rb
-- lib/inner_join_builder.rb
 - lib/insert.rb
+- lib/join_builder.rb
 - lib/numeric.rb
 - lib/on_where_builder.rb
 - lib/or_where_builder.rb

data/lib/inner_join_builder.rb

@@ -1,9 +0,0 @@
-class InnerJoinBuilder #:nodoc:
-  def initialize(select_builder)
-    @select_builder = select_builder
-  end
-  
-  def [](*table_names)
-    @select_builder.inner_join_table(table_names)
-  end
-end