sqldsl 1.3.0 → 1.3.1

data/README

@@ -143,7 +143,7 @@ See the tests for more examples
         end.or do
           column1 > 100
         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)"
         assert_equal expected, statement.to_sql
       end
       

data/lib/numeric.rb

@@ -7,4 +7,8 @@ class Numeric
   def to_sql
     self
   end
+  
+  def as(alias_name)
+    "#{self} as #{alias_name}"
+  end
 end

data/lib/or_where_builder.rb

@@ -7,9 +7,9 @@ class OrWhereBuilder < WhereBuilder
   #    OrWhereBuilder.new [] do 
   #      equal :column1, 10
   #      equal :column2, 'book'
-  #    end.to_sql         #=> " or column1 = 10 and column2 = 'book'"
+  #    end.to_sql         #=> " or (column1 = 10 and column2 = 'book')"
   def to_sql
-    " or #{sql_parts.join(' and ')}"
+    " or (#{sql_parts.join(' and ')})"
   end
 
 end

data/lib/select.rb

@@ -18,7 +18,7 @@ class Select < SqlStatement
       DistinctSelect
     end
     
-    # call-seq: Select[arg,...] -> a_select
+    # call-seq: Select.all -> a_select
     # 
     # Returns a Select instance with the SQL initialized to 'select *'
     # 

data/lib/string.rb

@@ -7,5 +7,9 @@ class String
   def to_sql
     "'#{self.gsub(/'/, "''")}'"
   end
+  
+  def as(alias_name)
+    "#{self.to_sql} as #{alias_name}"
+  end
 
 end

data/lib/symbol.rb

@@ -6,6 +6,10 @@ class Symbol
   #    "it's".to_sql     #=> "'it''s'"
   def to_sql
     to_s
-  end  
+  end
+  
+  def as(alias_name)
+    "#{self} as #{alias_name}"
+  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.0"
+	s.version = "1.3.1"
 	s.author = 'Jay Fields'
 	s.description = "A DSL for creating SQL Statements"
 	s.email = 'sqldsl-developer@rubyforge.org'

data/test/numeric_test.rb

@@ -4,4 +4,8 @@ class NumbericTest < Test::Unit::TestCase
   def test_to_sql_gives_self
     assert_equal 123, 123.to_sql
   end
+  
+  def test_as
+    assert_equal '1 as bam', 1.as(:bam)
+  end
 end

data/test/select_acceptance_test.rb

@@ -67,7 +67,7 @@ class SelectAcceptanceTest < Test::Unit::TestCase
     end.or do
       column1 > 100
     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)"
     assert_equal expected, statement.to_sql
   end
   

data/test/string_test.rb

@@ -8,4 +8,8 @@ class StringTest < Test::Unit::TestCase
   def test_to_sql_gives_quoted_and_escapes_single_quotes
     assert_equal "'it''s'", "it's".to_sql
   end
+  
+  def test_as
+    assert_equal "'foo' as bar", "foo".as(:bar)
+  end
 end

data/test/symbol_test.rb

@@ -4,4 +4,8 @@ class SymbolTest < Test::Unit::TestCase
   def test_to_sql_returns_to_s
     assert_equal 'asdf', :asdf.to_sql
   end
+  
+  def test_as
+    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.0
-date: 2007-03-11 00:00:00 -05:00
+  version: 1.3.1
+date: 2007-03-14 00:00:00 -04:00
 summary: A DSL for creating SQL Statements
 require_paths: 
 - lib