mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-06-17 12:50:33 +00:00
5d837780f5
* Moving settings to Database. - Moves many settings into the database. Fixes #2285 - Adds a local_site and instance table. Fixes #2365 . Fixes #2368 - Separates SQL update an insert forms, to avoid runtime errors. - Adds TypedBuilder to all the SQL forms, instead of default. * Fix weird clippy issue. * Removing extra lines. * Some fixes from suggestions. * Fixing apub tests. * Using instance creation helper function. * Move forms to their own line. * Trying to fix local_site_data, still broken. * Testing out async * Testing out async 2 * Fixing federation tests. * Trying to fix check features 1. * Starting on adding diesel async. 1/4th done. * Added async to views and schema. * Adding some more async * Compiling now. * Added diesel async. Fixes #2465 * Running clippy --fix * Trying to fix cargo test on drone. * Trying new muslrust. * Trying a custom dns * Trying a custom dns 2 * Trying a custom dns 3 * Trying a custom dns 4 * Trying a custom dns 5 * Trying a custom dns 6 * Trying a custom dns 7 * Addressing PR comments. * Adding check_apub to all verify functions. * Reverting back drone. * Fixing merge * Fix docker images. * Adding missing discussion_languages. * Trying to fix federation tests. * Fix site setup user creation. * Fix clippy * Fix clippy 2 * Test api faster * Try to fix 1 * Try to fix 2 * What are these lines about * Trying to fix 3 * Moving federation test back to top. * Remove logging cat.
67 lines
1.7 KiB
Rust
67 lines
1.7 KiB
Rust
use crate::{
|
|
diesel::ExpressionMethods,
|
|
newtypes::LanguageId,
|
|
schema::language::dsl::*,
|
|
source::language::Language,
|
|
utils::{get_conn, DbPool},
|
|
};
|
|
use diesel::{result::Error, QueryDsl};
|
|
use diesel_async::{AsyncPgConnection, RunQueryDsl};
|
|
|
|
impl Language {
|
|
pub async fn read_all(pool: &DbPool) -> Result<Vec<Language>, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
Self::read_all_conn(conn).await
|
|
}
|
|
|
|
pub async fn read_all_conn(conn: &mut AsyncPgConnection) -> Result<Vec<Language>, Error> {
|
|
language.load::<Self>(conn).await
|
|
}
|
|
|
|
pub async fn read_from_id(pool: &DbPool, id_: LanguageId) -> Result<Language, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
language.filter(id.eq(id_)).first::<Self>(conn).await
|
|
}
|
|
|
|
pub async fn read_id_from_code(pool: &DbPool, code_: &str) -> Result<LanguageId, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
Ok(
|
|
language
|
|
.filter(code.eq(code_))
|
|
.first::<Self>(conn)
|
|
.await?
|
|
.id,
|
|
)
|
|
}
|
|
|
|
pub async fn read_id_from_code_opt(
|
|
pool: &DbPool,
|
|
code_: Option<&str>,
|
|
) -> Result<Option<LanguageId>, Error> {
|
|
if let Some(code_) = code_ {
|
|
Ok(Some(Language::read_id_from_code(pool, code_).await?))
|
|
} else {
|
|
Ok(None)
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use crate::{source::language::Language, utils::build_db_pool_for_tests};
|
|
use serial_test::serial;
|
|
|
|
#[tokio::test]
|
|
#[serial]
|
|
async fn test_languages() {
|
|
let pool = &build_db_pool_for_tests().await;
|
|
|
|
let all = Language::read_all(pool).await.unwrap();
|
|
|
|
assert_eq!(184, all.len());
|
|
assert_eq!("ak", all[5].code);
|
|
assert_eq!("lv", all[99].code);
|
|
assert_eq!("yi", all[179].code);
|
|
}
|
|
}
|