From b60e632e807c31a1c462ccdf54dc188d06f429b7 Mon Sep 17 00:00:00 2001
From: Edward Shen <code@eddie.sh>
Date: Mon, 4 May 2020 19:47:48 -0400
Subject: [PATCH] remove init code from db.rs

---
 src/util/db.rs | 61 +++-----------------------------------------------
 1 file changed, 3 insertions(+), 58 deletions(-)

diff --git a/src/util/db.rs b/src/util/db.rs
index 305ef08..0859330 100644
--- a/src/util/db.rs
+++ b/src/util/db.rs
@@ -1,4 +1,3 @@
-use log::debug;
 use serenity::prelude::TypeMapKey;
 use sqlx::{
     sqlite::{SqliteConnection, SqlitePool},
@@ -15,7 +14,9 @@ pub(crate) struct DbConnPool {
 impl DbConnPool {
     pub async fn new() -> Result<Self, Error> {
         Ok(Self {
-            pool: init_pool().await?,
+            pool: SqlitePool::builder()
+                .build(&env::var("DATABASE_URL").unwrap())
+                .await?,
         })
     }
 }
@@ -23,59 +24,3 @@ impl DbConnPool {
 impl TypeMapKey for DbConnPool {
     type Value = Self;
 }
-
-async fn init_pool() -> Result<DbPool, Error> {
-    let pool = SqlitePool::builder()
-        .build(&env::var("DATABASE_URL").unwrap())
-        .await?;
-
-    // Heck table
-    sqlx::query!(
-        "CREATE TABLE IF NOT EXISTS Heck (
-            id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL UNIQUE,
-            count INTEGER NOT NULL
-        )"
-    )
-    .execute(&pool)
-    .await?;
-
-    debug!("Table Heck exists or was created");
-
-    // Arknights row roll counting
-    sqlx::query!(
-        "CREATE TABLE IF NOT EXISTS RollCount (
-            user_id TEXT PRIMARY KEY UNIQUE NOT NULL,
-            count INTEGER NOT NULL
-        )"
-    )
-    .execute(&pool)
-    .await?;
-
-    debug!("Table RollCount exists or was created");
-
-    sqlx::query!(
-        "CREATE TABLE IF NOT EXISTS OperatorCount (
-            user_id TEXT NOT NULL,
-            operator TEXT NOT NULL,
-            count INTEGER NOT NULL,
-            UNIQUE(user_id, operator)
-        )"
-    )
-    .execute(&pool)
-    .await?;
-
-    debug!("Table OperatorCount exists or was created");
-
-    if sqlx::query!("SELECT count FROM Heck")
-        .fetch_all(&pool)
-        .await?
-        .is_empty()
-    {
-        debug!("No entries in Heck, inserting default one");
-        sqlx::query!("INSERT INTO Heck (count) VALUES (0)")
-            .execute(&pool)
-            .await?;
-    }
-
-    Ok(pool)
-}