alemi/upub
alemi/upub
1
0
Fork 1
Code Issues 4 Pull requests Projects Releases Packages 1 Wiki Activity Actions

chore: bump sea_orm to 1.0

Browse source
This commit is contained in:
əlemi 2024-08-11 12:55:27 +02:00
parent 2bbc1270a1
commit e7e8653ce2
Signed by: alemi
GPG key ID: A4895B84D311642C
10 changed files with 246 additions and 219 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

446
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

2
Cargo.toml
View file

@ -35,7 +35,7 @@ clap = { version = "4.5", features = ["derive"] }
signal-hook = "0.3" signal-hook = "0.3"
signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] } signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
tokio = { version = "1.35", features = ["full"] } # TODO slim this down tokio = { version = "1.35", features = ["full"] } # TODO slim this down
sea-orm = { version = "0.12", features = ["sqlx-sqlite", "sqlx-postgres", "runtime-tokio-rustls"] } sea-orm = { version = "1.0", features = ["sqlx-sqlite", "sqlx-postgres", "runtime-tokio-rustls"] }
futures = "0.3" futures = "0.3"
upub = { path = "upub/core" } upub = { path = "upub/core" }

2
apb/Cargo.toml
View file

@ -19,7 +19,7 @@ thiserror = "1"
paste = "1.0" paste = "1.0"
tracing = "0.1" tracing = "0.1"
serde_json = { version = "1", optional = true } serde_json = { version = "1", optional = true }
sea-orm = { version = "0.12", optional = true, default-features = false } sea-orm = { version = "1.0", optional = true, default-features = false }
reqwest = { version = "0.12", features = ["json"], optional = true } reqwest = { version = "0.12", features = ["json"], optional = true }
[features] [features]

2
apb/src/macros.rs
View file

@ -97,7 +97,7 @@ macro_rules! strenum {
} }
fn column_type() -> sea_orm::sea_query::ColumnType { fn column_type() -> sea_orm::sea_query::ColumnType {
sea_orm::sea_query::ColumnType::String(Some(24)) sea_orm::sea_query::ColumnType::String(sea_orm::sea_query::table::StringLen::N(24))
} }
} }

2
upub/cli/Cargo.toml
View file

@ -20,6 +20,6 @@ uuid = { version = "1.8", features = ["v4"] }
chrono = { version = "0.4", features = ["serde"] } chrono = { version = "0.4", features = ["serde"] }
openssl = "0.10" # TODO handle pubkeys with a smaller crate openssl = "0.10" # TODO handle pubkeys with a smaller crate
clap = { version = "4.5", features = ["derive"] } clap = { version = "4.5", features = ["derive"] }
sea-orm = "0.12" sea-orm = "1.0"
futures = "0.3" futures = "0.3"
mdhtml = { path = "../../utils/mdhtml/" } mdhtml = { path = "../../utils/mdhtml/" }

2
upub/core/Cargo.toml
View file

@ -31,7 +31,7 @@ httpsign = { path = "../../utils/httpsign/" }
mdhtml = { path = "../../utils/mdhtml/" } mdhtml = { path = "../../utils/mdhtml/" }
jrd = "0.1" jrd = "0.1"
tracing = "0.1" tracing = "0.1"
sea-orm = { version = "0.12", features = ["macros"] } sea-orm = { version = "1.0", features = ["macros"] }
reqwest = { version = "0.12", features = ["json"] } reqwest = { version = "0.12", features = ["json"] }
apb = { path = "../../apb", features = ["unstructured", "orm", "did-core", "activitypub-miscellaneous-terms", "activitypub-fe", "activitypub-counters", "litepub", "ostatus", "toot"] } apb = { path = "../../apb", features = ["unstructured", "orm", "did-core", "activitypub-miscellaneous-terms", "activitypub-fe", "activitypub-counters", "litepub", "ostatus", "toot"] }
# nodeinfo = "0.0.2" # the version on crates.io doesn't re-export necessary types to build the struct!!! # nodeinfo = "0.0.2" # the version on crates.io doesn't re-export necessary types to build the struct!!!

3
upub/core/src/ext.rs
View file

@ -12,7 +12,8 @@ where
T::Model : Sync, T::Model : Sync,
{ {
async fn any(self, db: &impl ConnectionTrait) -> Result<bool, sea_orm::DbErr> { async fn any(self, db: &impl ConnectionTrait) -> Result<bool, sea_orm::DbErr> {
Ok(self.count(db).await? > 0) // TODO ConnectionTrait became an iterator?? self.count(db) gives error now
Ok(PaginatorTrait::count(self, db).await? > 0)
} }
} }

2
upub/migrations/Cargo.toml
View file

@ -11,4 +11,4 @@ readme = "README.md"
[lib] [lib]
[dependencies] [dependencies]
sea-orm-migration = "0.12" sea-orm-migration = "1.0"

2
upub/routes/Cargo.toml
View file

@ -27,7 +27,7 @@ tower-http = { version = "0.5", features = ["cors", "trace"] }
httpsign = { path = "../../utils/httpsign/", features = ["axum"] } httpsign = { path = "../../utils/httpsign/", features = ["axum"] }
apb = { path = "../../apb", features = ["unstructured", "orm", "activitypub-fe", "activitypub-counters", "litepub", "ostatus", "toot", "jsonld"] } apb = { path = "../../apb", features = ["unstructured", "orm", "activitypub-fe", "activitypub-counters", "litepub", "ostatus", "toot", "jsonld"] }
uriproxy = { path = "../../utils/uriproxy" } uriproxy = { path = "../../utils/uriproxy" }
sea-orm = { version = "0.12", features = ["macros", "sqlx-sqlite", "runtime-tokio-rustls"] } sea-orm = "1.0"
# nodeinfo = "0.0.2" # the version on crates.io doesn't re-export necessary types to build the struct!!! # nodeinfo = "0.0.2" # the version on crates.io doesn't re-export necessary types to build the struct!!!
nodeinfo = { git = "https://codeberg.org/thefederationinfo/nodeinfo-rs", rev = "e865094804" } nodeinfo = { git = "https://codeberg.org/thefederationinfo/nodeinfo-rs", rev = "e865094804" }
# mastodon # mastodon

2
upub/worker/Cargo.toml
View file

@ -15,7 +15,7 @@ thiserror = "1"
tracing = "0.1" tracing = "0.1"
async-trait = "0.1" async-trait = "0.1"
serde_json = "1" serde_json = "1"
sea-orm = "0.12" sea-orm = "1.0"
regex = "1.10" regex = "1.10"
chrono = { version = "0.4", features = ["serde"] } chrono = { version = "0.4", features = ["serde"] }
tokio = { version = "1.35", features = ["full"] } # TODO slim this down tokio = { version = "1.35", features = ["full"] } # TODO slim this down