Merge remote-tracking branch 'upstream/pull/5241'

[rails.git] / config / initializers / migrate.rb

diff --git a/config/initializers/migrate.rb b/config/initializers/migrate.rb
index 787f3d551d58426f77307a76f109deea041c9631..1af67dd10d518961cd36307c41395af95def1aa6 100644 (file)
--- a/config/initializers/migrate.rb
+++ b/config/initializers/migrate.rb
@@ -1,59 +1,51 @@
 if defined?(ActiveRecord::ConnectionAdapters::AbstractAdapter)
   module OpenStreetMap
 if defined?(ActiveRecord::ConnectionAdapters::AbstractAdapter)
   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
-
-      module PostgreSQLAdapter
+    module PostgreSQL
+      module Quoting

         def quote_column_name(name)
           Array(name).map { |n| super(n) }.join(", ")
         end
         def quote_column_name(name)
           Array(name).map { |n| super(n) }.join(", ")
         end

+      end

 
 

-        def add_primary_key(table_name, column_name, _options = {})
-          table_name = quote_table_name(table_name)
-          column_name = quote_column_name(column_name)
+      module SchemaStatements
+        def add_primary_key(table_name, column_name, options = {})
+          constraint_name = "#{table_name}_pkey"

 
 

-          execute "ALTER TABLE #{table_name} ADD PRIMARY KEY (#{column_name})"
-        end
+          options = options.merge(:name => constraint_name, :unique => true)

 
 

-        def remove_primary_key(table_name)
-          table_name = quote_table_name(table_name)
-
-          execute "ALTER TABLE #{table_name} DROP PRIMARY KEY"
+          add_index(table_name, column_name, **options)
+          set_primary_key table_name, constraint_name

         end
 
         end
 

-        def alter_primary_key(table_name, new_columns)
+        def remove_primary_key(table_name)

           constraint_name = quote_table_name("#{table_name}_pkey")
           table_name = quote_table_name(table_name)
           constraint_name = quote_table_name("#{table_name}_pkey")
           table_name = quote_table_name(table_name)

-          new_columns = quote_column_name(new_columns)

 
           execute "ALTER TABLE #{table_name} DROP CONSTRAINT #{constraint_name}"
 
           execute "ALTER TABLE #{table_name} DROP CONSTRAINT #{constraint_name}"

-          execute "ALTER TABLE #{table_name} ADD PRIMARY KEY (#{new_columns})"

         end
 
         end
 

-        def create_enumeration(enumeration_name, values)
-          execute "CREATE TYPE #{enumeration_name} AS ENUM ('#{values.join '\',\''}')"
-        end
+        def alter_primary_key(table_name, column_name, options = {})
+          constraint_name = "#{table_name}_pkey"
+          tmp_constraint_name = "#{table_name}_pkey_tmp"
+
+          options = options.merge(:name => tmp_constraint_name, :unique => true)

 
 

-        def drop_enumeration(enumeration_name)
-          execute "DROP TYPE #{enumeration_name}"
+          add_index(table_name, column_name, **options)
+          remove_primary_key table_name
+          set_primary_key table_name, tmp_constraint_name
+          rename_index table_name, tmp_constraint_name, constraint_name

         end
 
         end
 

-        def rename_enumeration(old_name, new_name)
-          old_name = quote_table_name(old_name)
-          new_name = quote_table_name(new_name)
+        def set_primary_key(table_name, constraint_name)
+          constraint_name = quote_table_name(constraint_name)
+          table_name = quote_table_name(table_name)

 
 

-          execute "ALTER TYPE #{old_name} RENAME TO #{new_name}"
+          execute "ALTER TABLE #{table_name} ADD PRIMARY KEY USING INDEX #{constraint_name}"

         end
       end
     end
   end
 
         end
       end
     end
   end
 

-  ActiveRecord::ConnectionAdapters::AbstractAdapter.prepend(OpenStreetMap::ActiveRecord::AbstractAdapter)
-  ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(OpenStreetMap::ActiveRecord::PostgreSQLAdapter)
+  ActiveRecord::ConnectionAdapters::PostgreSQL::Quoting.prepend(OpenStreetMap::PostgreSQL::Quoting)
+  ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaStatements.prepend(OpenStreetMap::PostgreSQL::SchemaStatements)

 end
 end