sequel 2.11.0 → 2.12.0

data/spec/adapters/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 unless Object.const_defined?('Sequel')
   $:.unshift(File.join(File.dirname(__FILE__), "../../lib/"))
-  require 'sequel_core'
+  require 'sequel/core'
   Sequel.quote_identifiers = false
 end
 begin

data/spec/adapters/sqlite_spec.rb

@@ -83,7 +83,7 @@ context "An SQLite database" do
 
     proc {@db.transaction do
       @db.create_table!(:v) {text :name}
-      raise Sequel::Error::Rollback
+      raise Sequel::Rollback
     end}.should_not raise_error
     # no commit
     @db.tables.should_not include(:r)
@@ -101,7 +101,7 @@ context "An SQLite database" do
     proc {@db.transaction do
       @db.create_table!(:v) {text :name}
       @db.transaction do
-        raise Sequel::Error::Rollback # should roll back the top-level transaction
+        raise Sequel::Rollback # should roll back the top-level transaction
       end
     end}.should_not raise_error
     # no commit
@@ -138,8 +138,8 @@ context "An SQLite database" do
     @db[:time] << {:t => t1.to_i, :d => t1}
     @db[:time].map(:t).should == [t1, t1]
     @db[:time].map(:d).should == [t1, t1]
-    t2 = t1.iso8601.to_datetime
     Sequel.datetime_class = DateTime
+    t2 = Sequel.string_to_datetime(t1.iso8601)
     @db[:time].map(:t).should == [t2, t2]
     @db[:time].map(:d).should == [t2, t2]
   end
@@ -169,15 +169,10 @@ context "An SQLite database" do
     @db.create_table!(:time2) {timestamp :t}
     @db.schema(:time2, :reload=>true).should == [[:t, {:type=>:datetime, :allow_null=>true, :default=>nil, :db_type=>"timestamp", :primary_key=>false}]]
   end
-
-  specify "should get the schema all database tables if no table name is used" do
-    @db.create_table!(:time2) {timestamp :t}
-    @db.schema(:time2, :reload=>true).should == @db.schema(nil, :reload=>true)[:time2]
-  end
 end
 
 context "An SQLite dataset" do
-  setup do
+  before do
     SQLITE_DB.create_table! :items do
       integer :id, :primary_key => true, :auto_increment => true
       text :name
@@ -289,7 +284,7 @@ context "An SQLite dataset AS clause" do
 end
 
 context "An SQLite dataset" do
-  setup do
+  before do
     SQLITE_DB.create_table! :items do
       integer :id, :primary_key => true, :auto_increment => true
       text :name
@@ -320,7 +315,7 @@ context "An SQLite dataset" do
 end
 
 context "SQLite::Dataset#delete" do
-  setup do
+  before do
     SQLITE_DB.create_table! :items do
       integer :id, :primary_key => true, :auto_increment => true
       text :name
@@ -335,10 +330,10 @@ context "SQLite::Dataset#delete" do
   
   specify "should return the number of records affected when filtered" do
     @d.count.should == 3
-    @d.filter {:value.sql_number < 3}.delete.should == 1
+    @d.filter(:value.sql_number < 3).delete.should == 1
     @d.count.should == 2
 
-    @d.filter {:value.sql_number < 3}.delete.should == 0
+    @d.filter(:value.sql_number < 3).delete.should == 0
     @d.count.should == 2
   end
   
@@ -352,7 +347,7 @@ context "SQLite::Dataset#delete" do
 end
 
 context "SQLite::Dataset#update" do
-  setup do
+  before do
     SQLITE_DB.create_table! :items do
       integer :id, :primary_key => true, :auto_increment => true
       text :name
@@ -375,7 +370,7 @@ context "SQLite::Dataset#update" do
 end
 
 context "SQLite dataset" do
-  setup do
+  before do
     SQLITE_DB.create_table! :test do
       integer :id, :primary_key => true, :auto_increment => true
       text :name
@@ -393,7 +388,7 @@ context "SQLite dataset" do
     @d << {:name => 'ghi', :value => 7.89}
   end
   
-  teardown do
+  after do
     SQLITE_DB.drop_table :test
   end
   
@@ -406,7 +401,7 @@ context "SQLite dataset" do
 end
 
 context "A SQLite database" do
-  setup do
+  before do
     @db = SQLITE_DB
     @db.create_table! :test2 do
       text :name

data/spec/{sequel_core → core}/connection_pool_spec.rb

@@ -3,7 +3,7 @@ CONNECTION_POOL_DEFAULTS = {:pool_timeout=>5, :pool_sleep_time=>0.001,
   :pool_reuse_connections=>:allow, :pool_convert_exceptions=>true, :max_connections=>4}
 
 context "An empty ConnectionPool" do
-  setup do
+  before do
     @cpool = Sequel::ConnectionPool.new(CONNECTION_POOL_DEFAULTS)
   end
 
@@ -21,7 +21,7 @@ context "An empty ConnectionPool" do
 end
 
 context "A connection pool handling connections" do
-  setup do
+  before do
     @max_size = 2
     @cpool = Sequel::ConnectionPool.new(CONNECTION_POOL_DEFAULTS.merge(:disconnection_proc=>proc{|c| @max_size=3},  :max_connections=>@max_size)) {:got_connection}
   end
@@ -114,7 +114,7 @@ class DummyConnection
 end
 
 context "ConnectionPool#hold" do
-  setup do
+  before do
     @pool = Sequel::ConnectionPool.new(CONNECTION_POOL_DEFAULTS) {DummyConnection.new}
   end
   
@@ -150,7 +150,7 @@ context "ConnectionPool#hold" do
 end
 
 context "ConnectionPool#connection_proc" do
-  setup do
+  before do
     @pool = Sequel::ConnectionPool.new(CONNECTION_POOL_DEFAULTS)
   end
   
@@ -168,7 +168,7 @@ context "ConnectionPool#connection_proc" do
 end
 
 context "A connection pool with a max size of 1" do
-  setup do
+  before do
     @invoked_count = 0
     @pool = Sequel::ConnectionPool.new(CONNECTION_POOL_DEFAULTS.merge(:max_connections=>1)) {@invoked_count += 1; 'herro'}
   end
@@ -244,7 +244,7 @@ context "A connection pool with a max size of 1" do
 end
 
 context "A connection pool with a max size of 5" do
-  setup do
+  before do
     @invoked_count = 0
     @pool = Sequel::ConnectionPool.new(CONNECTION_POOL_DEFAULTS.merge(:max_connections=>5)) {@invoked_count += 1}
   end
@@ -316,7 +316,7 @@ context "A connection pool with a max size of 5" do
 end
 
 context "ConnectionPool#disconnect" do
-  setup do
+  before do
     @count = 0
     @pool = Sequel::ConnectionPool.new(CONNECTION_POOL_DEFAULTS.merge(:max_connections=>5)) {{:id => @count += 1}}
   end
@@ -381,7 +381,7 @@ context "ConnectionPool#disconnect" do
 end
 
 context "A connection pool with multiple servers" do
-  setup do
+  before do
     @invoked_counts = Hash.new(0)
     @pool = Sequel::ConnectionPool.new(CONNECTION_POOL_DEFAULTS.merge(:servers=>{:read_only=>{}})){|server| "#{server}#{@invoked_counts[server] += 1}"}
   end
@@ -440,7 +440,7 @@ context "A connection pool with multiple servers" do
 end
 
 context "SingleThreadedPool" do
-  setup do
+  before do
     @pool = Sequel::SingleThreadedPool.new(CONNECTION_POOL_DEFAULTS){1234}
   end
   
@@ -461,7 +461,7 @@ context "SingleThreadedPool" do
 end
 
 context "A single threaded pool with multiple servers" do
-  setup do
+  before do
     @max_size=2
     @pool = Sequel::SingleThreadedPool.new(CONNECTION_POOL_DEFAULTS.merge(:disconnection_proc=>proc{|c| @max_size=3}, :servers=>{:read_only=>{}})){|server| server}
   end

data/spec/{sequel_core → core}/core_ext_spec.rb

@@ -1,13 +1,13 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 
 context "Array#extract_options!" do
-  specify "should pop the last item if it is a hash" do
+  deprec_specify "should pop the last item if it is a hash" do
     a = [1,2,{1=>2}]
     a.extract_options!.should == {1=>2}
     a.should == [1,2]
   end
 
-  specify "should return an empty hash if the last item is not a hash" do
+  deprec_specify "should return an empty hash if the last item is not a hash" do
     a = [1,2]
     a.extract_options!.should == {}
     a.should == [1,2]
@@ -15,7 +15,7 @@ context "Array#extract_options!" do
 end
 
 context "Enumerable#send_each" do
-  specify "should send the supplied method to each item" do
+  deprec_specify "should send the supplied method to each item" do
     a = ['abbc', 'bbccdd', 'hebtre']
     a.send_each(:gsub!, 'b', '_')
     a.should == ['a__c', '__ccdd', 'he_tre']
@@ -23,7 +23,7 @@ context "Enumerable#send_each" do
 end
 
 context "Range#interval" do
-  specify "should return the interval between the beginning and end for an inclusive range" do
+  deprec_specify "should return the interval between the beginning and end for an inclusive range" do
     (1..10).interval.should == 9
     
     r = rand(100000) + 10
@@ -31,7 +31,7 @@ context "Range#interval" do
     (t1..t2).interval.should == r
   end
 
-  specify "should return the interval between the beginning and end for an exclusive range" do
+  deprec_specify "should return the interval between the beginning and end for an exclusive range" do
     (1...10).interval.should == 8
     
     r = rand(100000) + 10
@@ -41,7 +41,7 @@ context "Range#interval" do
 end
 
 context "Module#class_attr_reader" do
-  specify "it should create instance methods that call class methods of the same name" do
+  deprec_specify "it should create instance methods that call class methods of the same name" do
     @c = Class.new do
       def self.x; 1; end
       class_attr_reader :x
@@ -53,7 +53,7 @@ context "Module#class_attr_reader" do
 end
 
 context "Module#metaalias" do
-  specify "it should create aliases of singleton/class methods" do
+  deprec_specify "it should create aliases of singleton/class methods" do
     @c = Class.new do
       def self.x; 1; end
       metaalias :y, :x
@@ -65,7 +65,7 @@ context "Module#metaalias" do
 end
 
 context "Module#metaattr_reader" do
-  specify "it should create attr_readers of singleton/class methods" do
+  deprec_specify "it should create attr_readers of singleton/class methods" do
     @c = Class.new do
       @y = 1
       @x = 2
@@ -77,20 +77,20 @@ context "Module#metaattr_reader" do
 end
 
 context "Object#is_one_of?" do
-  specify "it should be true if the object is one of the classes" do
+  deprec_specify "it should be true if the object is one of the classes" do
     1.is_one_of?(Numeric, Array).should == true
     [].is_one_of?(Numeric, Array).should == true
     {}.is_one_of?(Numeric, Enumerable).should == true
   end
 
-  specify "it should be false if the object is not one of the classes" do
+  deprec_specify "it should be false if the object is not one of the classes" do
     'a'.is_one_of?(Numeric, Array).should == false
     Object.new.is_one_of?(Numeric, Array).should == false
   end
 end
 
 context "Object#blank?" do
-  specify "it should be true if the object responds true to empty?" do
+  deprec_specify "it should be true if the object responds true to empty?" do
     [].blank?.should == true
     {}.blank?.should == true
     o = Object.new
@@ -98,7 +98,7 @@ context "Object#blank?" do
     o.blank?.should == true
   end
 
-  specify "it should be false if the object doesn't respond true to empty?" do
+  deprec_specify "it should be false if the object doesn't respond true to empty?" do
     [2].blank?.should == false
     {1=>2}.blank?.should == false
     Object.new.blank?.should == false
@@ -106,7 +106,7 @@ context "Object#blank?" do
 end
 
 context "Numeric#blank?" do
-  specify "it should always be false" do
+  deprec_specify "it should always be false" do
     1.blank?.should == false
     0.blank?.should == false
     -1.blank?.should == false
@@ -121,34 +121,34 @@ context "Numeric#blank?" do
 end
 
 context "NilClass#blank?" do
-  specify "it should always be true" do
+  deprec_specify "it should always be true" do
     nil.blank?.should == true
   end
 end
 
 context "TrueClass#blank?" do
-  specify "it should always be false" do
+  deprec_specify "it should always be false" do
     true.blank?.should == false
   end
 end
 
 context "FalseClass#blank?" do
-  specify "it should always be true" do
+  deprec_specify "it should always be true" do
     false.blank?.should == true
   end
 end
 
 context "FalseClass#blank?" do
-  specify "it should be true if the string is empty" do
+  deprec_specify "it should be true if the string is empty" do
     ''.blank?.should == true
   end
-  specify "it should be true if the string is composed of just whitespace" do
+  deprec_specify "it should be true if the string is composed of just whitespace" do
     ' '.blank?.should == true
     "\r\n\t".blank?.should == true
     (' '*4000).blank?.should == true
     ("\r\n\t"*4000).blank?.should == true
   end
-  specify "it should be false if the string has any non whitespace characters" do
+  deprec_specify "it should be false if the string has any non whitespace characters" do
     '1'.blank?.should == false
     ("\r\n\t"*4000 + 'a').blank?.should == false
     ("\r\na\t"*4000).blank?.should == false

data/spec/{sequel_core → core}/core_sql_spec.rb

@@ -24,7 +24,7 @@ context "Array#all_two_pairs?" do
 end
   
 context "Array#case and Hash#case" do
-  setup do
+  before do
     @d = Sequel::Dataset.new(nil)
   end
 
@@ -52,7 +52,7 @@ context "Array#case and Hash#case" do
 end
 
 context "Array#sql_array" do
-  setup do
+  before do
     @d = Sequel::Dataset.new(nil)
   end
 
@@ -64,44 +64,44 @@ context "Array#sql_array" do
 end
 
 context "Array#to_sql" do
-  specify "should concatenate multiple lines into a single string" do
+  deprec_specify "should concatenate multiple lines into a single string" do
     "SELECT * \r\nFROM items\r\n WHERE a = 1".split.to_sql. \
       should == 'SELECT * FROM items WHERE a = 1'
   end
   
-  specify "should remove superfluous white space and line breaks" do
+  deprec_specify "should remove superfluous white space and line breaks" do
     "\tSELECT * \n FROM items    ".split.to_sql. \
       should == 'SELECT * FROM items'
   end
   
-  specify "should remove ANSI SQL comments" do
+  deprec_specify "should remove ANSI SQL comments" do
     "SELECT *   --comment\r\n  FROM items\r\n  --comment".split.to_sql. \
       should == 'SELECT * FROM items'
   end
   
-  specify "should remove C-style comments" do
+  deprec_specify "should remove C-style comments" do
     "SELECT * \r\n /* comment comment\r\n comment\r\n FROM items */\r\n FROM items\r\n--comment".split.to_sql. \
       should == 'SELECT * FROM items'
   end
 end
 
 context "String#to_sql" do
-  specify "should concatenate multiple lines into a single string" do
+  deprec_specify "should concatenate multiple lines into a single string" do
     "SELECT * \r\nFROM items\r\nWHERE a = 1".to_sql. \
       should == 'SELECT * FROM items WHERE a = 1'
   end
   
-  specify "should remove superfluous white space and line breaks" do
+  deprec_specify "should remove superfluous white space and line breaks" do
     "\tSELECT * \r\n FROM items    ".to_sql. \
       should == 'SELECT * FROM items'
   end
   
-  specify "should remove ANSI SQL comments" do
+  deprec_specify "should remove ANSI SQL comments" do
     "SELECT *   --comment \r\n FROM items\r\n  --comment".to_sql. \
       should == 'SELECT * FROM items'
   end
   
-  specify "should remove C-style comments" do
+  deprec_specify "should remove C-style comments" do
     "SELECT * \r\n/* comment comment\r\ncomment\r\nFROM items */\r\nFROM items\r\n--comment".to_sql. \
       should == 'SELECT * FROM items'
   end
@@ -114,11 +114,11 @@ context "String#lit" do
   end
   
   specify "should inhibit string literalization" do
-    Sequel::Database.new[:t].update_sql(:stamp => "NOW()".expr).should == \
+    Sequel::Database.new[:t].update_sql(:stamp => "NOW()".lit).should == \
       "UPDATE t SET stamp = NOW()"
   end
 
-  specify "should be aliased as expr" do
+  deprec_specify "should be aliased as expr" do
     'xyz'.expr.should be_a_kind_of(Sequel::LiteralString)
     'xyz'.expr.to_s.should == 'xyz'
     Sequel::Database.new[:t].update_sql(:stamp => "NOW()".expr).should == \
@@ -135,33 +135,31 @@ context "String#lit" do
   end
 end
 
-context "String#to_blob and #to_sequel_blob" do
+context "String#to_sequel_blob" do
   specify "should return a Blob object" do
-    'xyz'.to_blob.should be_a_kind_of(::Sequel::SQL::Blob)
-    'xyz'.to_blob.should == 'xyz'
     'xyz'.to_sequel_blob.should be_a_kind_of(::Sequel::SQL::Blob)
     'xyz'.to_sequel_blob.should == 'xyz'
   end
 
   specify "should retain binary data" do
-    "\1\2\3\4".to_blob.should == "\1\2\3\4"
+    "\1\2\3\4".to_sequel_blob.should == "\1\2\3\4"
   end
 end
 
 context "String#split_sql" do
-  specify "should split a string containing multiple statements" do
+  deprec_specify "should split a string containing multiple statements" do
     "DROP TABLE a; DROP TABLE c".split_sql.should == \
       ['DROP TABLE a', 'DROP TABLE c']
   end
   
-  specify "should remove comments from the string" do
+  deprec_specify "should remove comments from the string" do
     "DROP TABLE a;/* DROP TABLE b; DROP TABLE c;*/DROP TABLE d".split_sql.should == \
       ['DROP TABLE a', 'DROP TABLE d']
   end
 end
 
 context "#desc" do
-  setup do
+  before do
     @ds = Sequel::Dataset.new(nil)
   end
   
@@ -177,7 +175,7 @@ context "#desc" do
 end
 
 context "#asc" do
-  setup do
+  before do
     @ds = Sequel::Dataset.new(nil)
   end
   
@@ -193,7 +191,7 @@ context "#asc" do
 end
 
 context "#as" do
-  setup do
+  before do
     @ds = Sequel::Dataset.new(nil)
   end
   
@@ -213,7 +211,7 @@ context "#as" do
 end
 
 context "Column references" do
-  setup do
+  before do
     @c = Class.new(Sequel::Dataset) do
       def quoted_identifier(c); "`#{c}`"; end
     end
@@ -244,15 +242,13 @@ context "Column references" do
   end
   
   specify "should be quoted properly in a cast function" do
-    @ds.literal(:x.cast_as(:integer)).should == "CAST(`x` AS integer)"
-    @ds.literal(:x__y.cast_as('varchar(20)')).should == "CAST(`x`.`y` AS varchar(20))"
+    @ds.literal(:x.cast(:integer)).should == "CAST(`x` AS integer)"
+    @ds.literal(:x__y.cast('varchar(20)')).should == "CAST(`x`.`y` AS varchar(20))"
   end
 end
 
 context "Blob" do
-  specify "#to_blob and #to_sequel_blob should return self" do
-    blob = "x".to_blob
-    blob.to_blob.object_id.should == blob.object_id
+  specify "#to_sequel_blob should return self" do
     blob = "x".to_sequel_blob
     blob.to_sequel_blob.object_id.should == blob.object_id
   end
@@ -270,7 +266,7 @@ if RUBY_VERSION < '1.9.0'
 end
 
 context "Symbol#*" do
-  setup do
+  before do
     @ds = Sequel::Dataset.new(nil)
   end
   
@@ -293,7 +289,7 @@ context "Symbol" do
   before do
     @ds = Sequel::Dataset.new(nil)
     @ds.quote_identifiers = true
-    @ds.upcase_identifiers = true
+    @ds.identifier_input_method = :upcase
   end
 
   specify "#identifier should format an identifier" do
@@ -314,44 +310,44 @@ context "Symbol" do
   end
 end
 
-context "Symbol#to_column_ref" do
-  setup do
+context "Dataset#literal" do
+  before do
     @ds = MockDataset.new(nil)
   end
   
   specify "should convert qualified symbol notation into dot notation" do
-    :abc__def.to_column_ref(@ds).should == 'abc.def'
+    @ds.literal(:abc__def).should == 'abc.def'
   end
   
   specify "should convert AS symbol notation into SQL AS notation" do
-    :xyz___x.to_column_ref(@ds).should == 'xyz AS x'
-    :abc__def___x.to_column_ref(@ds).should == 'abc.def AS x'
+    @ds.literal(:xyz___x).should == 'xyz AS x'
+    @ds.literal(:abc__def___x).should == 'abc.def AS x'
   end
   
   specify "should support names with digits" do
-    :abc2.to_column_ref(@ds).should == 'abc2'
-    :xx__yy3.to_column_ref(@ds).should == 'xx.yy3'
-    :ab34__temp3_4ax.to_column_ref(@ds).should == 'ab34.temp3_4ax'
-    :x1___y2.to_column_ref(@ds).should == 'x1 AS y2'
-    :abc2__def3___ggg4.to_column_ref(@ds).should == 'abc2.def3 AS ggg4'
+    @ds.literal(:abc2).should == 'abc2'
+    @ds.literal(:xx__yy3).should == 'xx.yy3'
+    @ds.literal(:ab34__temp3_4ax).should == 'ab34.temp3_4ax'
+    @ds.literal(:x1___y2).should == 'x1 AS y2'
+    @ds.literal(:abc2__def3___ggg4).should == 'abc2.def3 AS ggg4'
   end
   
   specify "should support upper case and lower case" do
-    :ABC.to_column_ref(@ds).should == 'ABC'
-    :Zvashtoy__aBcD.to_column_ref(@ds).should == 'Zvashtoy.aBcD'
+    @ds.literal(:ABC).should == 'ABC'
+    @ds.literal(:Zvashtoy__aBcD).should == 'Zvashtoy.aBcD'
   end
 
   specify "should support spaces inside column names" do
     @ds.quote_identifiers = true
-    :"AB C".to_column_ref(@ds).should == '"AB C"'
-    :"Zvas htoy__aB cD".to_column_ref(@ds).should == '"Zvas htoy"."aB cD"'
-    :"aB cD___XX XX".to_column_ref(@ds).should == '"aB cD" AS "XX XX"'
-    :"Zva shtoy__aB cD___XX XX".to_column_ref(@ds).should == '"Zva shtoy"."aB cD" AS "XX XX"'
+    @ds.literal(:"AB C").should == '"AB C"'
+    @ds.literal(:"Zvas htoy__aB cD").should == '"Zvas htoy"."aB cD"'
+    @ds.literal(:"aB cD___XX XX").should == '"aB cD" AS "XX XX"'
+    @ds.literal(:"Zva shtoy__aB cD___XX XX").should == '"Zva shtoy"."aB cD" AS "XX XX"'
   end
 end
 
 context "Symbol" do
-  setup do
+  before do
     @ds = Sequel::Dataset.new(MockDatabase.new)
   end
   
@@ -365,10 +361,13 @@ context "Symbol" do
     ds.select(:COUNT.sql_function('1')).sql.should == "SELECT COUNT('1') FROM t"
   end
   
-  specify "should support cast method and its cast_as alias" do
-    :abc.cast_as(:integer).to_s(@ds).should == "CAST(abc AS integer)"
+  specify "should support cast method" do
     :abc.cast(:integer).to_s(@ds).should == "CAST(abc AS integer)"
   end
+
+  deprec_specify "should support cast_as method" do
+    :abc.cast_as(:integer).to_s(@ds).should == "CAST(abc AS integer)"
+  end
   
   specify "should support cast_numeric and cast_string" do
     x = :abc.cast_numeric
@@ -398,8 +397,6 @@ context "Symbol" do
        end
     end
     @ds2 = Sequel::Dataset.new(m)
-    :abc.cast_as(Integer).to_s(@ds).should == "CAST(abc AS integer)"
-    :abc.cast_as(Integer).to_s(@ds2).should == "CAST(abc AS foo)"
     :abc.cast(String).to_s(@ds).should == "CAST(abc AS varchar(255))"
     :abc.cast(String).to_s(@ds2).should == "CAST(abc AS bar)"
     :abc.cast(String).to_s(@ds2).should == "CAST(abc AS bar)"
@@ -409,7 +406,7 @@ context "Symbol" do
     :abc.cast_numeric(String).to_s(@ds2).should == "CAST(abc AS bar)"
   end
 
-  specify "should support subscript access using | operator" do
+  deprec_specify "should support subscript access using | operator" do
     (:abc|1).to_s(@ds).should == 'abc[1]'
     (:abc|[1]).to_s(@ds).should == 'abc[1]'
     (:abc|[1, 2]).to_s(@ds).should == 'abc[1, 2]'
@@ -422,13 +419,13 @@ context "Symbol" do
 end
 
 context "String#to_time" do
-  specify "should convert the string into a Time object" do
+  deprec_specify "should convert the string into a Time object" do
     "2007-07-11".to_time.should == Time.parse("2007-07-11")
     "06:30".to_time.should == Time.parse("06:30")
   end
   
-  specify "should raise Error::InvalidValue for an invalid time" do
-    proc {'0000-00-00'.to_time}.should raise_error(Sequel::Error::InvalidValue)
+  deprec_specify "should raise InvalidValue for an invalid time" do
+    proc {'0000-00-00'.to_time}.should raise_error(Sequel::InvalidValue)
   end
 end
 
@@ -437,21 +434,21 @@ context "String#to_date" do
     Sequel.convert_two_digit_years = true
   end
 
-  specify "should convert the string into a Date object" do
+  deprec_specify "should convert the string into a Date object" do
     "2007-07-11".to_date.should == Date.parse("2007-07-11")
   end
   
-  specify "should convert 2 digit years by default" do
+  deprec_specify "should convert 2 digit years by default" do
     "July 11, 07".to_date.should == Date.parse("2007-07-11")
   end
 
-  specify "should not convert 2 digit years if set not to" do
+  deprec_specify "should not convert 2 digit years if set not to" do
     Sequel.convert_two_digit_years = false
     "July 11, 07".to_date.should == Date.parse("0007-07-11")
   end
 
-  specify "should raise Error::InvalidValue for an invalid date" do
-    proc {'0000-00-00'.to_date}.should raise_error(Sequel::Error::InvalidValue)
+  deprec_specify "should raise InvalidValue for an invalid date" do
+    proc {'0000-00-00'.to_date}.should raise_error(Sequel::InvalidValue)
   end
 end
 
@@ -460,21 +457,21 @@ context "String#to_datetime" do
     Sequel.convert_two_digit_years = true
   end
 
-  specify "should convert the string into a DateTime object" do
+  deprec_specify "should convert the string into a DateTime object" do
     "2007-07-11 10:11:12a".to_datetime.should == DateTime.parse("2007-07-11 10:11:12a")
   end
   
-  specify "should convert 2 digit years by default" do
+  deprec_specify "should convert 2 digit years by default" do
     "July 11, 07 10:11:12a".to_datetime.should == DateTime.parse("2007-07-11 10:11:12a")
   end
 
-  specify "should not convert 2 digit years if set not to" do
+  deprec_specify "should not convert 2 digit years if set not to" do
     Sequel.convert_two_digit_years = false
     "July 11, 07 10:11:12a".to_datetime.should == DateTime.parse("0007-07-11 10:11:12a")
   end
 
-  specify "should raise Error::InvalidValue for an invalid date" do
-    proc {'0000-00-00'.to_datetime}.should raise_error(Sequel::Error::InvalidValue)
+  deprec_specify "should raise InvalidValue for an invalid date" do
+    proc {'0000-00-00'.to_datetime}.should raise_error(Sequel::InvalidValue)
   end
 end
 
@@ -484,32 +481,32 @@ context "String#to_sequel_time" do
     Sequel.convert_two_digit_years = true
   end
 
-  specify "should convert the string into a Time object by default" do
+  deprec_specify "should convert the string into a Time object by default" do
     "2007-07-11 10:11:12a".to_sequel_time.class.should == Time
     "2007-07-11 10:11:12a".to_sequel_time.should == Time.parse("2007-07-11 10:11:12a")
   end
   
-  specify "should convert the string into a DateTime object if that is set" do
+  deprec_specify "should convert the string into a DateTime object if that is set" do
     Sequel.datetime_class = DateTime
     "2007-07-11 10:11:12a".to_sequel_time.class.should == DateTime
     "2007-07-11 10:11:12a".to_sequel_time.should == DateTime.parse("2007-07-11 10:11:12a")
   end
   
-  specify "should convert 2 digit years by default if using DateTime class" do
+  deprec_specify "should convert 2 digit years by default if using DateTime class" do
     Sequel.datetime_class = DateTime
     "July 11, 07 10:11:12a".to_sequel_time.should == DateTime.parse("2007-07-11 10:11:12a")
   end
 
-  specify "should not convert 2 digit years if set not to when using DateTime class" do
+  deprec_specify "should not convert 2 digit years if set not to when using DateTime class" do
     Sequel.datetime_class = DateTime
     Sequel.convert_two_digit_years = false
     "July 11, 07 10:11:12a".to_sequel_time.should == DateTime.parse("0007-07-11 10:11:12a")
   end
 
-  specify "should raise Error::InvalidValue for an invalid time" do
-    proc {'0000-00-00'.to_sequel_time}.should raise_error(Sequel::Error::InvalidValue)
+  deprec_specify "should raise InvalidValue for an invalid time" do
+    proc {'0000-00-00'.to_sequel_time}.should raise_error(Sequel::InvalidValue)
     Sequel.datetime_class = DateTime
-    proc {'0000-00-00'.to_sequel_time}.should raise_error(Sequel::Error::InvalidValue)
+    proc {'0000-00-00'.to_sequel_time}.should raise_error(Sequel::InvalidValue)
   end
 end