From 9b1e592ecd87882dc3893a3f67bf067cd2c3e3cd Mon Sep 17 00:00:00 2001 From: Priec Date: Sun, 16 Aug 2026 23:51:39 +0200 Subject: [PATCH] profile name sent with every table from now on --- Cargo.lock | 34 +++++++++---------- Cargo.toml | 2 +- client | 2 +- common/proto/table_definition.proto | 11 ++++++ common/src/proto/descriptor.bin | Bin 183788 -> 184445 bytes common/src/proto/komp_ac.table_definition.rs | 11 ++++++ server | 2 +- tui-canvas | 2 +- tui-pages | 2 +- web/CHANGELOG.md | 18 +++++++--- web/src/pages/table_scope.rs | 6 ++++ 11 files changed, 64 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 53e223f7..3cdea451 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -207,7 +207,7 @@ dependencies = [ "objc2-foundation", "parking_lot", "percent-encoding", - "windows-sys 0.59.0", + "windows-sys 0.52.0", "x11rb", ] @@ -883,7 +883,7 @@ version = "3.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "519bd3116aeeb42d5372c29d982d16d0170d3d4a5ed85fc7dd91642ffff3c67c" dependencies = [ - "darling 0.23.0", + "darling 0.20.11", "ident_case", "prettyplease", "proc-macro2", @@ -1161,7 +1161,7 @@ checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9" [[package]] name = "client" -version = "0.8.41" +version = "0.8.46" dependencies = [ "anyhow", "async-trait", @@ -1282,7 +1282,7 @@ dependencies = [ [[package]] name = "common" -version = "0.8.41" +version = "0.8.46" dependencies = [ "prost", "prost-build", @@ -2735,7 +2735,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -5755,7 +5755,7 @@ version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03da047801ff44bb6a4d407d4860c05fd70bb81714e6b2f3812603d5b145b042" dependencies = [ - "heck 0.5.0", + "heck 0.4.1", "itertools 0.14.0", "log", "multimap", @@ -5906,7 +5906,7 @@ dependencies = [ "once_cell", "socket2", "tracing", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -6590,7 +6590,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -6647,7 +6647,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -6754,7 +6754,7 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "search" -version = "0.8.41" +version = "0.8.46" dependencies = [ "anyhow", "common", @@ -6942,7 +6942,7 @@ dependencies = [ [[package]] name = "server" -version = "0.8.41" +version = "0.8.46" dependencies = [ "anyhow", "bcrypt", @@ -7205,7 +7205,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f103c50866b8743da9429b8a581d81a27c2d3a9c4ac7df8f8571c1dd7896eda" dependencies = [ - "heck 0.5.0", + "heck 0.4.1", "proc-macro2", "quote", "syn 2.0.117", @@ -7929,7 +7929,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -8532,7 +8532,7 @@ checksum = "e78122066b0cb818b8afd08f7ed22f7fdbc3e90815035726f0840d0d26c0747a" [[package]] name = "tui-canvas" -version = "0.8.41" +version = "0.8.46" dependencies = [ "anyhow", "arboard", @@ -8563,7 +8563,7 @@ dependencies = [ [[package]] name = "tui-canvas-validation-core" -version = "0.8.41" +version = "0.8.46" dependencies = [ "regex", "serde", @@ -8573,7 +8573,7 @@ dependencies = [ [[package]] name = "tui-pages" -version = "0.8.41" +version = "0.8.46" dependencies = [ "criterion", "crossterm", @@ -9284,7 +9284,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 94ec1b9a..524bb89d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ resolver = "3" [workspace.package] # TODO: idk how to do the name, fix later # name = "komp_ac" -version = "0.8.41" +version = "0.8.46" edition = "2024" license = "GPL-3.0-or-later" authors = ["Filip Priečinský "] diff --git a/client b/client index b87d463f..421b27e0 160000 --- a/client +++ b/client @@ -1 +1 @@ -Subproject commit b87d463f78d87e476c671a804129e644e3d9261f +Subproject commit 421b27e06999420f7db6a0e984cfa7699723f594 diff --git a/common/proto/table_definition.proto b/common/proto/table_definition.proto index 10dc0ea5..d31bbba5 100644 --- a/common/proto/table_definition.proto +++ b/common/proto/table_definition.proto @@ -289,6 +289,12 @@ message ProfileTreeResponse { // True when this table is shared by every profile. bool global = 6; + + // Profile (schema) the table is actually stored in. A global table is + // listed under every profile it is visible from, so this names the one it + // belongs to rather than the one it was reached through, and callers can + // use it as the table's identity without deciding anything themselves. + string profile_name = 7; } // Profile (schema) entry. @@ -377,6 +383,11 @@ message TableDetail { bool global = 9; // Revision of this table definition for optimistic concurrency control. int64 row_version = 10; + + // Profile (schema) the table is actually stored in, which is not the + // requested profile when a global table is being listed. See + // ProfileTreeResponse.Table.profile_name. + string profile_name = 11; } // Server-owned behavior for one logical column returned in table details. diff --git a/common/src/proto/descriptor.bin b/common/src/proto/descriptor.bin index 13a93b58e53e287d27f8e2474bf83d0f07c8dae3..a65fe88d3cdd66e67ff80c5b8ee4037a0b90dd45 100644 GIT binary patch delta 5823 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 P2@nb$nY|y1G5`7xCv`?$ delta 5222 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 Table { Table { @@ -72,6 +73,11 @@ pub(crate) mod tests { row_display_columns: Vec::new(), table_kind: "dynamic".to_string(), global, + profile_name: if global { + GLOBAL_SCOPE.to_string() + } else { + "test_profile".to_string() + }, } }