sequel 0.0.8 → 0.0.9

data/CHANGELOG

@@ -1,3 +1,15 @@
+*0.0.9*
+
+* Fixed Postgres::Database#tables and #locks methods.
+
+* Added PGconn#last_insert_id method that should support all 7.x and 8.x versions of Postgresql.
+
+* Added Dataset#exists method for EXISTS where clauses.
+
+* Changed behavior of Dataset#literal to regard symbols as field names.
+
+* Refactored and DRY'd Dataset#literal and overrides therof. Added support for subqueries in where clause.
+
 *0.0.8*
 
 * Fixed Dataset#reverse_order to provide chainability. This method can be called without arguments to invert the current order or with arguments to provide a descending order.

data/README

@@ -146,7 +146,11 @@ You can then retrieve the records by using any of the retrieval methods:
 You can also specify a custom WHERE clause:
 
   posts.filter('(stamp < ?) AND (author <> ?)', 3.days.ago, author_name)
-  
+
+Datasets can also be used as subqueries for filtering:
+
+expensive_stuff = DB[:items].filter(:price => DB[:items].select('AVG(price) + 100'))
+
 === Summarizing Records
 
 Counting records is easy:

data/Rakefile

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

data/lib/sequel/dataset.rb

@@ -1,3 +1,5 @@
+require 'time'
+
 module Sequel
   # A Dataset represents a view of a the data in a database, constrained by
   # specific parameters such as filtering conditions, order, etc. Datasets
@@ -100,9 +102,13 @@ module Sequel
     # of an SQL expression. This method is overriden in descendants.
     def literal(v)
       case v
-      when String: "'%s'" % v
+      when String: "'%s'" % v.gsub(/'/, "''")
+      when Integer, Float: v.to_s
+      when NilClass: NULL
+      when Symbol: v.to_field_name
       when Array: v.empty? ? NULL : v.join(COMMA_SEPARATOR)
-      else v.to_s
+      else
+        raise "can't express #{v.inspect}:#{v.class} as a SQL literal"
       end
     end
     
@@ -123,6 +129,8 @@ module Sequel
 #        BETWEEN_EXPR % [field_name(left), literal(right.begin), literal(right.end)]
       when Array:
         IN_EXPR % [left, literal(right)]
+      when self.class:
+        IN_EXPR % [left, right.sql]
       else
         EQUAL_COND % [left, literal(right)]
       end
@@ -358,6 +366,16 @@ module Sequel
       select(field.SUM).first.values.first
     end
     
+    def avg(field)
+      select(field.AVG).first.values.first
+    end
+    
+    EXISTS_EXPR = "EXISTS (%s)".freeze
+    
+    def exists(opts = nil)
+      EXISTS_EXPR % sql({:select => 1}.merge(opts || {}))
+    end
+    
     LIMIT_1 = {:limit => 1}.freeze
     
     def limit(l)
@@ -410,6 +428,7 @@ class Symbol
   def MIN; "min(#{to_field_name})"; end
   def MAX; "max(#{to_field_name})"; end
   def SUM; "sum(#{to_field_name})"; end
+  def AVG; "avg(#{to_field_name})"; end
 
   AS_REGEXP = /(.*)___(.*)/.freeze
   AS_FORMAT = "%s AS %s".freeze

data/lib/sequel/postgres.rb

@@ -65,6 +65,54 @@ class PGconn
       @transaction_in_progress = nil
     end
   end
+
+  SELECT_CURRVAL = "SELECT currval('%s')".freeze
+      
+  def last_insert_id(table)
+    @table_sequences ||= {}
+    seq = @table_sequences[table] ||= pkey_and_sequence(table)[1]
+    r = async_query(SELECT_CURRVAL % seq)
+    r[0][0].to_i unless r.nil? || r.empty?
+  end
+      
+  # Shamelessly appropriated from ActiveRecord's Postgresql adapter.
+  
+  SELECT_PK_AND_SERIAL_SEQUENCE = <<-end_sql
+    SELECT attr.attname, name.nspname, seq.relname
+    FROM pg_class seq, pg_attribute attr, pg_depend dep,
+      pg_namespace name, pg_constraint cons
+    WHERE seq.oid = dep.objid
+      AND seq.relnamespace  = name.oid
+      AND seq.relkind = 'S'
+      AND attr.attrelid = dep.refobjid
+      AND attr.attnum = dep.refobjsubid
+      AND attr.attrelid = cons.conrelid
+      AND attr.attnum = cons.conkey[1]
+      AND cons.contype = 'p'
+      AND dep.refobjid = '%s'::regclass
+  end_sql
+  
+  SELECT_PK_AND_CUSTOM_SEQUENCE = <<-end_sql
+    SELECT attr.attname, name.nspname, split_part(def.adsrc, '''', 2)
+    FROM pg_class t
+    JOIN pg_namespace  name ON (t.relnamespace = name.oid)
+    JOIN pg_attribute  attr ON (t.oid = attrelid)
+    JOIN pg_attrdef    def  ON (adrelid = attrelid AND adnum = attnum)
+    JOIN pg_constraint cons ON (conrelid = adrelid AND adnum = conkey[1])
+    WHERE t.oid = '%s'::regclass
+      AND cons.contype = 'p'
+      AND def.adsrc ~* 'nextval'
+  end_sql
+  
+  def pkey_and_sequence(table)
+    r = async_query(SELECT_PK_AND_SERIAL_SEQUENCE % table)
+    return [r[0].first, r[0].last] unless r.nil? or r.empty?
+
+    r = async_query(SELECT_PK_AND_CUSTOM_SEQUENCE % table)
+    return [r.first, r.last] unless r.nil? or r.empty?
+  rescue
+    nil
+  end
 end
 
 class String
@@ -130,11 +178,11 @@ module Sequel
     
     
       def tables
-        query(RELATION_QUERY).filter(RELATION_FILTER).map(:relname)
+        dataset(RELATION_QUERY).filter(RELATION_FILTER).map(:relname)
       end
       
       def locks
-        query.from("pg_class, pg_locks").
+        dataset.from("pg_class, pg_locks").
           select("pg_class.relname, pg_locks.*").
           filter("pg_class.relfilenode=pg_locks.relation")
       end
@@ -147,24 +195,10 @@ module Sequel
         @pool.hold {|conn| conn.execute(sql).clear}
       end
       
-      SELECT_LASTVAL = 'SELECT lastval()'.freeze
-
-      def execute_insert(sql)
+      def execute_insert(sql, table)
         @pool.hold do |conn|
           conn.execute(sql).clear
-          query_single_value(SELECT_LASTVAL)
-        end
-      end
-    
-      def query_single_value(sql)
-        @pool.hold do |conn|
-          result = conn.execute(sql)
-          begin
-            value = result.getvalue(0, 0)
-          ensure
-            result.clear
-          end
-          value
+          conn.last_insert_id(table)
         end
       end
     
@@ -180,11 +214,10 @@ module Sequel
     class Dataset < Sequel::Dataset
       def literal(v)
         case v
-        when Array: super
+        when String, Fixnum, Float, TrueClass, FalseClass: PGconn.quote(v)
         when Time: v.to_sql_timestamp
-        when Symbol: PGconn.quote(v.to_s)
         else
-          PGconn.quote(v)
+          super
         end
       end
     
@@ -267,11 +300,11 @@ module Sequel
       end
   
       def count(opts = nil)
-        @db.query_single_value(count_sql(opts)).to_i
+        query_single_value(count_sql(opts)).to_i
       end
     
       def insert(values = nil, opts = nil)
-        @db.execute_insert(insert_sql(values, opts))
+        @db.execute_insert(insert_sql(values, opts), @opts[:from])
       end
     
       def update(values, opts = nil)
@@ -338,6 +371,18 @@ module Sequel
         end
       end
       
+      def query_single_value(sql)
+        @db.synchronize do
+          result = @db.execute(sql)
+          begin
+            value = result.getvalue(0, 0)
+          ensure
+            result.clear
+          end
+          value
+        end
+      end
+    
       COMMA = ','.freeze
     
       @@converters_mutex = Mutex.new

data/lib/sequel/sqlite.rb

@@ -59,12 +59,9 @@ module Sequel
     class Dataset < Sequel::Dataset
       def literal(v)
         case v
-        when String: "'%s'" % v.gsub(/'/, "''")
         when Time: literal(v.iso8601)
-        when Array: v.empty? ? NULL : v.join(COMMA_SEPARATOR)
-        when Integer, Float: v.to_s
         else
-          raise "can't express #{v.inspect}:#{v.class} as a SQL literal"
+          super
         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.8
-date: 2007-03-24 00:00:00 +02:00
+  version: 0.0.9
+date: 2007-03-25 00:00:00 +02:00
 summary: Concise ORM for Ruby.
 require_paths: 
 - lib
@@ -36,15 +36,15 @@ files:
 - doc/rdoc
 - lib/sequel
 - lib/sequel.rb
-- lib/sequel/connection_pool.rb
-- lib/sequel/core_ext.rb
-- lib/sequel/database.rb
 - lib/sequel/dataset.rb
 - lib/sequel/model.rb
-- lib/sequel/mysql.rb
 - lib/sequel/postgres.rb
 - lib/sequel/schema.rb
 - lib/sequel/sqlite.rb
+- lib/sequel/connection_pool.rb
+- lib/sequel/database.rb
+- lib/sequel/core_ext.rb
+- lib/sequel/mysql.rb
 - CHANGELOG
 test_files: []