nuttycom/aftok - Change FD7SV5I6VCW27HZ3T3K4MMGB2OYGJTPKFFA263TNTAMRJGQJWVNAC

Fix handling of event_t columns.

Created by Kris Nuttycombe on April 17, 2015

FD7SV5I6VCW27HZ3T3K4MMGB2OYGJTPKFFA263TNTAMRJGQJWVNAC

Dependencies

In channels

main

Change contents

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 25 [4.456]

B:BD[4.1165] → [4.1165:1215]

eventTypeParser f v = fromField f v >>= nameEvent

[4.1165]

[4.1215]

eventTypeParser f v = do
  tn <- typename f
  case tn of 
    "event_t" -> maybe (returnError UnexpectedNull f "") (nameEvent . decodeUtf8) v
    _         -> returnError Incompatible f "column was not of type event_t"

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 52 [4.456]

B:BD[4.1646] → [5.3432:3511]

workEventParser = WorkEvent <$> fieldWith eventTypeParser <*> field  <*> field

[4.1646]

[4.1715]

workEventParser = WorkEvent <$> fieldWith eventTypeParser <*> field <*> field

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 163 [4.456]

∅:D[3.2411] → [6.655:740]

B:BD[6.655] → [6.655:740]

    "SELECT btc_addr, event_type, event_time from work_events WHERE project_id = ?"

[3.2411]

[6.740]

    "SELECT btc_addr, event_type, event_time, event_metadata from work_events WHERE project_id = ?"

Insertion in lib/Quixotic/TimeLog.hs at line 2 [8.846]
[7.3530]
[8.883]
```
{-# LANGUAGE DeriveDataTypeable #-}
```

Replacement in lib/Quixotic/TimeLog.hs at line 38 [8.846]

B:BD[8.1225] → [7.3657:3715]

data EventType = StartWork | StopWork deriving (Show, Eq)

[8.1225]

[9.5414]

data EventType = StartWork | StopWork deriving (Show, Eq, Typeable)

Replacement in lib/Quixotic/TimeLog.hs at line 54 [8.846]
B:BD[5.3997] → [5.3997:4023]
```
  , _eventMeta :: A.Value
```
[5.3997]
[7.4037]
```
  , _eventMeta :: Maybe A.Value
```

Replacement in server/Quixotic/Snaplet/WorkLog.hs at line 28 [10.5424]

B:BD[10.6042] → [5.4362:4460]

  let em = maybe A.Null id $ A.decode requestBody
      workEvent = WorkEvent evType timestamp em

[10.6042]

[6.4128]

  let workEvent = WorkEvent evType timestamp $ A.decode requestBody

Replacement in sql/quixotic-pg.sql at line 29 [8.3144]
B:BD[5.4597] → [5.4597:4624]
```
  event_meta json not null
```
[5.4597]
[11.4421]
```
  event_metadata json not null
```
Deletion in test/Quixotic/TimeLogSpec.hs at line 6 [8.3665]
B:BD[12.1681] → [2.3:36]
```
import qualified Data.Aeson as A
```

Replacement in test/Quixotic/TimeLogSpec.hs at line 33 [8.3665]

B:BD[13.3132] → [2.37:151]

            [ LogEntry addr (WorkEvent StartWork start' A.Null), LogEntry addr (WorkEvent StopWork end' A.Null) ]

[13.3132]

[14.417]

            [ LogEntry addr (WorkEvent StartWork start' Nothing), LogEntry addr (WorkEvent StopWork end' Nothing) ]