ISAR/rusqlite
3
0
Fork 0
mirror of https://github.com/isar/rusqlite.git synced 2024-11-25 02:21:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Support Rust expression like {x.y} in SQL strings"

Browse Source 
This reverts commit b86d9321b5.
This commit is contained in:
gwenn 2023-08-21 19:40:37 +02:00
parent b86d9321b5
commit bbb570aabd
4 changed files with 7 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rusqlite-macros/Cargo.toml
View File

@ -12,5 +12,5 @@ categories = ["database"]
proc-macro = true
[dependencies]
sqlite3-parser = { version = "0.10.0", default-features = false, features = ["YYNOERRORRECOVERY", "rust_variable"] }
sqlite3-parser = { version = "0.11", default-features = false, features = ["YYNOERRORRECOVERY"] }
fallible-iterator = "0.3"

6
rusqlite-macros/src/lib.rs
View File

@ -58,15 +58,11 @@ fn try_bind(input: TokenStream) -> Result<TokenStream> {
let mut res = TokenStream::new();
for (i, name) in info.names.iter().enumerate() {
res.extend(Some(stmt.clone()));
let offset = match name.as_bytes()[0] {
b'$' | b'@' | b'#' | b':' => 1,
_ => 0, // captured identifier: {...}
};
res.extend(respan(
parse_ts(&format!(
".raw_bind_parameter({}, &{})?;",
i + 1,
&name[offset..]
&name[1..]
)),
call_site,
));

25
rusqlite-macros/tests/test.rs
View File

@ -16,30 +16,7 @@ fn test_literal() -> Result {
let first_name = "El";
let last_name = "Barto";
let mut stmt = Stmt;
__bind!(stmt "SELECT $first_name, {last_name}");
Ok(())
}
#[test]
fn test_tuple() -> Result {
let names = ("El", "Barto");
let mut stmt = Stmt;
__bind!(stmt "SELECT {names.0}, {names.1}");
Ok(())
}
#[test]
fn test_struct() -> Result {
struct Person<'s> {
first_name: &'s str,
last_name: &'s str,
}
let p = Person {
first_name: "El",
last_name: "Barto",
};
let mut stmt = Stmt;
__bind!(stmt "SELECT {p.first_name}, {p.last_name}");
__bind!(stmt "SELECT $first_name, $last_name");
Ok(())
}

8
src/lib.rs
View File

@ -220,9 +220,9 @@ macro_rules! named_params {
/// Captured identifiers in SQL
///
/// * SQLite `$x` / `@x` / `:x` syntax works (Rust `&x` syntax does not work).
/// * only SQLite `$x` / `@x` / `:x` syntax works (Rust `&x` syntax does not
/// work).
/// * `$x.y` expression does not work.
/// * `{x}` and `{x.y}` work
///
/// # Example
///
@ -249,9 +249,9 @@ macro_rules! prepare_and_bind {
/// Captured identifiers in SQL
///
/// * SQLite `$x` / `@x` / `:x` syntax works (Rust `&x` syntax does not work).
/// * only SQLite `$x` / `@x` / `:x` syntax works (Rust `&x` syntax does not
/// work).
/// * `$x.y` expression does not work.
/// * `{x}` and `{x.y}` work
#[cfg(feature = "rusqlite-macros")]
#[cfg_attr(docsrs, doc(cfg(feature = "rusqlite-macros")))]
#[macro_export]