Skip to content

Commit e8d372d

Browse files
committed
Make execute return a u64 instead of usize
1 parent dec549b commit e8d372d

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

src/lib.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,7 +1045,7 @@ impl Connection {
10451045
/// or execution of the statement.
10461046
///
10471047
/// On success, returns the number of rows modified or 0 if not applicable.
1048-
pub fn execute(&self, query: &str, params: &[&ToSql]) -> Result<usize> {
1048+
pub fn execute(&self, query: &str, params: &[&ToSql]) -> Result<u64> {
10491049
let (param_types, result_desc) = try!(self.conn.borrow_mut().raw_prepare("", query));
10501050
let stmt = Statement {
10511051
conn: self,
@@ -1211,7 +1211,7 @@ impl<'conn> Transaction<'conn> {
12111211
}
12121212

12131213
/// Like `Connection::execute`.
1214-
pub fn execute(&self, query: &str, params: &[&ToSql]) -> Result<usize> {
1214+
pub fn execute(&self, query: &str, params: &[&ToSql]) -> Result<u64> {
12151215
self.conn.execute(query, params)
12161216
}
12171217

@@ -1405,7 +1405,7 @@ impl<'conn> Statement<'conn> {
14051405
/// Err(err) => println!("Error executing query: {:?}", err)
14061406
/// }
14071407
/// ```
1408-
pub fn execute(&self, params: &[&ToSql]) -> Result<usize> {
1408+
pub fn execute(&self, params: &[&ToSql]) -> Result<u64> {
14091409
check_desync!(self.conn);
14101410
try!(self.inner_execute("", 0, params));
14111411

@@ -1874,7 +1874,7 @@ impl<'a> CopyInStatement<'a> {
18741874
/// set in memory.
18751875
///
18761876
/// Returns the number of rows copied.
1877-
pub fn execute<I, J>(&self, rows: I) -> Result<usize>
1877+
pub fn execute<I, J>(&self, rows: I) -> Result<u64>
18781878
where I: Iterator<Item=J>, J: StreamIterator {
18791879
let mut conn = self.conn.conn.borrow_mut();
18801880

@@ -2004,7 +2004,7 @@ pub trait GenericConnection {
20042004
fn prepare_cached<'a>(&'a self, query: &str) -> Result<Statement<'a>>;
20052005

20062006
/// Like `Connection::execute`.
2007-
fn execute(&self, query: &str, params: &[&ToSql]) -> Result<usize>;
2007+
fn execute(&self, query: &str, params: &[&ToSql]) -> Result<u64>;
20082008

20092009
/// Like `Connection::prepare_copy_in`.
20102010
fn prepare_copy_in<'a>(&'a self, table: &str, columns: &[&str])
@@ -2029,7 +2029,7 @@ impl GenericConnection for Connection {
20292029
self.prepare_cached(query)
20302030
}
20312031

2032-
fn execute(&self, query: &str, params: &[&ToSql]) -> Result<usize> {
2032+
fn execute(&self, query: &str, params: &[&ToSql]) -> Result<u64> {
20332033
self.execute(query, params)
20342034
}
20352035

@@ -2060,7 +2060,7 @@ impl<'a> GenericConnection for Transaction<'a> {
20602060
self.prepare_cached(query)
20612061
}
20622062

2063-
fn execute(&self, query: &str, params: &[&ToSql]) -> Result<usize> {
2063+
fn execute(&self, query: &str, params: &[&ToSql]) -> Result<u64> {
20642064
self.execute(query, params)
20652065
}
20662066

src/util.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ pub fn comma_join<'a, W, I>(writer: &mut W, strs: I) -> IoResult<()>
1313
Ok(())
1414
}
1515

16-
pub fn parse_update_count(tag: String) -> usize {
16+
pub fn parse_update_count(tag: String) -> u64 {
1717
tag.split(' ').last().unwrap().parse().unwrap_or(0)
1818
}

0 commit comments

Comments
 (0)