log every sql statement, even when they error
This commit is contained in:
parent
19fc88646b
commit
98e001641f
@ -772,32 +772,32 @@ def exec_no_cache(sql, name, binds)
|
||||
end
|
||||
|
||||
def exec_cache(sql, name, binds)
|
||||
log(sql, name, binds) do
|
||||
begin
|
||||
stmt_key = prepare_statement(sql)
|
||||
stmt_key = prepare_statement(sql)
|
||||
|
||||
@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
|
||||
log(sql, name, binds) do
|
||||
@connection.send_query_prepared(stmt_key, binds.map { |col, val|
|
||||
type_cast(val, col)
|
||||
})
|
||||
@connection.block
|
||||
@connection.get_last_result
|
||||
end
|
||||
rescue ActiveRecord::StatementInvalid => e
|
||||
pgerror = e.original_exception
|
||||
|
||||
# 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 = pgerror.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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user