sequel 0.3.0 → 0.3.0.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 0.3.0.1 (2007-10-20)
+
+* Changed Database#fetch to return a modified dataset.
+
 === 0.3 (2007-10-20)
 
 * Added stock transforms to Dataset#transform. Refactored Model.serialize.

data/Rakefile

@@ -6,7 +6,7 @@ require 'fileutils'
 include FileUtils
 
 NAME = "sequel"
-VERS = "0.3.0"
+VERS = "0.3.0.1"
 CLEAN.include ['**/.*.sw?', 'pkg/*', '.config', 'doc/*', 'coverage/*']
 RDOC_OPTS = ['--quiet', '--title', "Sequel: Concise ORM for Ruby",
   "--opname", "index.html",

data/lib/sequel/database.rb

@@ -74,7 +74,9 @@ module Sequel
       if block
         ds.fetch_rows(sql, &block)
       else
-        Enumerable::Enumerator.new(ds, :fetch_rows, sql)
+        ds.meta_def(:select_sql) {|*args| sql}
+        ds.meta_def(:sql) {|*args| sql}
+        ds
       end
     end
     alias_method :>>, :fetch

data/spec/database_spec.rb

@@ -547,14 +547,24 @@ context "Database#fetch" do
     sql.should == "select name from table where name = 'aman' or id in (3, 4, 7)"
   end
   
-  specify "should return an enumerator if no block is given" do
-    @db.fetch('select * from xyz').should respond_to(:each)
+  specify "should return the dataset if no block is given" do
+    @db.fetch('select * from xyz').should be_a_kind_of(Sequel::Dataset)
     
     @db.fetch('select a from b').map {|r| r[:sql]}.should == ['select a from b']
 
     @db.fetch('select c from d').inject([]) {|m, r| m << r; m}.should == \
       [{:sql => 'select c from d'}]
   end
+  
+  specify "should return a dataset that always uses the given sql for SELECTs" do
+    ds = @db.fetch('select * from xyz')
+    ds.select_sql.should == 'select * from xyz'
+    ds.sql.should == 'select * from xyz'
+    
+    ds.filter! {:price < 100}
+    ds.select_sql.should == 'select * from xyz'
+    ds.sql.should == 'select * from xyz'
+  end
 end
 
 context "Database#[]" do

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.0.1
 date: 2007-10-20 00:00:00 +02:00
 summary: Lightweight ORM library for Ruby
 require_paths: