dm-migrations 0.9.3 → 0.9.4

data/lib/dm-migrations/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   class Migration
-    VERSION = "0.9.3"
+    VERSION = "0.9.4"
   end
-end
+end

data/lib/migration.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-gem 'dm-core', '=0.9.3'
+gem 'dm-core', '=0.9.4'
 require 'dm-core'
 require 'benchmark'
 require File.dirname(__FILE__) + '/sql'

data/lib/sql/table_creator.rb

@@ -36,6 +36,8 @@ module SQL
 
       def build_type(type_class)
         schema = {:name => @name, :quote_column_name => quoted_name}.merge(@opts)
+        schema[:serial?] ||= schema[:serial]
+        schema[:nullable?] ||= schema[:nullable]
         schema = @adapter.class.type_map[type_class].merge(schema)
         @adapter.property_schema_statement(schema)
       end
@@ -52,4 +54,3 @@ module SQL
   end
 
 end
-

data/spec/integration/sql_spec.rb

@@ -7,6 +7,7 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
     describe DataMapper::Migration, "#create_table helper" do
       before do
         @creator = DataMapper::Migration::TableCreator.new(repository(adapter).adapter, :people) do
+          column :id, Integer, :serial => true
           column :name, String
           column :long_string, String, :size => 200
         end
@@ -32,18 +33,18 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 
       it "should have an array of columns" do
         @creator.instance_eval("@columns").should be_kind_of(Array)
-        @creator.instance_eval("@columns").should have(2).items
+        @creator.instance_eval("@columns").should have(3).items
         @creator.instance_eval("@columns").first.should be_kind_of(DataMapper::Migration::TableCreator::Column)
       end
 
       it "should quote the table name for the adapter" do
         @creator.quoted_table_name.should == (adapter == :mysql ? '`people`' : '"people"')
       end
-      
+
       it "should allow for custom options" do
         columns = @creator.instance_eval("@columns")
         col = columns.detect{|c| c.name == "long_string"}
-        col.instance_eval("@type").should include("200") 
+        col.instance_eval("@type").should include("200")
       end
 
     end

data/spec/spec.opts

@@ -1,3 +1,2 @@
 --colour
 --format progress
-

data/spec/spec_helper.rb

@@ -11,7 +11,7 @@ def load_driver(name, default_uri)
   lib = "do_#{name}"
 
   begin
-    gem lib, '=0.9.3'
+    gem lib, '=0.9.4'
     require lib
     DataMapper.setup(name, default_uri)
     DataMapper::Repository.adapters[:default] =  DataMapper::Repository.adapters[name]

data/spec/unit/migration_spec.rb

@@ -46,7 +46,7 @@ describe 'Migration' do
       @adapter.should_receive(:class).and_return(DataMapper::Adapters::Sqlite3Adapter)
       DataMapper::Migration.new(1, :do_nothing, {}) {}
     end
-    
+
     it 'should extend the adapter with the right module' do
       @adapter.should_receive(:extend).with(SQL::Sqlite3)
       DataMapper::Migration.new(1, :do_nothing, {}) {}
@@ -64,10 +64,10 @@ describe 'Migration' do
       m.instance_variable_get(:@verbose).should be_false
     end
 
-    it 'should set @verbose to true by default' do 
+    it 'should set @verbose to true by default' do
       @m.instance_variable_get(:@verbose).should be_true
     end
-  
+
     it 'should set the @up_action to an empty block' do
       @m.instance_variable_get(:@up_action).should be_kind_of(Proc)
     end
@@ -77,7 +77,7 @@ describe 'Migration' do
     end
 
     it 'should evaluate the given block'
-      
+
   end
 
   it 'should set the @up_action when #up is called with a block' do
@@ -166,7 +166,7 @@ describe 'Migration' do
 
   end
 
-  describe 'methods used in the action blocks' do 
+  describe 'methods used in the action blocks' do
 
     describe '#execute' do
       before do
@@ -199,7 +199,7 @@ describe 'Migration' do
           SQL::TableCreator.should_receive(:new).with(@adapter, :users, {}).and_return(@tc)
           @m.create_table(:users) { }
         end
-        
+
         it 'should convert the TableCreator object to an sql statement' do
           @tc.should_receive(:to_sql).and_return('CREATE TABLE')
           @m.create_table(:users) { }
@@ -444,4 +444,3 @@ describe 'Migration' do
 
   end
 end
-

data/spec/unit/sql/column_spec.rb

@@ -4,7 +4,7 @@ require Pathname(__FILE__).dirname + '../../spec_helper'
 require Pathname(__FILE__).dirname + '../../../lib/sql/column'
 
 describe SQL::Column do
-  before do 
+  before do
     @column = SQL::Column.new
   end
 
@@ -15,4 +15,3 @@ describe SQL::Column do
   end
 
 end
-

data/spec/unit/sql/postgresql_spec.rb

@@ -95,5 +95,3 @@ describe "SQLite3 Extensions" do
 
 
 end
- 
-

data/spec/unit/sql/sqlite3_extensions_spec.rb

@@ -106,4 +106,3 @@ describe "SQLite3 Extensions" do
 
 
 end
- 

data/spec/unit/sql/table_creator_spec.rb

@@ -46,7 +46,7 @@ describe 'SQL module' do
       @adapter.should_receive(:quote_table_name).with('users').and_return(%{'users'})
       @tc.quoted_table_name.should == %{'users'}
     end
-    
+
     it 'should initialze a new column and add it to the list of columns' do
       col = mock('column')
       SQL::TableCreator::Column.should_receive(:new).with(@adapter, :foo, :bar, {}).and_return(col)
@@ -55,7 +55,7 @@ describe 'SQL module' do
     end
 
     it 'should output an SQL CREATE statement to build itself' do
-      @tc.to_sql.should == 
+      @tc.to_sql.should ==
         %{CREATE TABLE 'users' ()}
     end
 

data/spec/unit/sql/table_modifier_spec.rb

@@ -23,7 +23,7 @@ describe 'SQL module' do
       it 'should set @opts to the options hash' do
         @tc.instance_variable_get("@opts").should == {}
       end
-       
+
       it 'should set @statements to an empty array' do
         @tc.instance_variable_get("@statements").should == []
       end

data/spec/unit/sql/table_spec.rb

@@ -4,7 +4,7 @@ require Pathname(__FILE__).dirname + '../../spec_helper'
 require Pathname(__FILE__).dirname + '../../../lib/sql/table'
 
 describe SQL::Table do
-  before do 
+  before do
     @table = SQL::Table.new
   end
 
@@ -23,7 +23,7 @@ describe SQL::Table do
     column_a = mock('column', :name => 'id')
     column_b = mock('column', :name => 'login')
     @table.columns = [column_a, column_b]
-    
+
     @table.column('id').should == column_a
   end
 

data/spec/unit/sql_spec.rb

@@ -4,7 +4,7 @@ require Pathname(__FILE__).dirname + '../spec_helper'
 require Pathname(__FILE__).dirname + '../../lib/sql'
 
 describe 'SQL module' do
-  
+
   it 'doesnt really do anything'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-migrations
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Paul Sadauskas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-24 00:00:00 -05:00
+date: 2008-08-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe