Prefer string interpolation to concatenation

[rails.git] / lib / migrate.rb

diff --git a/lib/migrate.rb b/lib/migrate.rb
index b9917df6d7a98e636c7dcd857614e96196c258f4..d87d14bbb14e8d3c8129f920e0f7810ff131e3d9 100644 (file)
--- a/lib/migrate.rb
+++ b/lib/migrate.rb
@@ -1,31 +1,38 @@
-module OSM
-  module SchemaStatements
-    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]
+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
 
-  module PostgreSQL
-    module Quoting
+    module PostgreSQLAdapter
       def quote_column_name(name)
         Array(name).map { |n| super(n) }.join(", ")
       end
-    end
 
-    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)})"
+        table_name = quote_table_name(table_name)
+        column_name = quote_column_name(column_name)
+
+        execute "ALTER TABLE #{table_name} ADD PRIMARY KEY (#{column_name})"
       end
 
       def remove_primary_key(table_name)
-        execute "ALTER TABLE #{quote_table_name(table_name)} DROP PRIMARY KEY"
+        table_name = quote_table_name(table_name)
+
+        execute "ALTER TABLE #{table_name} DROP PRIMARY KEY"
       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)} ADD PRIMARY KEY (#{quote_column_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)
+
+        execute "ALTER TABLE #{table_name} DROP CONSTRAINT #{constraint_name}"
+        execute "ALTER TABLE #{table_name} ADD PRIMARY KEY (#{new_columns})"
       end
 
       def create_enumeration(enumeration_name, values)
@@ -37,12 +44,14 @@ module OSM
       end
 
       def rename_enumeration(old_name, new_name)
-        execute "ALTER TYPE #{quote_table_name(old_name)} RENAME TO #{quote_table_name(new_name)}"
+        old_name = quote_table_name(old_name)
+        new_name = quote_table_name(new_name)
+
+        execute "ALTER TYPE #{old_name} RENAME TO #{new_name}"
       end
     end
   end
 end
 
-ActiveRecord::ConnectionAdapters::SchemaStatements.extend(OSM::SchemaStatements)
-ActiveRecord::ConnectionAdapters::PostgreSQL::Quoting.extend(OSM::PostgreSQL::Quoting)
-ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaStatements.extend(OSM::PostgreSQL::SchemaStatements)
+ActiveRecord::ConnectionAdapters::AbstractAdapter.prepend(OpenStreetMap::ActiveRecord::AbstractAdapter)
+ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(OpenStreetMap::ActiveRecord::PostgreSQLAdapter)