From 072dbbf2aeb2be4f074ba8e404ee157f281bedf9 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Sat, 16 Mar 2013 16:19:48 -0700
Subject: [PATCH] pull add_column_options! off the pg connection class

---
 .../postgresql/schema_statements.rb                 | 13 +++++++++++++
 .../connection_adapters/postgresql_adapter.rb       | 13 -------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
index 766b5f07b1..28c5209ad4 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
@@ -15,6 +15,19 @@ def visit_AlterTable(o)
 
           sql
         end
+
+        def add_column_options!(sql, options)
+          if options[:array] || options[:column].try(:array)
+            sql << '[]'
+          end
+
+          column = options.fetch(:column) { return super }
+          if column.type == :uuid && options[:default] =~ /\(\)/
+            sql << " DEFAULT #{options[:default]}"
+          else
+            super
+          end
+        end
       end
 
       def schema_creation
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 2a19f4ab0b..0a903d8aad 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -627,19 +627,6 @@ def table_alias_length
         @table_alias_length ||= query('SHOW max_identifier_length', 'SCHEMA')[0][0].to_i
       end
 
-      def add_column_options!(sql, options)
-        if options[:array] || options[:column].try(:array)
-          sql << '[]'
-        end
-
-        column = options.fetch(:column) { return super }
-        if column.type == :uuid && options[:default] =~ /\(\)/
-          sql << " DEFAULT #{options[:default]}"
-        else
-          super
-        end
-      end
-
       # Set the authorized user for this session
       def session_auth=(user)
         clear_cache!
-- 
GitLab