sqldsl 1.3.1 → 1.3.2

data/README

@@ -149,7 +149,7 @@ See the tests for more examples
       
       def test_columns_in_inner_where_are_validated_against_outer_tables
         statement = Select.all.from[:table].where do
-          exists(Select.all.from[:inner_table => :aliased].where do
+          exists(Select.all.from[:inner_table.as(:aliased)].where do
             table.column1 = aliased.column1
           end)
         end

data/lib/numeric.rb

@@ -8,7 +8,12 @@ class Numeric
     self
   end
   
+  # call-seq: numeric.as(alias_name) -> a_symbol
+  # 
+  # Returns the number aliased (including 'as') as the aliased name
+  # 
+  #    10.as(:column1)     #=> :"10 as column"
   def as(alias_name)
-    "#{self} as #{alias_name}"
+    "#{self} as #{alias_name}".to_sym
   end
 end

data/lib/select.rb

@@ -45,11 +45,16 @@ class Select < SqlStatement
   # 
   #    Select[1, :column1, 'book'].from[:table1, :table2].to_sql       #=> "select 1, column1, 'book' from table1, table2"
   def [](*table_names)
-    @tables = table_names.inject([]) { |result, element| result + (element.is_a?(Hash) ? element.values : [element]) }
-
+    @tables = []
     @to_sql += table_names.inject([]) do |result, element|
-      result + (element.is_a?(Symbol) ? [element] : element.to_a.inject([]) { |result, pair| result << :"#{pair.first} #{pair.last}" })
-    end.sort{ |x,y| x.to_s <=> y.to_s }.to_sql
+      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/lib/sqldsl.rb

@@ -2,7 +2,6 @@ require File.dirname(__FILE__) + '/receive_any.rb'
 require File.dirname(__FILE__) + '/symbol.rb'
 require File.dirname(__FILE__) + '/array.rb'
 require File.dirname(__FILE__) + '/string.rb'
-require File.dirname(__FILE__) + '/hash.rb'
 require File.dirname(__FILE__) + '/numeric.rb'
 require File.dirname(__FILE__) + '/time.rb'
 require File.dirname(__FILE__) + '/sql_statement.rb'

data/lib/string.rb

@@ -8,8 +8,13 @@ class String
     "'#{self.gsub(/'/, "''")}'"
   end
   
+  # call-seq: string.as(alias_name) -> a_symbol
+  # 
+  # Returns the string aliased (including 'as') as the aliased name
+  # 
+  #    "book".as(:category)     #=> :"'book' as category"
   def as(alias_name)
-    "#{self.to_sql} as #{alias_name}"
+    "#{self.to_sql} as #{alias_name}".to_sym
   end
 
 end

data/lib/symbol.rb

@@ -8,8 +8,13 @@ class Symbol
     to_s
   end
   
+  # call-seq: symbol.as(alias_name) -> a_symbol
+  # 
+  # Returns the symbol aliased (including 'as') as the aliased name
+  # 
+  #    :book.as(:category)     #=> :"book as category"
   def as(alias_name)
-    "#{self} as #{alias_name}"
+    "#{self} as #{alias_name}".to_sym
   end
 
 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.3.1"
+	s.version = "1.3.2"
 	s.author = 'Jay Fields'
 	s.description = "A DSL for creating SQL Statements"
 	s.email = 'sqldsl-developer@rubyforge.org'

data/test/numeric_test.rb

@@ -6,6 +6,6 @@ class NumbericTest < Test::Unit::TestCase
   end
   
   def test_as
-    assert_equal '1 as bam', 1.as(:bam)
+    assert_equal :'1 as bam', 1.as(:bam)
   end
 end

data/test/select_acceptance_test.rb

@@ -73,7 +73,7 @@ class SelectAcceptanceTest < Test::Unit::TestCase
   
   def test_columns_in_inner_where_are_validated_against_outer_tables
     statement = Select.all.from[:table].where do
-      exists(Select.all.from[:inner_table => :aliased].where do
+      exists(Select.all.from[:inner_table.as(:aliased)].where do
         table.column1 = aliased.column1
       end)
     end

data/test/select_test.rb

@@ -23,7 +23,7 @@ class SelectTest < Test::Unit::TestCase
   end
     
   def test_select_with_multiple_tables
-    assert_equal 'select column from bar, foo', Select[:column].from[:foo, :bar].to_sql
+    assert_equal 'select column from foo, bar', Select[:column].from[:foo, :bar].to_sql
   end
   
   def test_order_by
@@ -39,11 +39,11 @@ class SelectTest < Test::Unit::TestCase
   end
   
   def test_column_aliasing
-    assert_equal 'select column1 as foo, column2 as bar', Select[:column1 => :foo, :column2 => :bar].to_sql
+    assert_equal "select column1 as foo, 2 as bar, 'foo' as baz", Select[:column1.as(:foo), 2.as(:bar), 'foo'.as(:baz)].to_sql
   end
   
   def test_table_aliasing
-    assert_equal 'select * from table1 foo, table2 bar', Select.all.from[:table1 => :foo, :table2 => :bar].to_sql
+    assert_equal 'select * from table1 foo, table2 bar, table3', Select.all.from[:table1.as(:foo), :table2.as(:bar), :table3].to_sql
   end
   
   def test_tables_no_aliasing

data/test/string_test.rb

@@ -10,6 +10,6 @@ class StringTest < Test::Unit::TestCase
   end
   
   def test_as
-    assert_equal "'foo' as bar", "foo".as(:bar)
+    assert_equal :"'foo' as bar", "foo".as(:bar)
   end
 end

data/test/symbol_test.rb

@@ -6,6 +6,6 @@ class SymbolTest < Test::Unit::TestCase
   end
   
   def test_as
-    assert_equal 'asdf as bam', :asdf.as(:bam)
+    assert_equal :'asdf as bam', :asdf.as(:bam)
   end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: sqldsl
 version: !ruby/object:Gem::Version 
-  version: 1.3.1
-date: 2007-03-14 00:00:00 -04:00
+  version: 1.3.2
+date: 2007-03-16 00:00:00 -04:00
 summary: A DSL for creating SQL Statements
 require_paths: 
 - lib
@@ -31,7 +31,6 @@ files:
 - lib/array.rb
 - lib/delete.rb
 - lib/distinct_select.rb
-- lib/hash.rb
 - lib/insert.rb
 - lib/numeric.rb
 - lib/or_where_builder.rb
@@ -48,7 +47,6 @@ files:
 - test/array_test.rb
 - test/delete_acceptance_test.rb
 - test/delete_test.rb
-- test/hash_test.rb
 - test/insert_acceptance_test.rb
 - test/insert_test.rb
 - test/numeric_test.rb

data/lib/hash.rb

@@ -1,16 +0,0 @@
-class Hash
-  
-  # call-seq: hash.to_sql -> a_string
-  # 
-  # Returns a string with single quotes escaped.
-  # 
-  #    {:column1 => :foo, :column2 => :bar}.to_sql     #=> "column1 as foo, column2 as bar"
-  def to_sql
-    result = []
-    each_pair do |key, value|
-      result << "#{key} as #{value}".to_sym
-    end
-    result.sort{ |x,y| x.to_s <=> y.to_s }.to_sql
-  end
-
-end

data/test/hash_test.rb

@@ -1,9 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper'
-
-class HashTest < Test::Unit::TestCase 
-
-  def test_to_sql_name_value_as_aliasing
-    assert_equal "a as b, c as d", {:a => :b, :c => :d}.to_sql
-  end
-  
-end