database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-22 23:02:54 +03:00
Code

Fixed transaction command handling to not ignore savepoints and to correctly check for errors.

Browse Source
This commit is contained in:
Michael Meskes 2005-09-12 11:57:53 +00:00
parent 4fe4563550
commit c959d370bf
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/interfaces/ecpg/ChangeLog
View File

@ -1933,8 +1933,13 @@ Thu Jun 2 14:22:32 CEST 2005
Wed Aug 24 12:17:48 CEST 2005 Wed Aug 24 12:17:48 CEST 2005
- Check for NULL before checking whether argument is an array. - Check for NULL before checking whether argument is an array.
- Removed stray character from string quoting. - Remove stray character from string quoting.
- Fixed check to report missing varchar pointer implementation. - Fixed check to report missing varchar pointer implementation.
Mon Sep 12 13:53:35 CEST 2005
- Fixed transaction command handling to not ignore savepoints
and to correctly check for errors.
- Set ecpg library version to 5.1. - Set ecpg library version to 5.1.
- Set ecpg version to 4.1.1. - Set ecpg version to 4.1.1.

32
src/interfaces/ecpg/ecpglib/misc.c
View File

@ -1,4 +1,4 @@
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/misc.c,v 1.24 2004/10/14 20:23:46 momjian Exp $ */ /* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/misc.c,v 1.25 2005/09/12 11:57:53 meskes Exp $ */
#define POSTGRES_ECPG_INTERNAL #define POSTGRES_ECPG_INTERNAL
#include "postgres_fe.h" #include "postgres_fe.h"
@ -186,31 +186,35 @@ ECPGtrans(int lineno, const char *connection_name, const char *transaction)
/* if we have no connection we just simulate the command */ /* if we have no connection we just simulate the command */
if (con && con->connection) if (con && con->connection)
{ {
/* /* If we got a transaction command but have no open transaction,
* if we are not in autocommit mode, already have committed the * we have to start one, unless we are in autocommit, where the
* transaction and get another commit, just ignore it * developers have to take care themselves.
* However, if the command is a begin statement, we just execute it once.
*/ */
if (!con->committed || con->autocommit) if (con->committed && !con->autocommit && strncmp(transaction, "begin", 5) != 0 && strncmp(transaction, "start", 5) != 0)
{ {
if ((res = PQexec(con->connection, transaction)) == NULL) res = PQexec(con->connection, "begin transaction");
if (res == NULL || PQresultStatus(res) != PGRES_COMMAND_OK)
{ {
ECPGraise(lineno, ECPG_TRANS, ECPG_SQLSTATE_TRANSACTION_RESOLUTION_UNKNOWN, NULL); ECPGraise(lineno, ECPG_TRANS, ECPG_SQLSTATE_TRANSACTION_RESOLUTION_UNKNOWN, NULL);
return FALSE; return FALSE;
} }
PQclear(res); PQclear(res);
} }
res = PQexec(con->connection, transaction);
if (res == NULL || PQresultStatus(res) != PGRES_COMMAND_OK)
{
ECPGraise(lineno, ECPG_TRANS, ECPG_SQLSTATE_TRANSACTION_RESOLUTION_UNKNOWN, NULL);
return FALSE;
}
PQclear(res);
} }
if (strcmp(transaction, "commit") == 0 || strcmp(transaction, "rollback") == 0) if (strcmp(transaction, "commit") == 0 || strcmp(transaction, "rollback") == 0)
{
con->committed = true; con->committed = true;
else
#if 0 con->committed = false;
/* deallocate all prepared statements */
if (!ECPGdeallocate_all(lineno))
return false;
#endif
}
return true; return true;
} }