diff options
Diffstat (limited to 'haskell/src/SpaceTraders/Database/Ships.hs')
| -rw-r--r-- | haskell/src/SpaceTraders/Database/Ships.hs | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/haskell/src/SpaceTraders/Database/Ships.hs b/haskell/src/SpaceTraders/Database/Ships.hs index 8c47059..5a2ab7c 100644 --- a/haskell/src/SpaceTraders/Database/Ships.hs +++ b/haskell/src/SpaceTraders/Database/Ships.hs @@ -9,8 +9,6 @@ module SpaceTraders.Database.Ships import Control.Monad.Reader import Data.Aeson -import Data.Time -import Data.Time.Format.ISO8601 import qualified Database.SQLite.Simple as S import SpaceTraders @@ -18,9 +16,7 @@ import SpaceTraders.Model.Ship import SpaceTraders.Utils addShip :: (HasDatabaseConn env, MonadIO m, MonadReader env m) => Ship -> m () -addShip ship = do - t <- liftIO getCurrentTime - execute "INSERT INTO ships(data, available) VALUES (json(?), ?);" (encode ship, iso8601Show t) +addShip ship = execute "INSERT INTO ships(data) VALUES (json(?));" (S.Only $ encode ship) getShips :: (HasDatabaseConn env, MonadIO m, MonadReader env m) => m [Ship] getShips = query_ "SELECT data FROM ships;" @@ -29,8 +25,7 @@ setShip :: (HasDatabaseConn env, MonadFail m, MonadIO m, MonadReader env m) => S setShip ship = do c <- count "SELECT count(id) FROM ships WHERE data->>'symbol' = ?;" (S.Only $ symbol ship) if c == 0 then addShip ship - else updateShip ship Nothing + else updateShip ship -updateShip :: (HasDatabaseConn env, MonadIO m, MonadReader env m) => Ship -> Maybe UTCTime -> m () -updateShip ship (Just time) = execute "UPDATE ships SET data = json(?), available = ? WHERE data->>'symbol' = ?;" (encode ship, iso8601Show time, symbol ship) -updateShip ship Nothing = execute "UPDATE ships SET data = json(?) WHERE data->>'symbol' = ?;" (encode ship, symbol ship) +updateShip :: (HasDatabaseConn env, MonadIO m, MonadReader env m) => Ship -> m () +updateShip ship = execute "UPDATE ships SET data = json(?) WHERE data->>'symbol' = ?;" (encode ship, symbol ship) |