sequel 3.21.0 → 3.22.0

data/CHANGELOG

@@ -1,3 +1,23 @@
+=== 3.22.0 (2011-04-01)
+
+* Add disconnect detection to tinytds adapter, though correct behavior may require an update to tiny_tds (cult_hero)
+
+* Add Dataset/Database#mssql_unicode_strings accessor when connecting to MSSQL to control string literalization (semmons99, jeremyevans)
+
+* Fix ODBC::Time instance handling in the odbc adapter (jeremyevans)
+
+* Use Sequel.application_timezone when connecting in the oracle adapter to set the connection's session's timezone (jmthomas)
+
+* In the ADO adapter, assume access to SQL Server if a :conn_string option is given that doesn't indicate Access/Jet (damir.si) (#332)
+
+* Use the correct class when loading instances for descendents of model classes that use single table inheritance (jeremyevans)
+
+* Support for COLLATE in column definitions (jfirebaugh)
+
+* Don't use a schema when creating a temporary table (jeremyevans)
+
+* Make migrator work correctly when a default_schema is set (jeremyevans) (#331)
+
 === 3.21.0 (2011-03-01)
 
 * Make symbol splitting (:table__column___alias) work correctly for identifiers that are not in the \w character class (authorNari)

data/doc/release_notes/3.22.0.txt

@@ -0,0 +1,39 @@
+= New Features
+
+* Support COLLATE in column definitions.  At least MySQL and Microsoft
+  SQL Server support them, and PostgreSQL 9.1 should as well.
+
+* When connecting to Microsoft SQL Server, you can use the
+  mssql_unicode_strings accessor to turn of the default usage
+  of unicode strings (N'') and use regular strings (''). This
+  can improve performance, but changes the behavior.  It's
+  set to true by default for backwards compatibility.  You can
+  change it at both the dataset and database level:
+
+    DB.mssql_unicode_strings = false # default for datasets
+    dataset.mssql_unicode_strings = false # just this dataset
+
+* In the oracle adapter, if Sequel.application_timezone is :utc, set
+  the timezone for the connection to use the 00:00 timezone.
+
+= Other Improvements
+
+* In the single_table_inheritance plugin, correctly handle a
+  multi-level class hierarchy so that loading instances from a
+  middle level of the hierarchy can return instances of subclasses.
+
+* Don't use a schema when creating a temporary table, even if
+  default_schema is set.
+
+* Fix the migrator when a default_schema is used.
+
+* In the ado adapter, assume a connection to SQL Server if the
+  :conn_string is given and doesn't indicate Access/Jet.
+
+* Fix fetching rows in the tinytds adapter when the
+  identifier_output_method is nil.
+
+* The tinytds adapter now checks for disconnect errors, but it might
+  not be reliable until the next release of tiny_tds.
+
+* The odbc adapter now handles ODBC::Time instances correctly.

data/lib/sequel/adapters/ado.rb

@@ -12,12 +12,13 @@ module Sequel
         when /Microsoft\.(Jet|ACE)\.OLEDB/io
           Sequel.ts_require 'adapters/shared/access'
           extend Sequel::Access::DatabaseMethods
-        when nil
+        else
           @opts[:driver] ||= 'SQL Server'
           case @opts[:driver]
           when 'SQL Server'
             Sequel.ts_require 'adapters/ado/mssql'
             extend Sequel::ADO::MSSQL::DatabaseMethods
+            set_mssql_unicode_strings
           end
         end
       end

data/lib/sequel/adapters/jdbc.rb

@@ -55,11 +55,13 @@ module Sequel
       :sqlserver=>proc do |db|
         Sequel.ts_require 'adapters/jdbc/mssql'
         db.extend(Sequel::JDBC::MSSQL::DatabaseMethods)
+        db.send(:set_mssql_unicode_strings)
         com.microsoft.sqlserver.jdbc.SQLServerDriver
       end,
       :jtds=>proc do |db|
         Sequel.ts_require 'adapters/jdbc/mssql'
         db.extend(Sequel::JDBC::MSSQL::DatabaseMethods)
+        db.send(:set_mssql_unicode_strings)
         JDBC.load_gem('jtds')
         Java::net.sourceforge.jtds.jdbc.Driver
       end,
@@ -101,7 +103,7 @@ module Sequel
       # True by default, can be set to false to roughly double performance when
       # fetching rows.
       attr_accessor :convert_types
-      
+
       # Call the DATABASE_SETUP proc directly after initialization,
       # so the object always uses sub adapter specific code.  Also,
       # raise an error immediately if the connection doesn't have a
@@ -530,8 +532,8 @@ module Sequel
       # Uses the database's setting by default, can be set to false to roughly
       # double performance when fetching rows.
       attr_accessor :convert_types
-      
-      # Use the convert_types default setting from the database
+
+      # Use the convert_types default setting from the database.
       def initialize(db, opts={})
         @convert_types = db.convert_types
         super

data/lib/sequel/adapters/odbc.rb

@@ -15,6 +15,7 @@ module Sequel
         when 'mssql'
           Sequel.ts_require 'adapters/odbc/mssql'
           extend Sequel::ODBC::MSSQL::DatabaseMethods
+          set_mssql_unicode_strings
         when 'progress'
           Sequel.ts_require 'adapters/shared/progress'
           extend Sequel::Progress::DatabaseMethods
@@ -116,6 +117,7 @@ module Sequel
         when ::ODBC::TimeStamp
           Sequel.database_to_application_timestamp([v.year, v.month, v.day, v.hour, v.minute, v.second])
         when ::ODBC::Time
+          now = ::Time.now
           Sequel.database_to_application_timestamp([now.year, now.month, now.day, v.hour, v.minute, v.second])
         when ::ODBC::Date
           Date.new(v.year, v.month, v.day)

data/lib/sequel/adapters/oracle.rb

@@ -24,6 +24,18 @@ module Sequel
         conn = OCI8.new(opts[:user], opts[:password], dbname, opts[:privilege])
         conn.autocommit = true
         conn.non_blocking = true
+        
+        # The ruby-oci8 gem which retrieves oracle columns with a type of
+        # DATE, TIMESTAMP, TIMESTAMP WITH TIME ZONE is complex based on the
+        # ruby version (1.9.2 or later) and Oracle version (9 or later)
+        # In the now standard case of 1.9.2 and Oracle 9 or later, the timezone
+        # is determined by the Oracle session timezone. Thus if the user
+        # requests Sequel provide UTC timezone to the application,
+        # we need to alter the session timezone to be UTC
+        if Sequel.application_timezone == :utc
+          conn.exec("ALTER SESSION SET TIME_ZONE='-00:00'")
+        end
+        
         conn
       end
       

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

@@ -11,10 +11,16 @@ module Sequel
       SQL_ROLLBACK_TO_SAVEPOINT = 'IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION autopoint_%d'.freeze
       SQL_SAVEPOINT = 'SAVE TRANSACTION autopoint_%d'.freeze
       
+      # Whether to use N'' to quote strings, which allows unicode characters inside the
+      # strings.  True by default for compatibility, can be set to false for a possible
+      # performance increase.  This sets the default for all datasets created from this
+      # Database object.
+      attr_accessor :mssql_unicode_strings
+
       # The types to check for 0 scale to transform :decimal types
       # to :integer.
       DECIMAL_TYPE_RE = /number|numeric|decimal/io
-      
+
       # Microsoft SQL Server uses the :mssql type.
       def database_type
         :mssql
@@ -163,6 +169,11 @@ module Sequel
           [m.call(row.delete(:column)), row]
         end
       end
+
+      # Set the mssql_unicode_strings settings from the given options.
+      def set_mssql_unicode_strings
+        @mssql_unicode_strings = typecast_value_boolean(@opts.fetch(:mssql_unicode_strings, true))
+      end
       
       # MSSQL has both datetime and timestamp classes, most people are going
       # to want datetime
@@ -211,6 +222,15 @@ module Sequel
       WILDCARD = LiteralString.new('*').freeze
       CONSTANT_MAP = {:CURRENT_DATE=>'CAST(CURRENT_TIMESTAMP AS DATE)'.freeze, :CURRENT_TIME=>'CAST(CURRENT_TIMESTAMP AS TIME)'.freeze}
 
+      # Allow overriding of the mssql_unicode_strings option at the dataset level.
+      attr_accessor :mssql_unicode_strings
+
+      # Copy the mssql_unicode_strings option from the +db+ object.
+      def initialize(db, opts={})
+        super
+        @mssql_unicode_strings = db.mssql_unicode_strings
+      end
+
       # MSSQL uses + for string concatenation, and LIKE is case insensitive by default.
       def complex_expression_sql(op, args)
         case op
@@ -441,9 +461,10 @@ module Sequel
         blob
       end
       
-      # Use unicode string syntax for all strings. Don't double backslashes.
+      # Optionally use unicode string syntax for all strings. Don't double
+      # backslashes.
       def literal_string(v)
-        "N'#{v.gsub(/'/, "''")}'"
+        "#{'N' if mssql_unicode_strings}'#{v.gsub(/'/, "''")}'"
       end
       
       # Use 0 for false on MSSQL

data/lib/sequel/adapters/tinytds.rb

@@ -13,6 +13,7 @@ module Sequel
         opts = server_opts(server)
         opts[:dataserver] = opts[:host]
         opts[:username] = opts[:user]
+        set_mssql_unicode_strings
         TinyTds::Client.new(opts)
       end
       
@@ -38,7 +39,7 @@ module Sequel
             end
             yield(r) if block_given?
           rescue TinyTds::Error => e
-            raise_error(e)
+            raise_error(e, :disconnect=>(c.closed? || (c.respond_to?(:dead?) && c.dead?)))
           ensure
            r.cancel if r && c.sqlsent?
           end
@@ -107,7 +108,7 @@ module Sequel
                 yield r
               end
             else
-              result.each(each_opts, &block)
+              result.each(each_opts, &Proc.new)
             end
           end
         end
@@ -118,7 +119,7 @@ module Sequel
       
       # Properly escape the given string +v+.
       def literal_string(v)
-        db.synchronize{|c| "N'#{c.escape(v)}'"}
+        s = db.synchronize{|c| "#{'N' if mssql_unicode_strings}'#{c.escape(v)}'"}
       end
     end
   end

data/lib/sequel/database/connecting.rb

@@ -54,7 +54,7 @@ module Sequel
           c = adapter_class(scheme)
           uri_options = c.send(:uri_to_options, uri)
           uri.query.split('&').collect{|s| s.split('=')}.each{|k,v| uri_options[k.to_sym] = v if k && !k.empty?} unless uri.query.to_s.strip.empty?
-          uri_options.entries.each{|k,v| uri_options[k] = URI.unescape(v) if v.is_a?(String)}
+          uri_options.to_a.each{|k,v| uri_options[k] = URI.unescape(v) if v.is_a?(String)}
           opts = uri_options.merge(opts)
           opts[:adapter] = scheme
         end

data/lib/sequel/database/schema_methods.rb

@@ -21,7 +21,7 @@ module Sequel
     UNSIGNED = ' UNSIGNED'.freeze
 
     # The order of column modifiers to use when defining a column.
-    COLUMN_DEFINITION_ORDER = [:default, :null, :unique, :primary_key, :auto_increment, :references]
+    COLUMN_DEFINITION_ORDER = [:collate, :default, :null, :unique, :primary_key, :auto_increment, :references]
 
     # Adds a column to the specified table. This method expects a column name,
     # a datatype and optionally a hash with additional constraints and options:
@@ -275,7 +275,12 @@ module Sequel
     def column_definition_auto_increment_sql(sql, column)
       sql << " #{auto_increment_sql}" if column[:auto_increment]
     end
-    
+
+    # Add collate SQL fragment to column creation SQL.
+    def column_definition_collate_sql(sql, column)
+      sql << " COLLATE #{column[:collate]}" if column[:collate]
+    end
+
     # Add default SQL fragment to column creation SQL.
     def column_definition_default_sql(sql, column)
       sql << " DEFAULT #{literal(column[:default])}" if column.include?(:default)
@@ -366,7 +371,7 @@ module Sequel
 
     # DDL statement for creating a table with the given name, columns, and options
     def create_table_sql(name, generator, options)
-      "CREATE #{temporary_table_sql if options[:temp]}TABLE #{quote_schema_table(name)} (#{column_list_sql(generator)})"
+      "CREATE #{temporary_table_sql if options[:temp]}TABLE #{options[:temp] ? quote_identifier(name) : quote_schema_table(name)} (#{column_list_sql(generator)})"
     end
 
     # Default index name for the table and columns, may be too long

data/lib/sequel/extensions/migration.rb

@@ -375,7 +375,8 @@ module Sequel
       @db = db
       @directory = directory
       @files = get_migration_files
-      @table = opts[:table]  || self.class.const_get(:DEFAULT_SCHEMA_TABLE)
+      schema, table = @db.send(:schema_and_table, opts[:table]  || self.class.const_get(:DEFAULT_SCHEMA_TABLE))
+      @table = schema ? Sequel::SQL::QualifiedIdentifier.new(schema, table) : table
       @column = opts[:column] || self.class.const_get(:DEFAULT_SCHEMA_COLUMN)
       @ds = schema_dataset
     end

data/lib/sequel/plugins/single_table_inheritance.rb

@@ -108,8 +108,10 @@ module Sequel
           key = skm[subclass] 
           sti_subclass_added(key)
           ska = [key]
+          rp = dataset.row_proc
           subclass.set_dataset(sd.filter(SQL::QualifiedIdentifier.new(table_name, sk)=>ska), :inherited=>true)
           subclass.instance_eval do
+            dataset.row_proc = rp
             @sti_key = sk
             @sti_key_array = ska
             @sti_dataset = sd

data/lib/sequel/version.rb

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

data/spec/adapters/mssql_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
 
 require ENV['SEQUEL_MSSQL_SPEC_REQUIRE'] if ENV['SEQUEL_MSSQL_SPEC_REQUIRE']
@@ -440,3 +441,38 @@ describe "MSSQL::Dataset#count" do
     MSSQL_DB[:items].select(:name, :value).group(:name, :value).order(:name).count.should == 1
   end
 end
+
+describe "MSSQL::Database#create_table" do
+  specify "should support collate with various other column options" do
+    MSSQL_DB.create_table!(:items){ String :name, :size => 128, :collate => :sql_latin1_general_cp1_ci_as, :default => 'foo', :null => false, :unique => true}
+    MSSQL_DB[:items].insert
+    MSSQL_DB[:items].select_map(:name).should == ["foo"]
+  end
+end
+
+describe "MSSQL::Database#mssql_unicode_strings = false" do
+  before do
+    MSSQL_DB.mssql_unicode_strings = false
+  end
+  after do
+    MSSQL_DB.drop_table(:items)
+    MSSQL_DB.mssql_unicode_strings = true
+  end
+
+  specify "should work correctly" do
+    MSSQL_DB.create_table!(:items){String :name}
+    MSSQL_DB[:items].mssql_unicode_strings.should == false
+    MSSQL_DB[:items].insert(:name=>'foo')
+    MSSQL_DB[:items].select_map(:name).should == ['foo']
+  end
+
+  specify "should be overridable at the dataset level" do
+    MSSQL_DB.create_table!(:items){String :name}
+    ds = MSSQL_DB[:items]
+    ds.mssql_unicode_strings.should == false
+    ds.mssql_unicode_strings = true
+    ds.mssql_unicode_strings.should == true
+    ds.insert(:name=>'foo')
+    ds.select_map(:name).should == ['foo']
+  end
+end

data/spec/adapters/mysql_spec.rb

@@ -82,6 +82,12 @@ describe "MySQL", '#create_table' do
     end
     @db.schema(:dolls).map{|k, v| v[:auto_increment]}.should == [nil, nil, true]
   end
+
+  specify "should support collate with various other column options" do
+    @db.create_table!(:dolls){ String :name, :size=>128, :collate=>:utf8_bin, :default=>'foo', :null=>false, :unique=>true}
+    @db[:dolls].insert
+    @db[:dolls].select_map(:name).should == ["foo"]
+  end
 end
 
 describe "A MySQL database" do

data/spec/core/database_spec.rb

@@ -523,6 +523,14 @@ describe "Database#create_table" do
       'CREATE UNIQUE INDEX test_tmp_name_index ON test_tmp (name)'
     ]
   end
+
+  specify "should not use default schema when creating a temporary table" do
+    @db.default_schema = :foo
+    @db.create_table :test_tmp, :temp => true do
+      column :name, :text
+    end
+    @db.sqls.should == ['CREATE TEMPORARY TABLE test_tmp (name text)']
+  end
 end
 
 describe "Database#alter_table" do

data/spec/core/schema_spec.rb

@@ -281,6 +281,13 @@ describe "DB#create_table" do
     @db.sqls.should == ["CREATE TABLE cats (project_id integer REFERENCES projects DEFERRABLE INITIALLY DEFERRED)"]
   end
 
+  specify "should accept collation" do
+    @db.create_table(:cats) do
+      varchar :name, :collate => :utf8_bin
+    end
+    @db.sqls.should == ["CREATE TABLE cats (name varchar(255) COLLATE utf8_bin)"]
+  end
+
   specify "should accept inline index definition" do
     @db.create_table(:cats) do
       integer :id, :index => true

data/spec/extensions/migration_spec.rb

@@ -202,7 +202,7 @@ describe "Sequel::IntegerMigrator" do
         @drops = []
         @tables_created = []
         @columns_created = []
-        @versions = {}
+        @versions = Hash.new{|h,k| h[k.to_sym]}
       end
   
       def version; versions.values.first || 0; end
@@ -212,7 +212,7 @@ describe "Sequel::IntegerMigrator" do
       def create_table(name, opts={}, &block)
         super
         @columns_created << / \(?(\w+) integer.*\)?\z/.match(sqls.last)[1].to_sym
-        @tables_created << name
+        @tables_created << name.to_sym
       end
       
       def dataset(opts={})
@@ -228,7 +228,7 @@ describe "Sequel::IntegerMigrator" do
       end
 
       def table_exists?(name)
-        @tables_created.include?(name)
+        @tables_created.include?(name.to_sym)
       end
     end
     @db = dbc.new
@@ -250,7 +250,7 @@ describe "Sequel::IntegerMigrator" do
 
   specify "should add a column name if it doesn't already exist in the schema_info table" do
     @db.create_table(:schema_info){Integer :v}
-    @db.should_receive(:alter_table).with(:schema_info)
+    @db.should_receive(:alter_table).with('schema_info')
     Sequel::Migrator.apply(@db, @dirname)
   end
 
@@ -320,45 +320,45 @@ describe "Sequel::TimestampMigrator" do
     @dsc = dsc = Class.new(MockDataset) do
       def columns
         case opts[:from].first
-        when :schema_info
+        when :schema_info, 'schema_info'
           [:version]
-        when :schema_migrations
+        when :schema_migrations, 'schema_migrations'
           [:filename]
-        when :sm
+        when :sm, 'sm'
           [:fn]
         end
       end
 
       def fetch_rows(sql)
         case opts[:from].first
-        when :schema_info
+        when :schema_info, 'schema_info'
           yield({:version=>$sequel_migration_version})
-        when :schema_migrations
+        when :schema_migrations, 'schema_migrations'
           $sequel_migration_files.sort.each{|f| yield(:filename=>f)}
-        when :sm
+        when :sm, 'sm'
           $sequel_migration_files.sort.each{|f| yield(:fn=>f)}
         end
       end
 
       def insert(h={})
         case opts[:from].first
-        when :schema_info
+        when :schema_info, 'schema_info'
           $sequel_migration_version = h.values.first
-        when :schema_migrations, :sm
+        when :schema_migrations, :sm, 'schema_migrations', 'sm'
           $sequel_migration_files << h.values.first
         end
       end
 
       def update(h={})
         case opts[:from].first
-        when :schema_info
+        when :schema_info, 'schema_info'
           $sequel_migration_version = h.values.first
         end
       end
 
       def delete
         case opts[:from].first
-        when :schema_migrations, :sm
+        when :schema_migrations, :sm, 'schema_migrations', 'sm'
           $sequel_migration_files.delete(opts[:where].args.last)
         end
       end
@@ -366,9 +366,9 @@ describe "Sequel::TimestampMigrator" do
     dbc = Class.new(MockDatabase) do
       tables = {}
       define_method(:dataset){|*a| dsc.new(self, *a)}
-      define_method(:create_table){|name, *args| tables[name] = true}
-      define_method(:drop_table){|*names| names.each{|n| tables.delete(n)}}
-      define_method(:table_exists?){|name| tables.has_key?(name)}
+      define_method(:create_table){|name, *args| tables[name.to_sym] = true}
+      define_method(:drop_table){|*names| names.each{|n| tables.delete(n.to_sym)}}
+      define_method(:table_exists?){|name| tables.has_key?(name.to_sym)}
     end
     @db = dbc.new
     @m = Sequel::Migrator

data/spec/extensions/single_table_inheritance_spec.rb

@@ -54,6 +54,17 @@ describe Sequel::Model, "#sti_key" do
     StiTest.all.collect{|x| x.class}.should == [StiTest, StiTestSub1, StiTestSub2]
   end 
 
+  it "should return rows with the correct class for subclasses based on the polymorphic_key value" do
+    class ::StiTestSub1Sub < StiTestSub1
+    end 
+    ds = StiTestSub1.dataset
+    def ds.fetch_rows(sql)
+      yield({:kind=>'StiTestSub1'})
+      yield({:kind=>'StiTestSub1Sub'})
+    end 
+    StiTestSub1.all.collect{|x| x.class}.should == [StiTestSub1, StiTestSub1Sub]
+  end 
+
   it "should fallback to the main class if the given class does not exist" do
     def @ds.fetch_rows(sql)
       yield({:kind=>'StiTestSub3'})

data/spec/integration/type_test.rb

@@ -68,6 +68,13 @@ describe "Supported types" do
     ds.first[:dat].to_s.should == d.to_s
   end
   
+  cspecify "should support generic time type", [:do], [:swift], [:odbc], [:jdbc, :mssql], [:tinytds] do
+    ds = create_items_table_with_column(:tim, Time, :only_time=>true)
+    t = Time.now
+    ds.insert(:tim => t)
+    ds.first[:tim].strftime('%H%M%S').should == t.strftime('%H%M%S')
+  end
+  
   cspecify "should support generic datetime type", [:do, :sqlite], [:jdbc, :sqlite] do
     ds = create_items_table_with_column(:tim, DateTime)
     t = DateTime.now

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sequel
 version: !ruby/object:Gem::Version 
-  hash: 83
+  hash: 95
   prerelease: false
   segments: 
   - 3
-  - 21
+  - 22
   - 0
-  version: 3.21.0
+  version: 3.22.0
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 -08:00
+date: 2011-04-01 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -85,6 +85,7 @@ extra_rdoc_files:
 - doc/release_notes/3.19.0.txt
 - doc/release_notes/3.20.0.txt
 - doc/release_notes/3.21.0.txt
+- doc/release_notes/3.22.0.txt
 files: 
 - MIT-LICENSE
 - CHANGELOG
@@ -137,6 +138,7 @@ files:
 - doc/release_notes/3.19.0.txt
 - doc/release_notes/3.20.0.txt
 - doc/release_notes/3.21.0.txt
+- doc/release_notes/3.22.0.txt
 - doc/sharding.rdoc
 - doc/sql.rdoc
 - doc/virtual_rows.rdoc