dm-migrations 0.9.10 → 0.9.11

data/History.txt

@@ -1,6 +1,16 @@
+=== 0.9.11 / 2009-03-29
+
+* 1 minor enhancement:
+
+  * Updated default MySQL engine to InnoDB
+
+* 1 bug fix:
+
+  * Fix :nullable for columns
+
 === 0.9.10 / 2009-01-19
 
-  * No changes this version
+* No changes this version
 
 === 0.9.9 / 2009-01-04
 

data/Rakefile

@@ -12,7 +12,7 @@ AUTHOR = 'Paul Sadauskas'
 EMAIL  = 'psadauskas [a] gmail [d] com'
 GEM_NAME = 'dm-migrations'
 GEM_VERSION = DataMapper::Migration::VERSION
-GEM_DEPENDENCIES = [['dm-core', "~>#{GEM_VERSION}"]]
+GEM_DEPENDENCIES = [['dm-core', GEM_VERSION]]
 GEM_CLEAN = %w[ log pkg coverage ]
 GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO History.txt ] }
 

data/lib/dm-migrations/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   class Migration
-    VERSION = '0.9.10'
+    VERSION = '0.9.11'
   end
 end

data/lib/migration.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-gem 'dm-core', '~>0.9.10'
+gem 'dm-core', '0.9.11'
 require 'dm-core'
 require 'benchmark'
 require File.dirname(__FILE__) + '/sql'

data/lib/sql/mysql.rb

@@ -21,6 +21,10 @@ module SQL
       true
     end
 
+    def create_table_statement(quoted_table_name)
+      "CREATE TABLE #{quoted_table_name} ENGINE = InnoDB CHARACTER SET #{character_set} COLLATE #{collation}"
+    end
+
     # TODO: move to dm-more/dm-migrations
     def property_schema_statement(schema)
       if supports_serial? && schema[:serial]

data/lib/sql/postgresql.rb

@@ -32,6 +32,10 @@ module SQL
       statement
     end
 
+    def create_table_statement(quoted_table_name)
+      "CREATE TABLE #{quoted_table_name}"
+    end
+
     class Table < SQL::Table
       def initialize(adapter, table_name)
         @adapter, @name = adapter, table_name

data/lib/sql/sqlite3.rb

@@ -17,6 +17,10 @@ module SQL
       # do nothing, sqlite will automatically create the database file
     end
 
+    def create_table_statement(quoted_table_name)
+      "CREATE TABLE #{quoted_table_name}"
+    end
+
     def supports_serial?
       true
     end

data/lib/sql/table_creator.rb

@@ -21,7 +21,7 @@ module SQL
     end
 
     def to_sql
-      "CREATE TABLE #{quoted_table_name} (#{@columns.map{ |c| c.to_sql }.join(', ')})"
+      "#{@adapter.create_table_statement(quoted_table_name)} (#{@columns.map{ |c| c.to_sql }.join(', ')})"
     end
 
     # A helper for using the native NOW() SQL function in a default
@@ -58,7 +58,9 @@ 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[:not_null]
+        unless schema.has_key?(:nullable?)
+          schema[:nullable?] = schema.has_key?(:nullable) ? schema[:nullable] : !schema[:not_null]
+        end
         if type_class.is_a?(String)
           schema[:primitive] = type_class
         else

data/spec/integration/sql_spec.rb

@@ -4,10 +4,18 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 ADAPTERS.each do |adapter|
   describe "Using Adapter #{adapter}," do
     describe DataMapper::Migration, "#create_table helper" do
+      before :all do
+        case adapter
+        when :sqlite3  then repository(adapter).adapter.extend(SQL::Sqlite3)
+        when :mysql    then repository(adapter).adapter.extend(SQL::Mysql)
+        when :postgres then repository(adapter).adapter.extend(SQL::Postgresql)
+        end
+      end
+
       before do
         @creator = DataMapper::Migration::TableCreator.new(repository(adapter).adapter, :people) do
           column :id, Integer, :serial => true
-          column :name, 'varchar(50)'
+          column :name, 'varchar(50)', :nullable => false
           column :long_string, String, :size => 200
         end
       end
@@ -46,6 +54,25 @@ ADAPTERS.each do |adapter|
         col.instance_eval("@type").should include("200")
       end
 
+      it "should generate a NOT NULL column when :nullable is false" do
+        @creator.instance_eval("@columns")[1].type.should match(/NOT NULL/)
+      end
+
+      case adapter
+      when :mysql
+        it "should create an InnoDB database for MySQL" do
+          #can't get an exact == comparison here because character set and collation may differ per connection
+          @creator.to_sql.should match(/^CREATE TABLE `people` ENGINE = InnoDB CHARACTER SET \w+ COLLATE \w+ \(`id` serial PRIMARY KEY, `name` varchar\(50\) NOT NULL, `long_string` VARCHAR\(200\)\)$/)
+        end
+      when :postgres
+        it "should output a CREATE TABLE statement when sent #to_sql" do
+          @creator.to_sql.should == %q{CREATE TABLE "people" ("id" serial PRIMARY KEY, "name" varchar(50) NOT NULL, "long_string" VARCHAR(200))}
+        end
+      when :sqlite3
+        it "should output a CREATE TABLE statement when sent #to_sql" do
+          @creator.to_sql.should == %q{CREATE TABLE "people" ("id" INTEGER PRIMARY KEY AUTOINCREMENT, "name" varchar(50) NOT NULL, "long_string" VARCHAR(200))}
+        end
+      end
     end
 
     describe DataMapper::Migration, "#modify_table helper" do

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'pathname'
 require 'rubygems'
 
-gem 'rspec', '~>1.1.11'
+gem 'rspec', '~>1.2'
 require 'spec'
 
 require Pathname(__FILE__).dirname.parent.expand_path + 'lib/dm-migrations'

data/spec/unit/sql/table_creator_spec.rb

@@ -55,6 +55,7 @@ describe 'SQL module' do
     end
 
     it 'should output an SQL CREATE statement to build itself' do
+      @adapter.should_receive(:create_table_statement).with("'users'").and_return(%{CREATE TABLE 'users'})
       @tc.to_sql.should ==
         %{CREATE TABLE 'users' ()}
     end

data/tasks/spec.rb

@@ -1,5 +1,5 @@
 begin
-  gem 'rspec', '~>1.1.11'
+  gem 'rspec', '~>1.2'
   require 'spec'
   require 'spec/rake/spectask'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-migrations
 version: !ruby/object:Gem::Version 
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors: 
 - Paul Sadauskas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-19 00:00:00 -08:00
+date: 2009-03-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,9 +18,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.10
+        version: 0.9.11
     version: 
 description: DataMapper plugin for writing and speccing migrations
 email: