haskelldb 2.1.1 → 2.2.1
raw patch · 5 files changed
+20/−7 lines, 5 filesdep +timePVP ok
version bump matches the API change (PVP)
Dependencies added: time
API changes (from Hackage documentation)
+ Database.HaskellDB.DBLayout: data LocalTime :: *
+ Database.HaskellDB.DBSpec: LocalTimeT :: FieldType
+ Database.HaskellDB.DBSpec.PPHelpers: checkChars :: [Char] -> [Char]
+ Database.HaskellDB.DBSpec.PPHelpers: checkKeyword :: [Char] -> [Char]
+ Database.HaskellDB.DBSpec.PPHelpers: checkLower :: [Char] -> [Char]
+ Database.HaskellDB.DBSpec.PPHelpers: checkLowerDef :: Char -> [Char] -> [Char]
+ Database.HaskellDB.DBSpec.PPHelpers: checkUpper :: [Char] -> [Char]
+ Database.HaskellDB.DBSpec.PPHelpers: checkUpperDef :: Char -> [Char] -> [Char]
+ Database.HaskellDB.DBSpec.PPHelpers: fileName :: [Char] -> [Char]
+ Database.HaskellDB.DBSpec.PPHelpers: mkIdentCamelCase :: MakeIdentifiers
+ Database.HaskellDB.DBSpec.PPHelpers: mkIdentPreserving :: MakeIdentifiers
+ Database.HaskellDB.DBSpec.PPHelpers: newline :: Doc
+ Database.HaskellDB.DBSpec.PPHelpers: ppComment :: [[Char]] -> Doc
+ Database.HaskellDB.DBSpec.PPHelpers: toLowerCamelCase :: [Char] -> [Char]
+ Database.HaskellDB.DBSpec.PPHelpers: toUpperCamelCase :: [Char] -> [Char]
+ Database.HaskellDB.Database: getLocalTime :: GetInstances s -> s -> String -> IO (Maybe LocalTime)
+ Database.HaskellDB.Database: instance [overlap ok] GetValue (Maybe LocalTime)
+ Database.HaskellDB.Database: instance [overlap ok] GetValue LocalTime
+ Database.HaskellDB.FieldType: LocalTimeT :: FieldType
+ Database.HaskellDB.FieldType: instance [overlap ok] ExprType LocalTime
- Database.HaskellDB.Database: GetInstances :: (s -> String -> IO (Maybe String)) -> (s -> String -> IO (Maybe Int)) -> (s -> String -> IO (Maybe Integer)) -> (s -> String -> IO (Maybe Double)) -> (s -> String -> IO (Maybe Bool)) -> (s -> String -> IO (Maybe CalendarTime)) -> GetInstances s
+ Database.HaskellDB.Database: GetInstances :: (s -> String -> IO (Maybe String)) -> (s -> String -> IO (Maybe Int)) -> (s -> String -> IO (Maybe Integer)) -> (s -> String -> IO (Maybe Double)) -> (s -> String -> IO (Maybe Bool)) -> (s -> String -> IO (Maybe CalendarTime)) -> (s -> String -> IO (Maybe LocalTime)) -> GetInstances s
- Database.HaskellDB.DriverAPI: class Monad m => MonadIO m :: (* -> *)
+ Database.HaskellDB.DriverAPI: class Monad m => MonadIO (m :: * -> *)
Files
- haskelldb.cabal +6/−6
- src/Database/HaskellDB/DBLayout.hs +2/−1
- src/Database/HaskellDB/Database.hs +5/−0
- src/Database/HaskellDB/FieldType.hs +6/−0
- src/Database/HaskellDB/Sql/Default.hs +1/−0
haskelldb.cabal view
@@ -1,8 +1,8 @@ Name: haskelldb-Version: 2.1.1+Version: 2.2.1 Cabal-version: >= 1.6 Build-type: Simple-Homepage: http://trac.haskell.org/haskelldb+Homepage: https://github.com/m4dc4p/haskelldb Copyright: The authors Maintainer: "Justin Bailey" <jgbailey@gmail.com> Author: Daan Leijen, Conny Andersson, Martin Andersson, Mary Bergman, Victor Blomqvist, Bjorn Bringert, Anders Hockersten, Torbjorn Martin, Jeremy Shaw, Justin Bailey@@ -20,7 +20,8 @@ old-time >= 1 && < 2, old-locale >= 1 && < 2, directory >= 1 && < 2,- containers >= 0.3 && < 1+ containers >= 0.3 && < 1,+ time >= 1.0 Extensions: EmptyDataDecls, DeriveDataTypeable,@@ -62,8 +63,7 @@ Database.HaskellDB.Version, Database.HaskellDB.DriverAPI Hs-source-dirs: src- ghc-options: -O2 Source-repository head- Type: darcs- Location: http://code.haskell.org/haskelldb+ Type: git+ Location: https://github.com/m4dc4p/haskelldb
src/Database/HaskellDB/DBLayout.hs view
@@ -17,7 +17,7 @@ module Database.HaskellDB.DBLayout (module Database.HaskellDB.BoundedString , module Database.HaskellDB.DBSpec- , CalendarTime+ , CalendarTime, LocalTime , Expr, Table, Attr, baseTable , RecCons, RecNil, FieldTag, fieldName , hdbMakeEntry, mkAttr, ( # )@@ -30,6 +30,7 @@ import Database.HaskellDB.BoundedString import System.Time (CalendarTime)+import Data.Time.LocalTime (LocalTime) import Database.HaskellDB.Query (Expr, Table, Attr(..) , baseTable, attribute, (<<), emptyTable) import Database.HaskellDB.DBSpec
src/Database/HaskellDB/Database.hs view
@@ -42,6 +42,7 @@ import Database.HaskellDB.HDBRec import System.Time+import Data.Time.LocalTime import Control.Monad infix 9 !.@@ -103,6 +104,8 @@ , getBool :: s -> String -> IO (Maybe Bool) -- | Get a 'CalendarTime' value. , getCalendarTime :: s -> String -> IO (Maybe CalendarTime)+ -- | Get a 'LocalTime' value.+ , getLocalTime :: s -> String -> IO (Maybe LocalTime) } @@ -144,6 +147,7 @@ instance GetValue Double where getValue = getNonNull instance GetValue Bool where getValue = getNonNull instance GetValue CalendarTime where getValue = getNonNull+instance GetValue LocalTime where getValue = getNonNull instance Size n => GetValue (BoundedString n) where getValue = getNonNull instance GetValue (Maybe String) where getValue = getString@@ -152,6 +156,7 @@ instance GetValue (Maybe Double) where getValue = getDouble instance GetValue (Maybe Bool) where getValue = getBool instance GetValue (Maybe CalendarTime) where getValue = getCalendarTime+instance GetValue (Maybe LocalTime) where getValue = getLocalTime instance Size n => GetValue (Maybe (BoundedString n)) where getValue fs s f = liftM (liftM trunc) (getValue fs s f)
src/Database/HaskellDB/FieldType.hs view
@@ -21,6 +21,7 @@ import Data.Dynamic import System.Time+import Data.Time.LocalTime import Database.HaskellDB.HDBRec (RecCons(..), Record, RecNil(..), ShowLabels) import Database.HaskellDB.BoundedString@@ -38,6 +39,7 @@ | DoubleT | BoolT | CalendarTimeT+ | LocalTimeT | BStrT Int deriving (Eq,Ord,Show,Read) @@ -64,6 +66,7 @@ toHaskellType DoubleT = "Double" toHaskellType BoolT = "Bool" toHaskellType CalendarTimeT = "CalendarTime"+toHaskellType LocalTimeT = "LocalTime" toHaskellType (BStrT a) = "BStr" ++ show a -- | Given a query, returns a list of the field names and their@@ -115,6 +118,9 @@ instance ExprType CalendarTime where fromHaskellType _ = (CalendarTimeT, False)++instance ExprType LocalTime where+ fromHaskellType _ = (LocalTimeT, False) instance (Size n) => ExprType (BoundedString n) where fromHaskellType b = (BStrT (listBound b), False)
src/Database/HaskellDB/Sql/Default.hs view
@@ -98,6 +98,7 @@ DoubleT -> SqlType "double precision" BoolT -> SqlType "bit" CalendarTimeT -> SqlType "timestamp with time zone"+ LocalTimeT -> SqlType "timestamp without time zone" BStrT a -> SqlType1 "varchar" a -----------------------------------------------------------