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

Make column_name() public

Browse Source 
Changes it's interface to Option<&str> to accommodate for out of bounds index
This commit is contained in:
Pro
2019-08-22 16:37:13 +02:00
parent 692b4b67dc
commit d46eb23364
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/row.rs
View File

@@ -224,7 +224,7 @@ impl<'stmt> Row<'stmt> {
let value = self.stmt.value_ref(idx);
FromSql::column_result(value).map_err(|err| match err {
FromSqlError::InvalidType => {
Error::InvalidColumnType(idx, self.stmt.column_name(idx).into(), value.data_type())
Error::InvalidColumnType(idx, self.stmt.column_name(idx).unwrap().into(), value.data_type())
}
FromSqlError::OutOfRange(i) => Error::IntegralValueOutOfRange(idx, i),
FromSqlError::Other(err) => {
@@ -232,11 +232,11 @@ impl<'stmt> Row<'stmt> {
}
#[cfg(feature = "i128_blob")]
FromSqlError::InvalidI128Size(_) => {
Error::InvalidColumnType(idx, self.stmt.column_name(idx).into(), value.data_type())
Error::InvalidColumnType(idx, self.stmt.column_name(idx).unwrap().into(), value.data_type())
}
#[cfg(feature = "uuid")]
FromSqlError::InvalidUuidSize(_) => {
Error::InvalidColumnType(idx, self.stmt.column_name(idx).into(), value.data_type())
Error::InvalidColumnType(idx, self.stmt.column_name(idx).unwrap().into(), value.data_type())
}
})
}