sequel 2.0.0 → 2.0.1

data/CHANGELOG

@@ -1,3 +1,9 @@
+=== 2.0.1 (2008-06-04)
+
+* Make the choice of Time or DateTime optional for typecasting :datetime types, default to Time (jeremyevans)
+
+* Reload database schema for table when calling Model.create_table (jeremyevans)
+
 === 2.0.0 (2008-06-01)
 
 * Comprehensive update of all documentation (jeremyevans)

data/Rakefile

@@ -9,8 +9,8 @@ include FileUtils
 # Configuration
 ##############################################################################
 NAME = "sequel"
-VERS = "2.0.0"
-SEQUEL_CORE_VERS= "2.0.0"
+VERS = "2.0.1"
+SEQUEL_CORE_VERS= "2.0.1"
 CLEAN.include ["**/.*.sw?", "pkg", ".config", "rdoc", "coverage"]
 RDOC_OPTS = ["--quiet", "--line-numbers", "--inline-source", '--title', \
   'Sequel: The Database Toolkit for Ruby: Model Classes', '--main', 'README']

data/lib/sequel_model/base.rb

@@ -326,7 +326,7 @@ module Sequel
     # Get the schema from the database, fall back on checking the columns
     # via the database if that will return inaccurate results or if
     # it raises an error.
-    def self.get_db_schema # :nodoc:
+    def self.get_db_schema(reload = false) # :nodoc:
       set_columns(nil)
       return nil unless @dataset
       schema_hash = {}
@@ -334,7 +334,7 @@ module Sequel
       single_table = ds_opts[:from] && (ds_opts[:from].length == 1) \
         && !ds_opts.include?(:join) && !ds_opts.include?(:sql)
       get_columns = proc{columns rescue []}
-      if single_table && (schema_array = (db.schema(table_name) rescue nil))
+      if single_table && (schema_array = (db.schema(table_name, :reload=>reload) rescue nil))
         schema_array.each{|k,v| schema_hash[k] = v}
         if ds_opts.include?(:select)
           # Dataset only selects certain columns, delete the other

data/lib/sequel_model/schema.rb

@@ -3,7 +3,7 @@ module Sequel
     # Creates table.
     def self.create_table
       db.create_table_sql_list(table_name, *schema.create_info).each {|s| db << s} 
-      @db_schema = get_db_schema unless @@lazy_load_schema
+      @db_schema = get_db_schema(true) unless @@lazy_load_schema
       columns
     end
     

data/spec/model_spec.rb

@@ -509,7 +509,7 @@ context "Model.db_schema" do
   
   specify "should use the database's schema_for_table and set the columns" do
     d = @dataset.db
-    def d.schema(table)
+    def d.schema(table, opts = {})
       [[:x, {:type=>:integer}], [:y, {:type=>:string}]]
     end
     @c.dataset = @dataset
@@ -520,7 +520,7 @@ context "Model.db_schema" do
   specify "should restrict the schema and columns for datasets with a :select option" do
     ds = @dataset.select(:x, :y___z)
     d = ds.db
-    def d.schema(table)
+    def d.schema(table, opts = {})
       [[:x, {:type=>:integer}], [:y, {:type=>:string}]]
     end
     def @c.columns; [:x, :z]; end

data/spec/record_spec.rb

@@ -701,6 +701,10 @@ describe Sequel::Model, "typecasting" do
     end
   end
 
+  teardown do
+    Sequel.time_class = Time
+  end
+
   specify "should not convert if typecasting is turned off" do
     @c.typecast_on_assignment = false
     @c.instance_variable_set(:@db_schema, {:x=>{:type=>:integer}})
@@ -828,25 +832,57 @@ describe Sequel::Model, "typecasting" do
     proc{@c.new.x = 'a'}.should raise_error
   end
 
-  specify "should convert to date for a datetime field" do
+  specify "should convert to time for a time field" do
+    @c.instance_variable_set(:@db_schema, {:x=>{:type=>:time}})
+    m = @c.new
+    x = '10:20:30'
+    y = x.to_time
+    m.x = x
+    m.x.should == y
+    m.x = y
+    m.x.should == y
+  end
+
+  specify "should raise an error if invalid data is used in a time field" do
+    @c.instance_variable_set(:@db_schema, {:x=>{:type=>:time}})
+    proc{@c.new.x = '0000'}.should raise_error
+    proc{@c.new.x = 'a'}.should_not raise_error # Valid Time
+    proc{@c.new.x = '2008-10-21'.to_date}.should raise_error
+    proc{@c.new.x = '2008-10-21'.to_datetime}.should raise_error
+  end
+
+  specify "should convert to the Sequel.time_class for a datetime field" do
     @c.instance_variable_set(:@db_schema, {:x=>{:type=>:datetime}})
     m = @c.new
-    m.x = '2007-10-21 10:20:30'
-    m.x.should == '2007-10-21 10:20:30'.to_datetime
-    y = DateTime.new(2007,10,21,10,20,30)
-    m.x = '2007-10-21 10:20:30'
+    x = '2007-10-21T10:20:30-07:00'
+    y = x.to_time
+    m.x = x
     m.x.should == y
-    m.x = '2007-10-21 10:20:30'.to_datetime
+    m.x = x.to_datetime
     m.x.should == y
-    m.x = '2007-10-21 10:20:30'.to_time
+    m.x = x.to_time
     m.x.should == y
     m.x = '2007-10-21'.to_date
-    m.x.should == DateTime.new(2007,10,21)
+    m.x.should == '2007-10-21'.to_time
+    Sequel.time_class = DateTime
+    y = x.to_datetime
+    m.x = x
+    m.x.should == y
+    m.x = x.to_datetime
+    m.x.should == y
+    m.x = x.to_time
+    m.x.should == y
+    m.x = '2007-10-21'.to_date
+    m.x.should == '2007-10-21'.to_datetime
   end
 
   specify "should raise an error if invalid data is used in a datetime field" do
     @c.instance_variable_set(:@db_schema, {:x=>{:type=>:datetime}})
-    proc{@c.new.x = 'a'}.should raise_error
+    proc{@c.new.x = '0000'}.should raise_error
+    proc{@c.new.x = ''}.should_not raise_error # Valid Time
+    Sequel.time_class = DateTime
+    proc{@c.new.x = '0000'}.should raise_error
+    proc{@c.new.x = ''}.should raise_error
   end
 
 end

data/spec/spec_helper.rb

@@ -26,6 +26,10 @@ class MockDataset < Sequel::Dataset
     @db.execute(sql)
     yield({:id => 1, :x => 1})
   end
+
+  def quoted_identifier(c)
+    "\"#{c}\""
+  end
 end
 
 class MockDatabase < Sequel::Database

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-01 00:00:00 -07:00
+date: 2008-06-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.0.0
+        version: 2.0.1
     version: 
 description: "The Database Toolkit for Ruby: Model Classes"
 email: code@jeremyevans.net