sqldsl 1.0.0 → 1.1.0

data/README

@@ -89,3 +89,6 @@ See the tests for more examples
         assert_equal expected, statement.to_sql
       end
     end
+
+=== Contributors
+Matt Deiters

data/lib/distinct_select.rb

@@ -0,0 +1,7 @@
+class DistinctSelect < Select #:nodoc:
+  class << self
+    def [](*columns)
+      self.new("select distinct #{create_columns_list(columns)}")
+    end
+  end
+end

data/lib/hash.rb

@@ -0,0 +1,16 @@
+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/lib/numeric.rb

@@ -1,4 +1,5 @@
 class Numeric
+  include WhereValue
   # call-seq: numeric.to_sql -> a_numeric
   # 
   # Returns self

data/lib/select.rb

@@ -6,8 +6,22 @@ class Select < SqlStatement
     # 
     #    Select[1, :column1, 'book'].to_sql       #=> "select 1, column1, 'book'"
     def [](*columns)
-      self.new("select #{columns.collect{ |column| column.to_sql }.join(', ')}")
+      self.new("select #{create_columns_list(columns)}")
     end
+    
+    def create_columns_list(columns) #:nodoc:
+      columns.collect{ |column| column.to_sql }.join(', ')
+    end
+    
+    # call-seq: Select.distinct -> a_select
+    # 
+    # Returns a Select class that appends 'distinct' to the select clause
+    # 
+    #    Select.distinct[1, :column1, 'book'].to_sql       #=> "select distinct 1, column1, 'book'"
+    def distinct
+      DistinctSelect
+    end
+
   end
   
   # call-seq: select.from -> a_select
@@ -26,7 +40,17 @@ class Select < SqlStatement
   # 
   #    Select[1, :column1, 'book'].from[:table1, :table2].to_sql       #=> "select 1, column1, 'book' from table1, table2"
   def [](*table_names)
-    @to_sql += table_names.collect{ |table| table.to_s }.sort.join(', ')
+    @to_sql += table_names.sort{ |x,y| x.to_s <=> y.to_s }.collect{ |table| table.to_s }.sort.join(', ')
+    self
+  end
+  
+  # call-seq: select.order_by -> a_select
+  # 
+  # Returns a Select instance with the order arguments, joined by ', ' appended to the SQL statement.
+  # 
+  #    Select[1].from[:table1].order_by(:column1, :column2).to_sql       #=> "select 1 from table1 order by column1, column2"
+  def order_by(*column)
+    @to_sql << " order by #{column.to_sql}"
     self
   end
   

data/lib/sqldsl.rb

@@ -1,12 +1,15 @@
+require File.dirname(__FILE__) + '/where_value.rb'
 require File.dirname(__FILE__) + '/object.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'
 require File.dirname(__FILE__) + '/where_builder.rb'
 require File.dirname(__FILE__) + '/select.rb'
+require File.dirname(__FILE__) + '/distinct_select.rb'
 require File.dirname(__FILE__) + '/insert.rb'
 require File.dirname(__FILE__) + '/update.rb'
 require File.dirname(__FILE__) + '/delete.rb'

data/lib/string.rb

@@ -1,4 +1,5 @@
 class String
+  include WhereValue
   
   # call-seq: string.to_sql -> a_string
   # 

data/lib/symbol.rb

@@ -1,5 +1,5 @@
 class Symbol
-
+  include WhereValue
   # call-seq: symbol.to_sql -> a_string
   # 
   # Returns a string with single quotes escaped.

data/lib/where_builder.rb

@@ -18,6 +18,15 @@ class WhereBuilder
   def equal(lval, rval)
     sql_parts << rval.to_sql_equal(lval)
   end
+  
+  # call-seq: where.not_null(arg1)
+  # 
+  # Appends a not null condition to the where SQL clause.
+  # 
+  #    WhereBuilder.new { not_null :column1 }.to_sql       #=> " where column1 is not null"
+  def not_null(column)
+    sql_parts << "#{column} is not null"
+  end
     
   # call-seq: where.exists(clause)
   # 
@@ -49,8 +58,6 @@ class WhereBuilder
     " where #{sql_parts.join(' and ')}"
   end
   
-  protected
-  
   def sql_parts  #:nodoc:
     @sql_parts ||= []
   end

data/lib/where_value.rb

@@ -0,0 +1,8 @@
+module WhereValue
+  
+  def is_not_in &block
+    builder = eval "self", block.binding
+    builder.sql_parts << "#{self.to_sql} not in (#{block.call.to_sql})"
+  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.0.0"
+	s.version = "1.1.0"
 	s.author = 'Jay Fields'
 	s.description = "A DSL for creating SQL Statements"
 	s.email = 'sqldsl-developer@rubyforge.org'

data/test/hash_test.rb

@@ -0,0 +1,9 @@
+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

data/test/numeric_test.rb

@@ -0,0 +1,12 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+class NumbericTest < Test::Unit::TestCase 
+  def test_to_sql_gives_self
+    assert_equal 123, 123.to_sql
+  end
+
+  def test_is_a_where_value_duck
+    assert_equal true, 123.respond_to?(:is_not_in)
+  end
+  
+end

data/test/select_test.rb

@@ -26,4 +26,21 @@ class SelectTest < Test::Unit::TestCase
     assert_equal 'select column from bar, foo',
                  Select[:column].from[:foo, :bar].to_sql
   end
+  
+  def test_order_by
+    assert_equal 'select foo order by bar', Select[:foo].order_by(:bar).to_sql
+  end
+  
+  def test_order_by_with_multiple_arguments
+    assert_equal 'select foo order by bar, baz', Select[:foo].order_by(:bar, :baz).to_sql
+  end
+  
+  def test_distinct_select
+    assert_equal 'select distinct foo', Select.distinct[:foo].to_sql
+  end
+  
+  def test_column_aliasing
+    assert_equal 'select column1 as foo, column2 as bar', Select[:column1 => :foo, :column2 => :bar].to_sql
+  end
+  
 end 

data/test/string_test.rb

@@ -8,4 +8,9 @@ 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_is_a_where_value_duck
+    assert_equal true, "foo".respond_to?(:is_not_in)
+  end
+  
 end

data/test/symbol_test.rb

@@ -4,4 +4,9 @@ class SymbolTest < Test::Unit::TestCase
   def test_to_sql_returns_to_s
     assert_equal 'asdf', :asdf.to_sql
   end
+  
+  def test_is_a_where_value_duck
+    assert_equal true, :sym.respond_to?(:is_not_in)
+  end
+  
 end

data/test/where_builder_test.rb

@@ -47,4 +47,21 @@ class WhereBuilderTest < Test::Unit::TestCase
     end
     assert_equal ' where not exists (select foo)', statement.to_sql
   end
+  
+  def test_is_not_null_where_criteria
+    statement = WhereBuilder.new do
+      not_null :something
+    end
+    assert_equal ' where something is not null', statement.to_sql
+  end
+  
+  def test_is_not_in_where_criteria
+    statement = WhereBuilder.new do
+      :column1.is_not_in do
+        Select[:shipment_option_id]
+      end
+    end
+    assert_equal ' where column1 not in (select shipment_option_id)', statement.to_sql
+  end
+  
 end

data/test/where_value_test.rb

@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+class WhereValueTest < Test::Unit::TestCase
+  
+  def test_not_in_sql_statement_with_value
+    klass = Class.new() do
+      include WhereValue
+      
+      def to_sql
+        "klass"
+      end
+    end
+    
+    statement = Select[:foo].where do
+      klass.new.is_not_in do
+        "anything"
+      end
+    end
+    assert_equal "select foo where klass not in ('anything')", statement.to_sql
+  end
+  
+end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.0
 specification_version: 1
 name: sqldsl
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2006-09-30 00:00:00 -04:00
+  version: 1.1.0
+date: 2007-03-01 00:00:00 -05:00
 summary: A DSL for creating SQL Statements
 require_paths: 
 - lib
@@ -25,11 +25,14 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Jay Fields
 files: 
 - lib/array.rb
 - lib/delete.rb
+- lib/distinct_select.rb
+- lib/hash.rb
 - lib/insert.rb
 - lib/numeric.rb
 - lib/object.rb
@@ -41,12 +44,15 @@ files:
 - lib/time.rb
 - lib/update.rb
 - lib/where_builder.rb
+- lib/where_value.rb
 - test/all_tests.rb
 - 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
 - test/object_test.rb
 - test/select_acceptance_test.rb
 - test/select_test.rb
@@ -57,6 +63,7 @@ files:
 - test/update_acceptance_test.rb
 - test/update_test.rb
 - test/where_builder_test.rb
+- test/where_value_test.rb
 - rakefile.rb
 - README
 test_files: