From feaf238deb9f6c606dfc6316a230eb8e8b9a54ee Mon Sep 17 00:00:00 2001
From: Louis-Guillaume Gagnon <louis.guillaume.gagnon@gmail.com>
Date: Wed, 4 Sep 2013 12:04:30 -0400
Subject: [PATCH] SQL: export function addEntry instead of buildSQLAdd + runSQL

---
 src/Add.hs       | 5 ++---
 src/Tools/SQL.hs | 6 ++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Add.hs b/src/Add.hs
index 23d87f8..0e3a254 100644
--- a/src/Add.hs
+++ b/src/Add.hs
@@ -31,7 +31,7 @@ import System.Directory
 import Tools.Constants
 import Tools.Filter (tryGetFilters, usageFilters)
 import Tools.Operation (isHelp)
-import Tools.SQL (buildSQLAdd, runSQL)
+import Tools.SQL (addEntry)
 
 add :: [String] -> IO ()
 add [] = error $ "add: no arguments specified ('" ++ progName ++ " add help' for help)"
@@ -40,8 +40,7 @@ add argv = if isHelp $ head argv
     else do filters <- tryGetFilters argv
             case filters of
                 Left  msg -> error $ "add: " ++ msg
-                Right fs  -> do let sql = buildSQLAdd fs
-                                runSQL sql 
+                Right fs  -> addEntry fs
 
 usageAdd :: String
 usageAdd = "usage: " ++ progName ++ " add <filters>\n" ++ usageFilters
diff --git a/src/Tools/SQL.hs b/src/Tools/SQL.hs
index 99ac04f..bb3534c 100644
--- a/src/Tools/SQL.hs
+++ b/src/Tools/SQL.hs
@@ -18,10 +18,9 @@
 -}
 
 module Tools.SQL (
-    buildSQLAdd,
+    addEntry,
     getAllEntries,
     getEntry,
-    runSQL,
     searchEntries
 ) where
 
@@ -31,6 +30,9 @@ import Database.HDBC.Sqlite3
 
 import Tools.Constants
 
+addEntry :: ([String],[String]) -> IO ()
+addEntry pairs = return (buildSQLAdd pairs) >>= runSQL
+
 buildSQLAdd :: ([String],[String]) -> String
 buildSQLAdd (ks,vs) = 
     "INSERT INTO " ++ tableName ++ " (" ++ keys ++ ") VALUES(" ++ vals ++ ");"
-- 
2.11.4.GIT