Merge changeset browser branch to trunk.

[rails.git] / lib / migrate.rb

diff --git a/lib/migrate.rb b/lib/migrate.rb
index 392060b6015a8cdb34d5fcfa6172e8a215b05eb4..50ba6321dc24ffea9e7388137433f1b370e51f4c 100644 (file)
--- a/lib/migrate.rb
+++ b/lib/migrate.rb
@@ -21,6 +21,11 @@ module ActiveRecord
          "REFERENCES #{reftbl} (#{quote_column_names(refcol || column_name)})"
       end
 
          "REFERENCES #{reftbl} (#{quote_column_names(refcol || column_name)})"
       end
 

+      def remove_foreign_key(table_name, column_name, reftbl, refcol = nil)
+        execute "ALTER TABLE #{table_name} DROP " +
+          "CONSTRAINT #{table_name}_#{column_name[0]}_fkey"
+      end
+

       alias_method :old_options_include_default?, :options_include_default?
 
       def options_include_default?(options)
       alias_method :old_options_include_default?, :options_include_default?
 
       def options_include_default?(options)


@@ -158,6 +163,21 @@ module ActiveRecord
       def interval_constant(interval)
         "'#{interval}'::interval"
       end
       def interval_constant(interval)
         "'#{interval}'::interval"
       end

+
+      def add_index(table_name, column_name, options = {})
+        column_names = Array(column_name)
+        index_name   = index_name(table_name, :column => column_names)
+
+        if Hash === options # legacy support, since this param was a string
+          index_type = options[:unique] ? "UNIQUE" : ""
+          index_name = options[:name] || index_name
+          index_method = options[:method] || "BTREE"
+        else
+          index_type = options
+        end
+        quoted_column_names = column_names.map { |e| quote_column_name(e) }.join(", ")
+        execute "CREATE #{index_type} INDEX #{quote_column_name(index_name)} ON #{quote_table_name(table_name)} USING #{index_method} (#{quoted_column_names})"
+      end

     end
   end
 end
     end
   end
 end