maintain names as constants

crates/kitsune-db/src/lib.rs

@@ -67,13 +67,8 @@ pub async fn connect(config: &DatabaseConfig) -> Result<PgPool> {
     {
         let mut conn = pool.get().await?;
 
-        kitsune_language::generate_postgres_enum(&mut conn, "language_iso_code").await?;
-        kitsune_language::generate_regconfig_function(
-            &mut conn,
-            "iso_code_to_language",
-            "language_iso_code",
-        )
-        .await?;
+        kitsune_language::generate_postgres_enum(&mut conn).await?;
+        kitsune_language::generate_regconfig_function(&mut conn).await?;
     }
 
     Ok(pool)

crates/kitsune-language/src/pg_enum.rs

@@ -3,6 +3,8 @@ use diesel::{pg::Pg, row::NamedRow, QueryResult, QueryableByName};
 use diesel_async::{AsyncConnection, RunQueryDsl};
 use std::fmt::Write;
 
+pub const ENUM_NAME: &str = "kitsune.language_iso_code";
+
 struct CountResult {
     count: i64,
 }
@@ -16,12 +18,12 @@ impl QueryableByName<Pg> for CountResult {
 }
 
 /// Generate a PostgreSQL enum definition of all supported ISO language codes
-pub async fn generate_postgres_enum<C>(conn: &mut C, enum_name: &str) -> QueryResult<()>
+pub async fn generate_postgres_enum<C>(conn: &mut C) -> QueryResult<()>
 where
     C: AsyncConnection<Backend = Pg>,
 {
     let language_count: CountResult = diesel::sql_query(format!(
-        "SELECT COUNT(1) AS count FROM UNNEST(ENUM_RANGE(NULL::{enum_name}));"
+        "SELECT COUNT(1) AS count FROM UNNEST(ENUM_RANGE(NULL::{ENUM_NAME}));"
     ))
     .get_result(conn)
     .await?;
@@ -35,7 +37,7 @@ where
     let queries = supported_languages().fold(String::new(), |mut out, lang| {
         write!(
             out,
-            "ALTER TYPE {enum_name} ADD VALUE IF NOT EXISTS '{}';",
+            "ALTER TYPE {ENUM_NAME} ADD VALUE IF NOT EXISTS '{}';",
             lang.to_639_3()
         )
         .unwrap();

crates/kitsune-language/src/regconfig.rs

@@ -1,8 +1,10 @@
-use crate::supported_languages;
+use crate::{pg_enum::ENUM_NAME, supported_languages};
 use diesel::{deserialize, pg::Pg, row::NamedRow, sql_types, QueryableByName};
 use diesel_async::{AsyncConnection, RunQueryDsl};
 use std::{collections::HashSet, fmt::Write};
 
+const FUNCTION_NAME: &str = "kitsune.iso_code_to_language";
+
 #[derive(Debug)]
 struct PgCatalogResult {
     cfgname: String,
@@ -16,11 +18,7 @@ impl QueryableByName<Pg> for PgCatalogResult {
     }
 }
 
-pub async fn generate_regconfig_function<C>(
-    conn: &mut C,
-    function_name: &str,
-    enum_name: &str,
-) -> diesel::QueryResult<()>
+pub async fn generate_regconfig_function<C>(conn: &mut C) -> diesel::QueryResult<()>
 where
     C: AsyncConnection<Backend = Pg>,
 {
@@ -36,7 +34,7 @@ where
 
     let mut function = format!(
         r#"
-        CREATE OR REPLACE FUNCTION {function_name} ({enum_name})
+        CREATE OR REPLACE FUNCTION {FUNCTION_NAME} ({ENUM_NAME})
             RETURNS regconfig
             AS $$
                 SELECT CASE $1