feat: Drop support for pg 9.6

Author: wolfgangwalther

.github/workflows/ci.yaml

@@ -70,7 +70,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        pgVersion: [9.6, 10, 11, 12, 13, 14, 15, 16]
+        pgVersion: [10, 11, 12, 13, 14, 15, 16]
     name: Test PG ${{ matrix.pgVersion }} (Nix)
     runs-on: ubuntu-latest
     defaults:

CHANGELOG.md

@@ -18,6 +18,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
  - #2815, Build static executable with GSSAPI support - @wolfgangwalther
  - #3205, Fix wrong subquery error returning a status of 400 Bad Request - @steve-chavez
 
+### Changed
+ - #2052, Dropped support for PostgreSQL 9.6 - @wolfgangwalther
+
 ### Deprecated
 
  - `Prefer: params=single-object` is deprecated. Use [a function with a single unnamed JSON parameter](https://postgrest.org/en/latest/references/api/stored_procedures.html#s-proc-single-json) instead. - @steve-chavez

default.nix

@@ -63,7 +63,6 @@ let
       { name = "postgresql-12"; postgresql = pkgs.postgresql_12.withPackages (p: [ p.postgis p.pg_safeupdate ]); }
       { name = "postgresql-11"; postgresql = pkgs.postgresql_11.withPackages (p: [ p.postgis p.pg_safeupdate ]); }
       { name = "postgresql-10"; postgresql = pkgs.postgresql_10.withPackages (p: [ p.postgis p.pg_safeupdate ]); }
-      { name = "postgresql-9.6"; postgresql = pkgs.postgresql_9_6.withPackages (p: [ p.postgis p.pg_safeupdate ]); }
     ];
 
   # Dynamic derivation for PostgREST

nix/README.md

@@ -79,7 +79,7 @@ postgrest-coverage                postgrest-with-postgresql-10
 postgrest-lint                    postgrest-with-postgresql-11
 postgrest-run                     postgrest-with-postgresql-12
 postgrest-style                   postgrest-with-postgresql-13
-postgrest-style-check             postgrest-with-postgresql-9.6
+postgrest-style-check             postgrest-with-postgresql-14
 postgrest-test-io
 ...
 
@@ -103,7 +103,7 @@ postgrest-coverage                postgrest-with-postgresql-10
 postgrest-lint                    postgrest-with-postgresql-11
 postgrest-run                     postgrest-with-postgresql-12
 postgrest-style                   postgrest-with-postgresql-13
-postgrest-style-check             postgrest-with-postgresql-9.6
+postgrest-style-check             postgrest-with-postgresql-14
 postgrest-test-io
 postgrest-test-memory
 ...

nix/overlays/postgis.nix

@@ -20,9 +20,4 @@ in
       postgis = prev.postgresql_10.pkgs.postgis.overrideAttrs (_: postgis_3_2_3);
     };
   };
-  postgresql_9_6 = prev.postgresql_9_6.override { this = final.postgresql_11; } // {
-    pkgs = prev.postgresql_9_6.pkgs // {
-      postgis = prev.postgresql_9_6.pkgs.postgis.overrideAttrs (_: postgis_3_2_3);
-    };
-  };
 }

nix/overlays/postgresql-legacy.nix

@@ -2,21 +2,6 @@ self: super:
 # Overlay that adds legacy versions of PostgreSQL that are supported by
 # PostgREST.
 {
-  # PostgreSQL 9.6 was removed from Nixpkgs with
-  # https://github.com/NixOS/nixpkgs/commit/757dd008b2f2926fc0f7688fa8189f930ea47521
-  # We pin its parent commit to get the last version that was available.
-  postgresql_9_6 =
-    let
-      rev = "571cbf3d1db477058303cef8754fb85a14e90eb7";
-      tarballHash = "0q74wn418i1bn5sssacmw8ykpmqvzr0s93sj6pbs3rf6bf134fkz";
-      pinnedPkgs =
-        builtins.fetchTarball {
-          url = "https://github.com/nixos/nixpkgs/archive/${rev}.tar.gz";
-          sha256 = tarballHash;
-        };
-    in
-    (import pinnedPkgs { }).pkgs.postgresql_9_6;
-
   # PostgreSQL 10 was removed from Nixpkgs with
   # https://github.com/NixOS/nixpkgs/commit/aa1483114bb329fee7e1266100b8d8921ed4723f
   # We pin its parent commit to get the last version that was available.

src/PostgREST/Config/PgVersion.hs

@@ -3,8 +3,6 @@
 module PostgREST.Config.PgVersion
   ( PgVersion(..)
   , minimumPgVersion
-  , pgVersion96
-  , pgVersion100
   , pgVersion109
   , pgVersion110
   , pgVersion112
@@ -32,10 +30,7 @@ instance Ord PgVersion where
 
 -- | Tells the minimum PostgreSQL version required by this version of PostgREST
 minimumPgVersion :: PgVersion
-minimumPgVersion = pgVersion96
-
-pgVersion96 :: PgVersion
-pgVersion96 = PgVersion 90600 "9.6"
+minimumPgVersion = pgVersion100
 
 pgVersion100 :: PgVersion
 pgVersion100 = PgVersion 100000 "10"

src/PostgREST/Query.hs

@@ -176,7 +176,7 @@ openApiQuery :: SchemaCache -> PgVersion -> AppConfig -> Schema -> DbHandler (Ma
 openApiQuery sCache pgVer AppConfig{..} tSchema =
   lift $ case configOpenApiMode of
     OAFollowPriv -> do
-      tableAccess <- SQL.statement [tSchema] (SchemaCache.accessibleTables pgVer configDbPreparedStatements)
+      tableAccess <- SQL.statement [tSchema] (SchemaCache.accessibleTables configDbPreparedStatements)
       Just <$> ((,,)
             (HM.filterWithKey (\qi _ -> S.member qi tableAccess) $ SchemaCache.dbTables sCache)
         <$> SQL.statement tSchema (SchemaCache.accessibleFuncs pgVer configDbPreparedStatements)

src/PostgREST/SchemaCache.hs

@@ -48,8 +48,7 @@ import PostgREST.Config                      (AppConfig (..))
 import PostgREST.Config.Database             (TimezoneNames,
                                               pgVersionStatement,
                                               toIsolationLevel)
-import PostgREST.Config.PgVersion            (PgVersion, pgVersion100,
-                                              pgVersion110,
+import PostgREST.Config.PgVersion            (PgVersion, pgVersion110,
                                               pgVersion120)
 import PostgREST.SchemaCache.Identifiers     (AccessSet, FieldName,
                                               QualifiedIdentifier (..),
@@ -478,8 +477,8 @@ schemaDescription =
       where
         n.nspname = $1 |]
 
-accessibleTables :: PgVersion -> Bool -> SQL.Statement [Schema] AccessSet
-accessibleTables pgVer =
+accessibleTables :: Bool -> SQL.Statement [Schema] AccessSet
+accessibleTables =
   SQL.Statement sql (arrayParam HE.text) decodeAccessibleIdentifiers
  where
   sql = [q|
@@ -495,10 +494,9 @@ accessibleTables pgVer =
       pg_has_role(c.relowner, 'USAGE')
       or has_table_privilege(c.oid, 'SELECT, INSERT, UPDATE, DELETE, TRUNCATE, REFERENCES, TRIGGER')
       or has_any_column_privilege(c.oid, 'SELECT, INSERT, UPDATE, REFERENCES')
-    ) |] <>
-    relIsPartition <>
-    "ORDER BY table_schema, table_name"
-  relIsPartition = if pgVer >= pgVersion100 then " AND not c.relispartition " else mempty
+    )
+    AND not c.relispartition
+    ORDER BY table_schema, table_name|]
 
 {-
 Adds M2O and O2O relationships for views to tables, tables to views, and views to views. The example below is taken from the test fixtures, but the views names/colnames were modified.
@@ -810,11 +808,10 @@ tablesSqlQuery pgVer =
   LEFT JOIN tbl_pk_cols tpks ON n.nspname = tpks.table_schema AND c.relname = tpks.table_name
   LEFT JOIN columns_agg cols_agg ON n.nspname = cols_agg.table_schema AND c.relname = cols_agg.table_name
   WHERE c.relkind IN ('v','r','m','f','p')
-  AND n.nspname NOT IN ('pg_catalog', 'information_schema') |] <>
-  relIsPartition <>
-  "ORDER BY table_schema, table_name"
+  AND n.nspname NOT IN ('pg_catalog', 'information_schema')
+  AND not c.relispartition
+  ORDER BY table_schema, table_name|]
   where
-    relIsPartition = if pgVer >= pgVersion100 then " AND not c.relispartition " else mempty
     columnDefault -- typbasetype and typdefaultbin handles `CREATE DOMAIN .. DEFAULT val`,  attidentity/attgenerated handles generated columns, pg_get_expr gets the default of a column
       | pgVer >= pgVersion120 = [q|
           CASE
@@ -823,17 +820,12 @@ tablesSqlQuery pgVer =
             WHEN a.attgenerated = 's' THEN null
             ELSE pg_get_expr(ad.adbin, ad.adrelid)::text
           END|]
-      | pgVer >= pgVersion100 = [q|
+      | otherwise = [q|
           CASE
             WHEN t.typbasetype  != 0  THEN pg_get_expr(t.typdefaultbin, 0)
             WHEN a.attidentity = 'd' THEN format('nextval(%s)', quote_literal(seqsch.nspname || '.' || seqclass.relname))
             ELSE pg_get_expr(ad.adbin, ad.adrelid)::text
           END|]
-      | otherwise  = [q|
-          CASE
-            WHEN t.typbasetype  != 0  THEN pg_get_expr(t.typdefaultbin, 0)
-            ELSE pg_get_expr(ad.adbin, ad.adrelid)::text
-          END|]
 
 -- | Gets many-to-one relationships and one-to-one(O2O) relationships, which are a refinement of the many-to-one's
 allM2OandO2ORels :: PgVersion -> Bool -> SQL.Statement () [Relationship]

test/spec/Feature/OpenApi/OpenApiSpec.hs

@@ -11,8 +11,7 @@ import Network.HTTP.Types
 import Test.Hspec         hiding (pendingWith)
 import Test.Hspec.Wai
 
-import PostgREST.Config.PgVersion (PgVersion, pgVersion100,
-                                   pgVersion110)
+import PostgREST.Config.PgVersion (PgVersion, pgVersion110)
 
 import PostgREST.Version (docsVersion)
 import Protolude         hiding (get)
@@ -254,31 +253,30 @@ spec actualPgVersion = describe "OpenAPI" $ do
             ]
           |]
 
-  when (actualPgVersion >= pgVersion100) $ do
-    describe "Partitioned table" $
+  describe "Partitioned table" $
 
-      it "includes partitioned table properties" $ do
-        r <- simpleBody <$> get "/"
+    it "includes partitioned table properties" $ do
+      r <- simpleBody <$> get "/"
 
-        let method s = key "paths" . key "/car_models" . key s
-            getSummary = r ^? method "get" . key "summary"
-            getDescription = r ^? method "get" . key "description"
-            getParameterName = r ^? method "get" . key "parameters" . nth 0 . key "$ref"
-            getParameterYear = r ^? method "get" . key "parameters" . nth 1 . key "$ref"
-            getParameterRef = r ^? method "get" . key "parameters" . nth 2 . key "$ref"
+      let method s = key "paths" . key "/car_models" . key s
+          getSummary = r ^? method "get" . key "summary"
+          getDescription = r ^? method "get" . key "description"
+          getParameterName = r ^? method "get" . key "parameters" . nth 0 . key "$ref"
+          getParameterYear = r ^? method "get" . key "parameters" . nth 1 . key "$ref"
+          getParameterRef = r ^? method "get" . key "parameters" . nth 2 . key "$ref"
 
-        liftIO $ do
+      liftIO $ do
 
-          getSummary `shouldBe` Just "A partitioned table"
+        getSummary `shouldBe` Just "A partitioned table"
 
-          getDescription `shouldBe` Just "A test for partitioned tables"
+        getDescription `shouldBe` Just "A test for partitioned tables"
 
-          getParameterName `shouldBe` Just "#/parameters/rowFilter.car_models.name"
+        getParameterName `shouldBe` Just "#/parameters/rowFilter.car_models.name"
 
-          getParameterYear `shouldBe` Just "#/parameters/rowFilter.car_models.year"
+        getParameterYear `shouldBe` Just "#/parameters/rowFilter.car_models.year"
 
-          when (actualPgVersion >= pgVersion110) $
-            getParameterRef `shouldBe` Just "#/parameters/rowFilter.car_models.car_brand_name"
+        when (actualPgVersion >= pgVersion110) $
+          getParameterRef `shouldBe` Just "#/parameters/rowFilter.car_models.car_brand_name"
 
   describe "Materialized view" $