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

DBD::SQLite: don't need to store a statement in imp_sth->statement as we can retrieve it from sqlite3_sql(imp_sth->stmt)

Browse source
This commit is contained in:
Kenichi Ishigaki 2009-10-20 19:27:22 +00:00
parent 0ced6f0a68
commit f8a471de36
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dbdimp.c
View file

@ -305,10 +305,6 @@ sqlite_st_prepare(SV *sth, imp_sth_t *imp_sth, char *statement, SV *attribs)
return FALSE; /* -> undef in lib/DBD/SQLite.pm */ return FALSE; /* -> undef in lib/DBD/SQLite.pm */
} }
/* store the query for later re-use if required */
/* but only when the query is properly prepared */
imp_sth->statement = savepv(statement);
DBIc_NUM_PARAMS(imp_sth) = sqlite3_bind_parameter_count(imp_sth->stmt); DBIc_NUM_PARAMS(imp_sth) = sqlite3_bind_parameter_count(imp_sth->stmt);
DBIc_NUM_FIELDS(imp_sth) = sqlite3_column_count(imp_sth->stmt); DBIc_NUM_FIELDS(imp_sth) = sqlite3_column_count(imp_sth->stmt);
DBIc_IMPSET_on(imp_sth); DBIc_IMPSET_on(imp_sth);
@ -647,16 +643,18 @@ sqlite_st_destroy(SV *sth, imp_sth_t *imp_sth)
int rc; int rc;
D_imp_dbh_from_sth; D_imp_dbh_from_sth;
/* warn("destroy statement: %s\n", imp_sth->statement); */
DBIc_ACTIVE_off(imp_sth); DBIc_ACTIVE_off(imp_sth);
if (DBIc_ACTIVE(imp_dbh)) { if (DBIc_ACTIVE(imp_dbh)) {
if (imp_sth->stmt)
sqlite_trace(sth, imp_sth, 4, form("destroy statement: %s", sqlite3_sql(imp_sth->stmt)));
/* finalize sth when active connection */ /* finalize sth when active connection */
rc = sqlite3_finalize(imp_sth->stmt); rc = sqlite3_finalize(imp_sth->stmt);
if (rc != SQLITE_OK) { if (rc != SQLITE_OK) {
sqlite_error(sth, rc, sqlite3_errmsg(imp_dbh->db)); sqlite_error(sth, rc, sqlite3_errmsg(imp_dbh->db));
} }
} }
Safefree(imp_sth->statement);
SvREFCNT_dec((SV*)imp_sth->params); SvREFCNT_dec((SV*)imp_sth->params);
SvREFCNT_dec((SV*)imp_sth->col_types); SvREFCNT_dec((SV*)imp_sth->col_types);
DBIc_IMPSET_off(imp_sth); DBIc_IMPSET_off(imp_sth);

1
dbdimp.h
View file

@ -42,7 +42,6 @@ struct imp_sth_st {
*/ */
int retval; int retval;
int nrow; int nrow;
char *statement;
AV *params; AV *params;
AV *col_types; AV *col_types;
}; };