Merge branch 'master' into openstreetbugs

[rails.git] / lib / migrate.rb

diff --git a/lib/migrate.rb b/lib/migrate.rb
index 05b3c90f24da86a9cf541ec9cf60c7e90c9c7520..8e6629f0d2639d25e40590cfcbc7cd5ce7233a21 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
 
+      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)
@@ -54,6 +59,11 @@ module ActiveRecord
         types[:bigint_auto_20] = { :name => "bigint(20) DEFAULT NULL auto_increment" }
         types[:four_byte_unsigned] = { :name=> "integer unsigned" }
         types[:inet] = { :name=> "integer unsigned" }
+
+        enumerations.each do |e,v|
+          types[e.to_sym]= { :name => "enum('#{v.join '\',\''}')" }
+        end
+
         types
       end
 
@@ -91,8 +101,16 @@ module ActiveRecord
         execute "CREATE FULLTEXT INDEX `#{table_name}_#{column}_idx` ON `#{table_name}` (`#{column}`)"
       end
 
-      def alter_column_nwr_enum (table_name, column)
-        execute "alter table #{table_name} change column #{column} #{column} enum('Node','Way','Relation');"
+      def enumerations
+        @enumerations ||= Hash.new
+      end
+
+      def create_enumeration(enumeration_name, values)
+        enumerations[enumeration_name] = values
+      end
+
+      def drop_enumeration(enumeration_name)
+        enumerations.delete(enumeration_name)
       end
 
       def alter_primary_key(table_name, new_columns)
@@ -120,6 +138,11 @@ module ActiveRecord
         types[:bigint_auto_20] = { :name => "bigint" } #fixme: need autoincrement?
         types[:four_byte_unsigned] = { :name => "bigint" } # meh
         types[:inet] = { :name=> "inet" }
+
+        enumerations.each_key do |e|
+          types[e.to_sym]= { :name => e }
+        end
+
         types
       end
 
@@ -135,24 +158,34 @@ module ActiveRecord
         return ""
       end
  
-      def change_engine (table_name, engine)
+      def change_engine(table_name, engine)
       end
 
-      def add_fulltext_index (table_name, column)
-        execute "CREATE INDEX #{table_name}_#{column}_idx on #{table_name} (#{column})"
+      def add_fulltext_index(table_name, column)
+        execute "CREATE INDEX #{table_name}_#{column}_idx ON #{table_name} (#{column})"
       end
 
-      def alter_column_nwr_enum (table_name, column)
-        response = select_one("select count(*) as count from pg_type where typname = 'nwr_enum'")
-        if response['count'] == "0" #yep, as a string
-          execute "create type nwr_enum as ENUM ('Node', 'Way', 'Relation')"
-        end
-        execute        "alter table #{table_name} drop #{column}"
-        execute "alter table #{table_name} add #{column} nwr_enum"
+      def enumerations
+        @enumerations ||= Hash.new
+      end
+
+      def create_enumeration(enumeration_name, values)
+        enumerations[enumeration_name] = values
+        execute "CREATE TYPE #{enumeration_name} AS ENUM ('#{values.join '\',\''}')"
+      end
+
+      def drop_enumeration(enumeration_name)
+        execute "DROP TYPE #{enumeration_name}"
+        enumerations.delete(enumeration_name)
+      end
+
+      def rename_enumeration(old_name, new_name)
+        execute "ALTER TYPE #{quote_table_name(old_name)} RENAME TO #{quote_table_name(new_name)}"
       end
 
       def alter_primary_key(table_name, new_columns)
-        execute "alter table #{table_name} drop constraint #{table_name}_pkey; alter table #{table_name} add primary key (#{new_columns.join(',')})"
+        execute "ALTER TABLE #{table_name} DROP CONSTRAINT #{table_name}_pkey"
+        execute "ALTER TABLE #{table_name} ADD PRIMARY KEY (#{new_columns.join(',')})"
       end
 
       def interval_constant(interval)
@@ -173,6 +206,14 @@ module ActiveRecord
         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
+
+      def rename_index(table_name, old_name, new_name)
+        execute "ALTER INDEX #{quote_table_name(old_name)} RENAME TO #{quote_table_name(new_name)}"
+      end
+
+      def rename_sequence(table_name, old_name, new_name)
+        execute "ALTER SEQUENCE #{quote_table_name(old_name)} RENAME TO #{quote_table_name(new_name)}"
+      end
     end
   end
 end