structure

Author: aumetra

crates/kitsune-language/src/consts.rs

@@ -0,0 +1,2 @@
+pub const DB_ENUM_NAME: &str = "kitsune.language_iso_code";
+pub const DB_FUNCTION_NAME: &str = "kitsune.iso_code_to_language";

crates/kitsune-language/src/lib.rs

@@ -1,6 +1,7 @@
 use rustc_hash::FxHashSet;
 use std::sync::OnceLock;
 
+mod consts;
 mod detect;
 mod map;
 mod pg_enum;

crates/kitsune-language/src/pg_enum.rs

@@ -1,10 +1,8 @@
-use crate::supported_languages;
+use crate::{consts::DB_ENUM_NAME, supported_languages};
 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,
 }
@@ -23,7 +21,7 @@ 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::{DB_ENUM_NAME}));"
     ))
     .get_result(conn)
     .await?;
@@ -37,7 +35,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 {DB_ENUM_NAME} ADD VALUE IF NOT EXISTS '{}';",
             lang.to_639_3()
         )
         .unwrap();

crates/kitsune-language/src/regconfig.rs

@@ -1,10 +1,11 @@
-use crate::{pg_enum::ENUM_NAME, supported_languages};
+use crate::{
+    consts::{DB_ENUM_NAME, DB_FUNCTION_NAME},
+    supported_languages,
+};
 use diesel::{deserialize, pg::Pg, row::NamedRow, 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,
@@ -34,7 +35,7 @@ where
 
     let mut function = format!(
         r#"
-        CREATE OR REPLACE FUNCTION {FUNCTION_NAME} ({ENUM_NAME})
+        CREATE OR REPLACE FUNCTION {DB_FUNCTION_NAME} ({DB_ENUM_NAME})
             RETURNS regconfig
             AS $$
                 SELECT CASE $1