0d8e76e · typeable/postgresql-simple

git.iko.soy/typeable/postgresql-simple

Use time-compat

commit0d8e76ef3964776a6167c3005e2333ee53c08175 authorOleg Grenrus <oleg.grenrus@iki.fi> dateTue 5 Jan 2021, 17:44 (6 years ago) parent5b3676c

10 files changed+21−22

compare with master

unifiedsplit

postgresql-simple.cabal+3−3 src/Database/PostgreSQL/Simple/FromField.hs+1−1 src/Database/PostgreSQL/Simple/Range.hs+1−1 src/Database/PostgreSQL/Simple/Time/Implementation.hs+2−2 src/Database/PostgreSQL/Simple/Time/Internal/Parser.hs+5−5 src/Database/PostgreSQL/Simple/Time/Internal/Printer.hs+3−3 src/Database/PostgreSQL/Simple/ToField.hs+2−2 test/Interval.hs+2−3 test/Main.hs+1−1 test/Time.hs+1−1

postgresql-simple.cabal+3−3

@@ -82,7 +82,7 @@ library

8282 , containers >=0.5.0.0 && <0.7

8383 , template-haskell >=2.8.0.0 && <2.17

8484 , text >=1.2.3.0 && <1.3

85− , time >=1.9.0.0 && <1.12

85+ , time-compat >=1.9.5 && <1.12

8686 , transformers >=0.3.0.0 && <0.6

8787

8888 -- Other dependencies

@@ -93,7 +93,7 @@ library

9393 , case-insensitive >=1.2.0.11 && <1.3

9494 , hashable >=1.2.7.0 && <1.4

9595 , Only >=0.1 && <0.1.1

96− , postgresql-libpq >=0.9.4.2 && <0.10

96+ , postgresql-libpq >=0.9.4.3 && <0.10

9797 , scientific >=0.3.6.2 && <0.4

9898 , uuid-types >=1.0.3 && <1.1

9999 , vector >=0.12.0.1 && <0.13

@@ -177,7 +177,7 @@ test-suite test

177177 , tasty-golden

178178 , tasty-hunit

179179 , text

180− , time

180+ , time-compat

181181 , vector

182182

183183 if !impl(ghc >=7.6)

src/Database/PostgreSQL/Simple/FromField.hs+1−1

@@ -129,7 +129,7 @@ import Data.Functor.Identity (Identity(Identity))

129129import Data.Int (Int16, Int32, Int64)

130130import Data.IORef (IORef, newIORef)

131131import Data.Ratio (Ratio)

132−import Data.Time ( UTCTime, ZonedTime, LocalTime, Day, TimeOfDay, CalendarDiffTime )

132+import Data.Time.Compat ( UTCTime, ZonedTime, LocalTime, Day, TimeOfDay, CalendarDiffTime )

133133import Data.Typeable (Typeable, typeOf)

134134import Data.Vector (Vector)

135135import Data.Vector.Mutable (IOVector)

src/Database/PostgreSQL/Simple/Range.hs+1−1

@@ -38,7 +38,7 @@ import Data.Monoid (mempty)

3838import Data.Scientific (Scientific)

3939import qualified Data.Text.Lazy.Builder as LT

4040import qualified Data.Text.Lazy.Encoding as LT

41−import Data.Time (Day, LocalTime,

41+import Data.Time.Compat (Day, LocalTime,

4242 NominalDiffTime,

4343 TimeOfDay, UTCTime,

4444 ZonedTime,

src/Database/PostgreSQL/Simple/Time/Implementation.hs+2−2

@@ -18,8 +18,8 @@ import Data.ByteString.Builder.Prim(primBounded)

1818import Control.Arrow((***))

1919import Control.Applicative

2020import qualified Data.ByteString as B

21−import Data.Time hiding (getTimeZone, getZonedTime)

22−import Data.Time.LocalTime (CalendarDiffTime)

21+import Data.Time.Compat (LocalTime, UTCTime, ZonedTime, Day, TimeOfDay, TimeZone, NominalDiffTime, utc)

22+import Data.Time.LocalTime.Compat (CalendarDiffTime)

2323import Data.Typeable

2424import Data.Maybe (fromMaybe)

2525import qualified Data.Attoparsec.ByteString.Char8 as A

src/Database/PostgreSQL/Simple/Time/Internal/Parser.hs+5−5

@@ -33,12 +33,12 @@ import Data.Char (ord)

3333import Data.Fixed (Pico)

3434import Data.Int (Int64)

3535import Data.Maybe (fromMaybe)

36−import Data.Time.Calendar (Day, fromGregorianValid, addDays)

37−import Data.Time.Clock (UTCTime(..))

38−import Data.Time.Format.ISO8601 (iso8601ParseM)

39−import Data.Time.LocalTime (CalendarDiffTime)

36+import Data.Time.Calendar.Compat (Day, fromGregorianValid, addDays)

37+import Data.Time.Clock.Compat (UTCTime(..))

38+import Data.Time.Format.ISO8601.Compat (iso8601ParseM)

39+import Data.Time.LocalTime.Compat (CalendarDiffTime)

4040import qualified Data.ByteString.Char8 as B8

41−import qualified Data.Time.LocalTime as Local

41+import qualified Data.Time.LocalTime.Compat as Local

4242

4343-- | Parse a date of the form @YYYY-MM-DD@.

4444day :: Parser Day

src/Database/PostgreSQL/Simple/Time/Internal/Printer.hs+3−3

@@ -28,12 +28,12 @@ import Data.ByteString.Builder.Prim

2828import Data.Char ( chr )

2929import Data.Int ( Int32, Int64 )

3030import Data.String (fromString)

31−import Data.Time

31+import Data.Time.Compat

3232 ( UTCTime(..), ZonedTime(..), LocalTime(..), NominalDiffTime

3333 , Day, toGregorian, TimeOfDay(..), timeToTimeOfDay

3434 , TimeZone, timeZoneMinutes )

35−import Data.Time.Format.ISO8601 (iso8601Show)

36−import Data.Time.LocalTime (CalendarDiffTime)

35+import Data.Time.Format.ISO8601.Compat (iso8601Show)

36+import Data.Time.LocalTime.Compat (CalendarDiffTime)

3737import Database.PostgreSQL.Simple.Compat ((<>), fromPico)

3838import Unsafe.Coerce (unsafeCoerce)

3939

src/Database/PostgreSQL/Simple/ToField.hs+2−2

@@ -36,8 +36,8 @@ import Data.Functor.Identity (Identity(Identity))

3636import Data.Int (Int8, Int16, Int32, Int64)

3737import Data.List (intersperse)

3838import Data.Monoid (mappend)

39−import Data.Time (Day, TimeOfDay, LocalTime, UTCTime, ZonedTime, NominalDiffTime)

40−import Data.Time.LocalTime (CalendarDiffTime)

39+import Data.Time.Compat (Day, TimeOfDay, LocalTime, UTCTime, ZonedTime, NominalDiffTime)

40+import Data.Time.LocalTime.Compat (CalendarDiffTime)

4141import Data.Typeable (Typeable)

4242import Data.Word (Word, Word8, Word16, Word32, Word64)

4343import {-# SOURCE #-} Database.PostgreSQL.Simple.ToRow

test/Interval.hs+2−3

@@ -36,9 +36,8 @@ module Interval (testInterval) where

3636

3737import Common

3838import Control.Monad(forM_, replicateM_)

39−import Data.Time

40−import Data.Time.LocalTime (CalendarDiffTime(..))

41−import Data.Time.LocalTime (CalendarDiffTime(..))

39+import Data.Time.Compat

40+import Data.Time.LocalTime.Compat (CalendarDiffTime(..))

4241import Data.ByteString(ByteString)

4342import Database.PostgreSQL.Simple.SqlQQ

4443

test/Main.hs+1−1

@@ -46,7 +46,7 @@ import qualified Data.Text.Encoding as T

4646import qualified Data.Vector as V

4747import System.FilePath

4848import System.Timeout(timeout)

49−import Data.Time(getCurrentTime, diffUTCTime)

49+import Data.Time.Compat (getCurrentTime, diffUTCTime)

5050import System.Environment (getEnvironment)

5151

5252import Test.Tasty

test/Time.hs+1−1

@@ -36,7 +36,7 @@ module Time (testTime) where