Update bundle

[rails.git] / lib / migrate.rb

diff --git a/lib/migrate.rb b/lib/migrate.rb
index 737ff57ece8f767efaf3310dba0d3065b07ccc71..9008b0a9f2ba8f8fdfa9435ef350c390fd141707 100644 (file)
--- a/lib/migrate.rb
+++ b/lib/migrate.rb
@@ -1,38 +1,50 @@
 module ActiveRecord
   module ConnectionAdapters
     module SchemaStatements
-      def add_primary_key(table_name, column_name, options = {})
-        index_name = options[:name]
-        column_names = Array(column_name)
-        quoted_column_names = column_names.map { |e| quote_column_name(e) }.join(", ")
-        execute "ALTER TABLE #{table_name} ADD PRIMARY KEY #{quote_column_name(index_name)} (#{quoted_column_names})"
+      def add_index_options_with_columns(table_name, column_name, options = {})
+        columns = options.delete(:columns)
+        index_name, index_type, index_columns, index_options, algorithm, using = add_index_options_without_columns(table_name, column_name, options)
+        [index_name, index_type, columns || index_columns, index_options, algorithm, using]
       end
 
-      alias_method :old_add_column_options!, :add_column_options!
+      alias_method_chain :add_index_options, :columns
+    end
+
+    module PostgreSQL
+      module Quoting
+        def quote_column_name_with_arrays(name)
+          Array(name).map { |n| quote_column_name_without_arrays(n) }.join(", ")
+        end
 
-      def add_column_options!(sql, options)
-        old_add_column_options!(sql, options)
-        sql << " #{options[:options]}"
+        alias_method_chain :quote_column_name, :arrays
       end
 
-      alias_method :old_options_include_default?, :options_include_default?
+      module SchemaStatements
+        def add_primary_key(table_name, column_name, _options = {})
+          execute "ALTER TABLE #{quote_table_name(table_name)} ADD PRIMARY KEY (#{quote_column_name(column_name)})"
+        end
 
-      def options_include_default?(options)
-        old_options_include_default?(options) && !(options[:options] =~ /AUTO_INCREMENT/i)
-      end
-    end
+        def remove_primary_key(table_name)
+          execute "ALTER TABLE #{quote_table_name(table_name)} DROP PRIMARY KEY"
+        end
 
-    class MysqlAdapter
-      alias_method :old_native_database_types, :native_database_types
+        def alter_primary_key(table_name, new_columns)
+          execute "ALTER TABLE #{quote_table_name(table_name)} DROP CONSTRAINT #{quote_table_name(table_name + "_pkey")}"
+          execute "ALTER TABLE #{quote_table_name(table_name)} ADD PRIMARY KEY (#{quote_column_name(new_columns)})"
+        end
 
-      def native_database_types
-        types = old_native_database_types
-        types[:bigint] = { :name => "bigint", :limit => 20 }
-        types
+        def create_enumeration(enumeration_name, values)
+          execute "CREATE TYPE #{enumeration_name} AS ENUM ('#{values.join '\',\''}')"
+        end
+
+        def drop_enumeration(enumeration_name)
+          execute "DROP TYPE #{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
       end
     end
   end
 end
-
-myisam_table = { :id => false, :force => true, :options => "ENGINE=MyIsam" }
-innodb_table = { :id => false, :force => true, :options => "ENGINE=InnoDB" }