luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[GB.DB.POSTGRESQL]

Browse source 
* NEW: Imbricated transactions are now allowed, by using savepoints.


git-svn-id: svn://localhost/gambas/trunk@7581 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2016-01-18 21:22:06 +00:00
parent a0f12eea97
commit 62699a1a9c
1 changed files with 42 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
gb.db.postgresql/src/main.c
View file

@ -457,7 +457,7 @@ static void conv_data(const char *data, int len, GB_VARIANT_VALUE *val, Oid type
date.year = (-date.year);
// 4713-01-01 BC is used for null dates
if (date.year == -4713 && date.month == 1 && date.day == 1)
date.year = date.month = date.day = 0;
@ -737,6 +737,7 @@ static int open_database(DB_DESC *desc, DB_DATABASE *db)
db->handle = conn;
db->version = db_version(db);
db->data = (void *)0; // transaction level
if (db->version >= 90000)
{
@ -755,7 +756,7 @@ static int open_database(DB_DESC *desc, DB_DATABASE *db)
/* flags */
db->flags.no_table_type = TRUE;
db->flags.no_nest = TRUE;
//db->flags.no_nest = TRUE;
db->flags.no_case = TRUE;
db->flags.schema = TRUE;
db->flags.no_collation = db->version < 90100;
@ -1247,7 +1248,19 @@ static int field_length(DB_RESULT result, int field)
static int begin_transaction(DB_DATABASE *db)
{
return do_query(db, "Unable to begin transaction: &1", NULL, "BEGIN", 0);
int trans = (int)(intptr_t)(db->data) + 1;
db->data = (void *)(intptr_t)trans;
if (trans == 1)
{
return do_query(db, "Unable to begin transaction: &1", NULL, "BEGIN", 0);
}
else
{
char buffer[8];
sprintf(buffer, "%d", trans - 1);
return do_query(db, "Unable to begin transaction: &1", NULL, "SAVEPOINT t&1", 1, buffer);
}
}
@ -1266,7 +1279,19 @@ static int begin_transaction(DB_DATABASE *db)
static int commit_transaction(DB_DATABASE *db)
{
return do_query(db, "Unable to commit transaction: &1", NULL, "COMMIT", 0);
int trans = (int)(intptr_t)(db->data) - 1;
db->data = (void *)(intptr_t)trans;
if (trans == 0)
{
return do_query(db, "Unable to commit transaction: &1", NULL, "COMMIT", 0);
}
else
{
char buffer[8];
sprintf(buffer, "%d", trans);
return do_query(db, "Unable to begin transaction: &1", NULL, "RELEASE SAVEPOINT t&1", 1, buffer);
}
}
@ -1285,7 +1310,19 @@ static int commit_transaction(DB_DATABASE *db)
static int rollback_transaction(DB_DATABASE *db)
{
return do_query(db, "Unable to rollback transaction: &1", NULL, "ROLLBACK", 0);
int trans = (int)(intptr_t)(db->data) - 1;
db->data = (void *)(intptr_t)trans;
if (trans == 0)
{
return do_query(db, "Unable to rollback transaction: &1", NULL, "ROLLBACK", 0);
}
else
{
char buffer[8];
sprintf(buffer, "%d", trans);
return do_query(db, "Unable to begin transaction: &1", NULL, "ROLLBACK TO SAVEPOINT t&1", 1, buffer);
}
}