Skip to content

Commit

Permalink
Bump sea-orm from 0.12.15 to 1.0.0 (#1217)
Browse files Browse the repository at this point in the history
* Bump sea-orm from 0.12.15 to 1.0.0

Bumps [sea-orm](https://github.com/SeaQL/sea-orm) from 0.12.15 to 1.0.0.
- [Release notes](https://github.com/SeaQL/sea-orm/releases)
- [Changelog](https://github.com/SeaQL/sea-orm/blob/master/CHANGELOG.md)
- [Commits](SeaQL/sea-orm@0.12.15...1.0.0)

---
updated-dependencies:
- dependency-name: sea-orm
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* Update column definitions.

These are equivalent to the previous definitions (at least under
Postgres), see the following two commits:

SeaQL/sea-query@0dda132
SeaQL/sea-query@12fe34b

* Bump sea-orm-migration 0.12.15 -> 1.0.0, too.

* cargo fmt

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Brandon Pitman <[email protected]>
  • Loading branch information
dependabot[bot] and branlwyd authored Aug 12, 2024
1 parent ca6884f commit ca6489a
Show file tree
Hide file tree
Showing 8 changed files with 65 additions and 32 deletions.
72 changes: 52 additions & 20 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ default-features = false
features = ["pkce-plain"]

[dependencies.sea-orm]
version = "0.12.15"
version = "1.0.0"
features = [
"runtime-tokio-rustls",
"macros",
Expand Down
6 changes: 3 additions & 3 deletions migration/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ path = "src/lib.rs"
[dependencies]
async-std = { version = "1", features = ["attributes", "tokio1"] }
clap = { version = "4.5.15", features = ["env", "derive"] }
sea-orm = "0.12.15"
sea-orm = "1.0.0"
serde_json = "1.0.124"
thiserror = "1.0.63"
time = "0.3.36"
tracing = "0.1.40"
tracing-subscriber = "0.3.18"

[dependencies.sea-orm-migration]
version = "0.12.15"
version = "1.0.0"
features = ["runtime-tokio-rustls", "sqlx-postgres"]

[dev-dependencies]
sea-orm = { version = "0.12.15", features = ["sqlx-sqlite"] }
sea-orm = { version = "1.0.0", features = ["sqlx-sqlite"] }
4 changes: 2 additions & 2 deletions src/entity/aggregator/protocol.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use rand::{distributions::Standard, prelude::Distribution};
use sea_orm::{DeriveActiveEnum, EnumIter};
use sea_orm::{prelude::StringLen, DeriveActiveEnum, EnumIter};
use serde::{Deserialize, Serialize};
use std::{
error::Error,
Expand All @@ -8,7 +8,7 @@ use std::{
};

#[derive(Debug, Clone, Copy, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
#[sea_orm(rs_type = "String", db_type = "String(None)")]
#[sea_orm(rs_type = "String", db_type = "String(StringLen::None)")]
pub enum Protocol {
#[sea_orm(string_value = "DAP-09")]
#[serde(rename = "DAP-09")]
Expand Down
4 changes: 2 additions & 2 deletions src/entity/codec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use janus_messages::codec::{Decode, Encode};
use prio::codec::CodecError;
use sea_orm::{
entity::ColumnType,
sea_query::{ArrayType, BlobSize, Nullable, ValueType, ValueTypeErr},
sea_query::{ArrayType, Nullable, ValueType, ValueTypeErr},
ColIdx, DbErr, QueryResult, TryGetError, TryGetable, Value,
};
use serde::{Deserialize, Serialize};
Expand Down Expand Up @@ -92,7 +92,7 @@ impl<T: Encode + Decode> ValueType for Codec<T> {
}

fn column_type() -> ColumnType {
ColumnType::Binary(BlobSize::Blob(None))
ColumnType::Blob
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/entity/session.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use sea_orm::{
ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait,
EnumIter, PrimaryKeyTrait,
ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EnumIter,
PrimaryKeyTrait,
};
use serde::{Deserialize, Serialize};
use serde_json::Value;
Expand Down
3 changes: 2 additions & 1 deletion src/entity/url.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use sea_orm::prelude::StringLen;
use serde::{Deserialize, Serialize};
use std::{
fmt::{self, Display, Formatter},
Expand Down Expand Up @@ -104,7 +105,7 @@ impl sea_orm::sea_query::ValueType for Url {
}

fn column_type() -> sea_orm::entity::ColumnType {
sea_orm::entity::ColumnType::String(None)
sea_orm::entity::ColumnType::String(StringLen::None)
}
}

Expand Down
2 changes: 1 addition & 1 deletion test-support/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ trillium-rustls = "0.8.1"
trillium-tokio = "0.4.0"
url = "2.5.2"
uuid = { version = "1.10.0", features = ["v4", "fast-rng", "serde"] }
sea-orm = { version = "0.12.15", features = ["sqlx-sqlite"] }
sea-orm = { version = "1.0.0", features = ["sqlx-sqlite"] }
pretty_assertions = "1.4.0"
rand = "0.8.5"
base64 = "0.22.1"
Expand Down

0 comments on commit ca6489a

Please sign in to comment.