sequel 0.3.0.1 → 0.3.1

data/spec/database_spec.rb

@@ -265,7 +265,7 @@ context "Database#table_exists?" do
     @db.table_exists?(:c).should be_false
   end
   
-  specify "should otherise try to select the first record from the table's dataset" do
+  specify "should otherwise try to select the first record from the table's dataset" do
     @db2.table_exists?(:a).should be_false
     @db2.table_exists?(:b).should be_true
   end

data/spec/dataset_spec.rb

@@ -119,6 +119,22 @@ context "A simple dataset" do
     @dataset.insert_sql(v).should == "INSERT INTO test DEFAULT VALUES;"
   end
   
+  specify "should format an insert statement with a model instance" do
+    dbb = Sequel::Database.new
+    
+    @c = Class.new(Sequel::Model) do
+      db = dbb
+      set_dataset Sequel::Dataset.new(dbb)
+    end
+    
+    v = @c.new(:a => 1)
+    
+    @dataset.insert_sql(v).should == "INSERT INTO test (a) VALUES (1);"
+    
+    v = @c.new({})
+    @dataset.insert_sql(v).should == "INSERT INTO test DEFAULT VALUES;"
+  end
+  
   specify "should format an insert statement with an arbitrary value" do
     @dataset.insert_sql(123).should == "INSERT INTO test VALUES (123);"
   end
@@ -425,7 +441,7 @@ context "Dataset#exclude" do
       "SELECT * FROM test WHERE (NOT (region = 'Asia' AND name = 'Japan'))"
   end
 
-  specify "should corrently parenthesize when it is used twice" do
+  specify "should correctly parenthesize when it is used twice" do
     @dataset.exclude(:region => 'Asia').exclude(:name => 'Japan').select_sql.should ==
       "SELECT * FROM test WHERE (NOT (region = 'Asia')) AND (NOT (name = 'Japan'))"
   end
@@ -858,7 +874,7 @@ context "Dataset#count" do
     @dataset = @c.new(nil).from(:test)
   end
   
-  specify "should format SQL propertly" do
+  specify "should format SQL properly" do
     @dataset.count.should == 1
     @c.sql.should == 'SELECT COUNT(*) FROM test'
   end
@@ -918,7 +934,7 @@ context "Dataset#join_table" do
       'SELECT * FROM items INNER JOIN b ON (b.items_id = items.id) LEFT OUTER JOIN c ON (c.b_id = b.id)'
   end
   
-  specify "should use id as implicit relation primary key if ommited" do
+  specify "should use id as implicit relation primary key if omitted" do
     @d.join_table(:left_outer, :categories, :category_id).sql.should ==
       @d.join_table(:left_outer, :categories, :category_id => :id).sql
 
@@ -1725,7 +1741,7 @@ context "Dataset#multi_insert" do
     ]
   end
   
-  specify "should accept the commit_every option for commiting every x records" do
+  specify "should accept the commit_every option for committing every x records" do
     @ds.multi_insert(@list, :commit_every => 2)
     @db.sqls.should == [
       'BEGIN;',

data/spec/migration_spec.rb

@@ -212,7 +212,7 @@ context "Sequel::Migrator" do
     Sequel::Migrator.get_current_migration_version(@db).should == 4321
   end
   
-  specify "should set the migration versison stored in the datbase" do
+  specify "should set the migration version stored in the database" do
     Sequel::Migrator.get_current_migration_version(@db).should == 0
     Sequel::Migrator.set_current_migration_version(@db, 6666)
     Sequel::Migrator.get_current_migration_version(@db).should == 6666

data/spec/model_spec.rb

@@ -28,7 +28,6 @@ describe Sequel::Model do
 end
 
 describe Sequel::Model, 'w/ primary key' do
-
   it "should default to ':id'" do
     model_a = Class.new Sequel::Model
     model_a.primary_key.should be_equal(:id)
@@ -48,11 +47,9 @@ describe Sequel::Model, 'w/ primary key' do
     model_a = Class.new(Sequel::Model) { set_primary_key [:a, :b] }
     model_a.primary_key.should be_eql([:a, :b])
   end
-
 end
 
 describe Sequel::Model, 'w/o primary key' do
-
   it "should return nil for primary key" do
     Class.new(Sequel::Model) { no_primary_key }.primary_key.should be_nil
   end
@@ -61,7 +58,6 @@ describe Sequel::Model, 'w/o primary key' do
     instance = Class.new(Sequel::Model) { no_primary_key }.new
     proc { instance.this }.should raise_error(SequelError)
   end
-
 end
 
 describe Sequel::Model, 'with this' do
@@ -256,13 +252,13 @@ context "A model class" do
   specify "should be able to create rows in the associated table" do
     o = @c.create(:x => 1)
     o.class.should == @c
-    MODEL_DB.sqls.should == ['INSERT INTO items (x) VALUES (1);']
+    MODEL_DB.sqls.should == ['INSERT INTO items (x) VALUES (1);',  "SELECT * FROM items WHERE (id IN ('INSERT INTO items (x) VALUES (1);')) LIMIT 1"]
   end
   
   specify "should be able to create rows without any values specified" do
     o = @c.create
     o.class.should == @c
-    MODEL_DB.sqls.should == ['INSERT INTO items DEFAULT VALUES;']
+    MODEL_DB.sqls.should == ["INSERT INTO items DEFAULT VALUES;", "SELECT * FROM items WHERE (id IN ('INSERT INTO items DEFAULT VALUES;')) LIMIT 1"]
   end
 end
 
@@ -404,13 +400,6 @@ context "Model attribute accessors" do
         [:id, :x, :y]
       end
     end
-    
-    ds = @c.dataset
-    ds.extend(Module.new {
-      def columns
-        [:id, :x, :y]
-      end
-    })
   end
   
   specify "should be created dynamically" do
@@ -433,7 +422,26 @@ context "Model attribute accessors" do
     proc {o.xx}.should raise_error(SequelError)
     
     proc {o.x = 3}.should_not raise_error
-    proc {o.yy = 4}.should raise_error
+    proc {o.yy = 4}.should raise_error(SequelError)
+
+    proc {o.yy?}.should raise_error(NoMethodError)
+  end
+  
+  specify "should not raise for a column not in the dataset, but for which there's a value" do
+    o = @c.new
+    
+    proc {o.xx}.should raise_error(SequelError)
+    proc {o.yy}.should raise_error(SequelError)
+    
+    o.values[:xx] = 123
+    o.values[:yy] = nil
+    
+    proc {o.xx; o.yy}.should_not raise_error(SequelError)
+    
+    o.xx.should == 123
+    o.yy.should == nil
+    
+    proc {o.xx = 3}.should raise_error(SequelError)
   end
 end
 
@@ -482,8 +490,8 @@ context "Model.after_create" do
     end
     
     n = @c.create(:x => 1)
-    MODEL_DB.sqls.should == ['INSERT INTO items (x) VALUES (1);']
-    s.should == ['INSERT INTO items (x) VALUES (1);']
+    MODEL_DB.sqls.should == ["INSERT INTO items (x) VALUES (1);", "SELECT * FROM items WHERE (id = 1) LIMIT 1"]
+    s.should == ["INSERT INTO items (x) VALUES (1);", "SELECT * FROM items WHERE (id = 1) LIMIT 1"]
   end
   
   specify "should allow calling save in the hook" do
@@ -494,7 +502,7 @@ context "Model.after_create" do
     end
     
     n = @c.create(:id => 1)
-    MODEL_DB.sqls.should == ['INSERT INTO items (id) VALUES (1);', 'UPDATE items SET id = 2 WHERE (id = 1)']
+    MODEL_DB.sqls.should == ["INSERT INTO items (id) VALUES (1);", "SELECT * FROM items WHERE (id = 1) LIMIT 1", "UPDATE items SET id = 2 WHERE (id = 1)"]
   end
 end
 
@@ -502,11 +510,7 @@ context "Model.subset" do
   setup do
     MODEL_DB.reset
 
-    @c = Class.new(Sequel::Model(:items)) do
-      def columns
-        [:id, :x, :y]
-      end
-    end
+    @c = Class.new(Sequel::Model(:items))
   end
 
   specify "should create a filter on the underlying dataset" do
@@ -532,11 +536,7 @@ context "Model.find" do
   setup do
     MODEL_DB.reset
     
-    @c = Class.new(Sequel::Model(:items)) do
-      def self.columns
-        [:name, :id]
-      end
-    end
+    @c = Class.new(Sequel::Model(:items))
     
     $cache_dataset_row = {:name => 'sharon', :id => 1}
     @dataset = @c.dataset
@@ -570,11 +570,7 @@ context "Model.[]" do
   setup do
     MODEL_DB.reset
     
-    @c = Class.new(Sequel::Model(:items)) do
-      def self.columns
-        [:name, :id]
-      end
-    end
+    @c = Class.new(Sequel::Model(:items))
     
     $cache_dataset_row = {:name => 'sharon', :id => 1}
     @dataset = @c.dataset
@@ -761,4 +757,216 @@ context "A cached model" do
       "SELECT * FROM items WHERE (id = 1) LIMIT 1", \
       "SELECT * FROM items WHERE (id = 4) LIMIT 1"]
   end
+end
+
+context "Model.one_to_one" do
+  setup do
+    MODEL_DB.reset
+    
+    @c1 = Class.new(Sequel::Model(:attributes)) do
+    end
+
+    @c2 = Class.new(Sequel::Model(:nodes)) do
+    end
+    
+    @dataset = @c2.dataset
+
+    $sqls = []
+    @dataset.extend(Module.new {
+      def fetch_rows(sql)
+        $sqls << sql
+        yield({:hey => 1})
+      end
+      
+      def update(values)
+        $sqls << update_sql(values)
+      end
+    })
+  end
+  
+  specify "should use implicit key if omitted" do
+    @c2.one_to_one :parent, :from => @c2
+    
+    d = @c2.new(:id => 1, :parent_id => 234)
+    p = d.parent
+    p.class.should == @c2
+    p.values.should == {:hey => 1}
+    
+    $sqls.should == ["SELECT * FROM nodes WHERE (id = 234) LIMIT 1"]
+  end
+  
+  specify "should use explicit key if given" do
+    @c2.one_to_one :parent, :from => @c2, :key => :blah
+    
+    d = @c2.new(:id => 1, :blah => 567)
+    p = d.parent
+    p.class.should == @c2
+    p.values.should == {:hey => 1}
+    
+    $sqls.should == ["SELECT * FROM nodes WHERE (id = 567) LIMIT 1"]
+  end
+  
+  specify "should support plain dataset in the from option" do
+    @c2.one_to_one :parent, :from => MODEL_DB[:xyz]
+
+    d = @c2.new(:id => 1, :parent_id => 789)
+    p = d.parent
+    p.class.should == Hash
+    
+    MODEL_DB.sqls.should == ["SELECT * FROM xyz WHERE (id = 789) LIMIT 1"]
+  end
+
+  specify "should support table name in the from option" do
+    @c2.one_to_one :parent, :from => :abc
+
+    d = @c2.new(:id => 1, :parent_id => 789)
+    p = d.parent
+    p.class.should == Hash
+    
+    MODEL_DB.sqls.should == ["SELECT * FROM abc WHERE (id = 789) LIMIT 1"]
+  end
+  
+  specify "should return nil if key value is nil" do
+    @c2.one_to_one :parent, :from => @c2
+    
+    d = @c2.new(:id => 1)
+    d.parent.should == nil
+  end
+  
+  specify "should define a setter method" do
+    @c2.one_to_one :parent, :from => @c2
+    
+    d = @c2.new(:id => 1)
+    d.parent = {:id => 4321}
+    d.values.should == {:id => 1, :parent_id => 4321}
+    $sqls.last.should == "UPDATE nodes SET parent_id = 4321 WHERE (id = 1)"
+    
+    d.parent = nil
+    d.values.should == {:id => 1, :parent_id => nil}
+    $sqls.last.should == "UPDATE nodes SET parent_id = NULL WHERE (id = 1)"
+    
+    e = @c2.new(:id => 6677)
+    d.parent = e
+    d.values.should == {:id => 1, :parent_id => 6677}
+    $sqls.last.should == "UPDATE nodes SET parent_id = 6677 WHERE (id = 1)"
+  end
+end
+
+context "Model.one_to_many" do
+  setup do
+    MODEL_DB.reset
+    
+    @c1 = Class.new(Sequel::Model(:attributes)) do
+    end
+
+    @c2 = Class.new(Sequel::Model(:nodes)) do
+    end
+  end
+  
+  specify "should define a getter method" do
+    @c2.one_to_many :attributes, :from => @c1, :key => :node_id
+    
+    n = @c2.new(:id => 1234)
+    a = n.attributes
+    a.should be_a_kind_of(Sequel::Dataset)
+    a.sql.should == 'SELECT * FROM attributes WHERE (node_id = 1234)'
+  end
+  
+  specify "should support plain dataset in the from option" do
+    @c2.one_to_many :attributes, :from => MODEL_DB[:xyz], :key => :node_id
+    
+    n = @c2.new(:id => 1234)
+    a = n.attributes
+    a.should be_a_kind_of(Sequel::Dataset)
+    a.sql.should == 'SELECT * FROM xyz WHERE (node_id = 1234)'
+  end
+
+  specify "should support table name in the from option" do
+    @c2.one_to_many :attributes, :from => :abc, :key => :node_id
+    
+    n = @c2.new(:id => 1234)
+    a = n.attributes
+    a.should be_a_kind_of(Sequel::Dataset)
+    a.sql.should == 'SELECT * FROM abc WHERE (node_id = 1234)'
+  end
+end
+
+context "Model#pk" do
+  setup do
+    @m = Class.new(Sequel::Model)
+  end
+  
+  specify "should be default return the value of the :id column" do
+    m = @m.new(:id => 111, :x => 2, :y => 3)
+    m.pk.should == 111
+  end
+
+  specify "should be return the primary key value for custom primary key" do
+    @m.set_primary_key :x
+    m = @m.new(:id => 111, :x => 2, :y => 3)
+    m.pk.should == 2
+  end
+
+  specify "should be return the primary key value for composite primary key" do
+    @m.set_primary_key [:y, :x]
+    m = @m.new(:id => 111, :x => 2, :y => 3)
+    m.pk.should == [3, 2]
+  end
+
+  specify "should raise if no primary key" do
+    @m.set_primary_key nil
+    m = @m.new(:id => 111, :x => 2, :y => 3)
+    proc {m.pk}.should raise_error(SequelError)
+
+    @m.no_primary_key
+    m = @m.new(:id => 111, :x => 2, :y => 3)
+    proc {m.pk}.should raise_error(SequelError)
+  end
+end
+
+context "Model#pk_hash" do
+  setup do
+    @m = Class.new(Sequel::Model)
+  end
+  
+  specify "should be default return the value of the :id column" do
+    m = @m.new(:id => 111, :x => 2, :y => 3)
+    m.pk_hash.should == {:id => 111}
+  end
+
+  specify "should be return the primary key value for custom primary key" do
+    @m.set_primary_key :x
+    m = @m.new(:id => 111, :x => 2, :y => 3)
+    m.pk_hash.should == {:x => 2}
+  end
+
+  specify "should be return the primary key value for composite primary key" do
+    @m.set_primary_key [:y, :x]
+    m = @m.new(:id => 111, :x => 2, :y => 3)
+    m.pk_hash.should == {:y => 3, :x => 2}
+  end
+
+  specify "should raise if no primary key" do
+    @m.set_primary_key nil
+    m = @m.new(:id => 111, :x => 2, :y => 3)
+    proc {m.pk_hash}.should raise_error(SequelError)
+
+    @m.no_primary_key
+    m = @m.new(:id => 111, :x => 2, :y => 3)
+    proc {m.pk_hash}.should raise_error(SequelError)
+  end
+end
+
+context "A Model constructor" do
+  setup do
+    @m = Class.new(Sequel::Model)
+  end
+
+  specify "should accept a hash" do
+    m = @m.new(:a => 1, :b => 2)
+    m.values.should == {:a => 1, :b => 2}
+    m.should be_new
+  end
+  
+  specify "should "
 end

data/spec/schema_spec.rb

@@ -104,6 +104,19 @@ context "DB#create_table" do
     @db.sqls.should == ["CREATE TABLE cats (project_id integer REFERENCES projects);"]
   end
   
+  specify "should accept foreign keys with arbitrary keys" do
+    @db.create_table(:cats) do
+      foreign_key :project_id, :table => :projects, :key => :id
+    end
+    @db.sqls.should == ["CREATE TABLE cats (project_id integer REFERENCES projects(id));"]
+
+    @db.sqls.clear
+    @db.create_table(:cats) do
+      foreign_key :project_id, :table => :projects, :key => :zzz
+    end
+    @db.sqls.should == ["CREATE TABLE cats (project_id integer REFERENCES projects(zzz));"]
+  end
+  
   specify "should accept foreign keys with ON DELETE clause" do
     @db.create_table(:cats) do
       foreign_key :project_id, :table => :projects, :on_delete => :restrict