[pull] master from jeremyevans:master

spec/core/database_spec.rb

@@ -118,18 +118,15 @@ def connect(*) raise end
 
   it "should just use a :uri option for jdbc with the full connection string" do
     begin
-      Sequel::Database.singleton_class.send(:alias_method, :adapter_class, :adapter_class)
-      Sequel::Database.singleton_class.send(:alias_method, :orig_adapter_class, :adapter_class)
-      def (Sequel::Database).adapter_class(_)
-        Class.new(Sequel::Database){def connect(*); Object.new end}
+      dbc = Class.new(Sequel::Database) do
+        set_adapter_scheme :jdbc
+        def connect(*); Object.new end
       end
       db = Sequel.connect('jdbc:test://host/db_name')
-      db.must_be_kind_of(Sequel::Database)
+      db.must_be_kind_of(dbc)
       db.opts[:uri].must_equal 'jdbc:test://host/db_name'
     ensure
-      Sequel::Database.singleton_class.send(:alias_method, :adapter_class, :adapter_class)
-      Sequel::Database.singleton_class.send(:alias_method, :adapter_class, :orig_adapter_class)
-      Sequel::Database.singleton_class.send(:remove_method, :orig_adapter_class)
+      Sequel::ADAPTER_MAP.delete(:jdbc)
     end
   end
 

spec/integration/plugin_test.rb

@@ -3400,7 +3400,7 @@ def self.name; "LogEntry" end
   end
   before do
     @a = a = []
-    @db[:sqdd_test].import([:id], [1, 2, 3])
+    @db[:sqdd_test].import([:id], [[1], [2], [3]])
     @class = Class.new(Sequel::Model(@db[:sqdd_test])) do
       set_primary_key :id
       plugin :single_statement_dataset_destroy