sequel 4.42.1 → 4.43.0

data/spec/extensions/single_table_inheritance_spec.rb

@@ -94,7 +94,7 @@ describe Sequel::Model, "single table inheritance plugin" do
     StiTest.new.save
     StiTestSub1.new.save
     StiTestSub2.new.save
-    DB.sqls.must_equal ["INSERT INTO sti_tests (kind) VALUES ('StiTest')", "SELECT * FROM sti_tests WHERE (id = 10) LIMIT 1", "INSERT INTO sti_tests (kind) VALUES ('StiTestSub1')", "SELECT * FROM sti_tests WHERE ((sti_tests.kind IN ('StiTestSub1')) AND (id = 10)) LIMIT 1", "INSERT INTO sti_tests (kind) VALUES ('StiTestSub2')", "SELECT * FROM sti_tests WHERE ((sti_tests.kind IN ('StiTestSub2')) AND (id = 10)) LIMIT 1"]
+    DB.sqls.must_equal ["INSERT INTO sti_tests (kind) VALUES ('StiTest')", "SELECT * FROM sti_tests WHERE id = 10", "INSERT INTO sti_tests (kind) VALUES ('StiTestSub1')", "SELECT * FROM sti_tests WHERE ((sti_tests.kind IN ('StiTestSub1')) AND (id = 10)) LIMIT 1", "INSERT INTO sti_tests (kind) VALUES ('StiTestSub2')", "SELECT * FROM sti_tests WHERE ((sti_tests.kind IN ('StiTestSub2')) AND (id = 10)) LIMIT 1"]
   end
 
   it "should destroy the model correctly" do
@@ -119,14 +119,14 @@ describe Sequel::Model, "single table inheritance plugin" do
 
   it "should override an existing value in the class name field" do
     StiTest.create(:kind=>'StiTestSub1')
-    DB.sqls.must_equal ["INSERT INTO sti_tests (kind) VALUES ('StiTestSub1')", "SELECT * FROM sti_tests WHERE (id = 10) LIMIT 1"]
+    DB.sqls.must_equal ["INSERT INTO sti_tests (kind) VALUES ('StiTestSub1')", "SELECT * FROM sti_tests WHERE id = 10"]
   end
 
   it "should handle type column with the same name as existing method names" do
     StiTest.plugin :single_table_inheritance, :type
     StiTest.columns :id, :type
     StiTest.create
-    DB.sqls.must_equal ["INSERT INTO sti_tests (type) VALUES ('StiTest')", "SELECT * FROM sti_tests WHERE (id = 10) LIMIT 1"]
+    DB.sqls.must_equal ["INSERT INTO sti_tests (type) VALUES ('StiTest')", "SELECT * FROM sti_tests WHERE id = 10"]
   end
 
   it "should add a filter to model datasets inside subclasses hook to only retreive objects with the matching key" do

data/spec/extensions/skip_create_refresh_spec.rb

@@ -7,7 +7,7 @@ describe "Sequel::Plugins::SkipCreateRefresh" do
     c.dataset = c.dataset.with_autoid(2)
     c.db.reset
     c.create(:x=>1)
-    c.db.sqls.must_equal ['INSERT INTO a (x) VALUES (1)', 'SELECT * FROM a WHERE (id = 2) LIMIT 1']
+    c.db.sqls.must_equal ['INSERT INTO a (x) VALUES (1)', 'SELECT * FROM a WHERE id = 2']
 
     c.dataset = c.dataset.with_autoid(2)
     c.plugin :skip_create_refresh

data/spec/integration/associations_test.rb

@@ -2264,7 +2264,7 @@ end
 describe "Sequel::Model pg_array_to_many" do
   before(:all) do
     @db = DB
-    @db.extension :pg_array
+    @db.extension :pg_array unless @db.frozen?
     Sequel.extension :pg_array_ops
     @db.drop_table?(:tags, :albums, :artists)
     @db.create_table(:artists) do
@@ -2345,7 +2345,7 @@ end if DB.database_type == :postgres && [:postgres, :jdbc].include?(DB.adapter_s
 describe "Sequel::Model many_to_pg_array" do
   before(:all) do
     @db = DB
-    @db.extension :pg_array
+    @db.extension :pg_array unless @db.frozen?
     Sequel.extension :pg_array_ops
     @db.drop_table?(:tags, :albums, :artists)
     @db.create_table(:artists) do

data/spec/integration/dataset_test.rb

@@ -1825,11 +1825,7 @@ end
 describe "Dataset replace" do
   before do
     DB.create_table!(:items){Integer :id, :unique=>true; Integer :value}
-    sqls = []
-    DB.loggers << Class.new{%w'info error'.each{|m| define_method(m){|sql| sqls << sql}}}.new
-
     @d = DB[:items]
-    sqls.clear
   end
 
   after do

data/spec/integration/eager_loader_test.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
 
 describe "Eagerly loading a tree structure" do
   before(:all) do
-    DB.instance_variable_set(:@schemas, {})
+    DB.instance_variable_get(:@schemas).clear
     DB.create_table!(:nodes) do
       primary_key :id
       foreign_key :parent_id, :nodes
@@ -128,7 +128,7 @@ describe "Association Extensions" do
         first(:name=>name) || model.create(:name=>name, :author_id=>model_object.pk)
       end
     end
-    DB.instance_variable_set(:@schemas, {})
+    DB.instance_variable_get(:@schemas).clear
     DB.create_table!(:authors) do
       primary_key :id
     end
@@ -171,7 +171,7 @@ end
 
 describe "has_many :through has_many and has_one :through belongs_to" do
   before(:all) do
-    DB.instance_variable_set(:@schemas, {})
+    DB.instance_variable_get(:@schemas).clear
     DB.create_table!(:firms) do
       primary_key :id
     end
@@ -322,7 +322,7 @@ end
 
 describe "Polymorphic Associations" do
   before(:all) do
-    DB.instance_variable_set(:@schemas, {})
+    DB.instance_variable_get(:@schemas).clear
     DB.create_table!(:assets) do
       primary_key :id
       Integer :attachable_id
@@ -448,7 +448,7 @@ end
 
 describe "many_to_one/one_to_many not referencing primary key" do
   before(:all) do
-    DB.instance_variable_set(:@schemas, {})
+    DB.instance_variable_get(:@schemas).clear
     DB.create_table!(:clients) do
       primary_key :id
       String :name

data/spec/integration/plugin_test.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
 describe "Class Table Inheritance Plugin" do
   before(:all) do
     @db = DB
-    @db.instance_variable_set(:@schemas, {})
+    @db.instance_variable_get(:@schemas).clear
     @db.drop_table?(:staff, :executives, :managers, :employees)
     @db.create_table(:employees) do
       primary_key :id
@@ -175,7 +175,7 @@ end
 describe "Many Through Many Plugin" do
   before(:all) do
     @db = DB
-    @db.instance_variable_set(:@schemas, {})
+    @db.instance_variable_get(:@schemas).clear
     @db.drop_table?(:albums_artists, :albums, :artists)
     @db.create_table(:albums) do
       primary_key :id
@@ -470,7 +470,7 @@ end
 describe "Tactical Eager Loading Plugin" do
   before(:all) do
     @db = DB
-    @db.instance_variable_set(:@schemas, {})
+    @db.instance_variable_get(:@schemas).clear
     @db.drop_table?(:albums_artists)
     @db.create_table!(:artists) do
       primary_key :id
@@ -1992,7 +1992,7 @@ end
 describe "Sequel::Plugins::ConstraintValidations" do
   before(:all) do
     @db = DB
-    @db.extension(:constraint_validations)
+    @db.extension(:constraint_validations) unless @db.frozen?
     @db.drop_table?(:sequel_constraint_validations)
     @db.create_constraint_validations_table
     @ds = @db[:cv_test]
@@ -2064,6 +2064,7 @@ describe "Sequel::Plugins::ConstraintValidations" do
     end
 
     it "should set up automatic validations inside the model" do 
+      skip if @db.frozen?
       c = Class.new(Sequel::Model(@ds))
       c.plugin :constraint_validations
       c.dataset.delete
@@ -2188,7 +2189,8 @@ describe "date_arithmetic extension" do
 
   before(:all) do
     @db = DB
-    @db.extension(:date_arithmetic)
+    @db.extension(:date_arithmetic) unless @db.frozen?
+    skip if @db.database_type == :sqlite && @db.frozen?
     if @db.database_type == :sqlite
       @db.use_timestamp_timezones = false
     end
@@ -2269,7 +2271,7 @@ end
 describe "string_agg extension" do
   before(:all) do
     @db = DB
-    @db.extension(:string_agg)
+    @db.extension(:string_agg) unless @db.frozen?
     @db.create_table!(:string_agg_test) do
       Integer :id
       String :s

data/spec/integration/schema_test.rb

@@ -48,7 +48,7 @@ describe "Database schema parser" do
         DB.drop_table(:items)
       end
     end
-  end if IDENTIFIER_MANGLING
+  end if IDENTIFIER_MANGLING && !DB.frozen?
 
   it "should not issue an sql query if the schema has been loaded unless :reload is true" do
     DB.create_table!(:items){Integer :number}
@@ -843,5 +843,5 @@ describe "Database#tables and #views" do
       @db.identifier_input_method = :xxxxx
       @db.views.each{|t| t.to_s.must_match(/\Ax{5}\d+\z/)}
     end if DB.supports_view_listing?
-  end if IDENTIFIER_MANGLING
+  end if IDENTIFIER_MANGLING && !DB.frozen?
 end

data/spec/integration/spec_helper.rb

@@ -20,6 +20,10 @@ Sequel::Deprecation.backtrace_filter = lambda{|line, lineno| lineno < 4 || line
 Sequel.split_symbols = false if ENV['SEQUEL_NO_SPLIT_SYMBOLS']
 Sequel::Database.extension :columns_introspection if ENV['SEQUEL_COLUMNS_INTROSPECTION']
 Sequel::Model.cache_associations = false if ENV['SEQUEL_NO_CACHE_ASSOCIATIONS']
+if ENV['SEQUEL_MODEL_PREPARED_STATEMENTS']
+  Sequel::Model.plugin :prepared_statements
+  Sequel::Model.plugin :prepared_statements_associations
+end
 Sequel::Model.use_transactions = false
 Sequel.cache_anonymous_models = false
 
@@ -61,3 +65,9 @@ if dch = ENV['SEQUEL_DUPLICATE_COLUMNS_HANDLER']
   DB.extension :duplicate_columns_handler
   DB.opts[:on_duplicate_columns] = dch.to_sym unless dch.empty?
 end
+
+if ENV['SEQUEL_FREEZE_DATABASE']
+  DB.extension(:constraint_validations, :string_agg, :date_arithmetic)
+  DB.extension(:pg_array) if DB.database_type == :postgres
+  DB.freeze
+end

data/spec/integration/timezone_test.rb

@@ -83,4 +83,4 @@ describe "Sequel timezone support" do
       o.must_equal t.utc_offset
     end
   end
-end
+end unless DB.frozen?

data/spec/integration/transaction_test.rb

@@ -166,17 +166,17 @@ describe "Database transactions" do
   end
 
   it "should handle returning inside of the block by committing" do
-    def @db.ret_commit
-      transaction do
-        self[:items] << {:name => 'abc'}
+    def ret_commit
+      @db.transaction do
+        @db[:items] << {:name => 'abc'}
         return
       end
     end
 
     @d.count.must_equal 0
-    @db.ret_commit
+    ret_commit
     @d.count.must_equal 1
-    @db.ret_commit
+    ret_commit
     @d.count.must_equal 2
     proc do
       @db.transaction do

data/spec/model/associations_spec.rb

@@ -762,7 +762,7 @@ describe Sequel::Model, "one_to_one" do
     sqls = DB.sqls
     ['INSERT INTO attributes (node_id, id) VALUES (1234, 3)',
       'INSERT INTO attributes (id, node_id) VALUES (3, 1234)'].must_include(sqls.slice! 1)
-    sqls.must_equal ['UPDATE attributes SET node_id = NULL WHERE (node_id = 1234)', "SELECT * FROM attributes WHERE (id = 3) LIMIT 1"]
+    sqls.must_equal ['UPDATE attributes SET node_id = NULL WHERE (node_id = 1234)', "SELECT * FROM attributes WHERE id = 3"]
 
     @c2.new(:id => 1234).attribute.must_equal attrib
     attrib = @c1.load(:id=>3)
@@ -801,7 +801,7 @@ describe Sequel::Model, "one_to_one" do
     sqls = DB.sqls
     ['INSERT INTO attributes (node_id, id) VALUES (5, 3)',
       'INSERT INTO attributes (id, node_id) VALUES (3, 5)'].must_include(sqls.slice! 1)
-    sqls.must_equal ['UPDATE attributes SET node_id = NULL WHERE (node_id = 5)', "SELECT * FROM attributes WHERE (id = 3) LIMIT 1"]
+    sqls.must_equal ['UPDATE attributes SET node_id = NULL WHERE (node_id = 5)', "SELECT * FROM attributes WHERE id = 3"]
 
     @c2.new(:id => 321, :xxx=>5).attribute.must_equal attrib
     attrib = @c1.load(:id=>3)
@@ -947,7 +947,7 @@ describe Sequel::Model, "one_to_one" do
     sqls = DB.sqls
     ["INSERT INTO nodes (blah, id) VALUES (3, 4321)",
      "INSERT INTO nodes (id, blah) VALUES (4321, 3)"].must_include(sqls.slice! 1)
-    sqls.must_equal ["UPDATE nodes SET blah = NULL WHERE (blah = 3)", "SELECT * FROM nodes WHERE (id = 4321) LIMIT 1"]
+    sqls.must_equal ["UPDATE nodes SET blah = NULL WHERE (blah = 3)", "SELECT * FROM nodes WHERE id = 4321"]
   end
   
   it "should persist changes to associated object when the setter is called" do
@@ -1275,7 +1275,7 @@ describe Sequel::Model, "one_to_many" do
     a.must_equal n.add_attribute(a)
     sqls = DB.sqls
     sqls.shift.must_match(/INSERT INTO attributes \((node_)?id, (node_)?id\) VALUES \(1?234, 1?234\)/)
-    sqls.must_equal ["SELECT * FROM attributes WHERE (id = 234) LIMIT 1"]
+    sqls.must_equal ["SELECT * FROM attributes WHERE id = 234"]
     a.values.must_equal(:node_id => 1234, :id => 234)
   end
 
@@ -1307,7 +1307,7 @@ describe Sequel::Model, "one_to_many" do
     n.add_attribute(:id => 234).must_equal @c1.load(:node_id => 1234, :id => 234)
     sqls = DB.sqls
     sqls.shift.must_match(/INSERT INTO attributes \((node_)?id, (node_)?id\) VALUES \(1?234, 1?234\)/)
-    sqls.must_equal ["SELECT * FROM attributes WHERE (id = 234) LIMIT 1"]
+    sqls.must_equal ["SELECT * FROM attributes WHERE id = 234"]
   end
 
   it "should accept a primary key for the add_ method" do
@@ -2213,7 +2213,7 @@ describe Sequel::Model, "many_to_many" do
     ['INSERT INTO attributes_nodes (node_id, attribute_id) VALUES (1234, 1)',
      'INSERT INTO attributes_nodes (attribute_id, node_id) VALUES (1, 1234)'
     ].must_include(sqls.pop)
-    sqls.must_equal ['INSERT INTO attributes (id) VALUES (1)', "SELECT * FROM attributes WHERE (id = 1) LIMIT 1"]
+    sqls.must_equal ['INSERT INTO attributes (id) VALUES (1)', "SELECT * FROM attributes WHERE id = 1"]
   end
 
   it "should define a remove_ method that works on existing records" do
@@ -4497,6 +4497,13 @@ describe "Model#freeze" do
     @o.associations.frozen?.must_equal true
   end
 
+  it "should freeze associations after validating" do
+    Album.send(:define_method, :validate){super(); b}
+    @o = Album.load(:id=>1)
+    @o.freeze
+    @o.associations.fetch(:b).id.must_equal 1
+  end
+
   it "should not break associations getters" do
     Album::B.dataset = Album::B.dataset.with_fetch(:album_id=>1, :id=>2)
     @o.b.must_equal Album::B.load(:id=>2, :album_id=>1)

data/spec/model/base_spec.rb

@@ -603,7 +603,7 @@ describe Sequel::Model, ".(allowed|restricted)_columns " do
     i = @c.new
     i.update(:x => 7, :z => 9)
     i.values.must_equal(:x => 7)
-    DB.sqls.must_equal ["INSERT INTO blahblah (x) VALUES (7)", "SELECT * FROM blahblah WHERE (id = 10) LIMIT 1"]
+    DB.sqls.must_equal ["INSERT INTO blahblah (x) VALUES (7)", "SELECT * FROM blahblah WHERE id = 10"]
   end
 end
 

data/spec/model/hooks_spec.rb

@@ -17,7 +17,7 @@ describe "Model#before_create && Model#after_create" do
   it "should be called around new record creation" do
     @c.send(:define_method, :before_create){DB << "BLAH before"}
     @c.create(:x => 2)
-    DB.sqls.must_equal ['BLAH before', 'INSERT INTO items (x) VALUES (2)', 'BLAH after', 'SELECT * FROM items WHERE (x = 2) LIMIT 1']
+    DB.sqls.must_equal ['BLAH before', 'INSERT INTO items (x) VALUES (2)', 'BLAH after', 'SELECT * FROM items WHERE x = 2']
   end
 
   it ".create should cancel the save and raise an error if before_create returns false and raise_on_save_failure is true" do
@@ -124,7 +124,7 @@ describe "Model#before_save && Model#after_save" do
     @c.set_primary_key :x
     @c.unrestrict_primary_key
     @c.create(:x => 2)
-    DB.sqls.must_equal ['BLAH before', 'INSERT INTO items (x) VALUES (2)', 'BLAH after', 'SELECT * FROM items WHERE (x = 2) LIMIT 1']
+    DB.sqls.must_equal ['BLAH before', 'INSERT INTO items (x) VALUES (2)', 'BLAH after', 'SELECT * FROM items WHERE x = 2']
   end
 
   it "#save should cancel the save and raise an error if before_save returns false and raise_on_save_failure is true" do
@@ -313,7 +313,7 @@ describe "Model around filters" do
       end
     end
     @c.create(:x => 2)
-    DB.sqls.must_equal ['ac_before', 'INSERT INTO items (x) VALUES (2)', 'ac_after', "SELECT * FROM items WHERE (id = 10) LIMIT 1"]
+    DB.sqls.must_equal ['ac_before', 'INSERT INTO items (x) VALUES (2)', 'ac_after', "SELECT * FROM items WHERE id = 10"]
   end
 
   it "around_delete should be called around record destruction" do
@@ -359,7 +359,7 @@ describe "Model around filters" do
       end
     end
     @c.create(:x => 2)
-    DB.sqls.must_equal ['as_before', 'ac_before', 'INSERT INTO items (x) VALUES (2)', 'ac_after', 'as_after', "SELECT * FROM items WHERE (id = 10) LIMIT 1"]
+    DB.sqls.must_equal ['as_before', 'ac_before', 'INSERT INTO items (x) VALUES (2)', 'ac_after', 'as_after', "SELECT * FROM items WHERE id = 10"]
     @c.load(:id=>1, :x => 2).save
     DB.sqls.must_equal ['as_before', 'au_before', 'UPDATE items SET x = 2 WHERE (id = 1)', 'au_after', 'as_after']
   end

data/spec/model/model_spec.rb

@@ -798,7 +798,7 @@ describe Sequel::Model, ".find_or_create" do
     @c.find_or_create(:x => 1).must_equal @c.load(:x=>1, :id=>1)
     @db.sqls.must_equal ["SELECT * FROM items WHERE (x = 1) LIMIT 1",
       "INSERT INTO items (x) VALUES (1)",
-      "SELECT * FROM items WHERE (id = 1) LIMIT 1"]
+      "SELECT * FROM items WHERE id = 1"]
   end
 
   it "should pass the new record to be created to the block if no record is found" do
@@ -808,7 +808,7 @@ describe Sequel::Model, ".find_or_create" do
     sqls = @db.sqls
     sqls.first.must_equal "SELECT * FROM items WHERE (x = 1) LIMIT 1"
     ["INSERT INTO items (x, y) VALUES (1, 2)", "INSERT INTO items (y, x) VALUES (2, 1)"].must_include(sqls[1])
-    sqls.last.must_equal "SELECT * FROM items WHERE (id = 1) LIMIT 1"
+    sqls.last.must_equal "SELECT * FROM items WHERE id = 1"
   end
 end
 

data/spec/model/record_spec.rb

@@ -64,7 +64,7 @@ describe "Model#save" do
   it "should insert a record for a new model instance" do
     o = @c.new(:x => 1)
     o.save
-    DB.sqls.must_equal ["INSERT INTO items (x) VALUES (1)", "SELECT * FROM items WHERE (id = 13) LIMIT 1"]
+    DB.sqls.must_equal ["INSERT INTO items (x) VALUES (1)", "SELECT * FROM items WHERE id = 13"]
   end
 
   it "should raise if the object can't be refreshed after save" do
@@ -111,8 +111,7 @@ describe "Model#save" do
   it "should use value returned by insert as the primary key and refresh the object" do
     o = @c.new(:x => 11)
     o.save
-    DB.sqls.must_equal ["INSERT INTO items (x) VALUES (11)",
-      "SELECT * FROM items WHERE (id = 13) LIMIT 1"]
+    DB.sqls.must_equal ["INSERT INTO items (x) VALUES (11)", "SELECT * FROM items WHERE id = 13"]
   end
 
   it "should allow you to skip refreshing by overridding _save_refresh" do
@@ -1111,7 +1110,7 @@ describe Sequel::Model, "#update" do
   
   it "should filter the given params using the model columns" do
     @o1.update(:x => 1, :z => 2)
-    DB.sqls.must_equal ["INSERT INTO items (x) VALUES (1)", "SELECT * FROM items WHERE (id = 10) LIMIT 1"]
+    DB.sqls.must_equal ["INSERT INTO items (x) VALUES (1)", "SELECT * FROM items WHERE id = 10"]
 
     DB.reset
     @o2.update(:y => 1, :abc => 2)
@@ -1121,12 +1120,12 @@ describe Sequel::Model, "#update" do
   it "should support virtual attributes" do
     @c.send(:define_method, :blah=){|v| self.x = v}
     @o1.update(:blah => 333)
-    DB.sqls.must_equal ["INSERT INTO items (x) VALUES (333)", "SELECT * FROM items WHERE (id = 10) LIMIT 1"]
+    DB.sqls.must_equal ["INSERT INTO items (x) VALUES (333)", "SELECT * FROM items WHERE id = 10"]
   end
   
   it "should not modify the primary key" do
     @o1.update(:x => 1, :id => 2)
-    DB.sqls.must_equal ["INSERT INTO items (x) VALUES (1)", "SELECT * FROM items WHERE (id = 10) LIMIT 1"]
+    DB.sqls.must_equal ["INSERT INTO items (x) VALUES (1)", "SELECT * FROM items WHERE id = 10"]
     DB.reset
     @o2.update('y'=> 1, 'id'=> 2)
     @o2.values.must_equal(:y => 1, :id=> 5)
@@ -1321,18 +1320,18 @@ describe Sequel::Model, "#(set|update)_(all|only)" do
 
   it "#update_all should update all attributes" do
     @c.new.update_all(:x => 1)
-    DB.sqls.must_equal ["INSERT INTO items (x) VALUES (1)", "SELECT * FROM items WHERE (id = 10) LIMIT 1"]
+    DB.sqls.must_equal ["INSERT INTO items (x) VALUES (1)", "SELECT * FROM items WHERE id = 10"]
     @c.new.update_all(:y => 1)
-    DB.sqls.must_equal ["INSERT INTO items (y) VALUES (1)", "SELECT * FROM items WHERE (id = 10) LIMIT 1"]
+    DB.sqls.must_equal ["INSERT INTO items (y) VALUES (1)", "SELECT * FROM items WHERE id = 10"]
     @c.new.update_all(:z => 1)
-    DB.sqls.must_equal ["INSERT INTO items (z) VALUES (1)", "SELECT * FROM items WHERE (id = 10) LIMIT 1"]
+    DB.sqls.must_equal ["INSERT INTO items (z) VALUES (1)", "SELECT * FROM items WHERE id = 10"]
   end
 
   it "#update_only should only update given attributes" do
     @o1.update_only({:x => 1, :y => 2, :z=>3, :id=>4}, [:x])
-    DB.sqls.must_equal ["INSERT INTO items (x) VALUES (1)", "SELECT * FROM items WHERE (id = 10) LIMIT 1"]
+    DB.sqls.must_equal ["INSERT INTO items (x) VALUES (1)", "SELECT * FROM items WHERE id = 10"]
     @c.new.update_only({:x => 1, :y => 2, :z=>3, :id=>4}, :x)
-    DB.sqls.must_equal ["INSERT INTO items (x) VALUES (1)", "SELECT * FROM items WHERE (id = 10) LIMIT 1"]
+    DB.sqls.must_equal ["INSERT INTO items (x) VALUES (1)", "SELECT * FROM items WHERE id = 10"]
   end
 end
 
@@ -1699,13 +1698,13 @@ describe Sequel::Model, ".create" do
   it "should be able to create rows in the associated table" do
     o = @c.create(:x => 1)
     o.class.must_equal @c
-    DB.sqls.must_equal ['INSERT INTO items (x) VALUES (1)', "SELECT * FROM items WHERE (id = 10) LIMIT 1"]
+    DB.sqls.must_equal ['INSERT INTO items (x) VALUES (1)', "SELECT * FROM items WHERE id = 10"]
   end
 
   it "should be able to create rows without any values specified" do
     o = @c.create
     o.class.must_equal @c
-    DB.sqls.must_equal ["INSERT INTO items DEFAULT VALUES", "SELECT * FROM items WHERE (id = 10) LIMIT 1"]
+    DB.sqls.must_equal ["INSERT INTO items DEFAULT VALUES", "SELECT * FROM items WHERE id = 10"]
   end
 
   it "should accept a block and call it" do
@@ -1715,14 +1714,14 @@ describe Sequel::Model, ".create" do
     o1.must_be :===, o
     o3.must_be :===, o
     o2.must_equal :blah
-    DB.sqls.must_equal ["INSERT INTO items (x) VALUES (333)", "SELECT * FROM items WHERE (id = 10) LIMIT 1"]
+    DB.sqls.must_equal ["INSERT INTO items (x) VALUES (333)", "SELECT * FROM items WHERE id = 10"]
   end
   
   it "should create a row for a model with custom primary key" do
     @c.set_primary_key :x
     o = @c.create(:x => 30)
     o.class.must_equal @c
-    DB.sqls.must_equal ["INSERT INTO items (x) VALUES (30)", "SELECT * FROM items WHERE (x = 30) LIMIT 1"]
+    DB.sqls.must_equal ["INSERT INTO items (x) VALUES (30)", "SELECT * FROM items WHERE x = 30"]
   end
 end
 
@@ -1741,14 +1740,14 @@ describe Sequel::Model, "#refresh" do
     @c.dataset = @c.dataset.with_fetch(:x => 'kaboom', :id => 555)
     @m.refresh
     @m[:x].must_equal 'kaboom'
-    DB.sqls.must_equal ["SELECT * FROM items WHERE (id = 555) LIMIT 1"]
+    DB.sqls.must_equal ["SELECT * FROM items WHERE id = 555"]
   end
   
   it "should raise if the instance is not found" do
     @m = @c.new(:id => 555)
     @c.dataset = @c.dataset.with_fetch([])
     proc {@m.refresh}.must_raise(Sequel::NoExistingObject)
-    DB.sqls.must_equal ["SELECT * FROM items WHERE (id = 555) LIMIT 1"]
+    DB.sqls.must_equal ["SELECT * FROM items WHERE id = 555"]
   end
   
   it "should be aliased by #reload" do
@@ -1756,7 +1755,7 @@ describe Sequel::Model, "#refresh" do
     @c.dataset = @c.dataset.with_fetch(:x => 'kaboom', :id => 555)
     @m.reload
     @m[:x].must_equal 'kaboom'
-    DB.sqls.must_equal ["SELECT * FROM items WHERE (id = 555) LIMIT 1"]
+    DB.sqls.must_equal ["SELECT * FROM items WHERE id = 555"]
   end
 end