Merge pull request #3009 from gravitystorm/svg_icons

[rails.git] / lib / migrate.rb

diff --git a/lib/migrate.rb b/lib/migrate.rb
index 585b47b1ca624d7bfc2cad06f7dd24432cb8857f..d87d14bbb14e8d3c8129f920e0f7810ff131e3d9 100644 (file)
--- a/lib/migrate.rb
+++ b/lib/migrate.rb
@@ -1,90 +1,57 @@
-module ActiveRecord
-  module ConnectionAdapters
-    module SchemaStatements
-      def quote_column_names(column_name)
-        Array(column_name).map { |e| quote_column_name(e) }.join(", ")
+module OpenStreetMap
+  module ActiveRecord
+    module AbstractAdapter
+      def add_index_options(table_name, column_name, options = {})
+        columns = options.delete(:columns)
+        index_name, index_type, index_columns, index_options, algorithm, using = super(table_name, column_name, options)
+        [index_name, index_type, columns || index_columns, index_options, algorithm, using]

       end
       end

+    end

 
 

-      def add_primary_key(table_name, column_name, options = {})
-        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 (#{quoted_column_names})"
-      end
-
-      def remove_primary_key(table_name)
-        execute "ALTER TABLE #{table_name} DROP PRIMARY KEY"
-      end
-
-      def add_foreign_key(table_name, column_name, reftbl, refcol = nil)
-        execute "ALTER TABLE #{table_name} ADD " +
-         "FOREIGN KEY (#{quote_column_names(column_name)}) " +
-         "REFERENCES #{reftbl} (#{quote_column_names(refcol || column_name)})"
-      end
-
-      alias_method :old_options_include_default?, :options_include_default?
-
-      def options_include_default?(options)
-        return false if options[:options] =~ /AUTO_INCREMENT/i
-        return old_options_include_default?(options)
+    module PostgreSQLAdapter
+      def quote_column_name(name)
+        Array(name).map { |n| super(n) }.join(", ")

       end
 
       end
 

-      alias_method :old_add_column_options!, :add_column_options!
+      def add_primary_key(table_name, column_name, _options = {})
+        table_name = quote_table_name(table_name)
+        column_name = quote_column_name(column_name)

 
 

-      def add_column_options!(sql, options)
-        sql << " UNSIGNED" if options[:unsigned]
-        old_add_column_options!(sql, options)
-        sql << " #{options[:options]}"
+        execute "ALTER TABLE #{table_name} ADD PRIMARY KEY (#{column_name})"

       end
       end

-    end

 
 

-    class MysqlAdapter
-      alias_method :old_native_database_types, :native_database_types
+      def remove_primary_key(table_name)
+        table_name = quote_table_name(table_name)

 
 

-      def native_database_types
-        types = old_native_database_types
-        types[:bigint] = { :name => "bigint", :limit => 20 }
-        types[:double] = { :name => "double" }
-        types[:bigint_pk] = { :name => "bigint(20) DEFAULT NULL auto_increment PRIMARY KEY" }
-        types[:bigint_pk_64] = { :name => "bigint(64) DEFAULT NULL auto_increment PRIMARY KEY" }
-        types[:bigint_auto_64] = { :name => "bigint(64) DEFAULT NULL auto_increment" }
-        types[:bigint_auto_11] = { :name => "bigint(11) DEFAULT NULL auto_increment" }
-        types[:bigint_auto_20] = { :name => "bigint(20) DEFAULT NULL auto_increment" }
-        types
+        execute "ALTER TABLE #{table_name} DROP PRIMARY KEY"

       end
 
       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"]
+      def alter_primary_key(table_name, new_columns)
+        constraint_name = quote_table_name("#{table_name}_pkey")
+        table_name = quote_table_name(table_name)
+        new_columns = quote_column_name(new_columns)

 
 

-          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)
-        execute(change_column_sql) 
+        execute "ALTER TABLE #{table_name} DROP CONSTRAINT #{constraint_name}"
+        execute "ALTER TABLE #{table_name} ADD PRIMARY KEY (#{new_columns})"

       end
 
       end
 

-      def myisam_table
-        return { :id => false, :force => true, :options => "ENGINE=MyIsam" }
+      def create_enumeration(enumeration_name, values)
+        execute "CREATE TYPE #{enumeration_name} AS ENUM ('#{values.join '\',\''}')"

       end
 
       end
 

-      def innodb_table
-        return { :id => false, :force => true, :options => "ENGINE=InnoDB" }
+      def drop_enumeration(enumeration_name)
+        execute "DROP TYPE #{enumeration_name}"

       end
 
       end
 

-      def innodb_option
-        return "ENGINE=InnoDB"
-      end
- 
-      def change_engine (table_name, engine)
-        execute "ALTER TABLE #{table_name} ENGINE = #{engine}"
-      end
+      def rename_enumeration(old_name, new_name)
+        old_name = quote_table_name(old_name)
+        new_name = quote_table_name(new_name)

 
 

-      def add_fulltext_index (table_name, column)
-        execute "CREATE FULLTEXT INDEX `#{table_name}_#{column}_idx` ON `#{table_name}` (`#{column}`)"
+        execute "ALTER TYPE #{old_name} RENAME TO #{new_name}"

       end
     end
   end
 end
       end
     end
   end
 end

+
+ActiveRecord::ConnectionAdapters::AbstractAdapter.prepend(OpenStreetMap::ActiveRecord::AbstractAdapter)
+ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(OpenStreetMap::ActiveRecord::PostgreSQLAdapter)