Merge pull request #8548 from garysweaver/postgresql_fallback_to_disable_user_triggers

fix #5523: postgresql adapter to disable user triggers in disable_referential_integrity

2 files changed, 17 insertions, 4 deletions

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index e7d3b529fe..25a02d76a4 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   Add ability for postgresql adapter to disable user triggers in disable_referential_integrity.
+    Fix #5523
+
+    *Gary S. Weaver*
+
 *   Added support for `validates_uniqueness_of` in PostgreSQL array columns.
     Fixes #8075.
 
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/referential_integrity.rb b/activerecord/lib/active_record/connection_adapters/postgresql/referential_integrity.rb
index 16da3ea732..bc775394a6 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/referential_integrity.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/referential_integrity.rb
@@ -7,13 +7,21 @@ module ActiveRecord
         end
 
         def disable_referential_integrity #:nodoc:
-          if supports_disable_referential_integrity? then
-            execute(tables.collect { |name| "ALTER TABLE #{quote_table_name(name)} DISABLE TRIGGER ALL" }.join(";"))
+          if supports_disable_referential_integrity?
+            begin
+              execute(tables.collect { |name| "ALTER TABLE #{quote_table_name(name)} DISABLE TRIGGER ALL" }.join(";"))
+            rescue
+              execute(tables.collect { |name| "ALTER TABLE #{quote_table_name(name)} DISABLE TRIGGER USER" }.join(";"))
+            end
           end
           yield
         ensure
-          if supports_disable_referential_integrity? then
-            execute(tables.collect { |name| "ALTER TABLE #{quote_table_name(name)} ENABLE TRIGGER ALL" }.join(";"))
+          if supports_disable_referential_integrity?
+            begin
+              execute(tables.collect { |name| "ALTER TABLE #{quote_table_name(name)} ENABLE TRIGGER ALL" }.join(";"))
+            rescue
+              execute(tables.collect { |name| "ALTER TABLE #{quote_table_name(name)} ENABLE TRIGGER USER" }.join(";"))
+            end
           end
         end
       end