@@ -13,7 +13,7 @@ module Rel8.Expr.Time
1313 , diffTime
1414 , subtractTime
1515
16− -- * Working with @DiffTime@
16+ -- * Working with @NominalDiffTime@
1717 , scaleInterval
1818 , second, seconds
1919 , minute, minutes
@@ -35,7 +35,7 @@ import Rel8.Expr.Opaleye ( unsafeCastExpr, unsafeLiteral )
3535
3636-- time
3737import Data.Time.Calendar ( Day )
38−import Data.Time.Clock ( DiffTime, UTCTime )
38+import Data.Time.Clock ( NominalDiffTime, UTCTime )
3939
4040
4141-- | Corresponds to @date(now())@.
@@ -74,93 +74,93 @@ now = nullaryFunction "now"
7474
7575
7676-- | Add a time interval to a point in time, yielding a new point in time.
77−addTime :: Expr DiffTime -> Expr UTCTime -> Expr UTCTime
77+addTime :: Expr NominalDiffTime -> Expr UTCTime -> Expr UTCTime
7878addTime = flip (binaryOperator "+")
7979
8080
8181-- | Find the duration between two times.
82−diffTime :: Expr UTCTime -> Expr UTCTime -> Expr DiffTime
82+diffTime :: Expr UTCTime -> Expr UTCTime -> Expr NominalDiffTime
8383diffTime = binaryOperator "-"
8484
8585
8686-- | Subtract a time interval from a point in time, yielding a new point in time.
87−subtractTime :: Expr DiffTime -> Expr UTCTime -> Expr UTCTime
87+subtractTime :: Expr NominalDiffTime -> Expr UTCTime -> Expr UTCTime
8888subtractTime = flip (binaryOperator "-")
8989
9090
91−scaleInterval :: Expr Double -> Expr DiffTime -> Expr DiffTime
91+scaleInterval :: Expr Double -> Expr NominalDiffTime -> Expr NominalDiffTime
9292scaleInterval = binaryOperator "*"
9393
9494
9595-- | An interval of one second.
96−second :: Expr DiffTime
96+second :: Expr NominalDiffTime
9797second = singleton "second"
9898
9999
100100-- | Create a literal interval from a number of seconds.
101−seconds :: Expr Double -> Expr DiffTime
101+seconds :: Expr Double -> Expr NominalDiffTime
102102seconds = (`scaleInterval` second)
103103
104104
105105-- | An interval of one minute.
106−minute :: Expr DiffTime
106+minute :: Expr NominalDiffTime
107107minute = singleton "minute"
108108
109109
110110-- | Create a literal interval from a number of minutes.
111−minutes :: Expr Double -> Expr DiffTime
111+minutes :: Expr Double -> Expr NominalDiffTime
112112minutes = (`scaleInterval` minute)
113113
114114
115115-- | An interval of one hour.
116−hour :: Expr DiffTime
116+hour :: Expr NominalDiffTime
117117hour = singleton "hour"
118118
119119
120120-- | Create a literal interval from a number of hours.
121−hours :: Expr Double -> Expr DiffTime
121+hours :: Expr Double -> Expr NominalDiffTime
122122hours = (`scaleInterval` hour)
123123
124124
125125-- | An interval of one day.
126−day :: Expr DiffTime
126+day :: Expr NominalDiffTime
127127day = singleton "day"
128128
129129
130130-- | Create a literal interval from a number of days.
131−days :: Expr Double -> Expr DiffTime
131+days :: Expr Double -> Expr NominalDiffTime
132132days = (`scaleInterval` day)
133133
134134
135135-- | An interval of one week.
136−week :: Expr DiffTime
136+week :: Expr NominalDiffTime
137137week = singleton "week"
138138
139139
140140-- | Create a literal interval from a number of weeks.
141−weeks :: Expr Double -> Expr DiffTime
141+weeks :: Expr Double -> Expr NominalDiffTime
142142weeks = (`scaleInterval` week)
143143
144144
145145-- | An interval of one month.
146−month :: Expr DiffTime
146+month :: Expr NominalDiffTime
147147month = singleton "month"
148148
149149
150150-- | Create a literal interval from a number of months.
151−months :: Expr Double -> Expr DiffTime
151+months :: Expr Double -> Expr NominalDiffTime
152152months = (`scaleInterval` month)
153153
154154
155155-- | An interval of one year.
156−year :: Expr DiffTime
156+year :: Expr NominalDiffTime
157157year = singleton "year"
158158
159159
160160-- | Create a literal interval from a number of years.
161−years :: Expr Double -> Expr DiffTime
161+years :: Expr Double -> Expr NominalDiffTime
162162years = (`scaleInterval` year)
163163
164164
165−singleton :: String -> Expr DiffTime
165+singleton :: String -> Expr NominalDiffTime
166166singleton unit = unsafeLiteral $ "'1 " ++ unit ++ "'"