khibino/haskell-relational-record
1
1
Fork 0
mirror of https://github.com/khibino/haskell-relational-record.git synced 2024-11-29 14:45:51 +03:00
Code Issues Projects Releases Wiki Activity

Fix along with warnings.

Browse Source
This commit is contained in:
Kei Hibino 2014-12-10 01:10:08 +09:00
parent 18740b31f9
commit a1116bbd23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
relational-schemas/src/Database/Relational/Schema/Oracle.hs
View File

@ -5,7 +5,7 @@ module Database.Relational.Schema.Oracle
, columnsQuerySQL, primaryKeyQuerySQL
) where
import Control.Applicative ((<|>), (<$>))
import Control.Applicative ((<|>))
import Data.ByteString (ByteString)
import Data.Char (toLower)
import Data.Map (Map)
@ -59,10 +59,10 @@ getType :: Map String TypeQ -- ^ Type mapping specified by user
-> DbaTabColumns -- ^ Column info in data dictionary
-> Maybe (String, TypeQ) -- ^ Result normalized name and mapped Haskell type
getType mapFromSql cols = do
key <- Cols.dataType cols
typ <- if key == "NUMBER"
ky <- Cols.dataType cols
typ <- if ky == "NUMBER"
then return $ numberType $ Cols.dataScale cols
else Map.lookup key mapFromSql <|> Map.lookup key mapFromSqlDefault
else Map.lookup ky mapFromSql <|> Map.lookup ky mapFromSqlDefault
return (normalizeColumn $ Cols.columnName cols, mayNull typ)
where
mayNull typ