Skip to content

Commit

Permalink
fix more tests (BigInt not inferred to be i64)
Browse files Browse the repository at this point in the history
  • Loading branch information
Ten0 committed Dec 28, 2020
1 parent a312528 commit c460715
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 20 deletions.
4 changes: 2 additions & 2 deletions diesel_tests/tests/delete.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ fn delete_records() {

assert_eq!(Ok(1), deleted_rows);

let num_users = users.count().first(&connection);
let num_users = users.count().first::<i64>(&connection);

assert_eq!(Ok(1), num_users);
}
Expand Down Expand Up @@ -39,6 +39,6 @@ fn return_deleted_records() {
.get_result(&connection);
assert_eq!(Ok("Sean".to_string()), deleted_name);

let num_users = users.count().first(&connection);
let num_users = users.count().first::<i64>(&connection);
assert_eq!(Ok(1), num_users);
}
8 changes: 4 additions & 4 deletions diesel_tests/tests/expressions/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,25 @@ fn test_count_counts_the_rows() {
let connection = connection();
let source = users.select(count(id));

assert_eq!(Ok(0), source.first(&connection));
assert_eq!(Ok(0), source.first::<i64>(&connection));
insert_into(users)
.values(&NewUser::new("Sean", None))
.execute(&connection)
.unwrap();
assert_eq!(Ok(1), source.first(&connection));
assert_eq!(Ok(1), source.first::<i64>(&connection));
}

#[test]
fn test_count_star() {
let connection = connection();
let source = users.count();

assert_eq!(Ok(0), source.first(&connection));
assert_eq!(Ok(0), source.first::<i64>(&connection));
insert_into(users)
.values(&NewUser::new("Sean", None))
.execute(&connection)
.unwrap();
assert_eq!(Ok(1), source.first(&connection));
assert_eq!(Ok(1), source.first::<i64>(&connection));

// Ensure we're doing COUNT(*) instead of COUNT(table.*) which is going to be more efficient
assert!(debug_query::<TestBackend, _>(&source)
Expand Down
26 changes: 17 additions & 9 deletions diesel_tests/tests/expressions/ops.rs
Original file line number Diff line number Diff line change
Expand Up @@ -210,11 +210,13 @@ fn test_adding_unsigned() {
.unwrap();

let expected_data = vec![2, 3];
let data = unsigned_table.select(value + 1).load(&connection);
let data = unsigned_table.select(value + 1).load::<u32>(&connection);
assert_eq!(Ok(expected_data), data);

let expected_data = vec![2, 4];
let data = unsigned_table.select(value + value).load(&connection);
let data = unsigned_table
.select(value + value)
.load::<u32>(&connection);
assert_eq!(Ok(expected_data), data);
}

Expand All @@ -228,11 +230,13 @@ fn test_subtracting_unsigned() {
.unwrap();

let expected_data = vec![0, 1];
let data = unsigned_table.select(value - 1).load(&connection);
let data = unsigned_table.select(value - 1).load::<u32>(&connection);
assert_eq!(Ok(expected_data), data);

let expected_data = vec![0, 0];
let data = unsigned_table.select(value - value).load(&connection);
let data = unsigned_table
.select(value - value)
.load::<u32>(&connection);
assert_eq!(Ok(expected_data), data);
}

Expand All @@ -246,11 +250,13 @@ fn test_multiplying_unsigned() {
.unwrap();

let expected_data = vec![1, 2];
let data = unsigned_table.select(value * 1).load(&connection);
let data = unsigned_table.select(value * 1).load::<u32>(&connection);
assert_eq!(Ok(expected_data), data);

let expected_data = vec![1, 4];
let data = unsigned_table.select(value * value).load(&connection);
let data = unsigned_table
.select(value * value)
.load::<u32>(&connection);
assert_eq!(Ok(expected_data), data);
}

Expand All @@ -264,11 +270,13 @@ fn test_dividing_unsigned() {
.unwrap();

let expected_data = vec![1, 2];
let data = unsigned_table.select(value / 1).load(&connection);
let data = unsigned_table.select(value / 1).load::<u32>(&connection);
assert_eq!(Ok(expected_data), data);

let expected_data = vec![1, 1];
let data = unsigned_table.select(value / value).load(&connection);
let data = unsigned_table
.select(value / value)
.load::<u32>(&connection);
assert_eq!(Ok(expected_data), data);
}

Expand All @@ -282,6 +290,6 @@ fn test_multiple_unsigned() {
.unwrap();

let expected_data = vec![1, 1];
let data = unsigned_table.select(value / id).load(&connection);
let data = unsigned_table.select(value / id).load::<u32>(&connection);
assert_eq!(Ok(expected_data), data);
}
8 changes: 4 additions & 4 deletions diesel_tests/tests/filter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -330,14 +330,14 @@ fn or_doesnt_mess_with_precedence_of_previous_statements() {
.filter(f)
.filter(f.or(true.into_sql::<sql_types::Bool>()))
.count()
.first(&connection);
.first::<i64>(&connection);

assert_eq!(Ok(0), count);

let count = users
.filter(f.or(f).and(f.or(true.into_sql::<sql_types::Bool>())))
.count()
.first(&connection);
.first::<i64>(&connection);

assert_eq!(Ok(0), count);
}
Expand All @@ -352,7 +352,7 @@ fn not_does_not_affect_expressions_other_than_those_passed_to_it() {
.filter(not(name.eq("Tess")))
.filter(id.eq(1))
.count()
.get_result(&connection);
.get_result::<i64>(&connection);

assert_eq!(Ok(1), count);
}
Expand All @@ -366,7 +366,7 @@ fn not_affects_arguments_passed_when_they_contain_higher_operator_precedence() {
let count = users
.filter(not(name.eq("Tess").and(id.eq(1))))
.count()
.get_result(&connection);
.get_result::<i64>(&connection);

assert_eq!(Ok(2), count);
}
Expand Down
2 changes: 1 addition & 1 deletion diesel_tests/tests/insert.rs
Original file line number Diff line number Diff line change
Expand Up @@ -609,5 +609,5 @@ fn batch_insert_is_atomic_on_sqlite() {
let result = insert_into(users).values(&new_users).execute(&connection);
assert!(result.is_err());

assert_eq!(Ok(0), users.count().get_result(&connection));
assert_eq!(Ok(0), users.count().get_result::<i64>(&connection));
}

0 comments on commit c460715

Please sign in to comment.