sequel 3.21.0 → 3.41.0

data/lib/sequel/timezones.rb

@@ -39,6 +39,48 @@ module Sequel
       convert_output_timestamp(v, Sequel.database_timezone)
     end
 
+    # Converts the object to the given +output_timezone+.
+    def convert_output_timestamp(v, output_timezone)
+      if output_timezone
+        if v.is_a?(DateTime)
+          case output_timezone
+          when :utc
+            v.new_offset(0)
+          when :local
+            v.new_offset(local_offset_for_datetime(v))
+          else
+            convert_output_datetime_other(v, output_timezone)
+          end
+        else
+          v.send(output_timezone == :utc ? :getutc : :getlocal)
+        end
+      else
+        v
+      end
+    end
+    
+    # Converts the given object from the given input timezone to the
+    # +application_timezone+ using +convert_input_timestamp+ and
+    # +convert_output_timestamp+.
+    def convert_timestamp(v, input_timezone)
+      begin
+        if v.is_a?(Date) && !v.is_a?(DateTime)
+          # Dates handled specially as they are assumed to already be in the application_timezone
+          if datetime_class == DateTime
+            DateTime.civil(v.year, v.month, v.day, 0, 0, 0, application_timezone == :local ? (defined?(Rational) ? Rational(Time.local(v.year, v.month, v.day).utc_offset, 86400) : Time.local(v.year, v.month, v.day).utc_offset/86400.0) : 0)
+          else
+            Time.send(application_timezone == :utc ? :utc : :local, v.year, v.month, v.day)
+          end
+        else
+          convert_output_timestamp(convert_input_timestamp(v, input_timezone), application_timezone)
+        end
+      rescue InvalidValue
+        raise
+      rescue => e
+        raise convert_exception_class(e, InvalidValue)
+      end
+    end
+    
     # Convert the given object into an object of <tt>Sequel.datetime_class</tt> in the
     # +application_timezone+.  Used when coverting datetime/timestamp columns
     # returned by the database.
@@ -103,26 +145,44 @@ module Sequel
           v2
         end
       when Array
-        y, mo, d, h, mi, s = v
+        y, mo, d, h, mi, s, ns, off = v
         if datetime_class == DateTime
-          convert_input_datetime_no_offset(DateTime.civil(y, mo, d, h, mi, s, 0), input_timezone)
+          s += (defined?(Rational) ? Rational(ns, 1000000000) : ns/1000000000.0) if ns
+          if off
+            DateTime.civil(y, mo, d, h, mi, s, off)
+          else
+            convert_input_datetime_no_offset(DateTime.civil(y, mo, d, h, mi, s), input_timezone)
+          end
         else
-          Time.send(input_timezone == :utc ? :utc : :local, y, mo, d, h, mi, s)
+          Time.send(input_timezone == :utc ? :utc : :local, y, mo, d, h, mi, s, (ns ? ns / 1000.0 : 0))
+        end
+      when Hash
+        ary = [:year, :month, :day, :hour, :minute, :second, :nanos].map{|x| (v[x] || v[x.to_s]).to_i}
+        if (offset = (v[:offset] || v['offset']))
+          ary << offset
         end
+        convert_input_timestamp(ary, input_timezone)
+        convert_input_timestamp(ary, input_timezone)
       when Time
         if datetime_class == DateTime
-          v.respond_to?(:to_datetime) ? v.to_datetime : string_to_datetime(v.iso8601)
+          if v.respond_to?(:to_datetime)
+            v.to_datetime
+          else
+            # Ruby 1.8 code, %N not available and %z broken on Windows
+            offset_hours, offset_minutes = (v.utc_offset/60).divmod(60)
+            string_to_datetime(v.strftime("%Y-%m-%dT%H:%M:%S") << sprintf(".%06i%+03i%02i", v.usec, offset_hours, offset_minutes))
+          end
         else
           v
         end
       when DateTime
         if datetime_class == DateTime
           v
+        elsif v.respond_to?(:to_time)
+          v.to_time
         else
-          v.respond_to?(:to_time) ? v.to_time : string_to_datetime(v.to_s)
+          string_to_datetime(v.strftime("%FT%T.%N%z"))
         end
-      when Date
-        convert_input_timestamp(v.to_s, input_timezone)
       else
         raise InvalidValue, "Invalid convert_input_timestamp type: #{v.inspect}"
       end
@@ -135,39 +195,6 @@ module Sequel
       raise InvalidValue, "Invalid output_timezone: #{output_timezone.inspect}"
     end
     
-    # Converts the object to the given +output_timezone+.
-    def convert_output_timestamp(v, output_timezone)
-      if output_timezone
-        if v.is_a?(DateTime)
-          case output_timezone
-          when :utc
-            v.new_offset(0)
-          when :local
-            v.new_offset(local_offset_for_datetime(v))
-          else
-            convert_output_datetime_other(v, output_timezone)
-          end
-        else
-          v.send(output_timezone == :utc ? :getutc : :getlocal)
-        end
-      else
-        v
-      end
-    end
-    
-    # Converts the given object from the given input timezone to the
-    # +application_timezone+ using +convert_input_timestamp+ and
-    # +convert_output_timestamp+.
-    def convert_timestamp(v, input_timezone)
-      begin
-        convert_output_timestamp(convert_input_timestamp(v, input_timezone), Sequel.application_timezone)
-      rescue InvalidValue
-        raise
-      rescue => e
-        raise convert_exception_class(e, InvalidValue)
-      end
-    end
-    
     # Convert the timezone setter argument.  Returns argument given by default,
     # exists for easier overriding in extensions.
     def convert_timezone_setter_arg(tz)

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 = 41
   # 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

@@ -0,0 +1,146 @@
+#!/usr/bin/env ruby
+# coding: utf-8
+#Author: Roy L Zuo (roylzuo at gmail dot com)
+#Description: 
+
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
+
+require ENV['SEQUEL_DB2_SPEC_REQUIRE'] if ENV['SEQUEL_DB2_SPEC_REQUIRE']
+
+unless defined?(DB2_DB)
+  DB2_DB = Sequel.connect(ENV['SEQUEL_DB2_SPEC_DB']||DB2_URL)
+end
+
+if DB2_DB.table_exists?(:test)
+  DB2_DB.drop_table :test
+end
+INTEGRATION_DB = DB2_DB unless defined?(INTEGRATION_DB)
+
+describe Sequel::Database do
+  before do
+    @db = DB2_DB
+    @db.create_table(:test){String :a}
+    @ds = @db[:test]
+  end
+
+  after do
+    @db.drop_table(:test)
+  end
+  
+  specify "should provide disconnect functionality after preparing a connection" do
+    @ds.prepare(:first, :a).call
+    @db.disconnect
+    @db.pool.size.should == 0
+  end
+
+  specify "should return version correctly" do
+    @db.db2_version.should match(/DB2 v/i)
+  end
+end
+
+describe "Simple Dataset operations" do
+  before do
+    DB2_DB.create_table!(:items) do
+      Integer :id, :primary_key => true
+      Integer :number
+    end
+    @ds = DB2_DB[:items]
+    @ds.insert(:number=>10, :id => 1 )
+  end
+  after do
+    DB2_DB.drop_table(:items)
+  end
+  cspecify "should insert with a primary key specified", :mssql do
+    @ds.insert(:id=>100, :number=>20)
+    @ds.count.should == 2
+    @ds.order(:id).all.should == [{:id=>1, :number=>10}, {:id=>100, :number=>20}]
+  end
+end
+
+describe Sequel::Database do
+  before do
+    @db = DB2_DB
+  end
+  after do
+    @db.drop_table(:items)
+  end
+  specify "should parse primary keys from the schema properly" do
+    @db.create_table!(:items){Integer :number}
+    @db.schema(:items).collect{|k,v| k if v[:primary_key]}.compact.should == []
+    @db.create_table!(:items){primary_key :number}
+    @db.schema(:items).collect{|k,v| k if v[:primary_key]}.compact.should == [:number]
+    @db.create_table!(:items){Integer :number1, :null => false; Integer :number2, :null => false; primary_key [:number1, :number2]}
+    @db.schema(:items).collect{|k,v| k if v[:primary_key]}.compact.should == [:number1, :number2]
+  end
+end
+
+describe "Sequel::IBMDB.convert_smallint_to_bool" do
+  before do
+    @db = DB2_DB
+    @db.create_table!(:booltest){column :b, 'smallint'; column :i, 'integer'}
+    @ds = @db[:booltest]
+  end
+  after do
+    Sequel::IBMDB.convert_smallint_to_bool = true
+    @db.drop_table(:booltest)
+  end
+  
+  specify "should consider smallint datatypes as boolean if set, but not larger smallints" do
+    @db.schema(:booltest, :reload=>true).first.last[:type].should == :boolean
+    @db.schema(:booltest, :reload=>true).first.last[:db_type].should match /smallint/i
+    Sequel::IBMDB.convert_smallint_to_bool = false
+    @db.schema(:booltest, :reload=>true).first.last[:type].should == :integer
+    @db.schema(:booltest, :reload=>true).first.last[:db_type].should match /smallint/i
+  end
+  
+  specify "should return smallints as bools and integers as integers when set" do
+    Sequel::IBMDB.convert_smallint_to_bool = true
+    @ds.delete
+    @ds << {:b=>true, :i=>10}
+    @ds.all.should == [{:b=>true, :i=>10}]
+    @ds.delete
+    @ds << {:b=>false, :i=>0}
+    @ds.all.should == [{:b=>false, :i=>0}]
+    @ds.delete
+    @ds << {:b=>true, :i=>1}
+    @ds.all.should == [{:b=>true, :i=>1}]
+  end
+
+  specify "should return all smallints as integers when unset" do
+    Sequel::IBMDB.convert_smallint_to_bool = false
+    @ds.delete
+    @ds << {:b=>true, :i=>10}
+    @ds.all.should == [{:b=>1, :i=>10}]
+    @ds.delete
+    @ds << {:b=>false, :i=>0}
+    @ds.all.should == [{:b=>0, :i=>0}]
+    
+    @ds.delete
+    @ds << {:b=>1, :i=>10}
+    @ds.all.should == [{:b=>1, :i=>10}]
+    @ds.delete
+    @ds << {:b=>0, :i=>0}
+    @ds.all.should == [{:b=>0, :i=>0}]
+  end
+end if DB2_DB.adapter_scheme == :ibmdb
+
+describe "Simple Dataset operations in transactions" do
+  before do
+    DB2_DB.create_table!(:items_insert_in_transaction) do
+      Integer :id, :primary_key => true
+      integer :number
+    end
+    @ds = DB2_DB[:items_insert_in_transaction]
+  end
+  after do
+    DB2_DB.drop_table(:items_insert_in_transaction)
+  end
+
+  specify "should insert correctly with a primary key specified inside a transaction" do
+    DB2_DB.transaction do
+      @ds.insert(:id=>100, :number=>20)
+      @ds.count.should == 1
+      @ds.order(:id).all.should == [{:id=>100, :number=>20}]
+    end
+  end
+end

data/spec/adapters/firebird_spec.rb

@@ -247,74 +247,88 @@ end
 describe "A Firebird database" do
   before do
     @db = FIREBIRD_DB
-    @db.drop_table(:posts) rescue nil
+    @db.drop_table?(:posts)
     @db.sqls.clear
   end
 
   specify "should allow us to name the sequences" do
     @db.create_table(:posts){primary_key :id, :sequence_name => "seq_test"}
-    @db.sqls.should == [
-      "DROP SEQUENCE SEQ_TEST",
-      "CREATE TABLE POSTS (ID integer PRIMARY KEY )",
-      "CREATE SEQUENCE SEQ_TEST",
-      "          CREATE TRIGGER BI_POSTS_ID for POSTS\n          ACTIVE BEFORE INSERT position 0\n          as               begin\n                if ((new.ID is null) or (new.ID = 0)) then\n                begin\n                  new.ID = next value for seq_test;\n                end\n              end\n\n"
-    ]
+    check_sqls do
+      @db.sqls.should == [
+        "DROP SEQUENCE SEQ_TEST",
+        "CREATE TABLE POSTS (ID integer PRIMARY KEY )",
+        "CREATE SEQUENCE SEQ_TEST",
+        "          CREATE TRIGGER BI_POSTS_ID for POSTS\n          ACTIVE BEFORE INSERT position 0\n          as               begin\n                if ((new.ID is null) or (new.ID = 0)) then\n                begin\n                  new.ID = next value for seq_test;\n                end\n              end\n\n"
+      ]
+    end
   end
 
   specify "should allow us to set the starting position for the sequences" do
     @db.create_table(:posts){primary_key :id, :sequence_start_position => 999}
-    @db.sqls.should == [
-      "DROP SEQUENCE SEQ_POSTS_ID",
-      "CREATE TABLE POSTS (ID integer PRIMARY KEY )",
-      "CREATE SEQUENCE SEQ_POSTS_ID",
-      "ALTER SEQUENCE SEQ_POSTS_ID RESTART WITH 999",
-      "          CREATE TRIGGER BI_POSTS_ID for POSTS\n          ACTIVE BEFORE INSERT position 0\n          as               begin\n                if ((new.ID is null) or (new.ID = 0)) then\n                begin\n                  new.ID = next value for seq_posts_id;\n                end\n              end\n\n"
-    ]
+    check_sqls do
+      @db.sqls.should == [
+        "DROP SEQUENCE SEQ_POSTS_ID",
+        "CREATE TABLE POSTS (ID integer PRIMARY KEY )",
+        "CREATE SEQUENCE SEQ_POSTS_ID",
+        "ALTER SEQUENCE SEQ_POSTS_ID RESTART WITH 999",
+        "          CREATE TRIGGER BI_POSTS_ID for POSTS\n          ACTIVE BEFORE INSERT position 0\n          as               begin\n                if ((new.ID is null) or (new.ID = 0)) then\n                begin\n                  new.ID = next value for seq_posts_id;\n                end\n              end\n\n"
+      ]
+    end
   end
 
   specify "should allow us to name and set the starting position for the sequences" do
     @db.create_table(:posts){primary_key :id, :sequence_name => "seq_test", :sequence_start_position => 999}
-    @db.sqls.should == [
-      "DROP SEQUENCE SEQ_TEST",
-      "CREATE TABLE POSTS (ID integer PRIMARY KEY )",
-      "CREATE SEQUENCE SEQ_TEST",
-      "ALTER SEQUENCE SEQ_TEST RESTART WITH 999",
-      "          CREATE TRIGGER BI_POSTS_ID for POSTS\n          ACTIVE BEFORE INSERT position 0\n          as               begin\n                if ((new.ID is null) or (new.ID = 0)) then\n                begin\n                  new.ID = next value for seq_test;\n                end\n              end\n\n"
-    ]
+    check_sqls do
+      @db.sqls.should == [
+        "DROP SEQUENCE SEQ_TEST",
+        "CREATE TABLE POSTS (ID integer PRIMARY KEY )",
+        "CREATE SEQUENCE SEQ_TEST",
+        "ALTER SEQUENCE SEQ_TEST RESTART WITH 999",
+        "          CREATE TRIGGER BI_POSTS_ID for POSTS\n          ACTIVE BEFORE INSERT position 0\n          as               begin\n                if ((new.ID is null) or (new.ID = 0)) then\n                begin\n                  new.ID = next value for seq_test;\n                end\n              end\n\n"
+      ]
+    end
   end
 
   specify "should allow us to name the triggers" do
     @db.create_table(:posts){primary_key :id, :trigger_name => "trig_test"}
-    @db.sqls.should == [
-      "DROP SEQUENCE SEQ_POSTS_ID",
-      "CREATE TABLE POSTS (ID integer PRIMARY KEY )",
-      "CREATE SEQUENCE SEQ_POSTS_ID",
-      "          CREATE TRIGGER TRIG_TEST for POSTS\n          ACTIVE BEFORE INSERT position 0\n          as               begin\n                if ((new.ID is null) or (new.ID = 0)) then\n                begin\n                  new.ID = next value for seq_posts_id;\n                end\n              end\n\n"
-    ]
+    check_sqls do
+      @db.sqls.should == [
+        "DROP SEQUENCE SEQ_POSTS_ID",
+        "CREATE TABLE POSTS (ID integer PRIMARY KEY )",
+        "CREATE SEQUENCE SEQ_POSTS_ID",
+        "          CREATE TRIGGER TRIG_TEST for POSTS\n          ACTIVE BEFORE INSERT position 0\n          as               begin\n                if ((new.ID is null) or (new.ID = 0)) then\n                begin\n                  new.ID = next value for seq_posts_id;\n                end\n              end\n\n"
+      ]
+    end
   end
 
   specify "should allow us to not create the sequence" do
     @db.create_table(:posts){primary_key :id, :create_sequence => false}
-    @db.sqls.should == [
-      "CREATE TABLE POSTS (ID integer PRIMARY KEY )",
-      "          CREATE TRIGGER BI_POSTS_ID for POSTS\n          ACTIVE BEFORE INSERT position 0\n          as               begin\n                if ((new.ID is null) or (new.ID = 0)) then\n                begin\n                  new.ID = next value for seq_posts_id;\n                end\n              end\n\n"
-    ]
+    check_sqls do
+      @db.sqls.should == [
+        "CREATE TABLE POSTS (ID integer PRIMARY KEY )",
+        "          CREATE TRIGGER BI_POSTS_ID for POSTS\n          ACTIVE BEFORE INSERT position 0\n          as               begin\n                if ((new.ID is null) or (new.ID = 0)) then\n                begin\n                  new.ID = next value for seq_posts_id;\n                end\n              end\n\n"
+      ]
+    end
   end
 
   specify "should allow us to not create the trigger" do
     @db.create_table(:posts){primary_key :id, :create_trigger => false}
-    @db.sqls.should == [
-      "DROP SEQUENCE SEQ_POSTS_ID",
-      "CREATE TABLE POSTS (ID integer PRIMARY KEY )",
-      "CREATE SEQUENCE SEQ_POSTS_ID",
-    ]
+    check_sqls do
+      @db.sqls.should == [
+        "DROP SEQUENCE SEQ_POSTS_ID",
+        "CREATE TABLE POSTS (ID integer PRIMARY KEY )",
+        "CREATE SEQUENCE SEQ_POSTS_ID",
+      ]
+    end
   end
 
   specify "should allow us to not create either the sequence nor the trigger" do
     @db.create_table(:posts){primary_key :id, :create_sequence => false, :create_trigger => false}
-    @db.sqls.should == [
-      "CREATE TABLE POSTS (ID integer PRIMARY KEY )"
-    ]
+    check_sqls do
+      @db.sqls.should == [
+        "CREATE TABLE POSTS (ID integer PRIMARY KEY )"
+      ]
+    end
   end
 
   specify "should support column operations" do