From 883ce7dce39b8f5eb48944ad4502c6f6340f5921 Mon Sep 17 00:00:00 2001 From: Ivan Ukhov Date: Sat, 4 Jul 2015 09:29:46 -0400 Subject: [PATCH] Clean up SQL literals --- README.md | 4 ++-- src/lib.rs | 4 ++-- tests/lib.rs | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 97c6278..33f59e6 100644 --- a/README.md +++ b/README.md @@ -9,10 +9,10 @@ The package provides an interface to [SQLite][1]. ```rust let connection = sqlite::open(":memory:").unwrap(); -connection.execute(r#" +connection.execute(" CREATE TABLE `users` (id INTEGER, name VARCHAR(255)); INSERT INTO `users` (id, name) VALUES (1, 'Alice'); -"#).unwrap(); +").unwrap(); connection.process("SELECT * FROM `users`;", |pairs| { for &(column, value) in pairs.iter() { diff --git a/src/lib.rs b/src/lib.rs index a38079d..6f08e92 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -5,10 +5,10 @@ //! ``` //! let connection = sqlite::open(":memory:").unwrap(); //! -//! connection.execute(r#" +//! connection.execute(" //! CREATE TABLE `users` (id INTEGER, name VARCHAR(255)); //! INSERT INTO `users` (id, name) VALUES (1, 'Alice'); -//! "#).unwrap(); +//! ").unwrap(); //! //! connection.process("SELECT * FROM `users`;", |pairs| { //! for &(column, value) in pairs.iter() { diff --git a/tests/lib.rs b/tests/lib.rs index d292f0e..bcd11ef 100644 --- a/tests/lib.rs +++ b/tests/lib.rs @@ -15,11 +15,11 @@ fn workflow() { let connection = ok!(sqlite::open(":memory:")); - let sql = r#"CREATE TABLE `users` (id INTEGER, name VARCHAR(255), age REAL);"#; + let sql = "CREATE TABLE `users` (id INTEGER, name VARCHAR(255), age REAL);"; ok!(connection.execute(sql)); { - let sql = r#"INSERT INTO `users` (id, name, age) VALUES (?, ?, ?);"#; + let sql = "INSERT INTO `users` (id, name, age) VALUES (?, ?, ?);"; let mut statement = ok!(connection.prepare(sql)); ok!(statement.bind(1, 1i64)); ok!(statement.bind(2, "Alice")); @@ -29,7 +29,7 @@ fn workflow() { { let mut done = false; - let sql = r#"SELECT * FROM `users`;"#; + let sql = "SELECT * FROM `users`;"; ok!(connection.process(sql, |pairs| { assert!(pairs.len() == 3); assert!(pairs[0] == pair!("id", "1")); @@ -42,7 +42,7 @@ fn workflow() { } { - let sql = r#"SELECT * FROM `users`;"#; + let sql = "SELECT * FROM `users`;"; let mut statement = ok!(connection.prepare(sql)); assert!(ok!(statement.step()) == State::Row); assert!(ok!(statement.read::(0)) == 1); @@ -63,7 +63,7 @@ fn stress() { let path = directory.path().join("database.sqlite3"); let connection = ok!(sqlite::open(&path)); - let sql = r#"CREATE TABLE `users` (id INTEGER, name VARCHAR(255), age REAL);"#; + let sql = "CREATE TABLE `users` (id INTEGER, name VARCHAR(255), age REAL);"; ok!(connection.execute(sql)); let guards = (0..100).map(|_| { @@ -71,7 +71,7 @@ fn stress() { thread::spawn(move || { let mut connection = ok!(sqlite::open(&path)); ok!(connection.set_busy_handler(|_| true)); - let sql = r#"INSERT INTO `users` (id, name, age) VALUES (?, ?, ?);"#; + let sql = "INSERT INTO `users` (id, name, age) VALUES (?, ?, ?);"; let mut statement = ok!(connection.prepare(sql)); ok!(statement.bind(1, 1i64)); ok!(statement.bind(2, "Alice"));