dm-migrations 0.9.5 → 0.9.6

data/Rakefile

@@ -10,7 +10,7 @@ AUTHOR = "Paul Sadauskas"
 EMAIL  = "psadauskas@gmail.com"
 GEM_NAME = "dm-migrations"
 GEM_VERSION = DataMapper::Migration::VERSION
-GEM_DEPENDENCIES = [["dm-core", GEM_VERSION]]
+GEM_DEPENDENCIES = [["dm-core", '>0.9.5']]
 GEM_CLEAN = ["log", "pkg"]
 GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO ] }
 
@@ -45,7 +45,7 @@ end
 desc 'Run specifications'
 Spec::Rake::SpecTask.new(:spec) do |t|
   t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-  t.spec_files = Pathname.glob(Pathname.new(__FILE__).dirname + 'spec/**/*_spec.rb')
+  t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
 
   begin
     t.rcov = ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true

data/lib/dm-migrations/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   class Migration
-    VERSION = "0.9.5"
+    VERSION = "0.9.6"
   end
 end

data/lib/migration.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-gem 'dm-core', '=0.9.5'
+gem 'dm-core', '=0.9.6'
 require 'dm-core'
 require 'benchmark'
 require File.dirname(__FILE__) + '/sql'
@@ -53,12 +53,12 @@ module DataMapper
     def perform_up
       result = nil
       if needs_up?
-        # DataMapper.database.adapter.transaction do
-        say_with_time "== Performing Up Migration ##{position}: #{name}", 0 do
-          result = @up_action.call
+        database.transaction.commit do
+          say_with_time "== Performing Up Migration ##{position}: #{name}", 0 do
+            result = @up_action.call
+          end
+          update_migration_info(:up)
         end
-        update_migration_info(:up)
-        # end
       end
       result
     end
@@ -67,12 +67,12 @@ module DataMapper
     def perform_down
       result = nil
       if needs_down?
-        # DataMapper.database.adapter.transaction do
-        say_with_time "== Performing Down Migration ##{position}: #{name}", 0 do
-          result = @down_action.call
+        database.transaction.commit do
+          say_with_time "== Performing Down Migration ##{position}: #{name}", 0 do
+            result = @down_action.call
+          end
+          update_migration_info(:down)
         end
-        update_migration_info(:down)
-        # end
       end
       result
     end
@@ -98,6 +98,22 @@ module DataMapper
       end
     end
 
+    def create_index(table_name, *columns_and_options)
+      if columns_and_options.last.is_a?(Hash)
+        opts = columns_and_options.pop
+      else
+        opts = {}
+      end
+      columns = columns_and_options.flatten
+
+      opts[:name] ||= "#{opts[:unique] ? 'unique_' : ''}index_#{table_name}_#{columns.join('_')}"
+
+      execute <<-SQL.compress_lines
+        CREATE #{opts[:unique] ? 'UNIQUE ' : '' }INDEX #{quote_column_name(opts[:name])} ON
+        #{quote_table_name(table_name)} (#{columns.map { |c| quote_column_name(c) }.join(', ') })
+      SQL
+    end
+
     # Orders migrations by position, so we know what order to run them in.
     # First order by postition, then by name, so at least the order is predictable.
     def <=> other
@@ -186,5 +202,12 @@ module DataMapper
       @migration_name_column ||= @adapter.send(:quote_column_name, 'migration_name')
     end
 
+    def quote_table_name(table_name)
+      @adapter.send(:quote_table_name, table_name.to_s)
+    end
+
+    def quote_column_name(column_name)
+      @adapter.send(:quote_column_name, column_name.to_s)
+    end
   end
 end

data/lib/sql/table_creator.rb

@@ -21,7 +21,28 @@ module SQL
     end
 
     def to_sql
-        "CREATE TABLE #{quoted_table_name} (#{@columns.map{ |c| c.to_sql }.join(', ')})"
+      "CREATE TABLE #{quoted_table_name} (#{@columns.map{ |c| c.to_sql }.join(', ')})"
+    end
+
+    # A helper for using the native NOW() SQL function in a default
+    def now
+      SqlExpr.new('NOW()')
+    end
+
+    # A helper for using the native UUID() SQL function in a default
+    def uuid
+      SqlExpr.new('UUID()')
+    end
+
+    class SqlExpr
+      attr_accessor :sql
+      def initialize(sql)
+        @sql = sql
+      end
+
+      def to_s
+        @sql.to_s
+      end
     end
 
     class Column
@@ -37,13 +58,17 @@ 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)
+        schema[:nullable?] ||= schema[:nullable] || !schema[:not_null]
+        if type_class.is_a?(String)
+          schema[:primitive] = type_class
+        else
+          schema = @adapter.class.type_map[type_class].merge(schema)
+        end
         @adapter.property_schema_statement(schema)
       end
 
       def to_sql
-          type
+        type
       end
 
       def quoted_name

data/spec/integration/sql_spec.rb

@@ -3,12 +3,12 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 
 [:sqlite3, :mysql, :postgres].each do |adapter|
   next unless eval("HAS_#{adapter.to_s.upcase}")
-  describe "Using Adapter #{adapter}, " do
+  describe "Using Adapter #{adapter}," do
     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 :name, 'varchar(50)'
           column :long_string, String, :size => 200
         end
       end

data/spec/spec_helper.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-migrations
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Paul Sadauskas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-26 00:00:00 -05:00
+date: 2008-10-12 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,7 +18,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">"
       - !ruby/object:Gem::Version 
         version: 0.9.5
     version: