WOOOOO SEA ORM IS GOATED

Author: RedstoneWizard08

Cargo.lock

@@ -30,10 +30,6 @@ crates_io_api = "0.12.0"
 crossbeam-channel = "0.5.15"
 ctrlc = "3.5.0"
 derive_builder = "0.20.2"
-diesel = { version = "2.3.1", features = ["chrono", "postgres"] }
-diesel-async = { version = "0.6.1", features = ["tokio", "postgres", "deadpool"], git = "https://github.com/weiznich/diesel_async" }
-diesel_migrations = "2.3.0"
-diesel-derive-enum = { version = "2.1.0", features = ["postgres"] }
 dotenvy = "0.15.7"
 duration-str = "0.17.0"
 flate2 = "1.1.2"
@@ -68,10 +64,12 @@ rsbadges = "1.1.5"
 semver = { version = "1.0.27", features = ["serde"] }
 serde = { version = "1.0.223", features = ["derive"] }
 serde_json = "1.0.145"
+serde_norway = "0.9.42"
 serde-this-or-that = "0.5.0"
-serde_yaml = "0.9.34"
 serde-xml-rs = "0.8.1"
 sha-1 = "0.10.1"
+strum = "0.27.2"
+strum_macros = "0.27.2"
 sysinfo = "0.37.0"
 tar = "0.4.44"
 tempfile = "3.22.0"
@@ -98,6 +96,10 @@ axum-tracing-opentelemetry = { version = "0.30.0" }
 opentelemetry-otlp = { version = "0.30.0", features = ["tonic"] }
 tracing-opentelemetry = { version = "0.31.0" }
 
+async-std = { version = "1.13.2", features = ["attributes", "tokio1"] }
+sea-orm = { version = "2.0.0-rc.6", features = ["runtime-tokio-rustls", "sqlx-postgres"] }
+sea-orm-migration = { version = "2.0.0-rc.6", features = ["runtime-tokio-rustls", "sqlx-postgres"] }
+
 axumite = { version = "0", path = "./crates/axumite" }
 imghdr = { version = "0", path = "./crates/imghdr", features = ["serde"] }
 include_dir = { version = "0", path = "./crates/include_dir" }
@@ -115,6 +117,8 @@ modhost-router = { version = "0", path = "./crates/modhost-router" }
 modhost-search = { version = "0", path = "./crates/modhost-search" }
 modhost-server-core = { version = "0", path = "./crates/modhost-server-core" }
 modhost-ui = { version = "0", path = "./crates/modhost-ui" }
+modhost-migrations = { version = "0", path = "./crates/modhost-migrations" }
+modhost-entities = { version = "0", path = "./crates/modhost-entities" }
 parse-wiki-text-2 = { version = "0", path = "./crates/parse-wiki-text-2" }
 quickhost = { version = "0", path = "./crates/quickhost" }
 

Cargo.toml

@@ -11,8 +11,6 @@ readme.workspace = true
 [dependencies]
 anyhow.workspace = true
 chrono.workspace = true
-diesel.workspace = true
-diesel-async.workspace = true
 indicatif.workspace = true
 itertools.workspace = true
 modhost.workspace = true
@@ -27,3 +25,4 @@ serde-this-or-that.workspace = true
 sha-1.workspace = true
 tokio.workspace = true
 tracing.workspace = true
+sea-orm.workspace = true

apps/astro-migrator/Cargo.toml

@@ -1,14 +1,14 @@
 use anyhow::Result;
 use astro_migrator::models::{Mod, ModsDump};
-use diesel::{SelectableHelper, insert_into};
-use diesel_async::RunQueryDsl;
 use indicatif::ProgressIterator;
 use itertools::Itertools;
 use modhost::init_logger;
 use modhost_config::get_config;
-use modhost_db::{NewUser, User, create_connection, run_migrations, users};
+use modhost_db::{create_connection, fresh_migrations, users};
 use modhost_search::MeilisearchService;
 use ron::ser::PrettyConfig;
+use sea_orm::ActiveModelTrait;
+use sea_orm::ActiveValue::Set;
 use std::{fs, path::PathBuf};
 use tracing::level_filters::LevelFilter;
 
@@ -17,9 +17,9 @@ pub async fn main() -> Result<()> {
     let _guard = init_logger("modhost-migrator-astro", LevelFilter::INFO)?;
 
     let config = get_config()?;
-    let pool = create_connection(Some(config.postgres.uri())).await?;
+    let db = create_connection(Some(config.postgres.uri())).await?;
 
-    run_migrations(&pool).await?;
+    fresh_migrations(&db).await?;
 
     let pkgs = config.storage.projects()?;
     let imgs = config.storage.gallery()?;
@@ -30,35 +30,31 @@ pub async fn main() -> Result<()> {
     let data = serde_json::from_str::<ModsDump>(&raw)?;
     let dump: Vec<Mod> = data.into();
 
-    let user = NewUser {
-        github_id: -1,
-        username: "ModHost Migrator".into(),
-        admin: false,
-        moderator: false,
-    };
+    let user = users::ActiveModel {
+        github_id: Set(-1),
+        username: Set("ModHost Migrator".into()),
+        admin: Set(false),
+        moderator: Set(false),
+        ..Default::default()
+    }
+    .insert(&db)
+    .await?;
 
-    let id = insert_into(users::table)
-        .values(user)
-        .returning(User::as_returning())
-        .get_result(&mut pool.get().await?)
-        .await?
-        .id;
+    let id = user.id;
 
     let mut tags = Vec::new();
 
     for item in dump.into_iter().progress() {
-        let (pkg, _) = item
-            .upload_all(id, &mut pool.get().await?, &pkgs, &imgs)
-            .await?;
+        let (pkg, _) = item.upload_all(id, &db, &pkgs, &imgs).await?;
 
         tags.extend(pkg.tags);
     }
 
-    let tags = tags.into_iter().flatten().sorted().dedup().collect_vec();
+    let tags = tags.into_iter().sorted().dedup().collect_vec();
 
     let search = MeilisearchService::new(&config)?;
 
-    search.index_projects(&mut pool.get().await?).await?;
+    search.index_projects(&db).await?;
 
     fs::write(
         tags_file,

apps/astro-migrator/src/main.rs

@@ -1,13 +1,11 @@
 use anyhow::Result;
 use chrono::{DateTime, NaiveDateTime, Utc};
-use diesel::{SelectableHelper, insert_into};
-use diesel_async::RunQueryDsl;
 use modhost_db::{
-    DbConn, NewGalleryImage, NewProject, NewProjectFile, NewProjectVersion, Project, ProjectAuthor,
-    ProjectVersion, ProjectVisibility, gallery_images, project_authors, project_versions, projects,
-    version_files,
+    DbConn, Project, ProjectVersion, ProjectVisibility, gallery_images, project_authors,
+    project_versions, projects, version_files,
 };
 use object_store::{ObjectStore, PutPayload, aws::AmazonS3};
+use sea_orm::{ActiveModelTrait, ActiveValue::Set};
 use serde::{Deserialize, Serialize};
 use serde_this_or_that::{as_bool, as_i64};
 use sha1::{Digest, Sha1};
@@ -197,92 +195,78 @@ impl Version {
     pub async fn as_ver(
         self,
         pkg: &Project,
-        db: &mut DbConn,
+        db: &DbConn,
         bucket: &AmazonS3,
     ) -> Result<ProjectVersion> {
         let (id, size) = self.upload(bucket).await?;
         let file_name = self.release_file_name.clone();
         let ver = self.into_ver(pkg);
-
-        let ver = insert_into(project_versions::table)
-            .values(ver)
-            .returning(ProjectVersion::as_returning())
-            .get_result(db)
-            .await?;
-
-        let file = NewProjectFile {
-            file_name,
-            s3_id: id.clone(),
-            sha1: id,
-            version_id: ver.id,
-            size,
-        };
-
-        insert_into(version_files::table)
-            .values(file)
-            .execute(db)
-            .await?;
+        let ver = ver.insert(db).await?;
+
+        version_files::ActiveModel {
+            file_name: Set(file_name),
+            s3_id: Set(id.clone()),
+            sha1: Set(id),
+            version_id: Set(ver.id),
+            size: Set(size),
+            ..Default::default()
+        }
+        .insert(db)
+        .await?;
 
         Ok(ver)
     }
 
-    pub fn into_ver(self, pkg: &Project) -> NewProjectVersion {
-        NewProjectVersion {
-            project: pkg.id,
-            name: self.version.clone(),
-            version_number: self.version,
-            changelog: Some("Migrated from astroneermods.space.".into()),
-            loaders: vec![Some("AstroModIntegrator".into())],
-            game_versions: vec![Some(self.astro_build)],
-            downloads: 0,
+    pub fn into_ver(self, pkg: &Project) -> project_versions::ActiveModel {
+        project_versions::ActiveModel {
+            project: Set(pkg.id),
+            name: Set(self.version.clone()),
+            version_number: Set(self.version),
+            changelog: Set(Some("Migrated from astroneermods.space.".into())),
+            loaders: Set(vec!["AstroModIntegrator".into()]),
+            game_versions: Set(vec![self.astro_build]),
+            downloads: Set(0),
+            ..Default::default()
         }
     }
 }
 
 impl Mod {
-    pub fn into_pkg(self) -> NewProject {
-        NewProject {
-            slug: self.mod_id,
-            name: self.name,
-            readme: format!("{}{}", DESC_PREFIX, self.description),
-            description: self.short_description,
-            source: None,
-            issues: None,
-            wiki: None,
-            tags: self.tags.into_iter().map(Some).collect(),
-            visibility: if self.published {
+    pub fn into_pkg(self) -> projects::ActiveModel {
+        projects::ActiveModel {
+            slug: Set(self.mod_id),
+            name: Set(self.name),
+            readme: Set(format!("{}{}", DESC_PREFIX, self.description)),
+            description: Set(self.short_description),
+            source: Set(None),
+            issues: Set(None),
+            wiki: Set(None),
+            tags: Set(self.tags),
+            visibility: Set(if self.published {
                 ProjectVisibility::Public
             } else {
                 ProjectVisibility::Private
-            },
-            license: Some(self.license),
+            }),
+            license: Set(Some(self.license)),
+            ..Default::default()
         }
     }
 
     pub async fn upload_all(
         self,
         user_id: i32,
-        db: &mut DbConn,
+        db: &DbConn,
         bucket: &AmazonS3,
         imgs: &AmazonS3,
     ) -> Result<(Project, Vec<ProjectVersion>)> {
-        let pkg = self.clone().into_pkg();
-
-        let pkg = insert_into(projects::table)
-            .values(pkg)
-            .returning(Project::as_returning())
-            .get_result(db)
-            .await?;
-
-        let author = ProjectAuthor {
-            user_id,
-            project: pkg.id,
-        };
+        let pkg = self.clone().into_pkg().insert(db).await?;
 
-        insert_into(project_authors::table)
-            .values(author)
-            .execute(db)
-            .await?;
+        project_authors::ActiveModel {
+            user_id: Set(user_id),
+            project: Set(pkg.id),
+        }
+        .insert(db)
+        .await?;
 
         let imgs_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
             .join("mods")
@@ -304,18 +288,16 @@ impl Mod {
             )
             .await?;
 
-            let img_data = NewGalleryImage {
-                name: self.mod_id.clone(),
-                description: None,
-                ordering: 0, // We want this to be first, but easily allow the user to override it.
-                project: pkg.id,
-                s3_id: img_id,
-            };
-
-            insert_into(gallery_images::table)
-                .values(img_data)
-                .execute(db)
-                .await?;
+            gallery_images::ActiveModel {
+                name: Set(self.mod_id.clone()),
+                description: Set(None),
+                ordering: Set(0), // We want this to be first, but easily allow the user to override it.
+                project: Set(pkg.id),
+                s3_id: Set(img_id),
+                ..Default::default()
+            }
+            .insert(db)
+            .await?;
         } else {
             println!("No image: {}", self.mod_id);
         }

apps/astro-migrator/src/models.rs

@@ -10,8 +10,6 @@ readme.workspace = true
 
 [dependencies]
 anyhow.workspace = true
-diesel.workspace = true
-diesel-async.workspace = true
 dotenvy.workspace = true
 flate2.workspace = true
 http-body-util.workspace = true
@@ -28,3 +26,4 @@ sha-1.workspace = true
 tar.workspace = true
 tokio.workspace = true
 tracing.workspace = true
+sea-orm.workspace = true