sequel 0.0.15 → 0.0.16

data/CHANGELOG

@@ -1,3 +1,15 @@
+*0.0.16*
+
+* Added support for subqueries in Dataset#literal.
+
+* Added support for Model.all_by_XXX methods through Model.method_missing.
+
+* Added basic SQL logging to Database.
+
+* Added Enumerable#send_each convenience method.
+
+* Changed Dataset#destroy to return the number of deleted records.
+
 *0.0.15*
 
 * Improved Dataset#insert_sql to allow arrays as well as hashes.

data/Rakefile

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

data/lib/sequel/core_ext.rb

@@ -7,3 +7,10 @@ class Time
     strftime(SQL_FORMAT)
   end
 end
+
+# Enumerable extensions.
+module Enumerable
+  def send_each(sym, *args)
+    each {|i| i.send(sym, *args)}
+  end
+end

data/lib/sequel/database.rb

@@ -17,6 +17,7 @@ module Sequel
     def initialize(opts = {})
       @opts = opts
       @pool = ConnectionPool.new(@opts[:max_connections] || 4)
+      @logger = opts[:logger]
     end
     
     # Returns a blank dataset

data/lib/sequel/dataset.rb

@@ -104,6 +104,7 @@ module Sequel
     end
     
     NULL = "NULL".freeze
+    SUBQUERY = "(%s)".freeze
     
     # Returns a literal representation of a value to be used as part
     # of an SQL expression. This method is overriden in descendants.
@@ -114,6 +115,7 @@ module Sequel
       when NilClass: NULL
       when Symbol: v.to_field_name
       when Array: v.empty? ? NULL : v.map {|i| literal(i)}.join(COMMA_SEPARATOR)
+      when self.class: SUBQUERY % v.sql
       else
         raise "can't express #{v.inspect}:#{v.class} as a SQL literal"
       end
@@ -421,7 +423,9 @@ module Sequel
     def destroy
       raise 'Dataset not associated with model' unless @record_class
       
-      @db.transaction {each {|r| r.destroy}}
+      count = 0
+      @db.transaction {each {|r| count += 1; r.destroy}}
+      count
     end
     
     def print(*columns)

data/lib/sequel/model.rb

@@ -202,6 +202,7 @@ module Sequel
     
     FIND_BY_REGEXP = /^find_by_(.*)/.freeze
     FILTER_BY_REGEXP = /^filter_by_(.*)/.freeze
+    ALL_BY_REGEXP = /^all_by_(.*)/.freeze
     
     def self.method_missing(m, *args)
       Thread.exclusive do
@@ -209,13 +210,15 @@ module Sequel
         if method_name =~ FIND_BY_REGEXP
           c = $1
           meta_def(method_name) {|arg| find(c => arg)}
-          send(m, *args) if respond_to?(m)
         elsif method_name =~ FILTER_BY_REGEXP
           c = $1
           meta_def(method_name) {|arg| filter(c => arg)}
-          send(m, *args) if respond_to?(m)
+        elsif method_name =~ ALL_BY_REGEXP
+          c = $1
+          meta_def(method_name) {|arg| filter(c => arg).all}
         end
       end
+      respond_to?(m) ? send(m, *args) : super(m, *args)
     end
     
     def db; self.class.db; end

data/lib/sequel/mysql.rb

@@ -23,12 +23,14 @@ module Sequel
       end
     
       def execute(sql)
+        @logger.info(sql) if @logger
         @pool.hold do |conn|
           conn.query(sql)
         end
       end
       
       def execute_insert(sql)
+        @logger.info(sql) if @logger
         @pool.hold do |conn|
           conn.query(sql)
           conn.insert_id
@@ -36,6 +38,7 @@ module Sequel
       end
     
       def execute_affected(sql)
+        @logger.info(sql) if @logger
         @pool.hold do |conn|
           conn.query(sql)
           conn.affected_rows

data/lib/sequel/postgres.rb

@@ -188,14 +188,17 @@ module Sequel
       end
     
       def execute(sql)
+        @logger.info(sql) if @logger
         @pool.hold {|conn| conn.execute(sql)}
       end
     
       def execute_and_forget(sql)
+        @logger.info(sql) if @logger
         @pool.hold {|conn| conn.execute(sql).clear}
       end
       
       def execute_insert(sql, table)
+        @logger.info(sql) if @logger
         @pool.hold do |conn|
           conn.execute(sql).clear
           conn.last_insert_id(table)

data/lib/sequel/sqlite.rb

@@ -30,10 +30,12 @@ module Sequel
       end
     
       def execute(sql)
+        @logger.info(sql) if @logger
         @pool.hold {|conn| conn.execute(sql)}
       end
       
       def execute_insert(sql)
+        @logger.info(sql) if @logger
         @pool.hold {|conn| conn.execute(sql); conn.last_insert_row_id}
       end
       

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 0.0.15
-date: 2007-03-30 00:00:00 +02:00
+  version: 0.0.16
+date: 2007-04-08 00:00:00 +03:00
 summary: Concise ORM for Ruby.
 require_paths: 
 - lib