diff --git a/src/Dbapi.hs b/src/Dbapi.hs index e50129170..244d092ce 100644 --- a/src/Dbapi.hs +++ b/src/Dbapi.hs @@ -1,5 +1,6 @@ {-# LANGUAGE OverloadedStrings #-} +-- {{{ Imports module Dbapi where import Types (SqlRow) @@ -20,7 +21,7 @@ import Network.Wai import qualified Data.ByteString.Lazy as BL import qualified Data.ByteString.Char8 as BS -import Database.HDBC.PostgreSQL (connectPostgreSQL) +import Database.HDBC.PostgreSQL (connectPostgreSQL') import Database.HDBC.Types (SqlError, seErrorMsg) import PgStructure (printTables, printColumns) @@ -31,6 +32,8 @@ import PgQuery import RangeQuery import Data.Ranged.Ranges (emptyRange) +-- }}} + data AppConfig = AppConfig { configDbUri :: String , configPort :: Int } @@ -51,7 +54,7 @@ jsonBody = (fmap JSON.eitherDecode) . strictRequestBody app :: AppConfig -> Application app config req respond = do - conn <- connectPostgreSQL $ configDbUri config + conn <- connectPostgreSQL' $ configDbUri config r <- try $ case (path, verb) of ([], _) -> diff --git a/src/PgQuery.hs b/src/PgQuery.hs index 4280f8dfd..f4bb5aaf2 100644 --- a/src/PgQuery.hs +++ b/src/PgQuery.hs @@ -109,7 +109,6 @@ insert schema table row conn = do query <- populateSql conn ("insert into %I.%I ("++colIds++")", map toSql $ (pack . show $ schema):table:cols) stmt <- prepare conn (query ++ " values ("++phs++") returning *") _ <- execute stmt values - commit conn keys <- getColumnNames stmt Just vals <- fetchRow stmt let rowMap = fromList $ zip keys vals