sequel 0.0.18 → 0.0.19

data/CHANGELOG

@@ -1,3 +1,21 @@
+*0.0.19*
+
+* More specs for Dataset.
+
+* Fixed Dataset#invert_order to work correctly with strings.
+
+* Fixed Model#== to check equality of values.
+
+* Added Model#exclude and Model#order.
+
+* Fixed Dataset#order and Dataset#group to behave correctly when supplied with qualified field name symbols.
+
+* Removed Database#literal. Shouldn't have been there.
+
+* Added SQLite::Dataset#explain. Returns an array of opcode hashes.
+
+* Specs for ConnectionPool.
+
 *0.0.18*
 
 * Implemented SequelError and SequelConnectionError classes. ConnectionPool#hold now catches any connection errors and reraises them SequelConnectionError.

data/README

@@ -9,6 +9,7 @@ Sequel makes it easy to deal with multiple records without having to break your
 * {Project page}[http://code.google.com/p/ruby-sequel/]
 * {Source code}[http://ruby-sequel.googlecode.com/svn/]
 * {Bug tracking}[http://code.google.com/p/ruby-sequel/issues/list]
+* {Google group}[http://groups.google.com/group/sequel-talk]
 * {RubyForge page}[http://rubyforge.org/projects/sequel/]
 
 To check out the source code:

data/Rakefile

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

data/lib/sequel/connection_pool.rb

@@ -43,7 +43,9 @@ module Sequel
     
     def acquire(thread)
       @mutex.synchronize do
-        @allocated[thread] = available
+        if conn = available
+          @allocated[thread] = conn
+        end
       end
     end
     

data/lib/sequel/database.rb

@@ -34,13 +34,15 @@ module Sequel
     alias_method :[], :from
 
     def execute(sql)
-      raise RuntimeError
+      raise NotImplementedError
     end
     
+    # Acquires a database connection, yielding it to the passed block.
     def synchronize(&block)
       @pool.hold(&block)
     end
-      
+
+    # Returns true if there is a database connection
     def test_connection
       @pool.hold {|conn|} if @pool
       true
@@ -55,15 +57,6 @@ module Sequel
       execute(sql)
     end
 
-    # Returns a literal SQL representation of a value. This method is usually
-    # overriden in database adapters.
-    def literal(v)
-      case v
-      when String: "'%s'" % v
-      else v.to_s
-      end
-    end
-    
     # Creates a table. The easiest way to use this method is to provide a
     # block:
     #   DB.create_table :posts do
@@ -104,23 +97,24 @@ module Sequel
     SQL_BEGIN = 'BEGIN'.freeze
     SQL_COMMIT = 'COMMIT'.freeze
     SQL_ROLLBACK = 'ROLLBACK'.freeze
-    
+
+    # A simple implementation of SQL transactions. Nested transactions are not 
+    # supported - calling #transaction within a transaction will reuse the 
+    # current transaction. May be overridden for databases that support nested 
+    # transactions.
     def transaction
       @pool.hold do |conn|
         @transactions ||= []
         if @transactions.include? Thread.current
           return yield(conn)
         end
-        # ServerSide.info('BEGIN')
         conn.execute(SQL_BEGIN)
         begin
           @transactions << Thread.current
           result = yield(conn)
-          # ServerSide.info('COMMIT')
           conn.execute(SQL_COMMIT)
           result
         rescue => e
-          # ServerSide.info('ROLLBACK')
           conn.execute(SQL_ROLLBACK)
           raise e
         ensure
@@ -132,11 +126,14 @@ module Sequel
     @@adapters = Hash.new
     
     # Sets the adapter scheme for the database class. Call this method in
-    # descendnants of Database to allow connection using a URL. For example:
+    # descendnants of Database to allow connection using a URL. For example the
+    # following:
     #   class DB2::Database < Sequel::Database
     #     set_adapter_scheme :db2
     #     ...
     #   end
+    # would allow connection using:
+    #   Sequel.open('db2://user:password@dbserver/mydb')
     def self.set_adapter_scheme(scheme)
       @@adapters[scheme.to_sym] = self
     end

data/lib/sequel/dataset.rb

@@ -51,7 +51,7 @@ module Sequel
     # objects). If no record class is defined for the dataset, self is
     # returned.
     def naked
-      @record_class ? self.class.new(@db, @opts) : self
+      @record_class ? self.class.new(@db, @opts.dup) : self
     end
     
     AS_REGEXP = /(.*)___(.*)/.freeze
@@ -90,7 +90,7 @@ module Sequel
     
     # Converts an array of sources into a comma separated list.
     def source_list(source)
-      raise 'No source specified for query' unless source
+      raise SequelError, 'No source specified for query' unless source
       source.map {|i| i.is_a?(Dataset) ? i.to_table_reference : i}.
         join(COMMA_SEPARATOR)
     end
@@ -109,7 +109,7 @@ module Sequel
       when Array: v.empty? ? NULL : v.map {|i| literal(i)}.join(COMMA_SEPARATOR)
       when Dataset: SUBQUERY % v.sql
       else
-        raise "can't express #{v.inspect}:#{v.class} as a SQL literal"
+        raise SequelError, "can't express #{v.inspect}:#{v.class} as a SQL literal"
       end
     end
     
@@ -195,9 +195,14 @@ module Sequel
     DESC_ORDER_REGEXP = /(.*)\sDESC/.freeze
     
     def invert_order(order)
-      order.map do |f|
-        f.to_s =~ DESC_ORDER_REGEXP ? $1 : f.DESC
+      new_order = []
+      order.each do |f|
+        f.to_s.split(',').map do |p|
+          p.strip!
+          new_order << (p =~ DESC_ORDER_REGEXP ? $1 : p.to_sym.DESC)
+        end
       end
+      new_order
     end
     
     # Returns a copy of the dataset with the results grouped by the value of 
@@ -240,7 +245,7 @@ module Sequel
     # if the dataset has been grouped. See also #filter
     def where(*cond)
       if @opts[:group]
-        raise "Can't specify a WHERE clause once the dataset has been grouped"
+        raise SequelError, "Can't specify a WHERE clause once the dataset has been grouped"
       else
         filter(*cond)
       end
@@ -250,7 +255,7 @@ module Sequel
     # if the dataset has not been grouped. See also #filter
     def having(*cond)
       unless @opts[:group]
-        raise "Can only specify a HAVING clause on a grouped dataset"
+        raise SequelError, "Can only specify a HAVING clause on a grouped dataset"
       else
         filter(*cond)
        end
@@ -331,11 +336,11 @@ module Sequel
       end
       
       if group = opts[:group]
-        sql << (GROUP % group.join(COMMA_SEPARATOR))
+        sql << (GROUP % field_list(group))
       end
 
       if order = opts[:order]
-        sql << (ORDER % order.join(COMMA_SEPARATOR))
+        sql << (ORDER % field_list(order))
       end
       
       if having = opts[:having]
@@ -384,9 +389,9 @@ module Sequel
       opts = opts ? @opts.merge(opts) : @opts
       
       if opts[:group]
-        raise "Can't update a grouped dataset" 
+        raise SequelError, "Can't update a grouped dataset" 
       elsif (opts[:from].size > 1) or opts[:join_type]
-        raise "Can't update a joined dataset"
+        raise SequelError, "Can't update a joined dataset"
       end
 
       set_list = values.map {|kv| SET_FORMAT % [kv[0], literal(kv[1])]}.
@@ -406,9 +411,9 @@ module Sequel
       opts = opts ? @opts.merge(opts) : @opts
 
       if opts[:group]
-        raise "Can't delete from a grouped dataset" 
+        raise SequelError, "Can't delete from a grouped dataset" 
       elsif opts[:from].is_a?(Array) && opts[:from].size > 1
-        raise "Can't delete from a joined dataset"
+        raise SequelError, "Can't delete from a joined dataset"
       end
 
       sql = DELETE % opts[:from]
@@ -495,7 +500,8 @@ module Sequel
     end
   
     def last(num = 1)
-      raise 'No order specified' unless @opts[:order] || (opts && opts[:order])
+      raise SequelError, 'No order specified' unless 
+        @opts[:order] || (opts && opts[:order])
       
       l = {:limit => num}
       opts = {:order => invert_order(@opts[:order])}.
@@ -511,7 +517,7 @@ module Sequel
     # Deletes all records in the dataset one at a time by invoking the destroy
     # method of the associated model class.
     def destroy
-      raise 'Dataset not associated with model' unless @record_class
+      raise SequelError, 'Dataset not associated with model' unless @record_class
       
       count = 0
       @db.transaction {each {|r| count += 1; r.destroy}}
@@ -531,7 +537,7 @@ class Symbol
   end
   
   def AS(target)
-    "#{field_name} AS #{target}"
+    "#{to_field_name} AS #{target}"
   end
   
   def MIN; "min(#{to_field_name})"; end
@@ -556,4 +562,3 @@ class Symbol
     "#{to_s}.*"
   end
 end
-

data/lib/sequel/model.rb

@@ -170,7 +170,9 @@ module Sequel
     def self.each(&block); dataset.each(&block); end
     def self.all; dataset.all; end
     def self.filter(*arg); dataset.filter(*arg); end
-    def self.first; dataset.first; end
+    def self.exclude(*arg); dataset.exclude(*arg); end
+    def self.order(*arg); dataset.order(*arg); end
+    def self.first(*arg); dataset.first(*arg); end
     def self.count; dataset.count; end
     def self.map(column); dataset.map(column); end
     def self.hash_column(column); dataset.hash_column(primary_key, column); end
@@ -254,7 +256,7 @@ module Sequel
     end
     
     def ==(obj)
-      (obj.class == model) && (obj.pkey == @pkey)
+      (obj.class == model) && (obj.values == @values)
     end
     
     def set(values)

data/lib/sequel/postgres.rb

@@ -172,7 +172,7 @@ module Sequel
         Postgres::Dataset.new(self, opts)
       end
     
-      RELATION_QUERY = {:from => :pg_class, :select => :relname}.freeze
+      RELATION_QUERY = {:from => [:pg_class], :select => [:relname]}.freeze
       RELATION_FILTER = "(relkind = 'r') AND (relname !~ '^pg|sql')".freeze
       SYSTEM_TABLE_REGEXP = /^pg|sql/.freeze
     

data/lib/sequel/sqlite.rb

@@ -101,6 +101,14 @@ module Sequel
         end
         self
       end
+      
+      EXPLAIN = 'EXPLAIN %s'.freeze
+
+      def explain
+        res = []
+        @db.result_set(EXPLAIN % select_sql(opts), nil) {|r| res << r}
+        res
+      end
     end
   end
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 0.0.18
-date: 2007-04-13 00:00:00 +03:00
+  version: 0.0.19
+date: 2007-04-16 00:00:00 +03:00
 summary: Concise ORM for Ruby.
 require_paths: 
 - lib
@@ -35,18 +35,18 @@ files:
 - bin/sequel
 - doc/rdoc
 - lib/sequel
-- lib/sequel.rb
-- lib/sequel/connection_pool.rb
-- lib/sequel/core_ext.rb
+- lib/sequel/pretty_table.rb
+- lib/sequel/model.rb
+- lib/sequel/schema.rb
+- lib/sequel/sqlite.rb
 - lib/sequel/database.rb
 - lib/sequel/dataset.rb
-- lib/sequel/error.rb
-- lib/sequel/model.rb
 - lib/sequel/mysql.rb
 - lib/sequel/postgres.rb
-- lib/sequel/pretty_table.rb
-- lib/sequel/schema.rb
-- lib/sequel/sqlite.rb
+- lib/sequel/connection_pool.rb
+- lib/sequel/core_ext.rb
+- lib/sequel/error.rb
+- lib/sequel.rb
 - CHANGELOG
 test_files: []