Refactors and fixes for schema cache

CHANGELOG.md

@@ -13,7 +13,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
- - #3093, Nested empty embeds no longer show empty values and are correctly omitted - @laurenceisla 
+ - #3093, Nested empty embeds no longer show empty values and are correctly omitted - @laurenceisla
+ - #3644, Make --dump-schema work with in-database pgrst.db_schemas setting - @wolfgangwalther
+ - #3644, Show number of timezones in schema cache load report - @wolfgangwalther
+ - #3644, List correct enum options in OpenApi output when multiple types with same name are present - @wolfgangwalther
 
 ### Changed
 
@@ -22,6 +25,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
  - #2052, Dropped support for PostgreSQL 11 - @wolfgangwalther
  - #3508, PostgREST now fails to start when `server-port` and `admin-server-port` config options are the same - @develop7
  - #3607, PostgREST now fails to start when the JWT secret is less than 32 characters long - @laurenceisla
+ - #3644, Fail schema cache lookup with invalid db-schemas config - @wolfgangwalther
+ - Previously, this would silently return 200 - OK on the root endpoint, but don't provide any usable endpoints.
 
 ## [12.2.1] - 2024-06-27
 

src/PostgREST/CLI.hs

@@ -44,7 +44,9 @@ main CLI{cliCommand, cliPath} = do
  CmdDumpConfig -> do
  when configDbConfig $ AppState.reReadConfig True appState
  putStr . Config.toText =<< AppState.getConfig appState
- CmdDumpSchema -> putStrLn =<< dumpSchema appState
+ CmdDumpSchema -> do
+ when configDbConfig $ AppState.reReadConfig True appState
+ putStrLn =<< dumpSchema appState
  CmdRun -> App.run appState)
 
 -- | Dump SchemaCache schema to JSON

src/PostgREST/Query.hs

@@ -181,7 +181,7 @@ actionQuery (MaybeDb plan@InspectPlan{ipSchema=tSchema}) AppConfig{..} _ _ sCach
  tableAccess <- SQL.statement [tSchema] (SchemaCache.accessibleTables configDbPreparedStatements)
  MaybeDbResult plan . Just <$> ((,,)
  (HM.filterWithKey (\qi _ -> S.member qi tableAccess) $ SchemaCache.dbTables sCache)
- <$> SQL.statement (tSchema, configDbHoistedTxSettings) (SchemaCache.accessibleFuncs configDbPreparedStatements)
+ <$> SQL.statement ([tSchema], configDbHoistedTxSettings) (SchemaCache.accessibleFuncs configDbPreparedStatements)
  <*> SQL.statement tSchema (SchemaCache.schemaDescription configDbPreparedStatements))
  OAIgnorePriv ->
  MaybeDbResult plan . Just <$> ((,,)

src/PostgREST/Query/SqlFragment.hs

@@ -157,10 +157,10 @@ pgBuildArrayLiteral vals =
 
 -- TODO: refactor by following https://github.com/PostgREST/postgrest/pull/1631#issuecomment-711070833
 pgFmtIdent :: Text -> SQL.Snippet
-pgFmtIdent x = SQL.sql $ escapeIdent x
+pgFmtIdent x = SQL.sql . encodeUtf8 $ escapeIdent x
 
-escapeIdent :: Text -> ByteString
-escapeIdent x = encodeUtf8 $ "\"" <> T.replace "\"" "\"\"" (trimNullChars x) <> "\""
+escapeIdent :: Text -> Text
+escapeIdent x = "\"" <> T.replace "\"" "\"\"" (trimNullChars x) <> "\""
 
 -- Only use it if the input comes from the database itself, like on `jsonb_build_object('column_from_a_table', val)..`
 pgFmtLit :: Text -> Text
@@ -181,7 +181,7 @@ trimNullChars = T.takeWhile (/= '\x0')
 -- >>> escapeIdentList ["schema_1", "schema_2", "SPECIAL \"@/\\#~_-"]
 -- "\"schema_1\", \"schema_2\", \"SPECIAL \"\"@/\\#~_-\""
 escapeIdentList :: [Text] -> ByteString
-escapeIdentList schemas = BS.intercalate ", " $ escapeIdent <$> schemas
+escapeIdentList schemas = BS.intercalate ", " $ encodeUtf8 . escapeIdent <$> schemas
 
 asCsvF :: SQL.Snippet
 asCsvF = asCsvHeaderF <> " || '\n' || " <> asCsvBodyF