+7
-3
@@ -115,7 +115,7 @@ insertInto t cols vals = B.Stmt
|
|||||||
("insert into " <> fromQt t <> " (" <>
|
("insert into " <> fromQt t <> " (" <>
|
||||||
T.intercalate ", " (map pgFmtIdent cols) <>
|
T.intercalate ", " (map pgFmtIdent cols) <>
|
||||||
") values ("
|
") values ("
|
||||||
<> T.intercalate ", " (map ((<> "::unknown") . pgFmtLit . unquoted) vals)
|
<> T.intercalate ", " (map insertableValue vals)
|
||||||
<> ") returning row_to_json(" <> fromQt t <> ".*)")
|
<> ") returning row_to_json(" <> fromQt t <> ".*)")
|
||||||
empty True
|
empty True
|
||||||
|
|
||||||
@@ -126,7 +126,7 @@ insertSelect t cols vals = B.Stmt
|
|||||||
("insert into " <> fromQt t <> " ("
|
("insert into " <> fromQt t <> " ("
|
||||||
<> T.intercalate ", " (map pgFmtIdent cols)
|
<> T.intercalate ", " (map pgFmtIdent cols)
|
||||||
<> ") select "
|
<> ") select "
|
||||||
<> T.intercalate ", " (map ((<> "::unknown") . pgFmtLit . unquoted) vals))
|
<> T.intercalate ", " (map insertableValue vals))
|
||||||
empty True
|
empty True
|
||||||
|
|
||||||
update :: QualifiedTable -> [T.Text] -> [JSON.Value] -> PStmt
|
update :: QualifiedTable -> [T.Text] -> [JSON.Value] -> PStmt
|
||||||
@@ -134,7 +134,7 @@ update t cols vals = B.Stmt
|
|||||||
("update " <> fromQt t <> " set ("
|
("update " <> fromQt t <> " set ("
|
||||||
<> T.intercalate ", " (map pgFmtIdent cols)
|
<> T.intercalate ", " (map pgFmtIdent cols)
|
||||||
<> ") = ("
|
<> ") = ("
|
||||||
<> T.intercalate ", " (map ((<> "::unknown") . pgFmtLit . unquoted) vals)
|
<> T.intercalate ", " (map insertableValue vals)
|
||||||
<> ")")
|
<> ")")
|
||||||
empty True
|
empty True
|
||||||
|
|
||||||
@@ -233,3 +233,7 @@ unquoted (JSON.Number n) =
|
|||||||
cs $ formatScientific Fixed (if isInteger n then Just 0 else Nothing) n
|
cs $ formatScientific Fixed (if isInteger n then Just 0 else Nothing) n
|
||||||
unquoted (JSON.Bool b) = cs . show $ b
|
unquoted (JSON.Bool b) = cs . show $ b
|
||||||
unquoted _ = ""
|
unquoted _ = ""
|
||||||
|
|
||||||
|
insertableValue :: JSON.Value -> T.Text
|
||||||
|
insertableValue JSON.Null = "null"
|
||||||
|
insertableValue v = ((<> "::unknown") . pgFmtLit . unquoted) v
|
||||||
|
|||||||
@@ -66,6 +66,13 @@ spec = afterAll_ resetDb $ around withApp $ do
|
|||||||
simpleHeaders p `shouldSatisfy` matchHeader hLocation "/no_pk\\?a=eq.bar&b=eq.baz"
|
simpleHeaders p `shouldSatisfy` matchHeader hLocation "/no_pk\\?a=eq.bar&b=eq.baz"
|
||||||
simpleStatus p `shouldBe` created201
|
simpleStatus p `shouldBe` created201
|
||||||
|
|
||||||
|
it "can post nulls" $ do
|
||||||
|
p <- request methodPost "/no_pk"
|
||||||
|
[("Prefer", "return=representation")]
|
||||||
|
[json| { "a":null, "b":null } |]
|
||||||
|
liftIO $
|
||||||
|
simpleBody p `shouldBe` [json| { "a":null, "b":null } |]
|
||||||
|
|
||||||
context "with compound pk supplied" . after_ (clearTable "compound_pk") $
|
context "with compound pk supplied" . after_ (clearTable "compound_pk") $
|
||||||
it "builds response location header appropriately" $
|
it "builds response location header appropriately" $
|
||||||
post "/compound_pk" [json| { "k1":12, "k2":42 } |]
|
post "/compound_pk" [json| { "k1":12, "k2":42 } |]
|
||||||
|
|||||||
Reference in New Issue
Block a user