sequel 4.4.0 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7006f0a52cb0de63ef52daa4eee4f0246b4dff47
-  data.tar.gz: e936af319d149dcfdd4cffc7e183f79862e71d9f
+  metadata.gz: ab0c1f081253f4b43e1a46f2132e9b516e2a67ba
+  data.tar.gz: e6b2cd60d962bb23d4b6b03a5a1ef33f81762bd0
 SHA512:
-  metadata.gz: f418f71c2c0bf871f80beb3948e03e5dfb531e7d14f612a78d9265cf7e7771781dd0cc0d23fe43c0539ff0b58512eeecac11c4a3c75aa93e887e9dd91fdbcc95
-  data.tar.gz: b33de96a8d47aa303998c9ee560a351574a92176ef80adf23d3c749ebdbdfaf0762861cf6d454c72a89705a7b5c7e167161229dd12d8857d97b1ea090f0fcdd9
+  metadata.gz: d31e482c17d09830fc9895d61d3b9bc3f1bc527fe8939ea7856c98ce4b077ad842e73f8e7982708276898e6353b769fe281bdbb8becd82863b3f8e5e6c58fd7a
+  data.tar.gz: 4c9791b19cab0084aead4cf4a57a5c822d937ad449208c5f10d4b64a8cc7f89c0effd799b1761f540fd1778fd4d8c399034d716dabd3141b6aae1551062df8ac

data/CHANGELOG

@@ -1,3 +1,21 @@
+=== 4.5.0 (2013-12-02)
+
+* Support :on_commit=>(:drop|:delete_rows|:preserve_rows) options when creating temp tables on PostgreSQL (rosenfeld) (#737)
+
+* Make Dataset#insert work on PostgreSQL if the table name is a SQL::PlaceholderLiteralString (jeremyevans) (#736)
+
+* Copy unique constraints when emulating alter_table operations on SQLite (jeremyevans) (#735)
+
+* Don't return clob column values as SQL::Blob instances in the db2 and ibmdb adapters unless use_clob_as_blob is true (jeremyevans)
+
+* Make use_clob_as_blob false by default on DB2 (jeremyevans)
+
+* Fix usage of Sequel::SQL::Blob objects as prepared statement arguments in jdbc/db2 adapter when use_clob_as_blob is false (jeremyevans)
+
+* Add mssql_optimistic_locking plugin, using a timestamp/rowversion column to protect against concurrent updates (pinx, jeremyevans) (#731)
+
+* Make Model.primary_key array immutable for composite keys (chanks) (#730)
+
 === 4.4.0 (2013-11-01)
 
 * Make Database#tables not show tables in the recycle bin on Oracle (jeremyevans) (#728)

data/README.rdoc

@@ -18,12 +18,12 @@ toolkit for Ruby.
 
 == Resources
 
-* {Website}[http://sequel.rubyforge.org]
+* {Website}[http://sequel.jeremyevans.net]
 * {Blog}[http://sequel.heroku.com]
 * {Source code}[http://github.com/jeremyevans/sequel]
 * {Bug tracking}[http://github.com/jeremyevans/sequel/issues]
 * {Google group}[http://groups.google.com/group/sequel-talk]
-* {RDoc}[http://sequel.rubyforge.org/rdoc]
+* {RDoc}[http://sequel.jeremyevans.net/rdoc]
 
 To check out the source code:
   

data/Rakefile

@@ -38,16 +38,11 @@ task :website do
   sh %{#{FileUtils::RUBY} www/make_www.rb}
 end
 
-desc "Update Non-RDoc section of sequel.rubyforge.org"
-task :website_rf_base=>[:website] do
-  sh %{rsync -rt www/public/*.html rubyforge.org:/var/www/gforge-projects/sequel/}
-end
-
 ### RDoc
 
 RDOC_DEFAULT_OPTS = ["--line-numbers", "--inline-source", '--title', 'Sequel: The Database Toolkit for Ruby']
 
-allow_website_rdoc = begin
+begin
   # Sequel uses hanna-nouveau for the website RDoc.
   # Due to bugs in older versions of RDoc, and the
   # fact that hanna-nouveau does not support RDoc 4,
@@ -55,9 +50,7 @@ allow_website_rdoc = begin
   gem 'rdoc', '= 3.12.2'
   gem 'hanna-nouveau'
   RDOC_DEFAULT_OPTS.concat(['-f', 'hanna'])
-  true
 rescue Gem::LoadError
-  false
 end
 
 rdoc_task_class = begin
@@ -80,32 +73,25 @@ if rdoc_task_class
     rdoc.rdoc_files.add %w"README.rdoc CHANGELOG MIT-LICENSE lib/**/*.rb doc/*.rdoc doc/release_notes/*.txt"
   end
 
-  if allow_website_rdoc
-    desc "Make rdoc for website"
-    task :website_rdoc=>[:website_rdoc_main, :website_rdoc_adapters, :website_rdoc_plugins]
-  
-    rdoc_task_class.new(:website_rdoc_main) do |rdoc|
-      rdoc.rdoc_dir = "www/public/rdoc"
-      rdoc.options += RDOC_OPTS + %w'--no-ignore-invalid'
-      rdoc.rdoc_files.add %w"README.rdoc CHANGELOG MIT-LICENSE lib/*.rb lib/sequel/*.rb lib/sequel/{connection_pool,dataset,database,model}/*.rb doc/*.rdoc doc/release_notes/*.txt lib/sequel/extensions/migration.rb lib/sequel/extensions/core_extensions.rb"
-    end
-  
-    rdoc_task_class.new(:website_rdoc_adapters) do |rdoc|
-      rdoc.rdoc_dir = "www/public/rdoc-adapters"
-      rdoc.options += RDOC_DEFAULT_OPTS + %w'--main Sequel --no-ignore-invalid'
-      rdoc.rdoc_files.add %w"lib/sequel/adapters/**/*.rb"
-    end
-  
-    rdoc_task_class.new(:website_rdoc_plugins) do |rdoc|
-      rdoc.rdoc_dir = "www/public/rdoc-plugins"
-      rdoc.options += RDOC_DEFAULT_OPTS + %w'--main Sequel --no-ignore-invalid'
-      rdoc.rdoc_files.add %w"lib/sequel/{extensions,plugins}/**/*.rb doc/core_*"
-    end
-  
-    desc "Update sequel.rubyforge.org"
-    task :website_rf=>[:website, :website_rdoc] do
-      sh %{rsync -rvt www/public/* rubyforge.org:/var/www/gforge-projects/sequel/}
-    end
+  desc "Make rdoc for website"
+  task :website_rdoc=>[:website_rdoc_main, :website_rdoc_adapters, :website_rdoc_plugins]
+
+  rdoc_task_class.new(:website_rdoc_main) do |rdoc|
+    rdoc.rdoc_dir = "www/public/rdoc"
+    rdoc.options += RDOC_OPTS + %w'--no-ignore-invalid'
+    rdoc.rdoc_files.add %w"README.rdoc CHANGELOG MIT-LICENSE lib/*.rb lib/sequel/*.rb lib/sequel/{connection_pool,dataset,database,model}/*.rb doc/*.rdoc doc/release_notes/*.txt lib/sequel/extensions/migration.rb lib/sequel/extensions/core_extensions.rb"
+  end
+
+  rdoc_task_class.new(:website_rdoc_adapters) do |rdoc|
+    rdoc.rdoc_dir = "www/public/rdoc-adapters"
+    rdoc.options += RDOC_DEFAULT_OPTS + %w'--main Sequel --no-ignore-invalid'
+    rdoc.rdoc_files.add %w"lib/sequel/adapters/**/*.rb"
+  end
+
+  rdoc_task_class.new(:website_rdoc_plugins) do |rdoc|
+    rdoc.rdoc_dir = "www/public/rdoc-plugins"
+    rdoc.options += RDOC_DEFAULT_OPTS + %w'--main Sequel --no-ignore-invalid'
+    rdoc.rdoc_files.add %w"lib/sequel/{extensions,plugins}/**/*.rb doc/core_*"
   end
 end
 

data/bin/sequel

@@ -26,7 +26,7 @@ options = OptionParser.new do |opts|
   opts.separator "  sequel postgres://localhost/my_blog"
   opts.separator "  sequel config/database.yml"
   opts.separator ""
-  opts.separator "For more information see http://sequel.rubyforge.org"
+  opts.separator "For more information see http://sequel.jeremyevans.net"
   opts.separator ""
   opts.separator "Options:"
 

data/doc/opening_databases.rdoc

@@ -28,7 +28,7 @@ You can use URI query parameters to specify options:
 
 You can also pass an additional option hash with the connection string:
 
-  DB = Sequel.connect('postgres://localhost/blog' :user=>'user', :password=>'password')
+  DB = Sequel.connect('postgres://localhost/blog', :user=>'user', :password=>'password')
 
 You can also just use an options hash without a connection string.  If you do this, you must
 provide the adapter to use:

data/doc/release_notes/4.5.0.txt

@@ -0,0 +1,34 @@
+= New Features
+
+* An mssql_optimistic_locking plugin has been added.  This is similar
+  to the regular optimistic_locking plugin, but instead of using an
+  integer lock column, it uses a timestamp/rowversion lock column.
+
+* Database#create_table with the :temp=>true option on PostgreSQL now
+  supports an :on_commit option.  This option can be set to :drop or
+  :delete_rows to either drop or empty the temporary table on
+  transaction commit.
+
+= Other Improvements
+
+* Dataset#insert no longer errors on PostgreSQL if the related table
+  is a placeholder literal string.
+
+* Unique constraints are now copied when emulating alter_table
+  operations on SQLite.
+
+* Clob column values are no longer returned as SQL::Blob instances
+  by the db2 and ibmdb adapters unless use_clob_as_blob is true.
+
+* SQL::Blob objects now work correctly as prepared statement
+  arguments in the jdbc/db2 adapter if use_clob_as_blob is false.
+
+= Backwards Compatibility
+
+* The Model.primary_key array for models with composite keys is now
+  frozen.
+
+* On DB2, use_clob_as_blob now defaults to false instead of true.
+
+* Sequel no longer uses RubyForge. The Sequel website is now located
+  at http://sequel.jeremyevans.net.

data/lib/sequel/adapters/db2.rb

@@ -31,7 +31,6 @@ module Sequel
       DB2CLI::SQL_TYPE_TIME => tt.method(:time),
       DB2CLI::SQL_DECIMAL => ::BigDecimal.method(:new)
     }
-    DB2_TYPES[DB2CLI::SQL_CLOB] = DB2_TYPES[DB2CLI::SQL_BLOB]
 
     class Database < Sequel::Database
       include DatabaseMethods
@@ -217,6 +216,8 @@ module Sequel
           name, buflen, datatype, size, digits, nullable = db.checked_error("Could not describe column"){DB2CLI.SQLDescribeCol(sth, i, MAX_COL_SIZE)}
           pr = if datatype == DB2CLI::SQL_SMALLINT && convert && size <= 5 && digits <= 1
             cps[:boolean]
+          elsif datatype == DB2CLI::SQL_CLOB && Sequel::DB2.use_clob_as_blob
+            cps[DB2CLI::SQL_BLOB]
           else
             cps[datatype]
           end

data/lib/sequel/adapters/ibmdb.rb

@@ -25,7 +25,6 @@ module Sequel
       :time => ::Sequel.method(:string_to_time),
       :date => ::Sequel.method(:string_to_date)
     }
-    DB2_TYPES[:clob] = DB2_TYPES[:blob]
 
     # Wraps an underlying connection to DB2 using IBM_DB.
     class Connection
@@ -435,7 +434,8 @@ module Sequel
             key = output_identifier(k)
             type = stmt.field_type(k).downcase.to_sym
             # decide if it is a smallint from precision
-            type = :boolean  if type ==:int && convert && stmt.field_precision(k) < 8
+            type = :boolean  if type == :int && convert && stmt.field_precision(k) < 8
+            type = :blob if type == :clob && Sequel::DB2.use_clob_as_blob
             columns << [key, cps[type]]
           end
           cols = columns.map{|c| c.at(0)}

data/lib/sequel/adapters/jdbc/db2.rb

@@ -32,7 +32,11 @@ module Sequel
         def set_ps_arg(cps, arg, i)
           case arg
           when Sequel::SQL::Blob
-            cps.setString(i, arg)
+            if ::Sequel::DB2.use_clob_as_blob
+              cps.setString(i, arg)
+            else
+              super
+            end
           else
             super
           end

data/lib/sequel/adapters/shared/db2.rb

@@ -2,7 +2,7 @@ Sequel.require 'adapters/utils/emulate_offset_with_row_number'
 
 module Sequel
   module DB2
-    @use_clob_as_blob = true
+    @use_clob_as_blob = false
 
     class << self
       # Whether to use clob as the generic File type, true by default.

data/lib/sequel/adapters/shared/mssql.rb

@@ -332,6 +332,8 @@ module Sequel
           :boolean
         when /\A(?:(?:small)?money)\z/io
           :decimal
+        when /\A(timestamp|rowversion)\z/io
+          :blob
         else
           super
         end

data/lib/sequel/adapters/shared/postgres.rb

@@ -94,6 +94,9 @@ module Sequel
       FOREIGN_KEY_LIST_ON_DELETE_MAP = {'a'.freeze=>:no_action, 'r'.freeze=>:restrict, 'c'.freeze=>:cascade, 'n'.freeze=>:set_null, 'd'.freeze=>:set_default}.freeze
       POSTGRES_DEFAULT_RE = /\A(?:B?('.*')::[^']+|\((-?\d+(?:\.\d+)?)\))\z/
       UNLOGGED = 'UNLOGGED '.freeze
+      ON_COMMIT = {
+        :drop => 'DROP', :delete_rows => 'DELETE ROWS', :preserve_rows => 'PRESERVE ROWS',
+      }.freeze
 
       # SQL fragment for custom sequences (ones not created by serial primary key),
       # Returning the schema and literal form of the sequence name, by parsing
@@ -766,6 +769,10 @@ module Sequel
 
       # DDL statement for creating a table with the given name, columns, and options
       def create_table_prefix_sql(name, options)
+        if on_commit = options[:on_commit]
+          raise(Error, "can't provide :on_commit without :temp to create_table") unless options[:temp]
+          raise(Error, "unsupported on_commit option: #{on_commit.inspect}") unless ON_COMMIT.has_key? on_commit
+        end
         temp_or_unlogged_sql = if options[:temp]
          raise(Error, "can't provide both :temp and :unlogged to create_table") if options[:unlogged]
          temporary_table_sql
@@ -780,9 +787,20 @@ module Sequel
         if inherits = options[:inherits]
           sql << " INHERITS (#{Array(inherits).map{|t| quote_schema_table(t)}.join(', ')})"
         end
+        if on_commit = options[:on_commit]
+          sql << " ON COMMIT #{ON_COMMIT[on_commit]}"
+        end
         sql
       end
 
+      def create_table_as_sql(name, sql, options)
+        result = create_table_prefix_sql name, options
+        if on_commit = options[:on_commit]
+          result << " ON COMMIT #{ON_COMMIT[on_commit]}"
+        end
+        result << " AS #{sql}"
+      end
+
       # Use a PostgreSQL-specific create table generator
       def create_table_generator_class
         Postgres::CreateTableGenerator
@@ -1367,8 +1385,13 @@ module Sequel
 
       # Return the primary key to use for RETURNING in an INSERT statement
       def insert_pk
-        if (f = opts[:from]) && !f.empty? && (pk = db.primary_key(f.first))
-          Sequel::SQL::Identifier.new(pk)
+        if (f = opts[:from]) && !f.empty?
+          case t = f.first
+          when Symbol, String, SQL::Identifier, SQL::QualifiedIdentifier
+            if pk = db.primary_key(t)
+              Sequel::SQL::Identifier.new(pk)
+            end
+          end
         end
       end
 

data/lib/sequel/adapters/shared/sqlite.rb

@@ -97,7 +97,8 @@ module Sequel
         im = input_identifier_meth
         indexes = {}
         metadata_dataset.with_sql("PRAGMA index_list(?)", im.call(table)).each do |r|
-          next if r[:name] =~ PRIMARY_KEY_INDEX_RE
+          # :only_autocreated internal option can be used to get only autocreated indexes
+          next if (!!(r[:name] =~ PRIMARY_KEY_INDEX_RE) ^ !!opts[:only_autocreated])
           indexes[m.call(r[:name])] = {:unique=>r[:unique].to_i==1}
         end
         indexes.each do |k, v|
@@ -389,6 +390,19 @@ module Sequel
           constraints.concat(fks.each{|h| h[:type] = :foreign_key})
         end
 
+        # Determine unique constraints and make sure the new columns have them
+        unique_columns = []
+        indexes(table, :only_autocreated=>true).each_value do |h|
+          unique_columns.concat(h[:columns]) if h[:columns].length == 1 && h[:unique]
+        end
+        unique_columns -= pks
+        unless unique_columns.empty?
+          unique_columns.map!{|c| quote_identifier(c)}
+          def_columns.each do |c|
+            c[:unique] = true if unique_columns.include?(quote_identifier(c[:name]))
+          end
+        end
+        
         def_columns_str = (def_columns.map{|c| column_definition_sql(c)} + constraints.map{|c| constraint_definition_sql(c)}).join(', ')
         new_columns = old_columns.dup
         opts[:new_columns_proc].call(new_columns) if opts[:new_columns_proc]

data/lib/sequel/database/schema_methods.rb

@@ -155,6 +155,7 @@ module Sequel
     # :engine :: The table engine to use for the table.
     #
     # PostgreSQL specific options:
+    # :on_commit :: Either :preserve_rows (default), :drop or :delete_rows.
     # :unlogged :: Create the table as an unlogged table.
     # :inherits :: Inherit from a different tables.  An array can be
     #              specified to inherit from multiple tables.

data/lib/sequel/extensions/pg_array.rb

@@ -36,6 +36,9 @@
 #
 #   DB.extension :pg_array
 #
+# See the {schema modification guide}[rdoc-ref:doc/schema_modification.rdoc]
+# for details on using postgres array columns in CREATE/ALTER TABLE statements.
+#
 # If you are not using the native postgres adapter and are using array
 # types as model column values you probably should use the
 # typecast_on_load plugin if the column values are returned as a

data/lib/sequel/extensions/pg_hstore.rb

@@ -75,6 +75,9 @@
 #
 #   DB.extension :pg_hstore
 #
+# See the {schema modification guide}[rdoc-ref:doc/schema_modification.rdoc]
+# for details on using hstore columns in CREATE/ALTER TABLE statements.
+#
 # If you are not using the native postgres adapter and are using hstore
 # types as model column values you probably should use the
 # typecast_on_load plugin if the column values are returned as a

data/lib/sequel/extensions/pg_inet.rb

@@ -25,6 +25,9 @@
 # addresses, so these will still be returned as strings.  The exception
 # to this is that the pg_array extension integration will recognize
 # macaddr[] types return them as arrays of strings.
+#
+# See the {schema modification guide}[rdoc-ref:doc/schema_modification.rdoc]
+# for details on using inet/cidr columns in CREATE/ALTER TABLE statements.
 
 require 'ipaddr'
 Sequel.require 'adapters/utils/pg_types'

data/lib/sequel/extensions/pg_interval.rb

@@ -31,6 +31,9 @@
 # very simple, and is only designed to parse PostgreSQL's default output
 # format, it is not designed to support all input formats that PostgreSQL
 # supports.
+#
+# See the {schema modification guide}[rdoc-ref:doc/schema_modification.rdoc]
+# for details on using interval columns in CREATE/ALTER TABLE statements.
 
 require 'active_support/duration'
 Sequel.require 'adapters/utils/pg_types'

data/lib/sequel/extensions/pg_json.rb

@@ -46,6 +46,9 @@
 # types as model column values you probably should use the
 # pg_typecast_on_load plugin if the column values are returned as a string.
 #
+# See the {schema modification guide}[rdoc-ref:doc/schema_modification.rdoc]
+# for details on using json columns in CREATE/ALTER TABLE statements.
+#
 # This extension integrates with the pg_array extension.  If you plan
 # to use the json[] type, load the pg_array extension before the
 # pg_json extension:

data/lib/sequel/extensions/pg_range.rb

@@ -49,6 +49,9 @@
 # types as model column values you probably should use the
 # pg_typecast_on_load plugin if the column values are returned as a string.
 #
+# See the {schema modification guide}[rdoc-ref:doc/schema_modification.rdoc]
+# for details on using range type columns in CREATE/ALTER TABLE statements.
+#
 # This extension integrates with the pg_array extension.  If you plan
 # to use arrays of range types, load the pg_array extension before the
 # pg_range extension:

data/lib/sequel/extensions/pg_row.rb

@@ -78,6 +78,9 @@
 # types as model column values you probably should use the
 # pg_typecast_on_load plugin if the column values are returned as a string.
 #
+# See the {schema modification guide}[rdoc-ref:doc/schema_modification.rdoc]
+# for details on using row type columns in CREATE/ALTER TABLE statements.
+#
 # This extension requires both the strscan and delegate libraries.
 
 require 'delegate'

data/lib/sequel/model/base.rb

@@ -542,8 +542,12 @@ module Sequel
       #   end
       def set_primary_key(key)
         clear_setter_methods_cache
-        if key.is_a?(Array) && key.length < 2
-          key = key.first
+        if key.is_a?(Array)
+          if key.length < 2
+            key = key.first
+          else
+            key = key.dup.freeze
+          end
         end
         self.simple_pk = if key && !key.is_a?(Array)
           (@dataset || db).literal(key)

data/lib/sequel/plugins/mssql_optimistic_locking.rb

@@ -0,0 +1,92 @@
+module Sequel
+  module Plugins
+    # This plugin implements optimistic locking mechanism on Microsoft SQL Server
+    # using a timestamp/rowversion column to ensure that concurrent updates are
+    # detected and previous changes are not automatically overridden. This is
+    # best implemented by a code example:
+    # 
+    #   class Person < Sequel::Model
+    #     plugin :mssql_optimistic_locking
+    #   end
+    #   p1 = Person[1]
+    #   p2 = Person[1]
+    #   p1.update(:name=>'Jim') # works
+    #   p2.update(:name=>'Bob') # raises Sequel::NoExistingObject
+    #
+    # In order for this plugin to work, you need to make sure that the database
+    # table has a column of timestamp or rowversion.  The plugin uses a default
+    # name of timestamp for this columns, but you can override that using the
+    # :lock_column option:
+    #
+    #     plugin :mssql_optimistic_locking, :lock_column=>:column_name
+    #
+    # This plugin relies on the instance_filters plugin.
+    module MssqlOptimisticLocking
+      # Load the instance_filters plugin into the model.
+      def self.apply(model, opts=OPTS)
+        model.plugin :instance_filters
+      end
+
+      # Set the lock_column to the :lock_column option (default: :timestamp)
+      def self.configure(model, opts=OPTS)
+        model.lock_column = opts[:lock_column] || :timestamp
+      end
+
+      module ClassMethods
+        # The timestamp/rowversion column containing the version for the current row.
+        attr_accessor :lock_column
+
+        Plugins.inherited_instance_variables(self, :@lock_column=>nil)
+      end
+
+      module InstanceMethods
+        # Add the lock column instance filter to the object before destroying it.
+        def before_destroy
+          lock_column_instance_filter
+          super
+        end
+        
+        # Add the lock column instance filter to the object before updating it.
+        def before_update
+          lock_column_instance_filter
+          super
+        end
+        
+        private
+        
+        # Add the lock column instance filter to the object.
+        def lock_column_instance_filter
+          lc = model.lock_column
+          instance_filter(lc=>Sequel.blob(send(lc)))
+        end
+
+        # Clear the instance filters when refreshing, so that attempting to
+        # refresh after a failed save removes the previous lock column filter
+        # (the new one will be added before updating).
+        def _refresh(ds)
+          clear_instance_filters
+          super
+        end
+
+        # Remove the lock column from the columns to update.
+        # SQL Server automatically updates the lock column value, and does not like
+        # it to be assigned.
+        def _save_update_all_columns_hash
+          v = @values.dup
+          Array(primary_key).each{|x| v.delete(x) unless changed_columns.include?(x)}
+          v.delete(model.lock_column)
+          v
+        end
+
+        # Add an OUTPUT clause to fetch the updated timestamp when updating the row.
+        def _update_without_checking(columns)
+          ds = _update_dataset
+          lc = model.lock_column
+          rows = ds.clone(ds.send(:default_server_opts, :sql=>ds.output(nil, [Sequel.qualify(:inserted, lc)]).update_sql(columns))).all
+          values[lc] = rows.first[lc] unless rows.empty?
+          rows.length
+        end
+      end
+    end
+  end
+end

data/lib/sequel/version.rb

@@ -3,7 +3,7 @@ module Sequel
   MAJOR = 4
   # The minor version of Sequel.  Bumped for every non-patch level
   # release, generally around once a month.
-  MINOR = 4
+  MINOR = 5
   # The tiny version of Sequel.  Usually 0, only bumped for bugfix
   # releases that fix regressions from previous versions.
   TINY  = 0

data/spec/adapters/db2_spec.rb

@@ -30,12 +30,12 @@ end
 
 describe "Simple Dataset operations" do
   before(:all) do
-    Sequel::DB2.use_clob_as_blob = false
+    Sequel::DB2.use_clob_as_blob = true
     DB.create_table!(:items) do
       Integer :id, :primary_key => true
       Integer :number
       column  :bin_string, 'varchar(20) for bit data'
-      column  :bin_blob, 'blob'
+      column  :bin_clob, 'clob'
     end
     @ds = DB[:items]
   end
@@ -43,7 +43,7 @@ describe "Simple Dataset operations" do
     @ds.delete
   end
   after(:all) do
-    Sequel::DB2.use_clob_as_blob = true
+    Sequel::DB2.use_clob_as_blob = false
     DB.drop_table(:items)
   end
 
@@ -54,8 +54,8 @@ describe "Simple Dataset operations" do
   end
 
   specify "should insert into binary columns" do
-    @ds.insert(:id => 1, :bin_string => Sequel.blob("\1"), :bin_blob => Sequel.blob("\2"))
-    @ds.select(:bin_string, :bin_blob).first.should == {:bin_string => "\1", :bin_blob => "\2"}
+    @ds.insert(:id => 1, :bin_string => Sequel.blob("\1"), :bin_clob => Sequel.blob("\2"))
+    @ds.select(:bin_string, :bin_clob).first.should == {:bin_string => "\1", :bin_clob => "\2"}
   end
 end
 

data/spec/adapters/mssql_spec.rb

@@ -607,8 +607,8 @@ describe "Database#foreign_key_list" do
       end
     end
     after(:all) do
-      DB.drop_table :vendor__mapping
-      DB.drop_table :vendor__vendors
+      DB.drop_table? :vendor__mapping
+      DB.drop_table? :vendor__vendors
       DB.execute_ddl "drop schema vendor"
     end
     it "should support mixed schema bound tables" do
@@ -616,3 +616,30 @@ describe "Database#foreign_key_list" do
     end
   end
 end
+
+describe "MSSQL optimistic locking plugin" do
+  before do
+    @db = DB
+    @db.create_table! :items do
+      primary_key :id
+      String :name, :size => 20
+      column :timestamp, 'timestamp'
+    end
+   end
+  after do
+    @db.drop_table?(:items)
+  end
+
+  it "should not allow stale updates" do
+    c = Class.new(Sequel::Model(:items))
+    c.plugin :mssql_optimistic_locking
+    o = c.create(:name=>'test')
+    o2 = c.first
+    ts = o.timestamp
+    ts.should_not be_nil
+    o.name = 'test2'
+    o.save
+    o.timestamp.should_not == ts
+    proc{o2.save}.should raise_error(Sequel::NoExistingObject)
+  end
+end unless DB.adapter_scheme == :odbc

data/spec/adapters/postgres_spec.rb

@@ -27,6 +27,46 @@ describe "PostgreSQL", '#create_table' do
     end
   end
 
+  specify "temporary table should support :on_commit option" do
+    @db.drop_table?(:some_table)
+    @db.transaction do
+      @db.create_table(:some_table, :temp => true, :on_commit => :drop){text :name}
+    end
+    @db.table_exists?(:some_table).should be_false
+
+    @db.transaction do
+      @db.create_table(:some_table, :temp => true, :on_commit => :delete_rows){text :name}
+      @db[:some_table].insert('a')
+    end
+    @db.table_exists?(:some_table).should be_true
+    @db[:some_table].empty?.should be_true
+
+    @db.drop_table(:some_table)
+    @db.transaction do
+      @db.create_table(:some_table, :temp => true, :on_commit => :preserve_rows){text :name}
+      @db[:some_table].insert('a')
+    end
+    @db.table_exists?(:some_table).should be_true
+    @db[:some_table].count.should == 1
+    @db.drop_table(:some_table)
+  end
+
+  specify "temporary table should accept :on_commit with :as option" do
+    @db.drop_table?(:some_table)
+    @db.transaction do
+      @db.create_table(:some_table, :temp => true, :on_commit => :drop, :as => 'select 1')
+    end
+    @db.table_exists?(:some_table).should be_false
+  end
+
+  specify ":on_commit should raise error if not used on a temporary table" do
+    proc{@db.create_table(:some_table, :on_commit => :drop)}.should raise_error(Sequel::Error)
+  end
+
+  specify ":on_commit should raise error if given unsupported value" do
+    proc{@db.create_table(:some_table, :temp => true, :on_commit => :unsupported){text :name}}.should raise_error(Sequel::Error)
+  end
+
   specify "should create an unlogged table" do
     @db.create_table(:unlogged_dolls, :unlogged => true){text :name}
     check_sqls do
@@ -161,6 +201,12 @@ describe "A PostgreSQL database" do
   specify "should return uuid fields as strings" do
     @db.get(Sequel.cast('550e8400-e29b-41d4-a716-446655440000', :uuid)).should == '550e8400-e29b-41d4-a716-446655440000'
   end
+
+  specify "should handle inserts with placeholder literal string tables" do
+    ds = @db.from(Sequel.lit('?', :testfk))
+    ds.insert(:id=>1)
+    ds.select_map(:id).should == [1]
+  end
 end
 
 describe "A PostgreSQL database with domain types" do

data/spec/adapters/sqlite_spec.rb

@@ -640,4 +640,11 @@ describe "A SQLite database" do
     @db.transaction_mode.should == :immediate
     proc {@db.transaction(:mode => :invalid) {}}.should raise_error(Sequel::Error)
   end
+
+  specify "should keep unique constraints when copying tables" do
+    @db.alter_table(:test2){add_unique_constraint :name}
+    @db.alter_table(:test2){drop_column :value}
+    @db[:test2].insert(:name=>'a')
+    proc{@db[:test2].insert(:name=>'a')}.should raise_error(Sequel::ConstraintViolation)
+  end
 end

data/spec/extensions/mssql_optimistic_locking_spec.rb

@@ -0,0 +1,91 @@
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+
+describe "MSSSQL optimistic locking plugin" do
+  before do
+    @db = Sequel.mock(:host=>'mssql')
+    @c = Class.new(Sequel::Model(@db[:items]))
+    @c.columns :id, :name, :timestamp
+    @c.plugin :mssql_optimistic_locking
+    @o = @c.load(:id=>1, :name=>'a', :timestamp=>'1234')
+    @db.sqls
+  end
+
+  it "should not include the lock column when updating" do
+    @db.fetch = [[{:timestamp=>'2345'}]]
+    @o.save
+    @db.sqls.should == ["UPDATE TOP (1) items SET name = 'a' OUTPUT inserted.timestamp WHERE ((id = 1) AND (timestamp = 0x31323334))"]
+  end
+
+  it "should automatically update lock column using new value from database" do
+    @db.fetch = [[{:timestamp=>'2345'}]]
+    @o.save
+    @o.timestamp.should == '2345'
+  end
+
+  it "should raise error when updating stale object" do
+    @db.fetch = []
+    @o.timestamp = '2345'
+    proc{@o.save}.should raise_error(Sequel::NoExistingObject)
+    @o.timestamp.should == '2345'
+    @db.sqls.should == ["UPDATE TOP (1) items SET name = 'a' OUTPUT inserted.timestamp WHERE ((id = 1) AND (timestamp = 0x32333435))"]
+  end
+
+  it "should raise error when destroying stale object" do
+    @db.numrows = 0
+    @o.timestamp = '2345'
+    proc{@o.destroy}.should raise_error(Sequel::NoExistingObject)
+    @db.sqls.should == ["DELETE FROM items WHERE ((id = 1) AND (timestamp = 0x32333435))"]
+  end
+
+  it "should allow refresh after failed save" do
+    @db.fetch = []
+    @o.timestamp = '2345'
+    proc{@o.save}.should raise_error(Sequel::NoExistingObject)
+    @db.fetch = {:id=>1, :name=>'a', :timestamp=>'2345'}
+    @o.refresh
+    @db.sqls
+    @o.save
+    @db.sqls.should == ["UPDATE TOP (1) items SET name = 'a' OUTPUT inserted.timestamp WHERE ((id = 1) AND (timestamp = 0x32333435))"]
+  end
+
+  specify "should allow changing the lock column via model.lock_column=" do
+    @c = Class.new(Sequel::Model(@db[:items]))
+    @c.columns :id, :name, :lv
+    @c.plugin :mssql_optimistic_locking
+    @c.lock_column = :lv
+    @o = @c.load(:id=>1, :name=>'a', :lv=>'1234')
+    @db.sqls
+    @db.fetch = []
+    proc{@o.save}.should raise_error(Sequel::NoExistingObject)
+    @o.lv.should == '1234'
+    @db.sqls.should == ["UPDATE TOP (1) items SET name = 'a' OUTPUT inserted.lv WHERE ((id = 1) AND (lv = 0x31323334))"]
+    @o = @c.load(:id=>1, :name=>'a', :lv=>'1234')
+    @db.fetch = {:lv=>'2345'}
+    @o.save
+    @o.lv.should == '2345'
+  end
+
+  specify "should allow changing the lock column via plugin option" do
+    @c = Class.new(Sequel::Model(@db[:items]))
+    @c.columns :id, :name, :lv
+    @c.plugin :mssql_optimistic_locking, :lock_column=>:lv
+    @o = @c.load(:id=>1, :name=>'a', :lv=>'1234')
+    @db.sqls
+    @db.fetch = []
+    proc{@o.save}.should raise_error(Sequel::NoExistingObject)
+    @o.lv.should == '1234'
+    @db.sqls.should == ["UPDATE TOP (1) items SET name = 'a' OUTPUT inserted.lv WHERE ((id = 1) AND (lv = 0x31323334))"]
+    @o = @c.load(:id=>1, :name=>'a', :lv=>'1234')
+    @db.fetch = {:lv=>'2345'}
+    @o.save
+    @o.lv.should == '2345'
+  end
+
+  specify "should work when subclassing" do
+    c = Class.new(@c)
+    o = c.load(:id=>1, :name=>'a', :timestamp=>'1234')
+    @db.fetch = [[{:timestamp=>'2345'}]]
+    o.save
+    @db.sqls.should == ["UPDATE TOP (1) items SET name = 'a' OUTPUT inserted.timestamp WHERE ((id = 1) AND (timestamp = 0x31323334))"]
+  end
+end

data/spec/model/model_spec.rb

@@ -686,6 +686,15 @@ describe "Model.db_schema" do
     @c.db_schema.should == {:x=>{:primary_key=>true}, :y=>{:primary_key=>true}}
     @c.primary_key.should == [:x, :y]
   end
+
+  specify "should set an immutable composite primary key based on the schema" do
+    ds = @dataset
+    d = ds.db
+    def d.schema(table, *opts) [[:x, {:primary_key=>true}], [:y, {:primary_key=>true}]] end
+    @c.dataset = ds
+    @c.primary_key.should == [:x, :y]
+    proc{@c.primary_key.pop}.should raise_error
+  end
   
   specify "should automatically set no primary key based on the schema" do
     ds = @dataset

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.5.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
+date: 2013-12-02 00:00:00.000000000 Z
 dependencies: []
 description: The Database Toolkit for Ruby
 email: code@jeremyevans.net
@@ -120,6 +120,7 @@ extra_rdoc_files:
 - doc/release_notes/4.2.0.txt
 - doc/release_notes/4.3.0.txt
 - doc/release_notes/4.4.0.txt
+- doc/release_notes/4.5.0.txt
 files:
 - MIT-LICENSE
 - CHANGELOG
@@ -227,6 +228,7 @@ files:
 - doc/release_notes/4.2.0.txt
 - doc/release_notes/4.3.0.txt
 - doc/release_notes/4.4.0.txt
+- doc/release_notes/4.5.0.txt
 - spec/adapters/firebird_spec.rb
 - spec/adapters/informix_spec.rb
 - spec/adapters/mssql_spec.rb
@@ -356,6 +358,7 @@ files:
 - spec/extensions/inflector_spec.rb
 - spec/extensions/association_proxies_spec.rb
 - spec/extensions/table_select_spec.rb
+- spec/extensions/mssql_optimistic_locking_spec.rb
 - spec/integration/associations_test.rb
 - spec/integration/database_test.rb
 - spec/integration/dataset_test.rb
@@ -648,11 +651,12 @@ files:
 - lib/sequel/plugins/blacklist_security.rb
 - lib/sequel/plugins/pg_array_associations.rb
 - lib/sequel/plugins/table_select.rb
+- lib/sequel/plugins/mssql_optimistic_locking.rb
 - lib/sequel/timezones.rb
 - lib/sequel/deprecated.rb
 - lib/sequel/ast_transformer.rb
 - lib/sequel/no_core_ext.rb
-homepage: http://sequel.rubyforge.org
+homepage: http://sequel.jeremyevans.net
 licenses:
 - MIT
 metadata: {}
@@ -678,7 +682,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: sequel
+rubyforge_project: 
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4