@@ -17,7 +17,7 @@ your own projects.
|
|||||||
|
|
||||||
### Usage
|
### Usage
|
||||||
|
|
||||||
Download the binary ([OS X](http://bin.begriffs.com/dbapi/osx/postgrest-0.2.4.10.tar.xz) / [Ubuntu](http://bin.begriffs.com/dbapi/heroku/postgrest-0.2.4.10.tar.xz)) and invoke like so:
|
Download the binary ([OS X](http://bin.begriffs.com/dbapi/osx/postgrest-0.2.5.0.tar.xz) / [Ubuntu](http://bin.begriffs.com/dbapi/heroku/postgrest-0.2.5.0.tar.xz)) and invoke like so:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
postgrest --db-host localhost --db-port 5432 \
|
postgrest --db-host localhost --db-port 5432 \
|
||||||
|
|||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
name: postgrest
|
name: postgrest
|
||||||
version: 0.2.4.10
|
version: 0.2.5.0
|
||||||
synopsis: The database is your api
|
synopsis: The database is your api
|
||||||
license: MIT
|
license: MIT
|
||||||
license-file: LICENSE
|
license-file: LICENSE
|
||||||
|
|||||||
+12
@@ -153,6 +153,18 @@ app reqBody req =
|
|||||||
$ update qt (map cs $ keys obj) (elems obj)
|
$ update qt (map cs $ keys obj) (elems obj)
|
||||||
return $ responseLBS status204 [ jsonH ] ""
|
return $ responseLBS status204 [ jsonH ] ""
|
||||||
|
|
||||||
|
([table], "DELETE") -> do
|
||||||
|
let qt = QualifiedTable schema (cs table)
|
||||||
|
let del = coerce $ countT
|
||||||
|
. returningStarT
|
||||||
|
. whereT qq
|
||||||
|
$ deleteFrom qt
|
||||||
|
row <- H.single del
|
||||||
|
let (Identity deletedCount) = fromMaybe (Identity 0 :: Identity Int) row
|
||||||
|
return $ if deletedCount == 0
|
||||||
|
then responseLBS status404 [] ""
|
||||||
|
else responseLBS status204 [("Content-Range", "*/"<> cs (show deletedCount))] ""
|
||||||
|
|
||||||
(_, _) ->
|
(_, _) ->
|
||||||
return $ responseLBS status404 [] ""
|
return $ responseLBS status404 [] ""
|
||||||
|
|
||||||
|
|||||||
@@ -74,6 +74,12 @@ iffNotT (aq, ap, apre) (bq, bp, bpre) =
|
|||||||
, All $ getAll apre && getAll bpre
|
, All $ getAll apre && getAll bpre
|
||||||
)
|
)
|
||||||
|
|
||||||
|
countT :: StatementT
|
||||||
|
countT (sql, params, pre) =
|
||||||
|
("WITH qqq AS (" <> sql <> ") SELECT count(1) FROM qqq"
|
||||||
|
, params
|
||||||
|
, pre)
|
||||||
|
|
||||||
countRows :: QualifiedTable -> DynamicSQL
|
countRows :: QualifiedTable -> DynamicSQL
|
||||||
countRows t =
|
countRows t =
|
||||||
("select count(1) from " <> fromQt t, [], mempty)
|
("select count(1) from " <> fromQt t, [], mempty)
|
||||||
@@ -93,6 +99,14 @@ selectStar :: QualifiedTable -> DynamicSQL
|
|||||||
selectStar t =
|
selectStar t =
|
||||||
("select * from " <> fromQt t, [], mempty)
|
("select * from " <> fromQt t, [], mempty)
|
||||||
|
|
||||||
|
returningStarT :: StatementT
|
||||||
|
returningStarT (sql, params, pre) =
|
||||||
|
(sql <> " RETURNING *", params, pre)
|
||||||
|
|
||||||
|
deleteFrom :: QualifiedTable -> DynamicSQL
|
||||||
|
deleteFrom t =
|
||||||
|
("delete from " <> fromQt t, [], mempty)
|
||||||
|
|
||||||
insertInto :: QualifiedTable -> [Text] -> [JSON.Value] -> DynamicSQL
|
insertInto :: QualifiedTable -> [Text] -> [JSON.Value] -> DynamicSQL
|
||||||
insertInto t [] _ =
|
insertInto t [] _ =
|
||||||
("insert into " <> fromQt t <> " default values returning *", [], mempty)
|
("insert into " <> fromQt t <> " default values returning *", [], mempty)
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
module Feature.DeleteSpec where
|
||||||
|
|
||||||
|
import Test.Hspec
|
||||||
|
import Test.Hspec.Wai
|
||||||
|
import SpecHelper
|
||||||
|
|
||||||
|
import Network.HTTP.Types
|
||||||
|
|
||||||
|
spec :: Spec
|
||||||
|
spec = beforeAll (clearTable "items" >> createItems 15) . afterAll_ (clearTable "items")
|
||||||
|
. around withApp $
|
||||||
|
describe "Deleting" $ do
|
||||||
|
context "existing record" $ do
|
||||||
|
it "succeeds with 204 and deletion count" $
|
||||||
|
request methodDelete "/items?id=eq.1" [] ""
|
||||||
|
`shouldRespondWith` ResponseMatcher {
|
||||||
|
matchBody = Nothing
|
||||||
|
, matchStatus = 204
|
||||||
|
, matchHeaders = ["Content-Range" <:> "*/1"]
|
||||||
|
}
|
||||||
|
|
||||||
|
it "actually clears items ouf the db" $ do
|
||||||
|
_ <- request methodDelete "/items?id=lt.15" [] ""
|
||||||
|
get "/items"
|
||||||
|
`shouldRespondWith` ResponseMatcher {
|
||||||
|
matchBody = Just "[{\"id\":15}]"
|
||||||
|
, matchStatus = 200
|
||||||
|
, matchHeaders = ["Content-Range" <:> "0-0/1"]
|
||||||
|
}
|
||||||
|
|
||||||
|
context "known route, unknown record" $
|
||||||
|
it "fails with 404" $
|
||||||
|
request methodDelete "/items?id=eq.101" [] "" `shouldRespondWith` 404
|
||||||
|
|
||||||
|
context "totally unknown route" $
|
||||||
|
it "fails with 404" $
|
||||||
|
request methodDelete "/foozle?id=eq.101" [] "" `shouldRespondWith` 404
|
||||||
Reference in New Issue
Block a user