sequel 2.4.0 → 2.5.0

data/spec/sequel_core/database_spec.rb

@@ -999,4 +999,19 @@ context "Database#server_opts" do
     opts = {:host=>1, :database=>2, :servers=>{:server1=>2}}
     proc{MockDatabase.new(opts).send(:server_opts, :server1)}.should raise_error(Sequel::Error)
   end
-end
+end
+
+context "Database#raise_error" do
+  specify "should reraise if the exception class is not in opts[:classes]" do
+    e = Class.new(StandardError)
+    proc{MockDatabase.new.send(:raise_error, e.new(''), :classes=>[])}.should raise_error(e)
+  end
+
+  specify "should convert the exception to a DatabaseError if the exception class is not in opts[:classes]" do
+    proc{MockDatabase.new.send(:raise_error, Interrupt.new(''), :classes=>[Interrupt])}.should raise_error(Sequel::DatabaseError)
+  end
+
+  specify "should convert the exception to a DatabaseError if opts[:classes] if not present" do
+    proc{MockDatabase.new.send(:raise_error, Interrupt.new(''))}.should raise_error(Sequel::DatabaseError)
+  end
+end

data/spec/sequel_core/dataset_spec.rb

@@ -161,6 +161,16 @@ context "A simple dataset" do
     @dataset.select_sql(:sql => 'xxx yyy zzz').should ==
       "xxx yyy zzz"
   end
+
+  specify "should use the :sql option for all sql methods" do
+    sql = "X"
+    ds = Sequel::Dataset.new(nil, :sql=>sql)
+    ds.sql.should == sql
+    ds.select_sql.should == sql
+    ds.insert_sql.should == sql
+    ds.delete_sql.should == sql
+    ds.update_sql.should == sql
+  end
 end
 
 context "A dataset with multiple tables in its FROM clause" do
@@ -1135,6 +1145,12 @@ context "Dataset#count" do
     @dataset.limit(5).count.should == 1
     @c.sql.should == "SELECT COUNT(*) FROM (SELECT * FROM test LIMIT 5) t1 LIMIT 1"
   end
+  
+  it "should work on a graphed_dataset" do
+    @dataset.should_receive(:columns).twice.and_return([:a])
+    @dataset.graph(@dataset, [:a], :table_alias=>:test2).count.should == 1
+    @c.sql.should == 'SELECT COUNT(*) FROM test LEFT OUTER JOIN test AS test2 USING (a) LIMIT 1'
+  end
 end
 
 
@@ -1754,6 +1770,11 @@ context "Dataset#single_value" do
   specify "should return nil if no records" do
     @e.single_value.should be_nil
   end
+  
+  it "should work on a graphed_dataset" do
+    @d.should_receive(:columns).twice.and_return([:a])
+    @d.graph(@d, [:a], :table_alias=>:test2).single_value.should == 'SELECT test.a, test2.a AS test2_a FROM test LEFT OUTER JOIN test AS test2 USING (a) LIMIT 1'
+  end
 end
 
 context "Dataset#get" do
@@ -3084,4 +3105,48 @@ context "Sequel::Dataset#server" do
       ['DELETE FROM items', :d],
       ['UPDATE items SET a = (a + 1)', :u]]
   end
-end
+end
+
+context "Sequel::Dataset #set_defaults" do
+  before do
+    @ds = Sequel::Dataset.new(nil).from(:items).set_defaults(:x=>1)
+  end
+
+  specify "should set the default values for inserts" do
+    @ds.insert_sql.should == "INSERT INTO items (x) VALUES (1)"
+    @ds.insert_sql(:x=>2).should == "INSERT INTO items (x) VALUES (2)"
+    @ds.insert_sql(:y=>2).should =~ /INSERT INTO items \([xy], [xy]\) VALUES \([21], [21]\)/
+    @ds.set_defaults(:y=>2).insert_sql.should =~ /INSERT INTO items \([xy], [xy]\) VALUES \([21], [21]\)/
+    @ds.set_defaults(:x=>2).insert_sql.should == "INSERT INTO items (x) VALUES (2)"
+  end
+
+  specify "should set the default values for updates" do
+    @ds.update_sql.should == "UPDATE items SET x = 1"
+    @ds.update_sql(:x=>2).should == "UPDATE items SET x = 2"
+    @ds.update_sql(:y=>2).should =~ /UPDATE items SET (x = 1|y = 2), (x = 1|y = 2)/
+    @ds.set_defaults(:y=>2).update_sql.should =~ /UPDATE items SET (x = 1|y = 2), (x = 1|y = 2)/
+    @ds.set_defaults(:x=>2).update_sql.should == "UPDATE items SET x = 2"
+  end
+end
+
+context "Sequel::Dataset #set_overrides" do
+  before do
+    @ds = Sequel::Dataset.new(nil).from(:items).set_overrides(:x=>1)
+  end
+
+  specify "should override the given values for inserts" do
+    @ds.insert_sql.should == "INSERT INTO items (x) VALUES (1)"
+    @ds.insert_sql(:x=>2).should == "INSERT INTO items (x) VALUES (1)"
+    @ds.insert_sql(:y=>2).should =~ /INSERT INTO items \([xy], [xy]\) VALUES \([21], [21]\)/
+    @ds.set_overrides(:y=>2).insert_sql.should =~ /INSERT INTO items \([xy], [xy]\) VALUES \([21], [21]\)/
+    @ds.set_overrides(:x=>2).insert_sql.should == "INSERT INTO items (x) VALUES (1)"
+  end
+
+  specify "should override the given values for updates" do
+    @ds.update_sql.should == "UPDATE items SET x = 1"
+    @ds.update_sql(:x=>2).should == "UPDATE items SET x = 1"
+    @ds.update_sql(:y=>2).should =~ /UPDATE items SET (x = 1|y = 2), (x = 1|y = 2)/
+    @ds.set_overrides(:y=>2).update_sql.should =~ /UPDATE items SET (x = 1|y = 2), (x = 1|y = 2)/
+    @ds.set_overrides(:x=>2).update_sql.should == "UPDATE items SET x = 1"
+  end
+end

data/spec/sequel_core/schema_generator_spec.rb

@@ -12,6 +12,8 @@ describe Sequel::Schema::Generator do
       index :title
       index [:title, :body]
       foreign_key :node_id, :nodes
+      primary_key [:title, :parent_id], :name => :cpk
+      foreign_key [:node_id, :prop_id], :nodes_props, :name => :cfk
     end
     @columns, @indexes = @generator.create_info
   end
@@ -23,7 +25,7 @@ describe Sequel::Schema::Generator do
   end
   
   it "counts primary key, column and constraint definitions as columns" do
-    @columns.size.should == 7
+    @columns.size.should == 9
   end
   
   it "places primary key first" do
@@ -53,6 +55,7 @@ describe Sequel::Schema::Generator do
   it "uses table for foreign key columns, if specified" do
     @columns[6][:table].should == :nodes
     @columns[3][:table].should == nil
+    @columns[8][:table].should == :nodes_props
   end
   
   it "finds columns" do
@@ -70,6 +73,17 @@ describe Sequel::Schema::Generator do
     @columns[5][:name].should == :xxx
     @columns[5][:type].should == :check
     @columns[5][:check].should be_a_kind_of(Proc)
+
+    @columns[7][:name].should == :cpk
+    @columns[7][:type].should == :check
+    @columns[7][:constraint_type].should == :primary_key
+    @columns[7][:columns].should == [ :title, :parent_id ]
+
+    @columns[8][:name].should == :cfk
+    @columns[8][:type].should == :check
+    @columns[8][:constraint_type].should == :foreign_key
+    @columns[8][:columns].should == [ :node_id, :prop_id ]
+    @columns[8][:table].should == :nodes_props
   end
   
   it "creates indexes" do
@@ -95,8 +109,11 @@ describe Sequel::Schema::AlterTableGenerator do
       add_index :blah, :where => {:something => true}
       add_constraint :con1, ':fred > 100'
       drop_constraint :con2
+      add_unique_constraint [:aaa, :bbb, :ccc], :name => :con3
       add_primary_key :id
       add_foreign_key :node_id, :nodes
+      add_primary_key [:aaa, :bbb]
+      add_foreign_key [:node_id, :prop_id], :nodes_props
     end
   end
   
@@ -113,10 +130,13 @@ describe Sequel::Schema::AlterTableGenerator do
       {:op => :add_index, :columns => [:geom], :type => :spatial},
       {:op => :add_index, :columns => [:blah], :type => :hash},
       {:op => :add_index, :columns => [:blah], :where => {:something => true}},
-      {:op => :add_constraint, :type => :check, :name => :con1, :check => [':fred > 100']},
+      {:op => :add_constraint, :type => :check, :constraint_type => :check, :name => :con1, :check => [':fred > 100']},
       {:op => :drop_constraint, :name => :con2},
+      {:op => :add_constraint, :type => :check, :constraint_type => :unique, :name => :con3, :columns => [:aaa, :bbb, :ccc]},
       {:op => :add_column, :name => :id, :type => :integer, :primary_key=>true, :auto_increment=>true},
-      {:op => :add_column, :name => :node_id, :type => :integer, :table=>:nodes}
+      {:op => :add_column, :name => :node_id, :type => :integer, :table=>:nodes},
+      {:op => :add_constraint, :type => :check, :constraint_type => :primary_key, :columns => [:aaa, :bbb]},
+      {:op => :add_constraint, :type => :check, :constraint_type => :foreign_key, :columns => [:node_id, :prop_id], :table => :nodes_props}
     ]
   end
 end

data/spec/sequel_core/schema_spec.rb

@@ -103,11 +103,11 @@ context "DB#create_table" do
     @db.sqls.should == ["CREATE TABLE cats (name varchar(51))"]
   end
   
-  specify "should accept varchar size as sql function" do
+  specify "should use double precision for double type" do
     @db.create_table(:cats) do
-      column :name, :varchar[102]
+      double :name
     end
-    @db.sqls.should == ["CREATE TABLE cats (name varchar(102))"]
+    @db.sqls.should == ["CREATE TABLE cats (name double precision)"]
   end
 
   specify "should accept foreign keys without options" do
@@ -181,6 +181,40 @@ context "DB#create_table" do
     @db.sqls.should == ["CREATE TABLE cats (project_id integer REFERENCES projects ON DELETE SET DEFAULT)"]
     @db.sqls.clear
   end
+
+  specify "should accept foreign keys with ON UPDATE clause" do
+    @db.create_table(:cats) do
+      foreign_key :project_id, :table => :projects, :on_update => :restrict
+    end
+    @db.sqls.should == ["CREATE TABLE cats (project_id integer REFERENCES projects ON UPDATE RESTRICT)"]
+
+    @db.sqls.clear
+    @db.create_table(:cats) do
+      foreign_key :project_id, :table => :projects, :on_update => :cascade
+    end
+    @db.sqls.should == ["CREATE TABLE cats (project_id integer REFERENCES projects ON UPDATE CASCADE)"]
+
+    @db.sqls.clear
+    @db.create_table(:cats) do
+      foreign_key :project_id, :table => :projects, :on_update => :no_action
+    end
+    @db.sqls.should == ["CREATE TABLE cats (project_id integer REFERENCES projects ON UPDATE NO ACTION)"]
+    @db.sqls.clear
+
+    @db.sqls.clear
+    @db.create_table(:cats) do
+      foreign_key :project_id, :table => :projects, :on_update => :set_null
+    end
+    @db.sqls.should == ["CREATE TABLE cats (project_id integer REFERENCES projects ON UPDATE SET NULL)"]
+    @db.sqls.clear
+
+    @db.sqls.clear
+    @db.create_table(:cats) do
+      foreign_key :project_id, :table => :projects, :on_update => :set_default
+    end
+    @db.sqls.should == ["CREATE TABLE cats (project_id integer REFERENCES projects ON UPDATE SET DEFAULT)"]
+    @db.sqls.clear
+  end
   
   specify "should accept inline index definition" do
     @db.create_table(:cats) do
@@ -210,7 +244,7 @@ context "DB#create_table" do
       text :name
       unique :name
     end
-    @db.sqls.should == ["CREATE TABLE cats (name text)", "CREATE UNIQUE INDEX cats_name_index ON cats (name)"]
+    @db.sqls.should == ["CREATE TABLE cats (name text, UNIQUE (name))", "CREATE UNIQUE INDEX cats_name_index ON cats (name)"]
   end
 
   specify "should raise on full-text index definitions" do
@@ -311,6 +345,92 @@ context "DB#create_table" do
     end
     @db.sqls.should == ["CREATE TABLE cats (CONSTRAINT blah_blah CHECK ((x > 0) AND (y < 1)))"]
   end
+
+  specify "should accept composite primary keys" do
+    @db.create_table(:cats) do
+      integer :a
+      integer :b
+      primary_key [:a, :b]
+    end
+    @db.sqls.should == ["CREATE TABLE cats (a integer, b integer, PRIMARY KEY (a, b))"]
+  end
+
+  specify "should accept named composite primary keys" do
+    @db.create_table(:cats) do
+      integer :a
+      integer :b
+      primary_key [:a, :b], :name => :cpk
+    end
+    @db.sqls.should == ["CREATE TABLE cats (a integer, b integer, CONSTRAINT cpk PRIMARY KEY (a, b))"]
+  end
+
+  specify "should accept composite foreign keys" do
+    @db.create_table(:cats) do
+      integer :a
+      integer :b
+      foreign_key [:a, :b], :abc
+    end
+    @db.sqls.should == ["CREATE TABLE cats (a integer, b integer, FOREIGN KEY (a, b) REFERENCES abc)"]
+  end
+
+  specify "should accept named composite foreign keys" do
+    @db.create_table(:cats) do
+      integer :a
+      integer :b
+      foreign_key [:a, :b], :abc, :name => :cfk
+    end
+    @db.sqls.should == ["CREATE TABLE cats (a integer, b integer, CONSTRAINT cfk FOREIGN KEY (a, b) REFERENCES abc)"]
+  end
+
+  specify "should accept composite foreign keys with arbitrary keys" do
+    @db.create_table(:cats) do
+      integer :a
+      integer :b
+      foreign_key [:a, :b], :abc, :key => [:real_a, :real_b]
+    end
+    @db.sqls.should == ["CREATE TABLE cats (a integer, b integer, FOREIGN KEY (a, b) REFERENCES abc(real_a, real_b))"]
+    @db.sqls.clear
+
+    @db.create_table(:cats) do
+      integer :a
+      integer :b
+      foreign_key [:a, :b], :abc, :key => [:z, :x]
+    end
+    @db.sqls.should == ["CREATE TABLE cats (a integer, b integer, FOREIGN KEY (a, b) REFERENCES abc(z, x))"]
+  end
+
+  specify "should accept composite foreign keys with on delete and on update clauses" do
+    @db.create_table(:cats) do
+      integer :a
+      integer :b
+      foreign_key [:a, :b], :abc, :on_delete => :cascade
+    end
+    @db.sqls.should == ["CREATE TABLE cats (a integer, b integer, FOREIGN KEY (a, b) REFERENCES abc ON DELETE CASCADE)"]
+
+    @db.sqls.clear
+    @db.create_table(:cats) do
+      integer :a
+      integer :b
+      foreign_key [:a, :b], :abc, :on_update => :no_action
+    end
+    @db.sqls.should == ["CREATE TABLE cats (a integer, b integer, FOREIGN KEY (a, b) REFERENCES abc ON UPDATE NO ACTION)"]
+
+    @db.sqls.clear
+    @db.create_table(:cats) do
+      integer :a
+      integer :b
+      foreign_key [:a, :b], :abc, :on_delete => :restrict, :on_update => :set_default
+    end
+    @db.sqls.should == ["CREATE TABLE cats (a integer, b integer, FOREIGN KEY (a, b) REFERENCES abc ON DELETE RESTRICT ON UPDATE SET DEFAULT)"]
+
+    @db.sqls.clear
+    @db.create_table(:cats) do
+      integer :a
+      integer :b
+      foreign_key [:a, :b], :abc, :key => [:x, :y], :on_delete => :set_null, :on_update => :set_null
+    end
+    @db.sqls.should == ["CREATE TABLE cats (a integer, b integer, FOREIGN KEY (a, b) REFERENCES abc(x, y) ON DELETE SET NULL ON UPDATE SET NULL)"]
+  end
 end
 
 context "DB#create_table!" do
@@ -361,6 +481,19 @@ context "DB#alter_table" do
     @db.sqls.should == ["ALTER TABLE cats ADD CONSTRAINT blah_blah CHECK ((x > 0) AND (y < 1))"]
   end
 
+  specify "should support add_unique_constraint" do
+    @db.alter_table(:cats) do
+      add_unique_constraint [:a, :b]
+    end
+    @db.sqls.should == ["ALTER TABLE cats ADD UNIQUE (a, b)"]
+
+    @db.sqls.clear
+    @db.alter_table(:cats) do
+      add_unique_constraint [:a, :b], :name => :ab_uniq
+    end
+    @db.sqls.should == ["ALTER TABLE cats ADD CONSTRAINT ab_uniq UNIQUE (a, b)"]
+  end
+
   specify "should support add_foreign_key" do
     @db.alter_table(:cats) do
       add_foreign_key :node_id, :nodes
@@ -368,6 +501,31 @@ context "DB#alter_table" do
     @db.sqls.should == ["ALTER TABLE cats ADD COLUMN node_id integer REFERENCES nodes"]
   end
 
+  specify "should support add_foreign_key with composite foreign keys" do
+    @db.alter_table(:cats) do
+      add_foreign_key [:node_id, :prop_id], :nodes_props
+    end
+    @db.sqls.should == ["ALTER TABLE cats ADD FOREIGN KEY (node_id, prop_id) REFERENCES nodes_props"]
+
+    @db.sqls.clear
+    @db.alter_table(:cats) do
+      add_foreign_key [:node_id, :prop_id], :nodes_props, :name => :cfk
+    end
+    @db.sqls.should == ["ALTER TABLE cats ADD CONSTRAINT cfk FOREIGN KEY (node_id, prop_id) REFERENCES nodes_props"]
+
+    @db.sqls.clear
+    @db.alter_table(:cats) do
+      add_foreign_key [:node_id, :prop_id], :nodes_props, :key => [:nid, :pid]
+    end
+    @db.sqls.should == ["ALTER TABLE cats ADD FOREIGN KEY (node_id, prop_id) REFERENCES nodes_props(nid, pid)"]
+
+    @db.sqls.clear
+    @db.alter_table(:cats) do
+      add_foreign_key [:node_id, :prop_id], :nodes_props, :on_delete => :restrict, :on_update => :cascade
+    end
+    @db.sqls.should == ["ALTER TABLE cats ADD FOREIGN KEY (node_id, prop_id) REFERENCES nodes_props ON DELETE RESTRICT ON UPDATE CASCADE"]
+  end
+
   specify "should support add_index" do
     @db.alter_table(:cats) do
       add_index :name
@@ -382,6 +540,19 @@ context "DB#alter_table" do
     @db.sqls.should == ["ALTER TABLE cats ADD COLUMN id integer PRIMARY KEY AUTOINCREMENT"]
   end
 
+  specify "should support add_primary_key with composite primary keys" do
+    @db.alter_table(:cats) do
+      add_primary_key [:id, :type]
+    end
+    @db.sqls.should == ["ALTER TABLE cats ADD PRIMARY KEY (id, type)"]
+
+    @db.sqls.clear
+    @db.alter_table(:cats) do
+      add_primary_key [:id, :type], :name => :cpk
+    end
+    @db.sqls.should == ["ALTER TABLE cats ADD CONSTRAINT cpk PRIMARY KEY (id, type)"]
+  end
+
   specify "should support drop_column" do
     @db.alter_table(:cats) do
       drop_column :score

data/spec/sequel_model/record_spec.rb

@@ -17,6 +17,19 @@ describe "Model#save" do
     MODEL_DB.sqls.first.should == "INSERT INTO items (x) VALUES (1)"
   end
 
+  it "should use dataset's insert_select method if present" do
+    ds = @c.dataset = @c.dataset.clone
+    def ds.insert_select(hash)
+      execute("INSERT INTO items (y) VALUES (2)")
+      {:y=>2}
+    end
+    o = @c.new(:x => 1)
+    o.save
+    
+    o.values.should == {:y=>2}
+    MODEL_DB.sqls.first.should == "INSERT INTO items (y) VALUES (2)"
+  end
+
   it "should update a record for an existing model instance" do
     o = @c.load(:id => 3, :x => 1)
     o.save
@@ -104,6 +117,40 @@ describe "Model#save_changes" do
     o.save_changes
     MODEL_DB.sqls.should == ["UPDATE items SET y = 4 WHERE (id = 3)"]
   end
+
+  it "should update columns changed in a before_update hook" do
+    o = @c.load(:id => 3, :x => 1, :y => nil)
+    @c.before_update{self.x += 1}
+    o.save_changes
+    MODEL_DB.sqls.should == []
+    o.x = 2
+    o.save_changes
+    MODEL_DB.sqls.should == ["UPDATE items SET x = 3 WHERE (id = 3)"]
+    MODEL_DB.reset
+    o.save_changes
+    MODEL_DB.sqls.should == []
+    o.x = 4
+    o.save_changes
+    MODEL_DB.sqls.should == ["UPDATE items SET x = 5 WHERE (id = 3)"]
+    MODEL_DB.reset
+  end
+
+  it "should update columns changed in a before_save hook" do
+    o = @c.load(:id => 3, :x => 1, :y => nil)
+    @c.before_save{self.x += 1}
+    o.save_changes
+    MODEL_DB.sqls.should == []
+    o.x = 2
+    o.save_changes
+    MODEL_DB.sqls.should == ["UPDATE items SET x = 3 WHERE (id = 3)"]
+    MODEL_DB.reset
+    o.save_changes
+    MODEL_DB.sqls.should == []
+    o.x = 4
+    o.save_changes
+    MODEL_DB.sqls.should == ["UPDATE items SET x = 5 WHERE (id = 3)"]
+    MODEL_DB.reset
+  end
 end
 
 describe "Model#update_values" do