Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexanderManich committed Nov 27, 2023
2 parents 116b845 + dc40109 commit 7ea371c
Show file tree
Hide file tree
Showing 19 changed files with 470 additions and 228 deletions.
6 changes: 4 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ path = "src/main.rs"
migration = { path = "migration" }
tokio = { version = "1.33.0", features = ["full"] }
dotenv = "0.15.0"
sea-orm = { version = "^0.12.0", features = [ "sqlx-postgres", "runtime-async-std-native-tls", "macros","tests-cfg","sqlx-sqlite" ] }
sea-orm = { version = "^0.12.0", features = ["sqlx-postgres", "runtime-async-std-native-tls", "macros", "tests-cfg", "sqlx-sqlite"] }
async-trait = { version = "0.1.73", features = [] }
futures = "0.3.28"
tonic = "0.10.2"
Expand All @@ -24,6 +24,8 @@ chrono = "0.4.31"
uuid = { version = "1.5.0", features = ["v4"] }
regex = "1.10.2"
mockall = "0.11.4"
bcrypt = "0.15.0"
serde_json = "1.0.108"

[build-dependencies]
tonic-build = "0.10.2"
Expand All @@ -33,4 +35,4 @@ complexity = "deny"
correctness = "deny"
perf = "deny"
suspicious = "warn"
enum_variant_names = "allow"
enum_variant_names = "allow"
2 changes: 1 addition & 1 deletion Ecdar-ProtoBuf
Submodule Ecdar-ProtoBuf updated 2 files
+38 −1 api.proto
+3 −3 services.proto
6 changes: 6 additions & 0 deletions migration/src/m20231012_094228_create_model_table.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ impl MigrationTrait for Migration {
.col(ColumnDef::new(Model::Name).string().not_null())
.col(ColumnDef::new(Model::ComponentsInfo).json().not_null())
.col(ColumnDef::new(Model::OwnerId).integer().not_null())
.index(
Index::create()
.col(Model::OwnerId)
.col(Model::Name)
.unique(),
)
.foreign_key(
ForeignKey::create()
.from(Model::Table, Model::OwnerId)
Expand Down
Loading

0 comments on commit 7ea371c

Please sign in to comment.