simcop2387/DBD-SQLite-SQLcipher
1
0
Fork 0
mirror of https://github.com/DBD-SQLite/DBD-SQLite synced 2025-06-07 22:28:47 -04:00
Code Issues Releases Wiki Activity

fixed RT#67843

Browse source
This commit is contained in:
Kenichi Ishigaki 2011-05-11 03:12:03 +00:00
parent 0c7bfca5bc
commit 9b3cdbfd0d
2 changed files with 82 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
dbdimp.c
View file

@ -714,7 +714,11 @@ sqlite_st_execute(SV *sth, imp_sth_t *imp_sth)
(sql[2] == 'M' || sql[2] == 'm') &&
(sql[3] == 'M' || sql[3] == 'm') &&
(sql[4] == 'I' || sql[4] == 'i') &&
(sql[5] == 'T' || sql[5] == 't')) ||
(sql[5] == 'T' || sql[5] == 't'))) {
DBIc_off(imp_dbh, DBIcf_BegunWork);
DBIc_on(imp_dbh, DBIcf_AutoCommit);
}
else if (
((sql[0] == 'R' || sql[0] == 'r') &&
(sql[1] == 'O' || sql[1] == 'o') &&
(sql[2] == 'L' || sql[2] == 'l') &&
@ -723,10 +727,41 @@ sqlite_st_execute(SV *sth, imp_sth_t *imp_sth)
(sql[5] == 'A' || sql[5] == 'a') &&
(sql[6] == 'C' || sql[6] == 'c') &&
(sql[7] == 'K' || sql[7] == 'k'))) {
int l = strlen(sql);
bool is_savepoint = FALSE;
for(i = 8; i < l; i++) {
if (sql[i] == ' ' || sql[i] == '\t') continue;
if (sql[i] == 'T' || sql[i] == 't') {
if ((sql[i+0] == 'T' || sql[i+0] == 't') &&
(sql[i+1] == 'R' || sql[i+1] == 'r') &&
(sql[i+2] == 'A' || sql[i+2] == 'a') &&
(sql[i+3] == 'N' || sql[i+3] == 'n') &&
(sql[i+4] == 'S' || sql[i+4] == 's') &&
(sql[i+5] == 'A' || sql[i+5] == 'a') &&
(sql[i+6] == 'C' || sql[i+6] == 'c') &&
(sql[i+7] == 'T' || sql[i+7] == 't') &&
(sql[i+8] == 'I' || sql[i+8] == 'i') &&
(sql[i+9] == 'O' || sql[i+9] == 'o') &&
(sql[i+10] == 'N' || sql[i+10] == 'n')) {
i += 10; continue;
}
else if (
(sql[i+0] == 'T' || sql[i+0] == 't') &&
(sql[i+1] == 'O' || sql[i+1] == 'o') &&
(sql[i+2] == ' ' || sql[i+2] == '\t')) {
/* rolling back to a savepoint should not
change AutoCommit status */
is_savepoint = TRUE;
}
}
break;
}
if (!is_savepoint) {
DBIc_off(imp_dbh, DBIcf_BegunWork);
DBIc_on(imp_dbh, DBIcf_AutoCommit);
}
}
}
imp_sth->nrow = 0;

44
t/45_savepoints.t Normal file
View file

@ -0,0 +1,44 @@
#!/usr/bin/perl
use strict;
BEGIN {
$| = 1;
$^W = 1;
}
use t::lib::Test;
use Test::More tests => 5;
use Test::NoWarnings;
my $dbh = connect_ok(
AutoCommit => 1,
RaiseError => 1,
);
$dbh->begin_work;
$dbh->do("CREATE TABLE MST (id, lbl)");
$dbh->do("SAVEPOINT svp_0");
$dbh->do("INSERT INTO MST VALUES(1, 'ITEM1')");
$dbh->do("INSERT INTO MST VALUES(2, 'ITEM2')");
$dbh->do("INSERT INTO MST VALUES(3, 'ITEM3')");
my $ac = $dbh->{AutoCommit};
ok((not $ac), 'AC != 1 inside txn');
{
local $dbh->{AutoCommit} = $dbh->{AutoCommit};
$dbh->do("ROLLBACK TRANSACTION TO SAVEPOINT svp_0");
is $dbh->{AutoCommit}, $ac,
"rolling back savepoint doesn't alter AC";
}
is $dbh->selectrow_array("SELECT COUNT(*) FROM MST"), 0,
"savepoint rolled back";
$dbh->rollback;