update todo examples to 0.4 and use migrations

 * update tests/x.py

 * add examples/x.py

Author: mehcode

.gitignore

@@ -9,4 +9,3 @@ target/
 
 # Environment
 .env
-!tests/.env

examples/.gitignore

@@ -0,0 +1 @@
+sqlite/todos/todos.db

examples/mysql/todos/README.md

@@ -1,29 +1,41 @@
 # TODOs Example
 
+## Setup
+
+1. Declare the database URL
+
+    ```
+    export DATABASE_URL="mysql://root:password@localhost/todos"
+    ```
+
+2. Create the database.
+
+    ```
+    $ sqlx db create
+    ```
+
+3. Run sql migrations
+
+    ```
+    $ sqlx migrate run
+    ```
+
 ## Usage
 
-Declare the database URL:
+Add a todo 
 
 ```
-export DATABASE_URL="mysql://localhost/todos"
+cargo run -- add "todo description"
 ```
 
-Connect to `mysql` and create the database:
+Complete a todo.
 
 ```
-$ mysql
-mysql> CREATE DATABASE todos;
+cargo run -- done <todo id>
 ```
 
-Load the database schema (using the MySQL CLI interface thats already open):
+List all todos
 
 ```
-mysql> USE todos;
-mysql> source schema.sql
+cargo run
 ```
-
-Use `exit` to exit the MySQL CLI. Then, to run this example:
-
-- Add a todo: `cargo run -- add "todo description"`
-- Complete a todo: `cargo run -- done <todo id>`
-- List all todos: `cargo run`

examples/mysql/todos/schema.sql renamed to examples/mysql/todos/migrations/20200718111257_todos.sql

@@ -1,5 +1,6 @@
-CREATE TABLE IF NOT EXISTS todos (
+CREATE TABLE IF NOT EXISTS todos
+(
     id          BIGINT UNSIGNED PRIMARY KEY NOT NULL AUTO_INCREMENT,
-    description TEXT NOT NULL,
+    description TEXT    NOT NULL,
     done        BOOLEAN NOT NULL DEFAULT FALSE
 );

examples/mysql/todos/src/main.rs

@@ -1,5 +1,5 @@
-use anyhow::Context;
-use sqlx::MySqlPool;
+use sqlx::mysql::MySqlPool;
+use sqlx::Done;
 use std::env;
 use structopt::StructOpt;
 
@@ -18,10 +18,7 @@ enum Command {
 #[async_std::main]
 #[paw::main]
 async fn main(args: Args) -> anyhow::Result<()> {
-    let pool = MySqlPool::new(
-        &env::var("DATABASE_URL").context("`DATABASE_URL` must be set to run this example")?,
-    )
-    .await?;
+    let pool = MySqlPool::connect(&env::var("DATABASE_URL")?).await?;
 
     match args.cmd {
         Some(Command::Add { description }) => {
@@ -47,22 +44,19 @@ async fn main(args: Args) -> anyhow::Result<()> {
 }
 
 async fn add_todo(pool: &MySqlPool, description: String) -> anyhow::Result<u64> {
-    // Insert the TODO, then obtain the ID of this row
-    sqlx::query!(
+    // Insert the task, then obtain the ID of this row
+    let todo_id = sqlx::query!(
         r#"
 INSERT INTO todos ( description )
 VALUES ( ? )
         "#,
         description
     )
     .execute(pool)
-    .await?;
+    .await?
+    .last_insert_id();
 
-    let rec: (u64,) = sqlx::query_as("SELECT LAST_INSERT_ID()")
-        .fetch_one(pool)
-        .await?;
-
-    Ok(rec.0)
+    Ok(todo_id)
 }
 
 async fn complete_todo(pool: &MySqlPool, id: u64) -> anyhow::Result<bool> {
@@ -75,7 +69,8 @@ WHERE id = ?
         id
     )
     .execute(pool)
-    .await?;
+    .await?
+    .rows_affected();
 
     Ok(rows_affected > 0)
 }

examples/postgres/todos/README.md

@@ -1,29 +1,41 @@
 # TODOs Example
 
+## Setup
+
+1. Declare the database URL
+
+    ```
+    export DATABASE_URL="postgres://postgres:password@localhost/todos"
+    ```
+
+2. Create the database.
+
+    ```
+    $ sqlx db create
+    ```
+
+3. Run sql migrations
+
+    ```
+    $ sqlx migrate run
+    ```
+
 ## Usage
 
-Declare the database URL:
+Add a todo 
 
 ```
-export DATABASE_URL="postgres://postgres@localhost/todos"
+cargo run -- add "todo description"
 ```
 
-Create the database:
+Complete a todo.
 
 ```
-createdb -U postgres todos
+cargo run -- done <todo id>
 ```
 
-Load the database schema:
+List all todos
 
 ```
-psql -d "$DATABASE_URL" -f ./schema.sql
+cargo run
 ```
-
-Run:
-
-- Add a todo: `cargo run -- add "todo description"`
-- Complete a todo: `cargo run -- done <todo id>`
-- List all todos: `cargo run`
-
-

examples/postgres/todos/schema.sql renamed to examples/postgres/todos/migrations/20200718111257_todos.sql

@@ -1,5 +1,6 @@
-CREATE TABLE IF NOT EXISTS todos (
+CREATE TABLE IF NOT EXISTS todos
+(
     id          BIGSERIAL PRIMARY KEY,
-    description TEXT NOT NULL,
+    description TEXT    NOT NULL,
     done        BOOLEAN NOT NULL DEFAULT FALSE
 );

examples/postgres/todos/src/main.rs

@@ -1,5 +1,5 @@
-use anyhow::Context;
-use sqlx::PgPool;
+use sqlx::postgres::PgPool;
+use sqlx::Done;
 use std::env;
 use structopt::StructOpt;
 
@@ -18,10 +18,7 @@ enum Command {
 #[async_std::main]
 #[paw::main]
 async fn main(args: Args) -> anyhow::Result<()> {
-    let mut pool = PgPool::new(
-        &env::var("DATABASE_URL").context("`DATABASE_URL` must be set to run this example")?,
-    )
-    .await?;
+    let pool = PgPool::connect(&env::var("DATABASE_URL")?).await?;
 
     match args.cmd {
         Some(Command::Add { description }) => {
@@ -39,14 +36,14 @@ async fn main(args: Args) -> anyhow::Result<()> {
         }
         None => {
             println!("Printing list of all todos");
-            list_todos(&mut pool).await?;
+            list_todos(&pool).await?;
         }
     }
 
     Ok(())
 }
 
-async fn add_todo(mut pool: &PgPool, description: String) -> anyhow::Result<i64> {
+async fn add_todo(pool: &PgPool, description: String) -> anyhow::Result<i64> {
     let rec = sqlx::query!(
         r#"
 INSERT INTO todos ( description )
@@ -55,13 +52,13 @@ RETURNING id
         "#,
         description
     )
-    .fetch_one(&mut pool)
+    .fetch_one(pool)
     .await?;
 
     Ok(rec.id)
 }
 
-async fn complete_todo(mut pool: &PgPool, id: i64) -> anyhow::Result<bool> {
+async fn complete_todo(pool: &PgPool, id: i64) -> anyhow::Result<bool> {
     let rows_affected = sqlx::query!(
         r#"
 UPDATE todos
@@ -70,8 +67,9 @@ WHERE id = $1
         "#,
         id
     )
-    .execute(&mut pool)
-    .await?;
+    .execute(pool)
+    .await?
+    .rows_affected();
 
     Ok(rows_affected > 0)
 }

examples/sqlite/todos/README.md

@@ -1,27 +1,41 @@
 # TODOs Example
 
+## Setup
+
+1. Declare the database URL
+
+    ```
+    export DATABASE_URL="sqlite:todos.db"
+    ```
+
+2. Create the database.
+
+    ```
+    $ sqlx db create
+    ```
+
+3. Run sql migrations
+
+    ```
+    $ sqlx migrate run
+    ```
+
 ## Usage
 
-Declare the database URL:
+Add a todo 
 
 ```
-export DATABASE_URL="sqlite:///path/to/this/directory/todos.db"
+cargo run -- add "todo description"
 ```
 
-Create the database:
+Complete a todo.
 
 ```
-sqlite3 todos.db
+cargo run -- done <todo id>
 ```
 
-Load the database schema (using the SQLite CLI interface opened from the previous command):
+List all todos
 
 ```
-sqlite> .read schema.sql
+cargo run
 ```
-
-Use `.exit` to leave the SQLite CLI. Then, to run this example:
-
-- Add a todo: `cargo run -- add "todo description"`
-- Complete a todo: `cargo run -- done <todo id>`
-- List all todos: `cargo run`

examples/sqlite/todos/migrations/20200718111257_todos.sql

@@ -0,0 +1,6 @@
+CREATE TABLE IF NOT EXISTS todos
+(
+    id          INTEGER PRIMARY KEY NOT NULL,
+    description TEXT                NOT NULL,
+    done        BOOLEAN             NOT NULL DEFAULT 0
+);

examples/sqlite/todos/schema.sql

@@ -1,5 +1,5 @@
-use anyhow::Context;
-use sqlx::SqlitePool;
+use sqlx::sqlite::SqlitePool;
+use sqlx::Done;
 use std::env;
 use structopt::StructOpt;
 
@@ -18,10 +18,7 @@ enum Command {
 #[async_std::main]
 #[paw::main]
 async fn main(args: Args) -> anyhow::Result<()> {
-    let pool = SqlitePool::new(
-        &env::var("DATABASE_URL").context("`DATABASE_URL` must be set to run this example")?,
-    )
-    .await?;
+    let pool = SqlitePool::connect(&env::var("DATABASE_URL")?).await?;
 
     match args.cmd {
         Some(Command::Add { description }) => {
@@ -49,35 +46,33 @@ async fn main(args: Args) -> anyhow::Result<()> {
 async fn add_todo(pool: &SqlitePool, description: String) -> anyhow::Result<i64> {
     let mut conn = pool.acquire().await?;
 
-    // Insert the TODO, then obtain the ID of this row
-    sqlx::query!(
+    // Insert the task, then obtain the ID of this row
+    let id = sqlx::query!(
         r#"
 INSERT INTO todos ( description )
-VALUES ( $1 )
+VALUES ( ?1 )
         "#,
         description
     )
     .execute(&mut conn)
-    .await?;
+    .await?
+    .last_insert_rowid();
 
-    let rec: (i64,) = sqlx::query_as("SELECT last_insert_rowid()")
-        .fetch_one(&mut conn)
-        .await?;
-
-    Ok(rec.0)
+    Ok(id)
 }
 
 async fn complete_todo(pool: &SqlitePool, id: i64) -> anyhow::Result<bool> {
     let rows_affected = sqlx::query!(
         r#"
 UPDATE todos
 SET done = TRUE
-WHERE id = $1
+WHERE id = ?1
         "#,
         id
     )
     .execute(pool)
-    .await?;
+    .await?
+    .rows_affected();
 
     Ok(rows_affected > 0)
 }