Bump sea orm
This commit is contained in:
parent
1fc74988cf
commit
5e25d81308
707
Cargo.lock
generated
707
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -63,7 +63,7 @@ pub fn derive_actix_admin_enum(item: TokenStream) -> TokenStream {
|
|||||||
parse_enum_variants(&mut it, &mut def);
|
parse_enum_variants(&mut it, &mut def);
|
||||||
let mut buffer = String::new();
|
let mut buffer = String::new();
|
||||||
buffer.push_str(&format!("impl std::str::FromStr for {} {{\n type Err = ();\n fn from_str(s: &str) -> Result<Self, ()> {{\n match s {{\n", def.name));
|
buffer.push_str(&format!("impl std::str::FromStr for {} {{\n type Err = ();\n fn from_str(s: &str) -> Result<Self, ()> {{\n match s {{\n", def.name));
|
||||||
for v in def.variants {
|
for v in &def.variants {
|
||||||
buffer.push_str(&format!(
|
buffer.push_str(&format!(
|
||||||
" {:?} => Ok({}::{}),\n",
|
" {:?} => Ok({}::{}),\n",
|
||||||
v.db_name, def.name, v.rs_name
|
v.db_name, def.name, v.rs_name
|
||||||
@ -71,6 +71,14 @@ pub fn derive_actix_admin_enum(item: TokenStream) -> TokenStream {
|
|||||||
}
|
}
|
||||||
buffer.push_str(" _ => Err(()),\n");
|
buffer.push_str(" _ => Err(()),\n");
|
||||||
buffer.push_str(" }\n }\n}");
|
buffer.push_str(" }\n }\n}");
|
||||||
|
buffer.push_str(&format!("impl ToString for {} {{\n fn to_string(&self) -> String {{\n match self {{\n", def.name));
|
||||||
|
for v in def.variants {
|
||||||
|
buffer.push_str(&format!(
|
||||||
|
" {}::{} => {:?},\n",
|
||||||
|
def.name, v.rs_name, v.db_name
|
||||||
|
));
|
||||||
|
}
|
||||||
|
buffer.push_str(" }.to_string()\n }\n}");
|
||||||
// eprintln!("{buffer}");
|
// eprintln!("{buffer}");
|
||||||
buffer.as_str().parse().unwrap()
|
buffer.as_str().parse().unwrap()
|
||||||
}
|
}
|
||||||
|
@ -4,9 +4,9 @@ version = "0.1.0"
|
|||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
actix-admin = "0.5.0"
|
# actix-admin = "0.5.0"
|
||||||
# actix-admin = { git = "https://github.com/Eraden/actix-admin.git", features = ['enable-tracing'] }
|
# actix-admin = { git = "https://github.com/Eraden/actix-admin.git", features = ['enable-tracing'] }
|
||||||
#actix-admin = { git = "https://code.ita-prog.pl/Tsumanu/actix-admin.git", features = ['enable-tracing'] }
|
actix-admin = { git = "https://code.ita-prog.pl/Tsumanu/actix-admin.git", features = ['enable-tracing'] }
|
||||||
actix-web = "4.3.1"
|
actix-web = "4.3.1"
|
||||||
actix-web-grants = "3.0.2"
|
actix-web-grants = "3.0.2"
|
||||||
askama = "0.12.0"
|
askama = "0.12.0"
|
||||||
|
@ -5,13 +5,13 @@ edition = "2021"
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
actix = "0.13.0"
|
actix = "0.13.0"
|
||||||
actix-admin = "0.5.0"
|
# actix-admin = "0.5.0"
|
||||||
# actix-admin = { git = "https://github.com/Eraden/actix-admin.git", features = ['enable-tracing'] }
|
# actix-admin = { git = "https://github.com/Eraden/actix-admin.git", features = ['enable-tracing'] }
|
||||||
# actix-admin = { git = "https://code.ita-prog.pl/Tsumanu/actix-admin.git", features = ['enable-tracing'] }
|
actix-admin = { git = "https://code.ita-prog.pl/Tsumanu/actix-admin.git", features = ['enable-tracing'] }
|
||||||
actix-rt = { version = "2.8.0", features = [] }
|
actix-rt = { version = "2.8.0", features = [] }
|
||||||
chrono = "0.4.26"
|
chrono = "0.4.26"
|
||||||
oswilno-actix-admin = { path = "../oswilno-actix-admin" }
|
oswilno-actix-admin = { path = "../oswilno-actix-admin" }
|
||||||
regex = "1.9.1"
|
regex = "1.9.1"
|
||||||
sea-orm = { version = "0.11", features = ["postgres-array", "runtime-actix-rustls", "sqlx-postgres", "macros", "sqlx"] }
|
sea-orm = { version = "0.12", features = ["postgres-array", "runtime-actix-rustls", "sqlx-postgres", "macros", "sqlx"] }
|
||||||
serde = { version = "1.0.175", features = ["derive"] }
|
serde = { version = "1.0.175", features = ["derive"] }
|
||||||
uuid = { version = "1.4.1", features = ["v4"] }
|
uuid = { version = "1.4.1", features = ["v4"] }
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
use super::sea_orm_active_enums::Userrole;
|
use super::sea_orm_active_enums::Userrole;
|
||||||
use actix_admin::prelude::*;
|
use actix_admin::prelude::*;
|
||||||
use sea_orm::entity::prelude::*;
|
use sea_orm::entity::prelude::*;
|
||||||
|
#[allow(unused_imports)]
|
||||||
use sea_orm::Iterable;
|
use sea_orm::Iterable;
|
||||||
|
|
||||||
#[derive(Copy, Clone, Default, Debug, DeriveEntity)]
|
#[derive(Copy, Clone, Default, Debug, DeriveEntity)]
|
||||||
@ -31,6 +32,7 @@ pub struct Model {
|
|||||||
#[actix_admin(primary_key)]
|
#[actix_admin(primary_key)]
|
||||||
pub id: i32,
|
pub id: i32,
|
||||||
pub login: String,
|
pub login: String,
|
||||||
|
#[actix_admin(list_hide_column)]
|
||||||
pub pass_hash: String,
|
pub pass_hash: String,
|
||||||
pub role: Userrole,
|
pub role: Userrole,
|
||||||
pub banned: bool,
|
pub banned: bool,
|
||||||
@ -40,6 +42,7 @@ pub struct Model {
|
|||||||
pub created_at: DateTime,
|
pub created_at: DateTime,
|
||||||
#[actix_admin(list_hide_column)]
|
#[actix_admin(list_hide_column)]
|
||||||
pub updated_at: DateTime,
|
pub updated_at: DateTime,
|
||||||
|
#[actix_admin(html_input_type = "email")]
|
||||||
pub email: String,
|
pub email: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
use super::sea_orm_active_enums::ImageState;
|
use super::sea_orm_active_enums::ImageState;
|
||||||
use actix_admin::prelude::*;
|
use actix_admin::prelude::*;
|
||||||
use sea_orm::entity::prelude::*;
|
use sea_orm::entity::prelude::*;
|
||||||
|
#[allow(unused_imports)]
|
||||||
use sea_orm::Iterable;
|
use sea_orm::Iterable;
|
||||||
|
|
||||||
#[derive(Copy, Clone, Default, Debug, DeriveEntity)]
|
#[derive(Copy, Clone, Default, Debug, DeriveEntity)]
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
use actix_admin::prelude::*;
|
use actix_admin::prelude::*;
|
||||||
use sea_orm::entity::prelude::*;
|
use sea_orm::entity::prelude::*;
|
||||||
|
#[allow(unused_imports)]
|
||||||
use sea_orm::Iterable;
|
use sea_orm::Iterable;
|
||||||
|
|
||||||
#[derive(Copy, Clone, Default, Debug, DeriveEntity)]
|
#[derive(Copy, Clone, Default, Debug, DeriveEntity)]
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
use actix_admin::prelude::*;
|
use actix_admin::prelude::*;
|
||||||
use sea_orm::entity::prelude::*;
|
use sea_orm::entity::prelude::*;
|
||||||
|
#[allow(unused_imports)]
|
||||||
use sea_orm::Iterable;
|
use sea_orm::Iterable;
|
||||||
|
|
||||||
#[derive(Copy, Clone, Default, Debug, DeriveEntity)]
|
#[derive(Copy, Clone, Default, Debug, DeriveEntity)]
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
use super::sea_orm_active_enums::ParkingSpaceState;
|
use super::sea_orm_active_enums::ParkingSpaceState;
|
||||||
use actix_admin::prelude::*;
|
use actix_admin::prelude::*;
|
||||||
use sea_orm::entity::prelude::*;
|
use sea_orm::entity::prelude::*;
|
||||||
|
#[allow(unused_imports)]
|
||||||
use sea_orm::Iterable;
|
use sea_orm::Iterable;
|
||||||
|
|
||||||
#[derive(Copy, Clone, Default, Debug, DeriveEntity)]
|
#[derive(Copy, Clone, Default, Debug, DeriveEntity)]
|
||||||
@ -30,7 +31,7 @@ impl EntityName for Entity {
|
|||||||
pub struct Model {
|
pub struct Model {
|
||||||
#[actix_admin(primary_key)]
|
#[actix_admin(primary_key)]
|
||||||
pub id: i32,
|
pub id: i32,
|
||||||
#[actix_admin(select_list=crate::ParkingSpaceState)]
|
#[actix_admin(select_list=crate::parking_spaces::ParkingSpaceState)]
|
||||||
pub state: ParkingSpaceState,
|
pub state: ParkingSpaceState,
|
||||||
pub account_id: i32,
|
pub account_id: i32,
|
||||||
#[actix_admin(list_hide_column)]
|
#[actix_admin(list_hide_column)]
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
use actix_admin::prelude::*;
|
use actix_admin::prelude::*;
|
||||||
use sea_orm::entity::prelude::*;
|
use sea_orm::entity::prelude::*;
|
||||||
|
#[allow(unused_imports)]
|
||||||
use sea_orm::Iterable;
|
use sea_orm::Iterable;
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
|
#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
|
||||||
|
@ -10,6 +10,7 @@ use garde::Validate;
|
|||||||
use oswilno_view::{Blank, Errors, Lang, Layout, Main, MainOpts, TranslationStorage};
|
use oswilno_view::{Blank, Errors, Lang, Layout, Main, MainOpts, TranslationStorage};
|
||||||
use sea_orm::DatabaseConnection;
|
use sea_orm::DatabaseConnection;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
use sea_orm::prelude::*;
|
||||||
|
|
||||||
pub use oswilno_view::filters;
|
pub use oswilno_view::filters;
|
||||||
|
|
||||||
|
@ -14,6 +14,7 @@ for f in $(ls crates/oswilno-contract/src/*.rs); do
|
|||||||
case $line in
|
case $line in
|
||||||
"use sea_orm::entity::prelude::*;" )
|
"use sea_orm::entity::prelude::*;" )
|
||||||
echo "use actix_admin::prelude::*;" >> /tmp/ajosdfjosdpjfojsdfjpajpfa
|
echo "use actix_admin::prelude::*;" >> /tmp/ajosdfjosdpjfojsdfjpajpfa
|
||||||
|
echo '#[allow(unused_imports)]' >> /tmp/ajosdfjosdpjfojsdfjpajpfa
|
||||||
echo 'use sea_orm::Iterable;' >> /tmp/ajosdfjosdpjfojsdfjpajpfa
|
echo 'use sea_orm::Iterable;' >> /tmp/ajosdfjosdpjfojsdfjpajpfa
|
||||||
;;
|
;;
|
||||||
*"EntityName for Entity"* )
|
*"EntityName for Entity"* )
|
||||||
@ -32,16 +33,23 @@ for f in $(ls crates/oswilno-contract/src/*.rs); do
|
|||||||
echo "#[actix_admin(primary_key)]" >> /tmp/ajosdfjosdpjfojsdfjpajpfa
|
echo "#[actix_admin(primary_key)]" >> /tmp/ajosdfjosdpjfojsdfjpajpfa
|
||||||
;;
|
;;
|
||||||
"pub location_id"* )
|
"pub location_id"* )
|
||||||
echo "#[actix_admin(select_list="crate::parking_space_locations::Entity")]" >> /tmp/ajosdfjosdpjfojsdfjpajpfa
|
echo '#[actix_admin(select_list=crate::parking_space_locations::Entity)]' >> /tmp/ajosdfjosdpjfojsdfjpajpfa
|
||||||
|
;;
|
||||||
|
"pub email: String," )
|
||||||
|
echo '#[actix_admin(html_input_type = "email")]' >> /tmp/ajosdfjosdpjfojsdfjpajpfa
|
||||||
;;
|
;;
|
||||||
"pub state"* )
|
"pub state"* )
|
||||||
echo "#[actix_admin(select_list="crate::ParkingSpaceState")]" >> /tmp/ajosdfjosdpjfojsdfjpajpfa
|
echo '#[actix_admin(select_list=crate::parking_spaces::ParkingSpaceState)]' >> /tmp/ajosdfjosdpjfojsdfjpajpfa
|
||||||
|
;;
|
||||||
|
|
||||||
|
"pub pass_hash: String," )
|
||||||
|
echo "#[actix_admin(list_hide_column)]" >> /tmp/ajosdfjosdpjfojsdfjpajpfa
|
||||||
;;
|
;;
|
||||||
*"_at: DateTime," )
|
*"_at: DateTime," )
|
||||||
echo "#[actix_admin(list_hide_column)]" >> /tmp/ajosdfjosdpjfojsdfjpajpfa
|
echo "#[actix_admin(list_hide_column)]" >> /tmp/ajosdfjosdpjfojsdfjpajpfa
|
||||||
;;
|
;;
|
||||||
*"parking_space_id"* )
|
*"parking_space_id"* )
|
||||||
echo "#[actix_admin(select_list="crate::parking_spaces::Entity")]" >> /tmp/ajosdfjosdpjfojsdfjpajpfa
|
echo '#[actix_admin(select_list=crate::parking_spaces::Entity)]' >> /tmp/ajosdfjosdpjfojsdfjpajpfa
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
echo $line >> /tmp/ajosdfjosdpjfojsdfjpajpfa
|
echo $line >> /tmp/ajosdfjosdpjfojsdfjpajpfa
|
||||||
|
Loading…
Reference in New Issue
Block a user