Clean up SQL literals

This commit is contained in:
Ivan Ukhov 2015-07-04 09:29:46 -04:00
parent 961dad0f65
commit 883ce7dce3
3 changed files with 10 additions and 10 deletions

View File

@ -9,10 +9,10 @@ The package provides an interface to [SQLite][1].
```rust ```rust
let connection = sqlite::open(":memory:").unwrap(); let connection = sqlite::open(":memory:").unwrap();
connection.execute(r#" connection.execute("
CREATE TABLE `users` (id INTEGER, name VARCHAR(255)); CREATE TABLE `users` (id INTEGER, name VARCHAR(255));
INSERT INTO `users` (id, name) VALUES (1, 'Alice'); INSERT INTO `users` (id, name) VALUES (1, 'Alice');
"#).unwrap(); ").unwrap();
connection.process("SELECT * FROM `users`;", |pairs| { connection.process("SELECT * FROM `users`;", |pairs| {
for &(column, value) in pairs.iter() { for &(column, value) in pairs.iter() {

View File

@ -5,10 +5,10 @@
//! ``` //! ```
//! let connection = sqlite::open(":memory:").unwrap(); //! let connection = sqlite::open(":memory:").unwrap();
//! //!
//! connection.execute(r#" //! connection.execute("
//! CREATE TABLE `users` (id INTEGER, name VARCHAR(255)); //! CREATE TABLE `users` (id INTEGER, name VARCHAR(255));
//! INSERT INTO `users` (id, name) VALUES (1, 'Alice'); //! INSERT INTO `users` (id, name) VALUES (1, 'Alice');
//! "#).unwrap(); //! ").unwrap();
//! //!
//! connection.process("SELECT * FROM `users`;", |pairs| { //! connection.process("SELECT * FROM `users`;", |pairs| {
//! for &(column, value) in pairs.iter() { //! for &(column, value) in pairs.iter() {

View File

@ -15,11 +15,11 @@ fn workflow() {
let connection = ok!(sqlite::open(":memory:")); 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)); 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)); let mut statement = ok!(connection.prepare(sql));
ok!(statement.bind(1, 1i64)); ok!(statement.bind(1, 1i64));
ok!(statement.bind(2, "Alice")); ok!(statement.bind(2, "Alice"));
@ -29,7 +29,7 @@ fn workflow() {
{ {
let mut done = false; let mut done = false;
let sql = r#"SELECT * FROM `users`;"#; let sql = "SELECT * FROM `users`;";
ok!(connection.process(sql, |pairs| { ok!(connection.process(sql, |pairs| {
assert!(pairs.len() == 3); assert!(pairs.len() == 3);
assert!(pairs[0] == pair!("id", "1")); 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)); let mut statement = ok!(connection.prepare(sql));
assert!(ok!(statement.step()) == State::Row); assert!(ok!(statement.step()) == State::Row);
assert!(ok!(statement.read::<i64>(0)) == 1); assert!(ok!(statement.read::<i64>(0)) == 1);
@ -63,7 +63,7 @@ fn stress() {
let path = directory.path().join("database.sqlite3"); let path = directory.path().join("database.sqlite3");
let connection = ok!(sqlite::open(&path)); 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)); ok!(connection.execute(sql));
let guards = (0..100).map(|_| { let guards = (0..100).map(|_| {
@ -71,7 +71,7 @@ fn stress() {
thread::spawn(move || { thread::spawn(move || {
let mut connection = ok!(sqlite::open(&path)); let mut connection = ok!(sqlite::open(&path));
ok!(connection.set_busy_handler(|_| true)); 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)); let mut statement = ok!(connection.prepare(sql));
ok!(statement.bind(1, 1i64)); ok!(statement.bind(1, 1i64));
ok!(statement.bind(2, "Alice")); ok!(statement.bind(2, "Alice"));