Merge remote-tracking branch 'openstreetmap/pull/1426'

[rails.git] / lib / migrate.rb

diff --git a/lib/migrate.rb b/lib/migrate.rb
index 681eba5b603ab7a61012e66759fde1f7a49361a1..21c1b2cf2ab7e8c03f8d2585af3f4ce1432f19e7 100644 (file)
--- a/lib/migrate.rb
+++ b/lib/migrate.rb
@@ -20,7 +20,7 @@ module ActiveRecord
       end
 
       module SchemaStatements
-        def add_primary_key(table_name, column_name, options = {})
+        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
 
@@ -29,7 +29,7 @@ module ActiveRecord
         end
 
         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)} 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