Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,558 changes: 2,537 additions & 21 deletions Cargo.lock

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions crates/oxide-sql-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ categories = ["database", "parser-implementations"]

[dev-dependencies]
oxide-sql-derive.workspace = true
duckdb = { version = "1.1", features = ["bundled"] }
11 changes: 8 additions & 3 deletions crates/oxide-sql-core/src/builder/typed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ impl<T: Table> Select<T, HasColumns, HasFrom> {
#[must_use]
pub fn build(self) -> (String, Vec<SqlValue>) {
let mut sql = String::from("SELECT ");
let params = vec![];
let mut params = vec![];

// Columns
sql.push_str(&self.columns.join(", "));
Expand All @@ -212,6 +212,7 @@ impl<T: Table> Select<T, HasColumns, HasFrom> {
if let Some(ref where_expr) = self.where_clause {
sql.push_str(" WHERE ");
sql.push_str(where_expr.sql());
params.extend(where_expr.params().iter().cloned());
}

// ORDER BY
Expand Down Expand Up @@ -452,12 +453,14 @@ impl<T: Table> Update<T, HasSet> {
.collect();
sql.push_str(&set_clauses.join(", "));

let mut params: Vec<SqlValue> = self.sets.into_iter().map(|(_, v)| v).collect();

if let Some(ref where_expr) = self.where_clause {
sql.push_str(" WHERE ");
sql.push_str(where_expr.sql());
params.extend(where_expr.params().iter().cloned());
}

let params: Vec<SqlValue> = self.sets.into_iter().map(|(_, v)| v).collect();
(sql, params)
}

Expand Down Expand Up @@ -518,13 +521,15 @@ impl<T: Table> Delete<T> {
pub fn build(self) -> (String, Vec<SqlValue>) {
let mut sql = String::from("DELETE FROM ");
sql.push_str(T::NAME);
let mut params = vec![];

if let Some(ref where_expr) = self.where_clause {
sql.push_str(" WHERE ");
sql.push_str(where_expr.sql());
params.extend(where_expr.params().iter().cloned());
}

(sql, vec![])
(sql, params)
}

/// Builds the query and returns only the SQL string.
Expand Down
Loading