feat: Drop support for pg 11

PostgreSQL 11 is EOL since November 2023.
2024-06-15 17:23:34 +02:00
parent 126178642b
commit bb96c2dc74
20 changed files with 206 additions and 362 deletions
@@ -7,13 +7,11 @@ import Test.Hspec
 import Test.Hspec.Wai
 import Test.Hspec.Wai.JSON

-import PostgREST.Config.PgVersion (PgVersion, pgVersion112)
-
 import Protolude  hiding (get)
 import SpecHelper

-spec :: PgVersion -> SpecWith ((), Application)
-spec actualPgVersion =
+spec :: SpecWith ((), Application)
+spec =
  describe "and/or params used for complex boolean logic" $ do
    context "used with GET" $ do
      context "or param" $ do
@@ -96,17 +94,16 @@ spec actualPgVersion =
          get "/entities?and=(id.gte.2,arr.isdistinct.{1,2})&select=id" `shouldRespondWith`
            [json|[{ "id": 3 }, { "id": 4 }]|] { matchHeaders = [matchContentTypeJson] }

-        when (actualPgVersion >= pgVersion112) $
-          it "can handle wfts (websearch_to_tsquery)" $
-            get "/tsearch?or=(text_search_vector.plfts(german).Art,text_search_vector.plfts(french).amusant,text_search_vector.not.wfts(english).impossible)"
-            `shouldRespondWith`
-              [json|[
-                     {"text_search_vector": "'also':2 'fun':3 'possibl':8" },
-                     {"text_search_vector": "'ate':3 'cat':2 'fat':1 'rat':4" },
-                     {"text_search_vector": "'amus':5 'fair':7 'impossibl':9 'peu':4" },
-                     {"text_search_vector": "'art':4 'spass':5 'unmog':7" }
-              ]|]
-              { matchHeaders = [matchContentTypeJson] }
+        it "can handle wfts (websearch_to_tsquery)" $
+          get "/tsearch?or=(text_search_vector.plfts(german).Art,text_search_vector.plfts(french).amusant,text_search_vector.not.wfts(english).impossible)"
+          `shouldRespondWith`
+            [json|[
+                   {"text_search_vector": "'also':2 'fun':3 'possibl':8" },
+                   {"text_search_vector": "'ate':3 'cat':2 'fat':1 'rat':4" },
+                   {"text_search_vector": "'amus':5 'fair':7 'impossibl':9 'peu':4" },
+                   {"text_search_vector": "'art':4 'spass':5 'unmog':7" }
+            ]|]
+            { matchHeaders = [matchContentTypeJson] }

        it "can handle cs and cd" $
          get "/entities?or=(arr.cs.{1,2,3},arr.cd.{1})&select=id" `shouldRespondWith`
@@ -11,8 +11,7 @@ import Test.Hspec.Wai
 import Test.Hspec.Wai.JSON
 import Text.Heredoc

-import PostgREST.Config.PgVersion (PgVersion, pgVersion112,
-                                   pgVersion120, pgVersion130,
+import PostgREST.Config.PgVersion (PgVersion, pgVersion130,
                                   pgVersion140)

 import Protolude  hiding (get)
@@ -542,28 +541,27 @@ spec actualPgVersion = do
              , matchHeaders = ["Preference-Applied" <:> "missing=default, return=representation"]
              }

-        when (actualPgVersion >= pgVersion120) $
-          it "fails with a good error message on generated always columns" $
-            request methodPost "/foo?columns=a,b" [("Prefer", "return=representation"), ("Prefer", "missing=default")]
-                [json| [
-                  {"a": "val"},
-                  {"a": "val", "b": "val"}
-                ]|]
-              `shouldRespondWith`
-                (if actualPgVersion < pgVersion140
-                  then [json| {
-                    "code": "42601",
-                    "details": "Column \"b\" is a generated column.",
-                    "hint": null,
-                    "message": "cannot insert into column \"b\""
-                  }|]
-                  else [json| {
-                    "code": "428C9",
-                    "details": "Column \"b\" is a generated column.",
-                    "hint": null,
-                    "message": "cannot insert a non-DEFAULT value into column \"b\""
-                  }|])
-                { matchStatus  = 400 }
+        it "fails with a good error message on generated always columns" $
+          request methodPost "/foo?columns=a,b" [("Prefer", "return=representation"), ("Prefer", "missing=default")]
+              [json| [
+                {"a": "val"},
+                {"a": "val", "b": "val"}
+              ]|]
+            `shouldRespondWith`
+              (if actualPgVersion < pgVersion140
+                then [json| {
+                  "code": "42601",
+                  "details": "Column \"b\" is a generated column.",
+                  "hint": null,
+                  "message": "cannot insert into column \"b\""
+                }|]
+                else [json| {
+                  "code": "428C9",
+                  "details": "Column \"b\" is a generated column.",
+                  "hint": null,
+                  "message": "cannot insert a non-DEFAULT value into column \"b\""
+                }|])
+              { matchStatus  = 400 }

        it "inserts a default on a DOMAIN with default" $
          request methodPost "/evil_friends?columns=id,name" [("Prefer", "return=representation"), ("Prefer", "missing=default")]
@@ -710,24 +708,16 @@ spec actualPgVersion = do

    it "fails inserting if more columns are selected" $
      request methodPost "/limited_article_stars?select=article_id,user_id,created_at" [("Prefer", "return=representation")]
-        [json| {"article_id": 2, "user_id": 2} |] `shouldRespondWith` (
-      if actualPgVersion >= pgVersion112 then
+          [json| {"article_id": 2, "user_id": 2} |] `shouldRespondWith`
      [json|{"hint":null,"details":null,"code":"42501","message":"permission denied for view limited_article_stars"}|]
-         else
-      [json|{"hint":null,"details":null,"code":"42501","message":"permission denied for relation limited_article_stars"}|]
-                                                                      )
        { matchStatus  = 401
        , matchHeaders = []
        }

    it "fails inserting if select is not specified" $
      request methodPost "/limited_article_stars" [("Prefer", "return=representation")]
-        [json| {"article_id": 3, "user_id": 1} |] `shouldRespondWith` (
-      if actualPgVersion >= pgVersion112 then
+        [json| {"article_id": 3, "user_id": 1} |] `shouldRespondWith`
      [json|{"hint":null,"details":null,"code":"42501","message":"permission denied for view limited_article_stars"}|]
-         else
-      [json|{"hint":null,"details":null,"code":"42501","message":"permission denied for relation limited_article_stars"}|]
-                                                                      )
        { matchStatus  = 401
        , matchHeaders = []
        }
@@ -7,8 +7,7 @@ import Test.Hspec
 import Test.Hspec.Wai
 import Test.Hspec.Wai.JSON

-import PostgREST.Config.PgVersion (PgVersion, pgVersion112,
-                                   pgVersion121)
+import PostgREST.Config.PgVersion (PgVersion, pgVersion121)

 import Protolude  hiding (get)
 import SpecHelper
@@ -75,28 +74,16 @@ spec actualPgVersion = describe "json and jsonb operators" $ do
    -- this works fine for /rpc/unexistent requests, but for this case a 500 seems more appropriate
    it "fails when a double arrow ->> is followed with a single arrow ->" $ do
      get "/json_arr?select=data->>c->1"
-        `shouldRespondWith` (
-        if actualPgVersion >= pgVersion112 then
+        `shouldRespondWith`
        [json|
          {"hint":"No operator matches the given name and argument types. You might need to add explicit type casts.",
           "details":null,"code":"42883","message":"operator does not exist: text -> integer"} |]
-           else
-        [json|
-          {"hint":"No operator matches the given name and argument type(s). You might need to add explicit type casts.",
-           "details":null,"code":"42883","message":"operator does not exist: text -> integer"} |]
-                            )
        { matchStatus  = 404 , matchHeaders = [] }
      get "/json_arr?select=data->>c->b"
-        `shouldRespondWith` (
-        if actualPgVersion >= pgVersion112 then
+        `shouldRespondWith`
        [json|
          {"hint":"No operator matches the given name and argument types. You might need to add explicit type casts.",
           "details":null,"code":"42883","message":"operator does not exist: text -> unknown"} |]
-           else
-        [json|
-          {"hint":"No operator matches the given name and argument type(s). You might need to add explicit type casts.",
-           "details":null,"code":"42883","message":"operator does not exist: text -> unknown"} |]
-                            )
        { matchStatus  = 404 , matchHeaders = [] }

    context "with array index" $ do
@@ -15,8 +15,7 @@ import           Test.Hspec           hiding (pendingWith)
 import           Test.Hspec.Wai
 import           Test.Hspec.Wai.JSON

-import PostgREST.Config.PgVersion (PgVersion, pgVersion120,
-                                   pgVersion130)
+import PostgREST.Config.PgVersion (PgVersion, pgVersion130)
 import Protolude                  hiding (get)
 import SpecHelper

@@ -34,10 +33,7 @@ spec actualPgVersion = do
      liftIO $ do
        resHeaders `shouldSatisfy` elem ("Content-Type", "application/vnd.pgrst.plan+json; for=\"application/json\"; charset=utf-8")
        resStatus `shouldBe` Status { statusCode = 200, statusMessage="OK" }
-        totalCost `shouldBe`
-          if actualPgVersion > pgVersion120
-            then 15.63
-            else 15.69
+        totalCost `shouldBe` 15.63

    it "outputs the total cost for a single filter on a view" $ do
      r <- request methodGet "/projects_view?id=gt.2"
@@ -50,10 +46,7 @@ spec actualPgVersion = do
      liftIO $ do
        resHeaders `shouldSatisfy` elem ("Content-Type", "application/vnd.pgrst.plan+json; for=\"application/json\"; charset=utf-8")
        resStatus `shouldBe` Status { statusCode = 200, statusMessage="OK" }
-        totalCost `shouldBe`
-          if actualPgVersion > pgVersion120
-            then 24.28
-            else 32.27
+        totalCost `shouldBe` 24.28

    it "outputs blocks info when using the buffers option" $
      if actualPgVersion >= pgVersion130
@@ -77,21 +70,20 @@ spec actualPgVersion = do
            resHeaders `shouldSatisfy` elem ("Content-Type", "application/vnd.pgrst.plan+json; for=\"application/json\"; options=analyze|buffers; charset=utf-8")
            blocks `shouldBe` Just [aesonQQ| 1.0 |]

-    when (actualPgVersion >= pgVersion120) $
-      it "outputs the search path when using the settings option" $ do
-        r <- request methodGet "/projects" (acceptHdrs "application/vnd.pgrst.plan+json; options=settings") ""
+    it "outputs the search path when using the settings option" $ do
+      r <- request methodGet "/projects" (acceptHdrs "application/vnd.pgrst.plan+json; options=settings") ""

-        let searchPath  = simpleBody r ^? nth 0 . key "Settings"
-            resHeaders = simpleHeaders r
+      let searchPath  = simpleBody r ^? nth 0 . key "Settings"
+          resHeaders = simpleHeaders r

-        liftIO $ do
-          resHeaders `shouldSatisfy` elem ("Content-Type", "application/vnd.pgrst.plan+json; for=\"application/json\"; options=settings; charset=utf-8")
-          searchPath `shouldBe`
-            Just [aesonQQ|
-              {
-                "search_path": "\"test\""
-              }
-            |]
+      liftIO $ do
+        resHeaders `shouldSatisfy` elem ("Content-Type", "application/vnd.pgrst.plan+json; for=\"application/json\"; options=settings; charset=utf-8")
+        searchPath `shouldBe`
+          Just [aesonQQ|
+            {
+              "search_path": "\"test\""
+            }
+          |]

    when (actualPgVersion >= pgVersion130) $
      it "outputs WAL info when using the wal option" $ do
@@ -123,9 +115,7 @@ spec actualPgVersion = do
      liftIO $ do
        resHeaders `shouldSatisfy` elem ("Content-Type", "application/vnd.pgrst.plan+json; for=\"application/json\"; options=verbose; charset=utf-8")
        aggCol `shouldBe`
-          if actualPgVersion >= pgVersion120
-            then Just [aesonQQ| "COALESCE(json_agg(ROW(projects.id, projects.name, projects.client_id)), '[]'::json)" |]
-            else Just [aesonQQ| "COALESCE(json_agg(ROW(pgrst_source.id, pgrst_source.name, pgrst_source.client_id)), '[]'::json)" |]
+          Just [aesonQQ| "COALESCE(json_agg(ROW(projects.id, projects.name, projects.client_id)), '[]'::json)" |]

    it "outputs the plan for application/vnd.pgrst.object " $ do
      r <- request methodGet "/projects_view" (acceptHdrs "application/vnd.pgrst.plan+json; for=\"application/vnd.pgrst.object\"; options=verbose") ""
@@ -136,9 +126,7 @@ spec actualPgVersion = do
      liftIO $ do
        resHeaders `shouldSatisfy` elem ("Content-Type", "application/vnd.pgrst.plan+json; for=\"application/vnd.pgrst.object+json\"; options=verbose; charset=utf-8")
        aggCol `shouldBe`
-          if actualPgVersion >= pgVersion120
-            then Just [aesonQQ| "COALESCE((json_agg(ROW(projects.id, projects.name, projects.client_id)) -> 0), 'null'::json)" |]
-            else Just [aesonQQ| "COALESCE((json_agg(ROW(pgrst_source.id, pgrst_source.name, pgrst_source.client_id)) -> 0), 'null'::json)" |]
+          Just [aesonQQ| "COALESCE((json_agg(ROW(projects.id, projects.name, projects.client_id)) -> 0), 'null'::json)" |]

  describe "writes plans" $ do
    it "outputs the total cost for an insert" $ do
@@ -452,11 +440,7 @@ spec actualPgVersion = do
      liftIO $ do
        resHeaders `shouldSatisfy` elem ("Content-Type", "application/vnd.pgrst.plan+json; for=\"application/vnd.twkb\"; options=verbose; charset=utf-8")
        aggCol `shouldBe`
-          (
-            if actualPgVersion >= pgVersion120
-              then Just [aesonQQ| "twkb_agg(ROW(lines.id, lines.name, lines.geom)::lines)" |]
-              else Just [aesonQQ| "twkb_agg(ROW(pgrst_source.id, pgrst_source.name, pgrst_source.geom)::lines)" |]
-          )
+          Just [aesonQQ| "twkb_agg(ROW(lines.id, lines.name, lines.geom)::lines)" |]

 disabledSpec :: SpecWith ((), Application)
 disabledSpec =
@@ -8,8 +8,7 @@ import Test.Hspec          hiding (pendingWith)
 import Test.Hspec.Wai
 import Test.Hspec.Wai.JSON

-import PostgREST.Config.PgVersion (PgVersion, pgVersion112,
-                                   pgVersion121)
+import PostgREST.Config.PgVersion (PgVersion, pgVersion121)
 import Protolude                  hiding (get)
 import SpecHelper

@@ -176,28 +175,27 @@ spec actualPgVersion = do
          [json| [ {"text_search_vector": "'ate':3 'cat':2 'fat':1 'rat':4" }] |]
          { matchHeaders = [matchContentTypeJson] }

-      when (actualPgVersion >= pgVersion112) $ do
-        it "finds matches with websearch_to_tsquery" $
-            get "/tsearch?text_search_vector=wfts.The%20Fat%20Rats" `shouldRespondWith`
-                [json| [ {"text_search_vector": "'ate':3 'cat':2 'fat':1 'rat':4" }] |]
-                { matchHeaders = [matchContentTypeJson] }
+      it "finds matches with websearch_to_tsquery" $
+          get "/tsearch?text_search_vector=wfts.The%20Fat%20Rats" `shouldRespondWith`
+              [json| [ {"text_search_vector": "'ate':3 'cat':2 'fat':1 'rat':4" }] |]
+              { matchHeaders = [matchContentTypeJson] }

-        it "can use boolean operators(and, or, -) in websearch_to_tsquery" $ do
-          get "/tsearch?text_search_vector=wfts.fun%20and%20possible"
-            `shouldRespondWith`
-              [json| [ {"text_search_vector": "'also':2 'fun':3 'possibl':8"}] |]
-              { matchHeaders = [matchContentTypeJson] }
-          get "/tsearch?text_search_vector=wfts.impossible%20or%20possible"
-            `shouldRespondWith`
-              [json| [
-                {"text_search_vector": "'fun':5 'imposs':9 'kind':3"},
-                {"text_search_vector": "'also':2 'fun':3 'possibl':8"}]
-                  |]
-              { matchHeaders = [matchContentTypeJson] }
-          get "/tsearch?text_search_vector=wfts.fun%20and%20-possible"
-            `shouldRespondWith`
-              [json| [ {"text_search_vector": "'fun':5 'imposs':9 'kind':3"}] |]
-              { matchHeaders = [matchContentTypeJson] }
+      it "can use boolean operators(and, or, -) in websearch_to_tsquery" $ do
+        get "/tsearch?text_search_vector=wfts.fun%20and%20possible"
+          `shouldRespondWith`
+            [json| [ {"text_search_vector": "'also':2 'fun':3 'possibl':8"}] |]
+            { matchHeaders = [matchContentTypeJson] }
+        get "/tsearch?text_search_vector=wfts.impossible%20or%20possible"
+          `shouldRespondWith`
+            [json| [
+              {"text_search_vector": "'fun':5 'imposs':9 'kind':3"},
+              {"text_search_vector": "'also':2 'fun':3 'possibl':8"}]
+                |]
+            { matchHeaders = [matchContentTypeJson] }
+        get "/tsearch?text_search_vector=wfts.fun%20and%20-possible"
+          `shouldRespondWith`
+            [json| [ {"text_search_vector": "'fun':5 'imposs':9 'kind':3"}] |]
+            { matchHeaders = [matchContentTypeJson] }

      it "finds matches with different dictionaries" $ do
        get "/tsearch?text_search_vector=fts(french).amusant" `shouldRespondWith`
@@ -207,11 +205,10 @@ spec actualPgVersion = do
          [json| [{"text_search_vector": "'amus':5 'fair':7 'impossibl':9 'peu':4" }] |]
          { matchHeaders = [matchContentTypeJson] }

-        when (actualPgVersion >= pgVersion112) $
-            get "/tsearch?text_search_vector=wfts(french).amusant%20impossible"
-                `shouldRespondWith`
-                  [json| [{"text_search_vector": "'amus':5 'fair':7 'impossibl':9 'peu':4" }] |]
-                  { matchHeaders = [matchContentTypeJson] }
+        get "/tsearch?text_search_vector=wfts(french).amusant%20impossible"
+            `shouldRespondWith`
+              [json| [{"text_search_vector": "'amus':5 'fair':7 'impossibl':9 'peu':4" }] |]
+              { matchHeaders = [matchContentTypeJson] }

      it "can be negated with not operator" $ do
        get "/tsearch?text_search_vector=not.fts.impossible%7Cfat%7Cfun" `shouldRespondWith`
@@ -231,13 +228,12 @@ spec actualPgVersion = do
            {"text_search_vector": "'amus':5 'fair':7 'impossibl':9 'peu':4"},
            {"text_search_vector": "'art':4 'spass':5 'unmog':7"}]|]
          { matchHeaders = [matchContentTypeJson] }
-        when (actualPgVersion >= pgVersion112) $
-            get "/tsearch?text_search_vector=not.wfts(english).impossible%20or%20fat%20or%20fun"
-                `shouldRespondWith`
-                  [json| [
-                    {"text_search_vector": "'amus':5 'fair':7 'impossibl':9 'peu':4"},
-                    {"text_search_vector": "'art':4 'spass':5 'unmog':7"}]|]
-                  { matchHeaders = [matchContentTypeJson] }
+        get "/tsearch?text_search_vector=not.wfts(english).impossible%20or%20fat%20or%20fun"
+            `shouldRespondWith`
+              [json| [
+                {"text_search_vector": "'amus':5 'fair':7 'impossibl':9 'peu':4"},
+                {"text_search_vector": "'art':4 'spass':5 'unmog':7"}]|]
+              { matchHeaders = [matchContentTypeJson] }

      context "Use of the phraseto_tsquery function" $ do
        it "finds matches" $
@@ -11,14 +11,11 @@ import Test.Hspec.Wai
 import Test.Hspec.Wai.JSON
 import Text.Heredoc

-import PostgREST.Config.PgVersion (PgVersion, pgVersion112,
-                                   pgVersion114)
-
 import Protolude  hiding (get)
 import SpecHelper

-spec :: PgVersion -> SpecWith ((), Application)
-spec actualPgVersion =
+spec :: SpecWith ((), Application)
+spec =
  describe "remote procedure call" $ do
    context "a proc that returns a set" $ do
      context "returns paginated results" $ do
@@ -599,13 +596,12 @@ spec actualPgVersion =
            [json|"object"|]
            { matchHeaders = [matchContentTypeJson] }

-      when (actualPgVersion >= pgVersion114) $
-        it "parses quoted JSON arguments as JSON string (from Postgres 10.9, 11.4)" $
-          post "/rpc/json_argument"
-              [json| { "arg": "{ \"key\": 3 }" } |]
-            `shouldRespondWith`
-              [json|"string"|]
-              { matchHeaders = [matchContentTypeJson] }
+      it "parses quoted JSON arguments as JSON string (from Postgres 10.9, 11.4)" $
+        post "/rpc/json_argument"
+            [json| { "arg": "{ \"key\": 3 }" } |]
+          `shouldRespondWith`
+            [json|"string"|]
+            { matchHeaders = [matchContentTypeJson] }

    context "improper input" $ do
      it "rejects unknown content type even if payload is good" $ do
@@ -1019,10 +1015,9 @@ spec actualPgVersion =
        get "/rpc/get_tsearch?text_search_vector=not.fts(english).fun%7Crat" `shouldRespondWith`
          [json|[{"text_search_vector":"'amus':5 'fair':7 'impossibl':9 'peu':4"},{"text_search_vector":"'art':4 'spass':5 'unmog':7"}]|]
          { matchHeaders = [matchContentTypeJson] }
-        when (actualPgVersion >= pgVersion112) $
-            get "/rpc/get_tsearch?text_search_vector=wfts.impossible" `shouldRespondWith`
-                [json|[{"text_search_vector":"'fun':5 'imposs':9 'kind':3"}]|]
-                { matchHeaders = [matchContentTypeJson] }
+        get "/rpc/get_tsearch?text_search_vector=wfts.impossible" `shouldRespondWith`
+          [json|[{"text_search_vector":"'fun':5 'imposs':9 'kind':3"}]|]
+          { matchHeaders = [matchContentTypeJson] }

      it "should work with the phraseto_tsquery function" $
        get "/rpc/get_tsearch?text_search_vector=phfts(english).impossible" `shouldRespondWith`