X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3fb931f9a86955faa39bec1fa4f2a731cbc74780..f5f71dd42c949a655f736e80de11ca51b940fcef:/lib/migrate.rb

diff --git a/lib/migrate.rb b/lib/migrate.rb
index baa7faecd..7f8d33693 100644
--- a/lib/migrate.rb
+++ b/lib/migrate.rb
@@ -1,48 +1,50 @@
 module ActiveRecord
   module ConnectionAdapters
-    module SchemaStatements
-      def quote_column_names(column_name)
-        Array(column_name).map { |e| quote_column_name(e) }.join(", ")
-      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
+    class PostgreSQLAdapter
+      class SchemaCreation
+        alias_method :old_add_column_options!, :add_column_options!
 
-      def remove_primary_key(table_name)
-        execute "ALTER TABLE #{table_name} DROP PRIMARY KEY"
+        def add_column_options!(sql, options)
+          sql << " UNSIGNED" if options[:unsigned]
+          old_add_column_options!(sql, options)
+          sql << " #{options[:options]}"
+        end
       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
+      module SchemaStatements
+        def quote_column_names(column_name)
+          Array(column_name).map { |e| quote_column_name(e) }.join(", ")
+        end
 
-      def remove_foreign_key(table_name, column_name, reftbl, refcol = nil)
-        execute "ALTER TABLE #{table_name} DROP " +
-          "CONSTRAINT #{table_name}_#{column_name[0]}_fkey"
-      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
 
-      alias_method :old_options_include_default?, :options_include_default?
+        def remove_primary_key(table_name)
+          execute "ALTER TABLE #{table_name} DROP PRIMARY KEY"
+        end
 
-      def options_include_default?(options)
-        return false if options[:options] =~ /AUTO_INCREMENT/i
-        return old_options_include_default?(options)
-      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_add_column_options!, :add_column_options!
+        def remove_foreign_key(table_name, column_name, reftbl, refcol = nil)
+          execute "ALTER TABLE #{table_name} DROP " +
+            "CONSTRAINT #{table_name}_#{column_name[0]}_fkey"
+        end
 
-      def add_column_options!(sql, options)
-        sql << " UNSIGNED" if options[:unsigned]
-        old_add_column_options!(sql, options)
-        sql << " #{options[:options]}"
+#        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)
+#        end
       end
-    end
 
-    class PostgreSQLAdapter
       alias_method :old_native_database_types, :native_database_types
 
       def native_database_types
@@ -126,6 +128,9 @@ module ActiveRecord
         if Hash === options and options[:lowercase]
           quoted_column_names = quoted_column_names.map { |e| "LOWER(#{e})" }
         end
+        if Hash === options and options[:columns]
+          quoted_column_names = quoted_column_names + Array[options[:columns]]
+        end
         quoted_column_names = quoted_column_names.join(", ")
 
         execute "CREATE #{index_type} INDEX #{quote_column_name(index_name)} ON #{quote_table_name(table_name)} USING #{index_method} (#{quoted_column_names})"