diff options
| author | Bruce Momjian <bruce@momjian.us> | 2013-11-25 19:19:40 -0500 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2013-11-25 19:19:40 -0500 |
| commit | a6542a4b6870a019cd952d055d2e7af2da2fe102 (patch) | |
| tree | a2b0c5daba153d704f31edfbf1e66834d4955627 /src/backend/utils | |
| parent | 05b476c2983a8d38bf6a0254553b4a0776896aa7 (diff) | |
| download | postgresql-a6542a4b6870a019cd952d055d2e7af2da2fe102.tar.gz postgresql-a6542a4b6870a019cd952d055d2e7af2da2fe102.zip | |
Change SET LOCAL/CONSTRAINTS/TRANSACTION and ABORT behavior
Change SET LOCAL/CONSTRAINTS/TRANSACTION behavior outside of a
transaction block from error (post-9.3) to warning. (Was nothing in <=
9.3.) Also change ABORT outside of a transaction block from notice to
warning.
Diffstat (limited to 'src/backend/utils')
| -rw-r--r-- | src/backend/utils/misc/guc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 54d8078fe7a..cbf3186789c 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -6274,7 +6274,7 @@ ExecSetVariableStmt(VariableSetStmt *stmt, bool isTopLevel) case VAR_SET_VALUE: case VAR_SET_CURRENT: if (stmt->is_local) - RequireTransactionChain(isTopLevel, "SET LOCAL"); + WarnNoTransactionChain(isTopLevel, "SET LOCAL"); (void) set_config_option(stmt->name, ExtractSetVariableArgs(stmt), (superuser() ? PGC_SUSET : PGC_USERSET), @@ -6295,7 +6295,7 @@ ExecSetVariableStmt(VariableSetStmt *stmt, bool isTopLevel) { ListCell *head; - RequireTransactionChain(isTopLevel, "SET TRANSACTION"); + WarnNoTransactionChain(isTopLevel, "SET TRANSACTION"); foreach(head, stmt->args) { @@ -6346,7 +6346,7 @@ ExecSetVariableStmt(VariableSetStmt *stmt, bool isTopLevel) (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("SET LOCAL TRANSACTION SNAPSHOT is not implemented"))); - RequireTransactionChain(isTopLevel, "SET TRANSACTION"); + WarnNoTransactionChain(isTopLevel, "SET TRANSACTION"); Assert(IsA(con, A_Const)); Assert(nodeTag(&con->val) == T_String); ImportSnapshot(strVal(&con->val)); @@ -6357,11 +6357,11 @@ ExecSetVariableStmt(VariableSetStmt *stmt, bool isTopLevel) break; case VAR_SET_DEFAULT: if (stmt->is_local) - RequireTransactionChain(isTopLevel, "SET LOCAL"); + WarnNoTransactionChain(isTopLevel, "SET LOCAL"); /* fall through */ case VAR_RESET: if (strcmp(stmt->name, "transaction_isolation") == 0) - RequireTransactionChain(isTopLevel, "RESET TRANSACTION"); + WarnNoTransactionChain(isTopLevel, "RESET TRANSACTION"); (void) set_config_option(stmt->name, NULL, |