From 0879ed7110d6d7808f10e9d38c5b7986bf87e63e Mon Sep 17 00:00:00 2001
From: "Adam C. Baker" <adam.durandal@gmail.com>
Date: Fri, 10 Oct 2014 15:54:05 -0700
Subject: [PATCH] flip app args

---
 src/Dbapi.hs       | 4 ++--
 src/Main.hs        | 2 +-
 test/SpecHelper.hs | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Dbapi.hs b/src/Dbapi.hs
index 9ce15f69a..a0a83c746 100644
--- a/src/Dbapi.hs
+++ b/src/Dbapi.hs
@@ -84,8 +84,8 @@ httpRequesterRole hdrs conn = do
     _ -> return NoCredentials
 
 
-app :: Connection -> DbRole -> Application
-app conn anonymous req respond = do
+app :: DbRole -> Connection -> Application
+app anonymous conn req respond = do
   attempt <- httpRequesterRole (requestHeaders req) conn
 
   case attempt of
diff --git a/src/Main.hs b/src/Main.hs
index 38f3598a4..c6782cf98 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -41,7 +41,7 @@ main = do
 
   Prelude.putStrLn $ "Listening on port " ++ (show $ configPort conf :: String)
   conn <- connectPostgreSQL' dburi
-  runTLS tls settings $ gzip def $ cors corsPolicy $ reportPgErrors $ app conn (cs $ configAnonRole conf)
+  runTLS tls settings $ gzip def $ cors corsPolicy $ reportPgErrors $ app (cs $ configAnonRole conf) conn
 
   where
     describe = progDesc "create a REST API to an existing Postgres database"
diff --git a/test/SpecHelper.hs b/test/SpecHelper.hs
index 2180a282f..0294a8579 100644
--- a/test/SpecHelper.hs
+++ b/test/SpecHelper.hs
@@ -59,14 +59,14 @@ withUser name pass role action conn = do
 withApp :: ActionWith Application -> ActionWith Connection
 withApp action conn = do
   runRaw conn "begin;"
-  action $ cors corsPolicy $ app conn "dbapi_anonymous"
+  action $ cors corsPolicy $ app "dbapi_anonymous" conn
   rollback conn
 
 appWithFixture :: ActionWith Application -> IO ()
 appWithFixture action = withDatabaseConnection $ \c -> do
   result <- tryJust transactionAborted $ do
     runRaw c "begin;"
-    action $ cors corsPolicy $ app c "dbapi_anonymous"
+    action $ cors corsPolicy $ app "dbapi_anonymous" c
     rollback c
 
   when (isLeft result) $