sequel 3.47.0 → 3.48.0

data/spec/extensions/list_spec.rb

@@ -45,9 +45,9 @@ describe "List plugin" do
 
   it "should modify the order when using the plugin" do
     c = Class.new(Sequel::Model(:items))
-    c.model.dataset.sql.should == 'SELECT * FROM items'
+    c.dataset.sql.should == 'SELECT * FROM items'
     c.plugin :list
-    c.model.dataset.sql.should == 'SELECT * FROM items ORDER BY position'
+    c.dataset.sql.should == 'SELECT * FROM items ORDER BY position'
   end
 
   it "should be able to access the position field as a class attribute" do
@@ -80,10 +80,10 @@ describe "List plugin" do
     @c.instance_dataset.autoid = @c.dataset.autoid = 1
     @c.create.values.should == {:id=>1, :position=>1}
     @c.create.values.should == {:id=>2, :position=>2}
-    @db.sqls.should == ["SELECT max(position) FROM items LIMIT 1",
+    @db.sqls.should == ["SELECT max(position) AS max FROM items LIMIT 1",
       "INSERT INTO items (position) VALUES (1)", 
       "SELECT * FROM items WHERE (id = 1) ORDER BY position LIMIT 1",
-      "SELECT max(position) FROM items LIMIT 1",
+      "SELECT max(position) AS max FROM items LIMIT 1",
       "INSERT INTO items (position) VALUES (2)", 
       "SELECT * FROM items WHERE (id = 2) ORDER BY position LIMIT 1"]
   end
@@ -98,11 +98,11 @@ describe "List plugin" do
     sqls.slice!(7).should =~ /INSERT INTO items \((scope_id|position), (scope_id|position)\) VALUES \([12], [12]\)/
     sqls.slice!(4).should =~ /INSERT INTO items \((scope_id|position), (scope_id|position)\) VALUES \([12], [12]\)/
     sqls.slice!(1).should =~ /INSERT INTO items \((scope_id|position), (scope_id|position)\) VALUES \(1, 1\)/
-    sqls.should == ["SELECT max(position) FROM items WHERE (scope_id = 1) LIMIT 1",
+    sqls.should == ["SELECT max(position) AS max FROM items WHERE (scope_id = 1) LIMIT 1",
       "SELECT * FROM items WHERE (id = 1) ORDER BY scope_id, position LIMIT 1",
-      "SELECT max(position) FROM items WHERE (scope_id = 1) LIMIT 1",
+      "SELECT max(position) AS max FROM items WHERE (scope_id = 1) LIMIT 1",
       "SELECT * FROM items WHERE (id = 2) ORDER BY scope_id, position LIMIT 1",
-      "SELECT max(position) FROM items WHERE (scope_id = 2) LIMIT 1",
+      "SELECT max(position) AS max FROM items WHERE (scope_id = 2) LIMIT 1",
       "SELECT * FROM items WHERE (id = 3) ORDER BY scope_id, position LIMIT 1"]
   end
 
@@ -111,8 +111,8 @@ describe "List plugin" do
     @o.last_position.should == 10
     @sc.dataset._fetch = {:max=>20}
     @so.last_position.should == 20
-    @db.sqls.should == ["SELECT max(position) FROM items LIMIT 1",
-      "SELECT max(position) FROM items WHERE (scope_id = 5) LIMIT 1"]
+    @db.sqls.should == ["SELECT max(position) AS max FROM items LIMIT 1",
+      "SELECT max(position) AS max FROM items WHERE (scope_id = 5) LIMIT 1"]
   end
 
   it "should have list_dataset return the model's dataset for non scoped lists" do
@@ -127,7 +127,7 @@ describe "List plugin" do
     @c.dataset._fetch = {:max=>10}
     @o.move_down.should == @o
     @o.position.should == 4
-    @db.sqls.should == ["SELECT max(position) FROM items LIMIT 1",
+    @db.sqls.should == ["SELECT max(position) AS max FROM items LIMIT 1",
       "UPDATE items SET position = (position - 1) WHERE ((position >= 4) AND (position <= 4))",
       "UPDATE items SET position = 4 WHERE (id = 7)"]
   end
@@ -136,7 +136,7 @@ describe "List plugin" do
     @c.dataset._fetch = {:max=>10}
     @o.move_down(3).should == @o
     @o.position.should == 6
-    @db.sqls.should == ["SELECT max(position) FROM items LIMIT 1",
+    @db.sqls.should == ["SELECT max(position) AS max FROM items LIMIT 1",
       "UPDATE items SET position = (position - 1) WHERE ((position >= 4) AND (position <= 6))",
       "UPDATE items SET position = 6 WHERE (id = 7)"]
   end
@@ -184,7 +184,7 @@ describe "List plugin" do
   it "should have move_to_bottom move the item to the last position" do
     @c.dataset._fetch = {:max=>10}
     @o.move_to_bottom
-    @db.sqls.should == ["SELECT max(position) FROM items LIMIT 1",
+    @db.sqls.should == ["SELECT max(position) AS max FROM items LIMIT 1",
       "UPDATE items SET position = (position - 1) WHERE ((position >= 4) AND (position <= 10))",
       "UPDATE items SET position = 10 WHERE (id = 7)"]
   end
@@ -213,7 +213,7 @@ describe "List plugin" do
     @c.dataset._fetch = {:max=>10}
     @o.move_up(-1).should == @o
     @o.position.should == 4
-    @db.sqls.should == ["SELECT max(position) FROM items LIMIT 1",
+    @db.sqls.should == ["SELECT max(position) AS max FROM items LIMIT 1",
       "UPDATE items SET position = (position - 1) WHERE ((position >= 4) AND (position <= 4))",
       "UPDATE items SET position = 4 WHERE (id = 7)"]
   end

data/spec/extensions/looser_typecasting_spec.rb

@@ -2,14 +2,15 @@ require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "LooserTypecasting Extension" do
   before do
-    @db = Sequel::Database.new({})
+    @db = Sequel::Database.new
+    def @db.supports_schema_parsing?() true end
     def @db.schema(*args)
-      [[:id, {}], [:z, {:type=>:float}], [:b, {:type=>:integer}], [:d, {:type=>:decimal}]]
+      [[:id, {}], [:z, {:type=>:float}], [:b, {:type=>:integer}], [:d, {:type=>:decimal}], [:s, {:type=>:string}]]
     end 
     @c = Class.new(Sequel::Model(@db[:items]))
     @db.extension(:looser_typecasting)
     @c.instance_eval do
-      @columns = [:id, :b, :z, :d] 
+      @columns = [:id, :b, :z, :d, :s] 
       def columns; @columns; end 
     end
   end
@@ -24,6 +25,12 @@ describe "LooserTypecasting Extension" do
     @c.new(:z=>'a').z.should be_a_kind_of(Float)
   end
 
+  specify "should not raise errors for hash or array input to string columns" do
+    @c.new(:s=>'a').s.should == 'a'
+    @c.new(:s=>[]).s.should be_a_kind_of(String)
+    @c.new(:s=>{}).s.should be_a_kind_of(String)
+  end
+
   specify "should not raise errors for invalid strings in decimal columns" do
     @c.new(:d=>'a').d.should == 0.0
     @c.new(:d=>'a').d.should be_a_kind_of(BigDecimal)

data/spec/extensions/many_through_many_spec.rb

@@ -652,7 +652,7 @@ describe "Sequel::Plugins::ManyThroughMany eager loading methods" do
     MODEL_DB.sqls.length.should == 0
   end
 
-  it "should respect the :limit option on a many_through_many association using a :correlated_subquery strategy" do
+  qspecify "should respect the :limit option on a many_through_many association using a :correlated_subquery strategy" do
     @c1.many_through_many :first_two_tags, [[:albums_artists, :artist_id, :album_id], [:albums, :id, :id], [:albums_tags, :album_id, :tag_id]], :class=>Tag, :limit=>2, :eager_limit_strategy=>:correlated_subquery, :order=>:name
     Tag.dataset._fetch = [{:x_foreign_key_x=>1, :id=>5},{:x_foreign_key_x=>1, :id=>6}]
     a = @c1.eager(:first_two_tags).all

data/spec/extensions/migration_spec.rb

@@ -231,7 +231,7 @@ describe "Sequel::IntegerMigrator" do
         @tables_created << name.to_sym
       end
       
-      def dataset(opts={})
+      def dataset
         ds = super
         ds.extend(Module.new do
           def count; 1; end
@@ -661,32 +661,32 @@ describe "Sequel::TimestampMigrator" do
 
   specify "should use TimestampMigrator if TimestampMigrator.apply is called even for integer migrations directory" do
     Sequel::TimestampMigrator.apply(@db, "spec/files/integer_migrations")
-    @db.sqls.should == ["SELECT NULL FROM schema_migrations LIMIT 1", "CREATE TABLE schema_migrations (filename varchar(255) PRIMARY KEY)", "SELECT NULL FROM schema_info LIMIT 1", "SELECT filename FROM schema_migrations ORDER BY filename", "CREATE TABLE sm1111 (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('001_create_sessions.rb')", "CREATE TABLE sm2222 (smc2 integer)", "INSERT INTO schema_migrations (filename) VALUES ('002_create_nodes.rb')", "CREATE TABLE sm3333 (smc3 integer)", "INSERT INTO schema_migrations (filename) VALUES ('003_3_create_users.rb')"]
+    @db.sqls.should == ["SELECT NULL AS nil FROM schema_migrations LIMIT 1", "CREATE TABLE schema_migrations (filename varchar(255) PRIMARY KEY)", "SELECT NULL AS nil FROM schema_info LIMIT 1", "SELECT filename FROM schema_migrations ORDER BY filename", "CREATE TABLE sm1111 (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('001_create_sessions.rb')", "CREATE TABLE sm2222 (smc2 integer)", "INSERT INTO schema_migrations (filename) VALUES ('002_create_nodes.rb')", "CREATE TABLE sm3333 (smc3 integer)", "INSERT INTO schema_migrations (filename) VALUES ('003_3_create_users.rb')"]
   end
 
   specify "should not use transactions by default" do
     Sequel::TimestampMigrator.apply(@db, "spec/files/transaction_unspecified_migrations")
-    @db.sqls.should == ["SELECT NULL FROM schema_migrations LIMIT 1", "CREATE TABLE schema_migrations (filename varchar(255) PRIMARY KEY)", "SELECT NULL FROM schema_info LIMIT 1", "SELECT filename FROM schema_migrations ORDER BY filename", "CREATE TABLE sm11111 (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('001_create_alt_basic.rb')", "CREATE TABLE sm (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('002_create_basic.rb')"]
+    @db.sqls.should == ["SELECT NULL AS nil FROM schema_migrations LIMIT 1", "CREATE TABLE schema_migrations (filename varchar(255) PRIMARY KEY)", "SELECT NULL AS nil FROM schema_info LIMIT 1", "SELECT filename FROM schema_migrations ORDER BY filename", "CREATE TABLE sm11111 (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('001_create_alt_basic.rb')", "CREATE TABLE sm (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('002_create_basic.rb')"]
   end
 
   specify "should use transactions by default if database supports transactional ddl" do
     @db.meta_def(:supports_transactional_ddl?){true}
     Sequel::TimestampMigrator.apply(@db, "spec/files/transaction_unspecified_migrations")
-    @db.sqls.should == ["SELECT NULL FROM schema_migrations LIMIT 1", "CREATE TABLE schema_migrations (filename varchar(255) PRIMARY KEY)", "SELECT NULL FROM schema_info LIMIT 1", "SELECT filename FROM schema_migrations ORDER BY filename", "BEGIN", "CREATE TABLE sm11111 (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('001_create_alt_basic.rb')", "COMMIT", "BEGIN", "CREATE TABLE sm (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('002_create_basic.rb')", "COMMIT"]
+    @db.sqls.should == ["SELECT NULL AS nil FROM schema_migrations LIMIT 1", "CREATE TABLE schema_migrations (filename varchar(255) PRIMARY KEY)", "SELECT NULL AS nil FROM schema_info LIMIT 1", "SELECT filename FROM schema_migrations ORDER BY filename", "BEGIN", "CREATE TABLE sm11111 (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('001_create_alt_basic.rb')", "COMMIT", "BEGIN", "CREATE TABLE sm (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('002_create_basic.rb')", "COMMIT"]
   end
 
   specify "should support transaction use on a per migration basis" do
     Sequel::TimestampMigrator.apply(@db, "spec/files/transaction_specified_migrations")
-    @db.sqls.should == ["SELECT NULL FROM schema_migrations LIMIT 1", "CREATE TABLE schema_migrations (filename varchar(255) PRIMARY KEY)", "SELECT NULL FROM schema_info LIMIT 1", "SELECT filename FROM schema_migrations ORDER BY filename", "BEGIN", "CREATE TABLE sm11111 (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('001_create_alt_basic.rb')", "COMMIT", "CREATE TABLE sm (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('002_create_basic.rb')"]
+    @db.sqls.should == ["SELECT NULL AS nil FROM schema_migrations LIMIT 1", "CREATE TABLE schema_migrations (filename varchar(255) PRIMARY KEY)", "SELECT NULL AS nil FROM schema_info LIMIT 1", "SELECT filename FROM schema_migrations ORDER BY filename", "BEGIN", "CREATE TABLE sm11111 (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('001_create_alt_basic.rb')", "COMMIT", "CREATE TABLE sm (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('002_create_basic.rb')"]
   end
 
   specify "should force transactions if enabled by the migrator" do
     Sequel::TimestampMigrator.run(@db, "spec/files/transaction_specified_migrations", :use_transactions=>true)
-    @db.sqls.should == ["SELECT NULL FROM schema_migrations LIMIT 1", "CREATE TABLE schema_migrations (filename varchar(255) PRIMARY KEY)", "SELECT NULL FROM schema_info LIMIT 1", "SELECT filename FROM schema_migrations ORDER BY filename", "BEGIN", "CREATE TABLE sm11111 (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('001_create_alt_basic.rb')", "COMMIT", "BEGIN", "CREATE TABLE sm (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('002_create_basic.rb')", "COMMIT"]
+    @db.sqls.should == ["SELECT NULL AS nil FROM schema_migrations LIMIT 1", "CREATE TABLE schema_migrations (filename varchar(255) PRIMARY KEY)", "SELECT NULL AS nil FROM schema_info LIMIT 1", "SELECT filename FROM schema_migrations ORDER BY filename", "BEGIN", "CREATE TABLE sm11111 (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('001_create_alt_basic.rb')", "COMMIT", "BEGIN", "CREATE TABLE sm (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('002_create_basic.rb')", "COMMIT"]
   end
 
   specify "should not use transactions if disabled in the migrator" do
     Sequel::TimestampMigrator.run(@db, "spec/files/transaction_unspecified_migrations", :use_transactions=>false)
-    @db.sqls.should == ["SELECT NULL FROM schema_migrations LIMIT 1", "CREATE TABLE schema_migrations (filename varchar(255) PRIMARY KEY)", "SELECT NULL FROM schema_info LIMIT 1", "SELECT filename FROM schema_migrations ORDER BY filename", "CREATE TABLE sm11111 (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('001_create_alt_basic.rb')", "CREATE TABLE sm (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('002_create_basic.rb')"]
+    @db.sqls.should == ["SELECT NULL AS nil FROM schema_migrations LIMIT 1", "CREATE TABLE schema_migrations (filename varchar(255) PRIMARY KEY)", "SELECT NULL AS nil FROM schema_info LIMIT 1", "SELECT filename FROM schema_migrations ORDER BY filename", "CREATE TABLE sm11111 (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('001_create_alt_basic.rb')", "CREATE TABLE sm (smc1 integer)", "INSERT INTO schema_migrations (filename) VALUES ('002_create_basic.rb')"]
   end
 end

data/spec/extensions/named_timezones_spec.rb

@@ -29,6 +29,12 @@ describe "Sequel named_timezones extension" do
     Sequel.database_timezone.should == @tz_out
   end
     
+  it "should convert string arguments for Database#timezone= to TZInfo::Timezone instances for database-specific timezones" do
+    @db.extension :named_timezones
+    @db.timezone = 'America/Los_Angeles'
+    @db.timezone.should == @tz_in
+  end
+    
   it "should accept TZInfo::Timezone instances in *_timezone=" do
     Sequel.application_timezone = @tz_in
     Sequel.database_timezone = @tz_out

data/spec/extensions/nested_attributes_spec.rb

@@ -36,7 +36,7 @@ describe "NestedAttributes plugin" do
     @Artist.one_to_many :albums, :class=>@Album, :key=>:artist_id
     @Artist.one_to_many :concerts, :class=>@Concert, :key=>:artist_id
     @Artist.one_to_one :first_album, :class=>@Album, :key=>:artist_id
-    @Album.many_to_one :artist, :class=>@Artist
+    @Album.many_to_one :artist, :class=>@Artist, :reciprocal=>:albums
     @Album.many_to_many :tags, :class=>@Tag, :left_key=>:album_id, :right_key=>:tag_id, :join_table=>:at
     @Artist.nested_attributes :albums, :first_album, :destroy=>true, :remove=>true
     @Artist.nested_attributes :concerts, :destroy=>true, :remove=>true
@@ -419,7 +419,7 @@ describe "NestedAttributes plugin" do
   end
   
   it "should not attempt to validate nested attributes if the :validate=>false association option is used" do
-    @Album.many_to_one :artist, :class=>@Artist, :validate=>false
+    @Album.many_to_one :artist, :class=>@Artist, :validate=>false, :reciprocal=>nil
     @Album.nested_attributes :artist, :tags, :destroy=>true, :remove=>true
     @Artist.class_eval do
       def validate

data/spec/extensions/null_dataset_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "null_dataset extension" do
   before do
-    @db = Sequel::mock(:fetch=>{:id=>1}, :autoid=>1, :numrows=>1, :columns=>[:id])
+    @db = Sequel::mock(:fetch=>{:id=>1}, :autoid=>1, :numrows=>1, :columns=>[:id]).extension(:null_dataset)
     @ds = @db[:table].nullify
     @i = 0
     @pr = proc{|*a| @i += 1}

data/spec/extensions/pagination_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "A paginated dataset" do
   before do
-    @d = Sequel::Dataset.new(nil)
+    @d = Sequel.mock.dataset.extension(:pagination)
     @d.meta_def(:count) {153}
     
     @paginated = @d.paginate(1, 20)
@@ -78,7 +78,7 @@ end
 
 describe "Dataset#each_page" do
   before do
-    @d = Sequel::Dataset.new(nil).from(:items)
+    @d = Sequel.mock.dataset.from(:items).extension(:pagination)
     @d.meta_def(:count) {153}
   end
   

data/spec/extensions/pg_hstore_ops_spec.rb

@@ -18,6 +18,14 @@ describe "Sequel::Postgres::HStoreOp" do
     @ds.literal(@h - Sequel.lit('a')).should == "(h - a)"
   end
 
+  it "#- should handle arrays" do
+    @ds.literal(@h - %w'a').should == "(h - ARRAY['a'])"
+  end
+
+  it "#- should handle hashes" do
+    @ds.literal(@h - {'a'=>'b'}).should == "(h - '\"a\"=>\"b\"'::hstore)"
+  end
+
   it "#- should return an HStoreOp" do
     @ds.literal((@h - :a)['a']).should == "((h - a) -> 'a')"
   end
@@ -26,6 +34,22 @@ describe "Sequel::Postgres::HStoreOp" do
     @ds.literal(@h['a']).should == "(h -> 'a')"
   end
 
+  it "#[] should handle arrays" do
+    @ds.literal(@h[%w'a']).should == "(h -> ARRAY['a'])"
+  end
+
+  it "#[] should return a PGArrayOp if given an array" do
+    @ds.literal(@h[%w'a'][0]).should == "(h -> ARRAY['a'])[0]"
+  end
+
+  it "#[] should return a PGArrayOp if given a PGArray" do
+    @ds.literal(@h[Sequel.pg_array(%w'a')][0]).should == "(h -> ARRAY['a'])[0]"
+  end
+
+  it "#[] should return a PGArrayOp if given a PGArrayOp" do
+    @ds.literal(@h[Sequel.pg_array_op(:a)][0]).should == "(h -> a)[0]"
+  end
+
   it "#[] should return a string expression" do
     @ds.literal(@h['a'] + 'b').should == "((h -> 'a') || 'b')"
   end
@@ -35,6 +59,11 @@ describe "Sequel::Postgres::HStoreOp" do
     @ds.literal(@h.merge(:h1)).should == "(h || h1)"
   end
 
+  it "#concat and #merge should handle hashes" do
+    @ds.literal(@h.concat('a'=>'b')).should == "(h || '\"a\"=>\"b\"'::hstore)"
+    @ds.literal(@h.merge('a'=>'b')).should == "(h || '\"a\"=>\"b\"'::hstore)"
+  end
+
   it "#concat should return an HStoreOp" do
     @ds.literal(@h.concat(:h1)['a']).should == "((h || h1) -> 'a')"
   end
@@ -43,18 +72,34 @@ describe "Sequel::Postgres::HStoreOp" do
     @ds.literal(@h.contain_all(:h1)).should == "(h ?& h1)"
   end
 
+  it "#contain_all handle arrays" do
+    @ds.literal(@h.contain_all(%w'h1')).should == "(h ?& ARRAY['h1'])"
+  end
+
   it "#contain_any should use the ?| operator" do
     @ds.literal(@h.contain_any(:h1)).should == "(h ?| h1)"
   end
 
+  it "#contain_any should handle arrays" do
+    @ds.literal(@h.contain_any(%w'h1')).should == "(h ?| ARRAY['h1'])"
+  end
+
   it "#contains should use the @> operator" do
     @ds.literal(@h.contains(:h1)).should == "(h @> h1)"
   end
 
+  it "#contains should handle hashes" do
+    @ds.literal(@h.contains('a'=>'b')).should == "(h @> '\"a\"=>\"b\"'::hstore)"
+  end
+
   it "#contained_by should use the <@ operator" do
     @ds.literal(@h.contained_by(:h1)).should == "(h <@ h1)"
   end
 
+  it "#contained_by should handle hashes" do
+    @ds.literal(@h.contained_by('a'=>'b')).should == "(h <@ '\"a\"=>\"b\"'::hstore)"
+  end
+
   it "#defined should use the defined function" do
     @ds.literal(@h.defined('a')).should == "defined(h, 'a')"
   end
@@ -63,6 +108,14 @@ describe "Sequel::Postgres::HStoreOp" do
     @ds.literal(@h.delete('a')).should == "delete(h, 'a')"
   end
 
+  it "#delete should handle arrays" do
+    @ds.literal(@h.delete(%w'a')).should == "delete(h, ARRAY['a'])"
+  end
+
+  it "#delete should handle hashes" do
+    @ds.literal(@h.delete('a'=>'b')).should == "delete(h, '\"a\"=>\"b\"'::hstore)"
+  end
+
   it "#delete should return an HStoreOp" do
     @ds.literal(@h.delete('a')['a']).should == "(delete(h, 'a') -> 'a')"
   end
@@ -88,6 +141,11 @@ describe "Sequel::Postgres::HStoreOp" do
     @ds.literal(@h.akeys).should == "akeys(h)"
   end
 
+  it "#keys and #akeys should return PGArrayOps" do
+    @ds.literal(@h.keys[0]).should == "akeys(h)[0]"
+    @ds.literal(@h.akeys[0]).should == "akeys(h)[0]"
+  end
+
   it "#populate should use the populate_record function" do
     @ds.literal(@h.populate(:a)).should == "populate_record(a, h)"
   end
@@ -104,6 +162,10 @@ describe "Sequel::Postgres::HStoreOp" do
     @ds.literal(@h.slice(:a)).should == "slice(h, a)"
   end
 
+  it "#slice should handle arrays" do
+    @ds.literal(@h.slice(%w'a')).should == "slice(h, ARRAY['a'])"
+  end
+
   it "#slice should return an HStoreOp" do
     @ds.literal(@h.slice(:a)['a']).should == "(slice(h, a) -> 'a')"
   end
@@ -116,15 +178,28 @@ describe "Sequel::Postgres::HStoreOp" do
     @ds.literal(@h.to_array).should == "hstore_to_array(h)"
   end
 
+  it "#to_array should return a PGArrayOp" do
+    @ds.literal(@h.to_array[0]).should == "hstore_to_array(h)[0]"
+  end
+
   it "#to_matrix should use the hstore_to_matrix function" do
     @ds.literal(@h.to_matrix).should == "hstore_to_matrix(h)"
   end
 
+  it "#to_matrix should return a PGArrayOp" do
+    @ds.literal(@h.to_matrix[0]).should == "hstore_to_matrix(h)[0]"
+  end
+
   it "#values and #avals should use the avals function" do
     @ds.literal(@h.values).should == "avals(h)"
     @ds.literal(@h.avals).should == "avals(h)"
   end
 
+  it "#values and #avals should return PGArrayOps" do
+    @ds.literal(@h.values[0]).should == "avals(h)[0]"
+    @ds.literal(@h.avals[0]).should == "avals(h)[0]"
+  end
+
   it "should have Sequel.hstore_op return HStoreOp instances as-is" do
     Sequel.hstore_op(@h).should equal(@h)
   end

data/spec/extensions/pg_range_ops_spec.rb

@@ -27,7 +27,7 @@ describe "Sequel::Postgres::RangeOp" do
     @ds.literal(Sequel.pg_range(1..2, :numrange).op.lower).should == "lower('[1,2]'::numrange)"
   end
 
-  it "should define methods for all of the the PostgreSQL range operators" do
+  it "should define methods for all of the PostgreSQL range operators" do
     @ds.literal(@h.contains(@h)).should == "(h @> h)"
     @ds.literal(@h.contained_by(@h)).should == "(h <@ h)"
     @ds.literal(@h.overlaps(@h)).should == "(h && h)"
@@ -36,12 +36,14 @@ describe "Sequel::Postgres::RangeOp" do
     @ds.literal(@h.ends_before(@h)).should == "(h &< h)"
     @ds.literal(@h.starts_after(@h)).should == "(h &> h)"
     @ds.literal(@h.adjacent_to(@h)).should == "(h -|- h)"
+  end
 
+  qspecify "should define methods for the deprecated PostgreSQL range operators" do
     @ds.literal(@h.starts_before(@h)).should == "(h &< h)"
     @ds.literal(@h.ends_after(@h)).should == "(h &> h)"
   end
 
-  it "should define methods for all of the the PostgreSQL range functions" do
+  it "should define methods for all of the PostgreSQL range functions" do
     @ds.literal(@h.lower).should == "lower(h)"
     @ds.literal(@h.upper).should == "upper(h)"
     @ds.literal(@h.isempty).should == "isempty(h)"

data/spec/extensions/pg_row_plugin_spec.rb

@@ -57,6 +57,6 @@ describe "Sequel::Plugins::PgRow" do
   end
 
   it "should allow inserting just this model value" do
-    @c2.insert_sql(@c.load(:street=>'123', :city=>'Bar')).should == "INSERT INTO company VALUES (ROW('123', 'Bar')::address)"
+    @c2.dataset.insert_sql(@c.load(:street=>'123', :city=>'Bar')).should == "INSERT INTO company VALUES (ROW('123', 'Bar')::address)"
   end
 end

data/spec/extensions/pretty_table_spec.rb

@@ -7,7 +7,7 @@ describe "Dataset#print" do
     @output = StringIO.new
     @orig_stdout = $stdout
     $stdout = @output
-    @dataset = Sequel.mock(:fetch=>[{:a=>1, :b=>2}, {:a=>3, :b=>4}, {:a=>5, :b=>6}])[:items]
+    @dataset = Sequel.mock(:fetch=>[{:a=>1, :b=>2}, {:a=>3, :b=>4}, {:a=>5, :b=>6}])[:items].extension(:pretty_table)
   end
 
   after do

data/spec/extensions/query_literals_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "query_literals extension" do
   before do
-    @ds = Sequel::Dataset.new(nil).from(:t).extension(:query_literals)
+    @ds = Sequel.mock.dataset.from(:t).extension(:query_literals)
   end
 
   it "should not use special support if given a block" do

data/spec/extensions/query_spec.rb

@@ -1,8 +1,8 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
-describe "Database#dataset" do
+describe "Database#query" do
   before do
-    @db = Sequel::Database.new
+    @db = Sequel.mock.extension(:query)
   end
 
   specify "should delegate to Dataset#query if block is provided" do
@@ -14,7 +14,7 @@ end
 
 describe "Dataset#query" do
   before do
-    @d = Sequel::Dataset.new(nil)
+    @d = Sequel.mock.dataset.extension(:query)
   end
   
   specify "should allow cloning without arguments" do