Skip to content

Commit

Permalink
Fix regression
Browse files Browse the repository at this point in the history
  • Loading branch information
mightybyte committed Mar 30, 2012
1 parent e5cb098 commit 688fbf1
Showing 1 changed file with 13 additions and 9 deletions.
22 changes: 13 additions & 9 deletions src/Snap/Snaplet/Auth/Backends/PostgresqlSimple.hs
Expand Up @@ -125,13 +125,16 @@ createTableIfMissing PostgresAuthManager{..} = do
"select relname from pg_class where relname='" "select relname from pg_class where relname='"
`T.append` tblName pamTable `T.append` "'" `T.append` tblName pamTable `T.append` "'"
when (null (res :: [Only T.Text])) $ when (null (res :: [Only T.Text])) $
P.execute_ conn (Query q) >> return () P.execute_ conn (Query $ T.encodeUtf8 q) >> return ()
return () return ()
where where
q = T.encodeUtf8 $ "CREATE TABLE " `T.append` q = T.concat
tblName pamTable `T.append` [ "CREATE TABLE "
" (" `T.append` , tblName pamTable
T.intercalate "," (map (fDesc . ($pamTable) . (fst)) colDef) , " ("
, T.intercalate "," (map (fDesc . ($pamTable) . (fst)) colDef)
, ")"
]


buildUid :: Int -> UserId buildUid :: Int -> UserId
buildUid = UserId . T.pack . show buildUid = UserId . T.pack . show
Expand Down Expand Up @@ -253,7 +256,8 @@ fDesc f = fst f `T.append` " " `T.append` snd f
-- 'AuthTable'. -- 'AuthTable'.
colDef :: [(AuthTable -> (Text, Text), AuthUser -> P.Action)] colDef :: [(AuthTable -> (Text, Text), AuthUser -> P.Action)]
colDef = colDef =
[ (colLogin , P.render . userLogin) [ (colId , P.render . fmap unUid . userId)
, (colLogin , P.render . userLogin)
, (colPassword , P.render . userPassword) , (colPassword , P.render . userPassword)
, (colActivatedAt , P.render . userActivatedAt) , (colActivatedAt , P.render . userActivatedAt)
, (colSuspendedAt , P.render . userSuspendedAt) , (colSuspendedAt , P.render . userSuspendedAt)
Expand Down Expand Up @@ -286,15 +290,15 @@ saveQuery at u@AuthUser{..} = maybe insertQuery updateQuery userId
(T.concat [ "UPDATE " (T.concat [ "UPDATE "
, tblName at , tblName at
, " SET " , " SET "
, T.intercalate "," (map (qval . fst) colDef) , T.intercalate "," (map (qval . fst) $ tail colDef)
, " WHERE " , " WHERE "
, fst (colId at) , fst (colId at)
, " = ?" , " = ?"
] ]
, params ++ [P.render $ unUid uid]) , params ++ [P.render $ unUid uid])
cols = map (fst . ($at) . fst) colDef cols = map (fst . ($at) . fst) $ tail colDef
vals = map (const "?") cols vals = map (const "?") cols
params = map (($u) . snd) colDef params = map (($u) . snd) $ tail colDef




------------------------------------------------------------------------------ ------------------------------------------------------------------------------
Expand Down

0 comments on commit 688fbf1

Please sign in to comment.