sequel_core 1.0 → 1.0.0.1

data/CHANGELOG

@@ -1,3 +1,11 @@
+=== 1.0.0.1 (2008-01-03)
+
+* Changed MySQL adapter to support specifying socket option.
+
+* Added support for limiting and paginating datasets with fixed SQL, gotten with DB#fetch (thanks Ruy Diaz). 
+
+* Added new Dataset#from_self method that returns a dataset selecting from the original dataset.
+
 === 1.0 (2008-01-02)
 
 * Removed deprecated adapter stubs.

data/Rakefile

@@ -9,7 +9,7 @@ include FileUtils
 # Configuration
 ##############################################################################
 NAME = "sequel_core"
-VERS = "1.0"
+VERS = "1.0.0.1"
 CLEAN.include ["**/.*.sw?", "pkg/*", ".config", "doc/*", "coverage/*"]
 RDOC_OPTS = [
   "--quiet", 

data/lib/sequel_core/adapters/mysql.rb

@@ -87,7 +87,7 @@ module Sequel
 
       def connect
         conn = Mysql.real_connect(@opts[:host], @opts[:user], @opts[:password], 
-        @opts[:database], @opts[:port], nil, Mysql::CLIENT_MULTI_RESULTS)
+        @opts[:database], @opts[:port], @opts[:socket], Mysql::CLIENT_MULTI_RESULTS)
         conn.query_with_result = false
         if encoding = @opts[:encoding] || @opts[:charset]
           conn.query("set character_set_connection = '#{encoding}'")

data/lib/sequel_core/dataset/sql.rb

@@ -142,6 +142,15 @@ module Sequel
       def from(*source)
         clone_merge(:from => source)
       end
+      
+      # Returns a dataset selecting from the current dataset.
+      #
+      #   ds = DB[:items].order(:name)
+      #   ds.sql #=> "SELECT * FROM items ORDER BY name"
+      #   ds.from_self #=> "SELECT * FROM (SELECT * FROM items ORDER BY name)"
+      def from_self
+        clone_merge(:sql => nil, :from => [self])
+      end
 
       # Returns a copy of the dataset with the selected columns changed.
       def select(*columns)
@@ -561,25 +570,31 @@ module Sequel
       # If given a range, it will contain only those at offsets within that
       # range. If a second argument is given, it is used as an offset.
       def limit(l, o = nil)
+        if @opts[:sql]
+          return from_self.limit(l, o)
+        end
+
+        opts = {}
         if l.is_a? Range
           lim = (l.exclude_end? ? l.last - l.first : l.last + 1 - l.first)
-          clone_merge(:limit => lim, :offset=>l.first)
+          opts = {:limit => lim, :offset=>l.first}
         elsif o
-          clone_merge(:limit => l, :offset => o)
+          opts = {:limit => l, :offset => o}
         else
-          clone_merge(:limit => l)
+          opts = {:limit => l}
         end
+        clone_merge(opts)
       end
       
       STOCK_COUNT_OPTS = {:select => ["COUNT(*)".lit], :order => nil}.freeze
 
       # Returns the number of records in the dataset.
       def count
-        opts = @opts[:sql] ? \
-          {:sql => "SELECT COUNT(*) FROM (#{@opts[:sql]}) AS c", :order => nil} : \
-          STOCK_COUNT_OPTS
-
-        single_value(opts).to_i
+        if @opts[:sql]
+          from_self.count
+        else
+          single_value(STOCK_COUNT_OPTS).to_i
+        end
       end
     end
   end

data/spec/adapters/informix_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../../lib/sequel')
+require File.join(File.dirname(__FILE__), '../../lib/sequel_core')
 
 INFORMIX_DB = Sequel('informix://localhost/mydb')
 if INFORMIX_DB.table_exists?(:test)

data/spec/adapters/mysql_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../../lib/sequel')
+require File.join(File.dirname(__FILE__), '../../lib/sequel_core')
 require 'logger'
 
 MYSQL_DB = Sequel('mysql://root@localhost/sandbox')
@@ -328,3 +328,15 @@ context "A MySQL database" do
     ]
   end
 end  
+
+context "A MySQL database" do
+  specify "should accept a socket option" do
+    db = Sequel.mysql('sandbox', :host => 'localhost', :user => 'root', :socket => '/tmp/mysql.sock')
+    proc {db.test_connection}.should_not raise_error
+  end
+  
+  specify "should fail to connect with invalid socket" do
+    db = Sequel.mysql('sandbox', :host => 'localhost', :user => 'root', :socket => 'blah')
+    proc {db.test_connection}.should raise_error
+  end
+end

data/spec/adapters/oracle_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../../lib/sequel')
+require File.join(File.dirname(__FILE__), '../../lib/sequel_core')
 
 ORACLE_DB = Sequel('oracle://hr:hr@loalhost/XE')
 if ORACLE_DB.table_exists?(:test)

data/spec/adapters/postgres_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../../lib/sequel')
+require File.join(File.dirname(__FILE__), '../../lib/sequel_core')
 
 PGSQL_DB = Sequel('postgres://postgres:postgres@localhost:5432/reality_spec')
 PGSQL_DB.drop_table(:test) if PGSQL_DB.table_exists?(:test)

data/spec/adapters/sqlite_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../../lib/sequel')
+require File.join(File.dirname(__FILE__), '../../lib/sequel_core')
 
 SQLITE_DB = Sequel('sqlite:/')
 SQLITE_DB.create_table :items do

data/spec/dataset_spec.rb

@@ -789,6 +789,12 @@ context "Dataset#limit" do
     @dataset.limit(6, 10).sql.should ==
       'SELECT * FROM test LIMIT 6 OFFSET 10'
   end
+  
+  specify "should work with fixed sql datasets" do
+    @dataset.opts[:sql] = 'select * from cccc'
+    @dataset.limit(6, 10).sql.should ==
+      'SELECT * FROM (select * from cccc) t1 LIMIT 6 OFFSET 10'
+  end
 end
 
 context "Dataset#naked" do
@@ -916,7 +922,7 @@ context "Dataset#count" do
   specify "should count properly for datasets with fixed sql" do
     @dataset.opts[:sql] = "select abc from xyz"
     @dataset.count.should == 1
-    @c.sql.should == "SELECT COUNT(*) FROM (select abc from xyz) AS c"
+    @c.sql.should == "SELECT COUNT(*) FROM (select abc from xyz) t1"
   end
 end
 
@@ -1806,6 +1812,12 @@ context "A paginated dataset" do
     @d.paginate(4, 50).current_page_record_count.should == 3
     @d.paginate(5, 50).current_page_record_count.should == 0
   end
+  
+  specify "should work with fixed sql" do
+    ds = @d.clone_merge(:sql => 'select * from blah')
+    ds.meta_def(:count) {150}
+    ds.paginate(2, 50).sql.should == 'SELECT * FROM (select * from blah) t1 LIMIT 50 OFFSET 50'
+  end
 end
 
 context "Dataset#columns" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel_core
 version: !ruby/object:Gem::Version 
-  version: "1.0"
+  version: 1.0.0.1
 platform: ruby
 authors: 
 - Sharon Rosner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-02 00:00:00 +02:00
+date: 2008-01-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency