simcop2387/DBD-SQLite-SQLcipher
1
0
Fork 0
mirror of https://github.com/DBD-SQLite/DBD-SQLite synced 2025-06-08 06:38:12 -04:00
Code Issues Releases Wiki Activity

DBD::SQLite: more cleanup

Browse source
This commit is contained in:
Kenichi Ishigaki 2009-10-18 13:11:07 +00:00
parent 26cde8f98c
commit 3d8e897d58
1 changed files with 39 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
dbdimp.c
View file

@ -96,8 +96,8 @@ sqlite_db_login(SV *dbh, imp_dbh_t *imp_dbh, char *dbname, char *user, char *pas
sqlite3_busy_timeout(imp_dbh->db, SQL_TIMEOUT); sqlite3_busy_timeout(imp_dbh->db, SQL_TIMEOUT);
rc = sqlite3_exec(imp_dbh->db, "PRAGMA empty_result_callbacks = ON", NULL, NULL, &errmsg); rc = sqlite3_exec(imp_dbh->db, "PRAGMA empty_result_callbacks = ON", NULL, NULL, &errmsg);
if (rc != SQLITE_OK) { if ( rc != SQLITE_OK ) {
/* warn("failed to set pragma: %s\n", errmsg); */ /* warn("failed to set pragma: %s\n", errmsg); */
sqlite_error(dbh, (imp_xxh_t*)imp_dbh, rc, errmsg); sqlite_error(dbh, (imp_xxh_t*)imp_dbh, rc, errmsg);
if (errmsg) if (errmsg)
sqlite3_free(errmsg); sqlite3_free(errmsg);
@ -106,8 +106,8 @@ sqlite_db_login(SV *dbh, imp_dbh_t *imp_dbh, char *dbname, char *user, char *pas
} }
rc = sqlite3_exec(imp_dbh->db, "PRAGMA show_datatypes = ON", NULL, NULL, &errmsg); rc = sqlite3_exec(imp_dbh->db, "PRAGMA show_datatypes = ON", NULL, NULL, &errmsg);
if (rc != SQLITE_OK) { if ( rc != SQLITE_OK ) {
/* warn("failed to set pragma: %s\n", errmsg); */ /* warn("failed to set pragma: %s\n", errmsg); */
sqlite_error(dbh, (imp_xxh_t*)imp_dbh, rc, errmsg); sqlite_error(dbh, (imp_xxh_t*)imp_dbh, rc, errmsg);
if (errmsg) if (errmsg)
sqlite3_free(errmsg); sqlite3_free(errmsg);
@ -133,20 +133,21 @@ sqlite_db_login(SV *dbh, imp_dbh_t *imp_dbh, char *dbname, char *user, char *pas
} }
int int
sqlite_db_busy_timeout (pTHX_ SV *dbh, int timeout ) sqlite_db_busy_timeout(pTHX_ SV *dbh, int timeout )
{ {
D_imp_dbh(dbh); D_imp_dbh(dbh);
if (timeout) { if (timeout) {
imp_dbh->timeout = timeout; imp_dbh->timeout = timeout;
sqlite3_busy_timeout(imp_dbh->db, timeout); sqlite3_busy_timeout(imp_dbh->db, timeout);
} }
return imp_dbh->timeout; return imp_dbh->timeout;
} }
int int
sqlite_db_disconnect (SV *dbh, imp_dbh_t *imp_dbh) sqlite_db_disconnect(SV *dbh, imp_dbh_t *imp_dbh)
{ {
dTHX; dTHX;
int rc;
sqlite3_stmt *pStmt; sqlite3_stmt *pStmt;
DBIc_ACTIVE_off(imp_dbh); DBIc_ACTIVE_off(imp_dbh);
@ -154,11 +155,12 @@ sqlite_db_disconnect (SV *dbh, imp_dbh_t *imp_dbh)
sqlite_db_rollback(dbh, imp_dbh); sqlite_db_rollback(dbh, imp_dbh);
} }
while ( (pStmt = sqlite3_next_stmt(imp_dbh->db, 0))!=0 ) { while ( (pStmt = sqlite3_next_stmt(imp_dbh->db, 0)) != SQLITE_OK ) {
sqlite3_finalize(pStmt); sqlite3_finalize(pStmt);
} }
if (sqlite3_close(imp_dbh->db) == SQLITE_BUSY) { rc = sqlite3_close(imp_dbh->db);
if (rc == SQLITE_BUSY) {
/* active statements! */ /* active statements! */
warn("closing dbh with active statement handles"); warn("closing dbh with active statement handles");
} }
@ -180,7 +182,7 @@ sqlite_db_disconnect (SV *dbh, imp_dbh_t *imp_dbh)
} }
void void
sqlite_db_destroy (SV *dbh, imp_dbh_t *imp_dbh) sqlite_db_destroy(SV *dbh, imp_dbh_t *imp_dbh)
{ {
dTHX; dTHX;
if (DBIc_ACTIVE(imp_dbh)) { if (DBIc_ACTIVE(imp_dbh)) {
@ -198,7 +200,7 @@ int
sqlite_db_rollback(SV *dbh, imp_dbh_t *imp_dbh) sqlite_db_rollback(SV *dbh, imp_dbh_t *imp_dbh)
{ {
dTHX; dTHX;
int retval; int rc;
char *errmsg; char *errmsg;
if (DBIc_is(imp_dbh, DBIcf_BegunWork)) { if (DBIc_is(imp_dbh, DBIcf_BegunWork)) {
@ -207,12 +209,12 @@ sqlite_db_rollback(SV *dbh, imp_dbh_t *imp_dbh)
} }
if (!sqlite3_get_autocommit(imp_dbh->db)) { if (!sqlite3_get_autocommit(imp_dbh->db)) {
sqlite_trace(dbh, (imp_xxh_t*)imp_dbh, 2, "ROLLBACK TRAN"); sqlite_trace(dbh, (imp_xxh_t*)imp_dbh, 2, "ROLLBACK TRAN");
if ((retval = sqlite3_exec(imp_dbh->db, "ROLLBACK TRANSACTION",
NULL, NULL, &errmsg)) rc = sqlite3_exec(imp_dbh->db, "ROLLBACK TRANSACTION", NULL, NULL, &errmsg);
!= SQLITE_OK) if (rc != SQLITE_OK) {
{ sqlite_error(dbh, (imp_xxh_t*)imp_dbh, rc, errmsg);
sqlite_error(dbh, (imp_xxh_t*)imp_dbh, retval, errmsg);
if (errmsg) if (errmsg)
sqlite3_free(errmsg); sqlite3_free(errmsg);
return FALSE; /* -> &sv_no in SQLite.xsi */ return FALSE; /* -> &sv_no in SQLite.xsi */
@ -226,11 +228,11 @@ int
sqlite_db_commit(SV *dbh, imp_dbh_t *imp_dbh) sqlite_db_commit(SV *dbh, imp_dbh_t *imp_dbh)
{ {
dTHX; dTHX;
int retval; int rc;
char *errmsg; char *errmsg;
if (DBIc_is(imp_dbh, DBIcf_AutoCommit)) { if (DBIc_is(imp_dbh, DBIcf_AutoCommit)) {
/* We don't need to warn, because the DBI layer will do it for us */ /* We don't need to warn, because the DBI layer will do it for us */
return TRUE; return TRUE;
} }
@ -241,16 +243,16 @@ sqlite_db_commit(SV *dbh, imp_dbh_t *imp_dbh)
if (!sqlite3_get_autocommit(imp_dbh->db)) { if (!sqlite3_get_autocommit(imp_dbh->db)) {
sqlite_trace(dbh, (imp_xxh_t*)imp_dbh, 2, "COMMIT TRAN"); sqlite_trace(dbh, (imp_xxh_t*)imp_dbh, 2, "COMMIT TRAN");
if ((retval = sqlite3_exec(imp_dbh->db, "COMMIT TRANSACTION",
NULL, NULL, &errmsg)) rc = sqlite3_exec(imp_dbh->db, "COMMIT TRANSACTION", NULL, NULL, &errmsg);
!= SQLITE_OK) if (rc != SQLITE_OK) {
{ sqlite_error(dbh, (imp_xxh_t*)imp_dbh, rc, errmsg);
sqlite_error(dbh, (imp_xxh_t*)imp_dbh, retval, errmsg);
if (errmsg) if (errmsg)
sqlite3_free(errmsg); sqlite3_free(errmsg);
return FALSE; /* -> &sv_no in SQLite.xsi */ return FALSE; /* -> &sv_no in SQLite.xsi */
} }
} }
return TRUE; return TRUE;
} }
@ -269,13 +271,12 @@ sqlite_db_last_insert_id(SV *dbh, imp_dbh_t *imp_dbh, SV *catalog, SV *schema, S
} }
int int
sqlite_st_prepare (SV *sth, imp_sth_t *imp_sth, sqlite_st_prepare(SV *sth, imp_sth_t *imp_sth, char *statement, SV *attribs)
char *statement, SV *attribs)
{ {
dTHX; dTHX;
D_imp_dbh_from_sth; int rc = 0;
const char *extra; const char *extra;
int retval = 0; D_imp_dbh_from_sth;
if (!DBIc_ACTIVE(imp_dbh)) { if (!DBIc_ACTIVE(imp_dbh)) {
sqlite_error(sth, (imp_xxh_t*)imp_sth, -2, "attempt to prepare on inactive database handle"); sqlite_error(sth, (imp_xxh_t*)imp_sth, -2, "attempt to prepare on inactive database handle");
@ -293,13 +294,13 @@ sqlite_st_prepare (SV *sth, imp_sth_t *imp_sth,
imp_sth->params = newAV(); imp_sth->params = newAV();
imp_sth->col_types = newAV(); imp_sth->col_types = newAV();
if ((retval = sqlite3_prepare_v2(imp_dbh->db, statement, -1, &(imp_sth->stmt), &extra)) rc = sqlite3_prepare_v2(imp_dbh->db, statement, -1, &(imp_sth->stmt), &extra);
!= SQLITE_OK) if (rc != SQLITE_OK) {
{ sqlite_error(sth, (imp_xxh_t*)imp_sth, rc, (char*)sqlite3_errmsg(imp_dbh->db));
sqlite_error(sth, (imp_xxh_t*)imp_sth, retval, (char*)sqlite3_errmsg(imp_dbh->db));
if (imp_sth->stmt) { if (imp_sth->stmt) {
if ((retval = sqlite3_finalize(imp_sth->stmt)) != SQLITE_OK) { rc = sqlite3_finalize(imp_sth->stmt);
sqlite_error(sth, (imp_xxh_t*)imp_sth, retval, (char*)sqlite3_errmsg(imp_dbh->db)); if (rc != SQLITE_OK) {
sqlite_error(sth, (imp_xxh_t*)imp_sth, rc, (char*)sqlite3_errmsg(imp_dbh->db));
} }
} }
return FALSE; /* -> undef in lib/DBD/SQLite.pm */ return FALSE; /* -> undef in lib/DBD/SQLite.pm */