Merge remote-tracking branch 'origin/parsing' into server-work

# Conflicts:
#	Cargo.lock
#	minisql/src/interpreter.rs
#	server/Cargo.toml
#	server/src/main.rs
This commit is contained in:
Jindřich Moravec 2024-01-26 18:48:37 +01:00
commit 595b47dc06
19 changed files with 1113 additions and 30 deletions

View file

@ -6,10 +6,10 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
tokio = { version = "1.35.1", features = ["full"] }
anyhow = "1.0.76"
clap = { version = "4.4.18", features = ["derive"] }
tokio = { version = "1.35.1", features = ["full"] }
minisql = { path = "../minisql" }
proto = { path = "../proto" }
async-trait = "0.1.74"
rand = "0.8.5"
minisql = { path = "../minisql" }
proto = { path = "../proto" }