ISAR/rusqlite
3
0
Fork 0
mirror of https://github.com/isar/rusqlite.git synced 2025-09-16 12:42:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add test and fix for invalid cached column_count.

Browse Source 
Issue raised in
https://github.com/jgallagher/rusqlite/pull/113#issuecomment-220122048.
This commit is contained in:
John Gallagher
2016-05-18 22:19:04 -05:00
parent 437a06fca3
commit 74b57ee47a
2 changed files with 42 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/lib.rs
View File

@@ -720,22 +720,19 @@ pub type SqliteStatement<'conn> = Statement<'conn>;
pub struct Statement<'conn> {
conn: &'conn Connection,
stmt: RawStatement,
column_count: c_int,
}
impl<'conn> Statement<'conn> {
fn new(conn: &Connection, stmt: RawStatement) -> Statement {
let column_count = stmt.column_count();
Statement {
conn: conn,
stmt: stmt,
column_count: column_count,
}
}
/// Get all the column names in the result set of the prepared statement.
pub fn column_names(&self) -> Vec<&str> {
let n = self.column_count;
let n = self.column_count();
let mut cols = Vec::with_capacity(n as usize);
for i in 0..n {
let slice = self.stmt.column_name(i);
@@ -747,7 +744,7 @@ impl<'conn> Statement<'conn> {
/// Return the number of columns in the result set returned by the prepared statement.
pub fn column_count(&self) -> i32 {
self.column_count
self.stmt.column_count()
}
/// Returns the column index in the result set for a given column name.
@@ -757,7 +754,7 @@ impl<'conn> Statement<'conn> {
/// Will return an `Error::InvalidColumnName` when there is no column with the specified `name`.
pub fn column_index(&self, name: &str) -> Result<i32> {
let bytes = name.as_bytes();
let n = self.column_count;
let n = self.column_count();
for i in 0..n {
if bytes == self.stmt.column_name(i).to_bytes() {
return Ok(i);
@@ -799,7 +796,7 @@ impl<'conn> Statement<'conn> {
self.stmt.reset();
match r {
ffi::SQLITE_DONE => {
if self.column_count == 0 {
if self.column_count() == 0 {
Ok(self.conn.changes())
} else {
Err(Error::ExecuteReturnedResults)
@@ -1166,7 +1163,7 @@ pub trait RowIndex {
impl RowIndex for i32 {
#[inline]
fn idx(&self, stmt: &Statement) -> Result<i32> {
if *self < 0 || *self >= stmt.column_count {
if *self < 0 || *self >= stmt.column_count() {
Err(Error::InvalidColumnIndex(*self))
} else {
Ok(*self)