sequel 0.0.7 → 0.0.8

data/CHANGELOG

@@ -1,3 +1,11 @@
+*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.
+
+* Fixed literal representation of literals in SQLite adapter (thanks Christian Neukirchen!) 
+
+* Refactored insert code in Postgres adapter (in preparation for fetching the last insert id for pre-8.1 versions).
+
 *0.0.7*
 
 * Fixed bug in Model.schema, duh!

data/Rakefile

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

data/lib/sequel/dataset.rb

@@ -166,15 +166,17 @@ module Sequel
       dup_merge(:order => order)
     end
     
+    # Returns a copy of the dataset with the order reversed. If no order is
+    # given, the existing order is inverted.
+    def reverse_order(*order)
+      order(invert_order(order.empty? ? @opts[:order] : order))
+    end
+    
     DESC_ORDER_REGEXP = /(.*)\sDESC/.freeze
     
-    def reverse_order(order)
+    def invert_order(order)
       order.map do |f|
-        if f.to_s =~ DESC_ORDER_REGEXP
-          $1
-        else
-          f.DESC
-        end
+        f.to_s =~ DESC_ORDER_REGEXP ? $1 : f.DESC
       end
     end
     
@@ -375,11 +377,10 @@ module Sequel
     end
   
     def last(num = 1)
-      raise RuntimeError, 'No order specified' unless
-        @opts[:order] || (opts && opts[:order])
+      raise 'No order specified' unless @opts[:order] || (opts && opts[:order])
       
       l = {:limit => num}
-      opts = {:order => reverse_order(@opts[:order])}.
+      opts = {:order => invert_order(@opts[:order])}.
         merge(opts ? opts.merge(l) : l)
 
       if num == 1
@@ -390,8 +391,7 @@ module Sequel
     end
     
     def destroy
-      raise RuntimeError, 'Dataset not associated with model' unless
-        @record_class
+      raise 'Dataset not associated with model' unless @record_class
       
       @db.transaction {each {|r| r.destroy}}
     end

data/lib/sequel/postgres.rb

@@ -146,6 +146,27 @@ module Sequel
       def execute_and_forget(sql)
         @pool.hold {|conn| conn.execute(sql).clear}
       end
+      
+      SELECT_LASTVAL = 'SELECT lastval()'.freeze
+
+      def execute_insert(sql)
+        @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
+        end
+      end
     
       def synchronize(&block)
         @pool.hold(&block)
@@ -246,14 +267,11 @@ module Sequel
       end
   
       def count(opts = nil)
-        query_single_value(count_sql(opts)).to_i
+        @db.query_single_value(count_sql(opts)).to_i
       end
     
-      SELECT_LASTVAL = ';SELECT lastval()'.freeze
-    
       def insert(values = nil, opts = nil)
-        @db.execute_and_forget(insert_sql(values, opts))
-        query_single_value(SELECT_LASTVAL).to_i
+        @db.execute_insert(insert_sql(values, opts))
       end
     
       def update(values, opts = nil)
@@ -320,18 +338,6 @@ 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

@@ -57,6 +57,17 @@ module Sequel
     end
     
     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"
+        end
+      end
+
       def each(opts = nil, &block)
         @db.result_set(select_sql(opts), @record_class, &block)
         self

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
-date: 2007-03-22 00:00:00 +02:00
+  version: 0.0.8
+date: 2007-03-24 00:00:00 +02:00
 summary: Concise ORM for Ruby.
 require_paths: 
 - lib