X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/f042a797c65fc96e79c2618e8653fbfb6488b67d..349413a520d05cf9c55fe6870de6ea2f933a3248:/lib/migrate.rb?ds=sidebyside

diff --git a/lib/migrate.rb b/lib/migrate.rb
index 737ff57ec..c31e31538 100644
--- a/lib/migrate.rb
+++ b/lib/migrate.rb
@@ -2,23 +2,20 @@ 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})"
+        execute "ALTER TABLE #{table_name} ADD PRIMARY KEY (#{quoted_column_names})"
       end
 
-      alias_method :old_add_column_options!, :add_column_options!
-
-      def add_column_options!(sql, options)
-        old_add_column_options!(sql, options)
-        sql << " #{options[:options]}"
+      def remove_primary_key(table_name)
+        execute "ALTER TABLE #{table_name} DROP PRIMARY KEY"
       end
 
       alias_method :old_options_include_default?, :options_include_default?
 
       def options_include_default?(options)
-        old_options_include_default?(options) && !(options[:options] =~ /AUTO_INCREMENT/i)
+        return false if options[:options] =~ /AUTO_INCREMENT/i
+        return old_options_include_default?(options)
       end
     end
 
@@ -28,11 +25,32 @@ module ActiveRecord
       def native_database_types
         types = old_native_database_types
         types[:bigint] = { :name => "bigint", :limit => 20 }
+        types[:double] = { :name => "double" }
         types
       end
+
+      def change_column(table_name, column_name, type, options = {})
+        unless options_include_default?(options)
+          options[:default] = select_one("SHOW COLUMNS FROM #{table_name} LIKE '#{column_name}'")["Default"]
+
+          unless type == :string or type == :text
+            options.delete(:default) if options[:default] = "";
+          end
+        end
+
+        change_column_sql = "ALTER TABLE #{table_name} CHANGE #{column_name} #{column_name} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
+        add_column_options!(change_column_sql, options)
+        change_column_sql << " #{options[:options]}"
+        execute(change_column_sql) 
+      end
+
+      def myisam_table
+        return { :id => false, :force => true, :options => "ENGINE=MyIsam" }
+      end
+
+      def innodb_table
+        return { :id => false, :force => true, :options => "ENGINE=InnoDB" }
+      end
     end
   end
 end
-
-myisam_table = { :id => false, :force => true, :options => "ENGINE=MyIsam" }
-innodb_table = { :id => false, :force => true, :options => "ENGINE=InnoDB" }