sequel 0.2.0.2 → 0.2.1

data/spec/sequelizer_spec.rb

@@ -45,6 +45,12 @@ context "Proc#to_sql" do
     def xyz; 321; end
     proc {:x == xyz}.to_sql.should == "(x = 321)"
     proc {:x == xyz.to_s}.to_sql.should == "(x = '321')"
+    
+    def y1(x); x; end
+    def y2; 111; end
+    
+    proc {:x == y1(222)}.to_sql.should == "(x = 222)"
+    proc {:x == y2}.to_sql.should == "(x = 111)"
   end
   
   specify "should support constants" do
@@ -184,16 +190,16 @@ context "Proc#to_sql" do
   end
 
   specify "should support comparison to sub-queries" do
-    # @ds2 = DB[:test].select(:node_id)
-    # 
-    # proc {:id == @ds2}.to_sql.should == \
-    #   "(id IN (SELECT node_id FROM test))"
-    #   
-    # proc {:id == DB[:test].select(:node_id)}.to_sql.should == \
-    # "(id IN (SELECT node_id FROM test))"
+    @ds2 = DB[:test].select(:node_id)
+    
+    proc {:id == @ds2}.to_sql.should == \
+      "(id IN (SELECT node_id FROM test))"
+      
+    proc {:id == DB[:test].select(:node_id)}.to_sql.should == \
+    "(id IN (SELECT node_id FROM test))"
 
-    # proc {:id == DB[:test].select(:node_id).filter {:active == true}}.to_sql.should == \
-    #   "(id IN (SELECT node_id FROM test WHERE (active = 't')))"
+    proc {:id == DB[:test].select(:node_id).filter {:active == true}}.to_sql.should == \
+      "(id IN (SELECT node_id FROM test WHERE (active = 't')))"
     
     proc {:price >= DB[:items].select(:price)}.to_sql.should == \
       "(price >= (SELECT price FROM items))"
@@ -267,4 +273,38 @@ context "Proc#to_sql" do
     "abc" =~ /(ab)/
     proc {:x == $1}.to_sql.should == "(x = 'ab')"
   end
+  
+  specify "should evaluate expression not referring to symbols or literal strings." do
+    proc {:x > 2 * 3}.to_sql.should == "(x > 6)"
+    y = 3
+    proc {:x > y * 4}.to_sql.should == "(x > 12)"
+
+    proc {:AVG[:x] > 4}.to_sql.should == "(AVG(x) > 4)"
+
+    proc {:AVG[:x] > 4}.to_sql.should == "(AVG(x) > 4)"
+    
+    proc {:y == (1 > 2)}.to_sql.should == "(y = 'f')"
+  end
+  
+  specify "should support ternary operator" do
+    y = true
+    proc {:x > (y ? 1 : 2)}.to_sql.should == "(x > 1)"
+    
+    proc {((1 > 2) ? :x : :y) > 3}.to_sql.should == "(y > 3)"
+  end
+  
+  specify "should support strings with embedded Ruby code in them and literalize them" do
+    proc {:n == "#{1+2}"}.to_sql.should == "(n = '3')"
+    
+    y = "12'34"
+    
+    proc {:x > "#{y}"}.to_sql.should == "(x > '12''34')"
+  end
+  
+  specify "should support format strings and literalize the result" do
+    prod = 1
+    proc {:x == "abc%d" % prod}.to_sql.should == "(x = 'abc1')"
+    
+    proc {:x == ("%d" % prod).lit}.to_sql.should == "(x = 1)"
+  end
 end

data/spec/spec_helper.rb

@@ -1,10 +1,32 @@
 require File.join(File.dirname(__FILE__), '../lib/sequel')
 
-class SchemaDummyDatabase < Sequel::Database
+class MockDataset < Sequel::Dataset
+  def insert(*args)
+    @db.execute insert_sql(*args)
+  end
+  
+  def update(*args)
+    @db.execute update_sql(*args)
+  end
+  
+  def fetch_rows(sql)
+    yield({:id => 1, :x => 1})
+  end
+end
+
+class MockDatabase < Sequel::Database
   attr_reader :sqls
   
-  # def execute(sql)
-  #   @sqls ||= []
-  #   @sqls << sql
-  # end
+  def execute(sql)
+    @sqls ||= []
+    @sqls << sql
+  end
+
+  def reset
+    @sqls = []
+  end
+
+  def transaction; yield; end
+  
+  def dataset; MockDataset.new(self); end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 0.2.0.2
-date: 2007-09-07 00:00:00 +03:00
+  version: 0.2.1
+date: 2007-09-24 00:00:00 +02:00
 summary: Lightweight ORM library for Ruby
 require_paths: 
 - lib
@@ -61,6 +61,7 @@ files:
 - lib/sequel/error.rb
 - lib/sequel/expressions.rb
 - lib/sequel/migration.rb
+- lib/sequel/model
 - lib/sequel/model.rb
 - lib/sequel/mysql.rb
 - lib/sequel/odbc.rb
@@ -72,6 +73,11 @@ files:
 - lib/sequel/dataset/convenience.rb
 - lib/sequel/dataset/sequelizer.rb
 - lib/sequel/dataset/sql.rb
+- lib/sequel/model/base.rb
+- lib/sequel/model/hooks.rb
+- lib/sequel/model/record.rb
+- lib/sequel/model/relations.rb
+- lib/sequel/model/schema.rb
 - lib/sequel/schema/schema_generator.rb
 - lib/sequel/schema/schema_sql.rb
 - CHANGELOG