1 files changed, 29 insertions, 25 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index f35dda8ffa..9a13d10ecc 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -767,35 +767,39 @@ module ActiveRecord
 
         FEATURE_NOT_SUPPORTED = "0A000" # :nodoc:
 
-        def exec_no_cache(sql, binds)
-          @connection.async_exec(sql)
+        def exec_no_cache(sql, name, binds)
+          log(sql, name, binds) { @connection.async_exec(sql) }
         end
 
-        def exec_cache(sql, binds)
+        def exec_cache(sql, name, binds)
           stmt_key = prepare_statement(sql)
 
-          # Clear the queue
-          @connection.get_last_result
-          @connection.send_query_prepared(stmt_key, binds.map { |col, val|
-            type_cast(val, col)
-          })
-          @connection.block
-          @connection.get_last_result
-        rescue PGError => e
-          # Get the PG code for the failure.  Annoyingly, the code for
-          # prepared statements whose return value may have changed is
-          # FEATURE_NOT_SUPPORTED.  Check here for more details:
-          # http://git.postgresql.org/gitweb/?p=postgresql.git;a=blob;f=src/backend/utils/cache/plancache.c#l573
-          begin
-            code = e.result.result_error_field(PGresult::PG_DIAG_SQLSTATE)
-          rescue
-            raise e
-          end
-          if FEATURE_NOT_SUPPORTED == code
-            @statements.delete sql_key(sql)
-            retry
-          else
-            raise e
+          log(sql, name, binds) do
+            begin
+              # Clear the queue
+              @connection.get_last_result
+              @connection.send_query_prepared(stmt_key, binds.map { |col, val|
+                type_cast(val, col)
+              })
+              @connection.block
+              @connection.get_last_result
+            rescue PGError => e
+              # Get the PG code for the failure.  Annoyingly, the code for
+              # prepared statements whose return value may have changed is
+              # FEATURE_NOT_SUPPORTED.  Check here for more details:
+              # http://git.postgresql.org/gitweb/?p=postgresql.git;a=blob;f=src/backend/utils/cache/plancache.c#l573
+              begin
+                code = e.result.result_error_field(PGresult::PG_DIAG_SQLSTATE)
+              rescue
+                raise e
+              end
+              if FEATURE_NOT_SUPPORTED == code
+                @statements.delete sql_key(sql)
+                retry
+              else
+                raise e
+              end
+            end
           end
         end