khibino/haskell-relational-record
1
1
Fork 0
mirror of https://github.com/khibino/haskell-relational-record.git synced 2024-12-01 22:02:07 +03:00
Code Issues Projects Releases Wiki Activity

Simplify.

Browse Source
This commit is contained in:
Kei Hibino 2014-10-09 17:00:14 +09:00
parent 4c96f3f5c8
commit 528dbc8f59
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
relational-query-HDBC/src/Database/HDBC/Query/TH.hs
View File

@ -26,8 +26,9 @@ module Database.HDBC.Query.TH (
inlineVerifiedQuery
) where
import Data.Maybe (listToMaybe, isJust, catMaybes)
import Data.Maybe (listToMaybe, fromMaybe)
import qualified Data.Map as Map
import Control.Applicative ((<$>))
import Control.Monad (when)
import Database.HDBC (IConnection, SqlValue, prepare)
@ -112,13 +113,8 @@ defineTableFromDB connect drv scm tbl derives = do
$ "defineTableFromDB: fail to find index of pkey - " ++ k ++ ". Something wrong!!"
return found
primaryIxs <- case primCols of
_:_ -> do
founds <- mapM lookup' primCols
if all isJust founds
then return $ catMaybes founds
else return []
[] -> return []
primaryIxs <- fromMaybe [] . sequence <$> mapM lookup' primCols
return (cols, notNullIdxs, primaryIxs) )
(cols, notNullIdxs, primaryIxs) <- runIO getDBinfo