Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions crates/crates_io_database_dump/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,6 @@ zip = { version = "=2.2.0", default-features = false, features = ["deflate"] }
[dev-dependencies]
crates_io_test_db = { path = "../crates_io_test_db" }
diesel = "=2.2.4"
diesel-async = { version = "=0.5.1", features = ["postgres"] }
insta = { version = "=1.41.1", features = ["glob"] }
tokio = { version = "=1.41.1", features = ["macros", "rt"] }
12 changes: 7 additions & 5 deletions crates/crates_io_database_dump/src/gen_scripts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -120,17 +120,18 @@ mod tests {
use super::*;
use crates_io_test_db::TestDatabase;
use diesel::prelude::*;
use diesel_async::{AsyncPgConnection, RunQueryDsl};
use std::collections::HashSet;
use std::iter::FromIterator;

/// Test whether the visibility configuration matches the schema of the
/// test database.
#[test]
fn check_visibility_config() {
#[tokio::test]
async fn check_visibility_config() {
let test_db = TestDatabase::new();
let mut conn = test_db.connect();
let mut conn = test_db.async_connect().await;

let db_columns = HashSet::<Column>::from_iter(get_db_columns(&mut conn));
let db_columns = HashSet::<Column>::from_iter(get_db_columns(&mut conn).await);
let vis_columns = VisibilityConfig::get()
.0
.iter()
Expand Down Expand Up @@ -186,13 +187,14 @@ mod tests {
column_name: String,
}

fn get_db_columns(conn: &mut PgConnection) -> Vec<Column> {
async fn get_db_columns(conn: &mut AsyncPgConnection) -> Vec<Column> {
use information_schema::columns;
columns::table
.select((columns::table_name, columns::column_name))
.filter(columns::table_schema.eq("public"))
.order_by((columns::table_name, columns::ordinal_position))
.load(conn)
.await
.unwrap()
}
}