Skip to content

Commit aedeb3e

Browse files
committed
FIX: returning error on bad characters and columns named "id"
1 parent c32e1c8 commit aedeb3e

5 files changed

Lines changed: 253 additions & 31 deletions

File tree

Cargo.lock

Lines changed: 72 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/catlog-wasm/src/theories.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,17 @@ impl ThSchema {
9595
analyses::sql::SQLBackend::try_from(backend)
9696
.and_then(|backend| {
9797
analyses::sql::SQLAnalysis::new(backend)
98-
.render(
98+
.execute(
9999
model.discrete()?,
100100
|id| model.ob_namespace.label_string(id),
101101
|id| model.mor_namespace.label_string(id),
102102
)
103-
.map_err(|e| format!("{}", e))
103+
.map_err(|errs| {
104+
errs.into_iter()
105+
.map(|e| format!("- {e}"))
106+
.collect::<Vec<String>>()
107+
.join("\n\n")
108+
})
104109
})
105110
.into()
106111
}

packages/catlog/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ edition = "2024"
99
ode = ["dep:ode_solvers", "dep:nalgebra"]
1010
serde = ["dep:serde", "nonempty/serialize", "ustr/serde", "uuid/serde"]
1111
serde-wasm = ["serde", "dep:wasm-bindgen", "dep:tsify"]
12-
sql = ["dep:sea-query", "dep:sqlformat" ]
12+
sql = ["dep:sea-query", "dep:sqlformat", "dep:sqlparser"]
1313
stochastic = ["dep:rebop"]
1414

1515
[dependencies]
@@ -41,6 +41,7 @@ wasm-bindgen = { version = "0.2.100", optional = true }
4141
catcolab-document-types = { version = "0.1.0", path = "../document-types" }
4242
sea-query = { version = "0.32.7", optional = true }
4343
sqlformat = { version = "0.5.0", optional = true }
44+
sqlparser = { version = "0.62.0", optional = true }
4445

4546
[dev-dependencies]
4647
clap = { version = "4.5.47", features = ["derive"] }

0 commit comments

Comments
 (0)