@@ -1,5 +1,7 @@ === HEAD +* Make Dataset#from_self take an options hash and respect an :alias option, giving the alias to use (Phrogz) + * Make the JDBC adapter accept a :convert_types option to turn off Java type conversion and double performance (jeremyevans) * Slight increase in ConnectionPool performance (jeremyevans) @@ -12,7 +14,7 @@ * Significant improvements to the ODBC and ADO adapters in general (jeremyevans) -* The ADO adapter no longer attempts to use database transations, since they never worked (jeremyevans) +* The ADO adapter no longer attempts to use database transactions, since they never worked (jeremyevans) * Much better support for Microsoft SQL Server using the ADO, ODBC, and JDBC adapters (jeremyevans) CHANGELOG @@ -272,14 +272,16 @@ module Sequel end # Returns a dataset selecting from the current dataset. + # Supplying the :alias option controls the name of the result. # - # ds = DB[:items].order(:name) - # ds.sql #=> "SELECT * FROM items ORDER BY name" - # ds.from_self.sql #=> "SELECT * FROM (SELECT * FROM items ORDER BY name)" - def from_self + # ds = DB[:items].order(:name).select(:id, :name) + # ds.sql #=> "SELECT id,name FROM items ORDER BY name" + # ds.from_self.sql #=> "SELECT * FROM (SELECT id, name FROM items ORDER BY name) AS 't1'" + # ds.from_self(:alias=>:foo).sql #=> "SELECT * FROM (SELECT id, name FROM items ORDER BY name) AS 'foo'" + def from_self(opts={}) fs = {} @opts.keys.each{|k| fs[k] = nil} - clone(fs).from(self) + clone(fs).from(opts[:alias] ? as(opts[:alias]) : self) end # SQL fragment specifying an SQL function call lib/sequel/dataset/sql.rb @@ -1399,6 +1399,25 @@ context "Dataset#empty?" do end end +context "Dataset#from_self" do + before do + @ds = Sequel::Dataset.new(nil).from(:test).select(:name).limit(1) + end + specify "should set up a default alias" do + @ds.from_self.sql.should == 'SELECT * FROM (SELECT name FROM test LIMIT 1) AS t1' + end + specify "should modify only the new dataset" do + @ds.from_self.select(:bogus).sql.should == 'SELECT bogus FROM (SELECT name FROM test LIMIT 1) AS t1' + end + specify "should use the user-specified alias" do + @ds.from_self(:alias=>:some_name).sql.should == 'SELECT * FROM (SELECT name FROM test LIMIT 1) AS some_name' + end + specify "should use the user-specified alias for joins" do + @ds.from_self(:alias=>:some_name).inner_join(:posts, :alias=>:name).sql.should == \ + 'SELECT * FROM (SELECT name FROM test LIMIT 1) AS some_name INNER JOIN posts ON (posts.alias = some_name.name)' + end +end + context "Dataset#join_table" do before do @d = MockDataset.new(nil).from(:items) spec/core/dataset_spec.rb af2ba1b780afd7013dfd1321dfd708f9816eeb50 Jeremy Evans code@jeremyevans.net http://github.com/jeremyevans/sequel/commit/3c9b0912e3d9a995828f23271b7de59b64455ffe 3c9b0912e3d9a995828f23271b7de59b64455ffe 2009-07-08T11:38:56-07:00 2009-07-08T11:38:56-07:00 Make Dataset#from_self take an options hash and respect an :alias option, giving the alias to use 775778e99c3480fc46c3650deaad8d974e440731 Jeremy Evans code@jeremyevans.net