jimmy/postgrest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: log full pg version to stderr on connection

Browse Source
This commit is contained in:
steve-chavez
2024-02-10 19:21:55 -05:00
committed by Steve Chavez
parent 410fa9508b
commit 21e8ca5051
3 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PostgREST/AppState.hs
+1 -1
View File
@@ -376,7 +376,7 @@ internalConnectionWorker appState = work
putPgVersion appState actualPgVersion putPgVersion appState actualPgVersion
when configDbChannelEnabled $ when configDbChannelEnabled $
signalListener appState signalListener appState
logWithZTime appState "Connection successful" logWithZTime appState $ "Successfully connected to " <> pgvFullName actualPgVersion
-- this could be fail because the connection drops, but the loadSchemaCache will pick the error and retry again -- this could be fail because the connection drops, but the loadSchemaCache will pick the error and retry again
-- We cannot retry after it fails immediately, because db-pre-config could have user errors. We just log the error and continue. -- We cannot retry after it fails immediately, because db-pre-config could have user errors. We just log the error and continue.
when configDbConfig $ reReadConfig False appState when configDbConfig $ reReadConfig False appState
src/PostgREST/Config/Database.hs
+2 -2
View File
@@ -75,8 +75,8 @@ queryPgVersion prepared = statement mempty $ pgVersionStatement prepared
pgVersionStatement :: Bool -> SQL.Statement () PgVersion pgVersionStatement :: Bool -> SQL.Statement () PgVersion
pgVersionStatement = SQL.Statement sql HE.noParams versionRow pgVersionStatement = SQL.Statement sql HE.noParams versionRow
where where
sql = "SELECT current_setting('server_version_num')::integer, current_setting('server_version')" sql = "SELECT current_setting('server_version_num')::integer, current_setting('server_version'), version()"
versionRow = HD.singleRow $ PgVersion <$> column HD.int4 <*> column HD.text versionRow = HD.singleRow $ PgVersion <$> column HD.int4 <*> column HD.text <*> column HD.text
-- | Query the in-database configuration. The settings have the following priorities: -- | Query the in-database configuration. The settings have the following priorities:
-- --
src/PostgREST/Config/PgVersion.hs
+15 -14
View File
@@ -22,47 +22,48 @@ import Protolude
data PgVersion = PgVersion data PgVersion = PgVersion
{ pgvNum :: Int32 { pgvNum :: Int32
, pgvName :: Text , pgvName :: Text
, pgvFullName :: Text
} }
deriving (Eq, Generic, JSON.ToJSON) deriving (Eq, Generic, JSON.ToJSON)
instance Ord PgVersion where instance Ord PgVersion where
(PgVersion v1 _) `compare` (PgVersion v2 _) = v1 `compare` v2 (PgVersion v1 _ _) `compare` (PgVersion v2 _ _) = v1 `compare` v2
-- | Tells the minimum PostgreSQL version required by this version of PostgREST -- | Tells the minimum PostgreSQL version required by this version of PostgREST
minimumPgVersion :: PgVersion minimumPgVersion :: PgVersion
minimumPgVersion = pgVersion96 minimumPgVersion = pgVersion96
pgVersion96 :: PgVersion pgVersion96 :: PgVersion
pgVersion96 = PgVersion 90600 "9.6" pgVersion96 = PgVersion 90600 "9.6" "9.6"
pgVersion100 :: PgVersion pgVersion100 :: PgVersion
pgVersion100 = PgVersion 100000 "10" pgVersion100 = PgVersion 100000 "10" "10"
pgVersion109 :: PgVersion pgVersion109 :: PgVersion
pgVersion109 = PgVersion 100009 "10.9" pgVersion109 = PgVersion 100009 "10.9" "10.9"
pgVersion110 :: PgVersion pgVersion110 :: PgVersion
pgVersion110 = PgVersion 110000 "11.0" pgVersion110 = PgVersion 110000 "11.0" "11.0"
pgVersion112 :: PgVersion pgVersion112 :: PgVersion
pgVersion112 = PgVersion 110002 "11.2" pgVersion112 = PgVersion 110002 "11.2" "11.2"
pgVersion114 :: PgVersion pgVersion114 :: PgVersion
pgVersion114 = PgVersion 110004 "11.4" pgVersion114 = PgVersion 110004 "11.4" "11.4"
pgVersion120 :: PgVersion pgVersion120 :: PgVersion
pgVersion120 = PgVersion 120000 "12.0" pgVersion120 = PgVersion 120000 "12.0" "12.0"
pgVersion121 :: PgVersion pgVersion121 :: PgVersion
pgVersion121 = PgVersion 120001 "12.1" pgVersion121 = PgVersion 120001 "12.1" "12.1"
pgVersion130 :: PgVersion pgVersion130 :: PgVersion
pgVersion130 = PgVersion 130000 "13.0" pgVersion130 = PgVersion 130000 "13.0" "13.0"
pgVersion140 :: PgVersion pgVersion140 :: PgVersion
pgVersion140 = PgVersion 140000 "14.0" pgVersion140 = PgVersion 140000 "14.0" "14.0"
pgVersion150 :: PgVersion pgVersion150 :: PgVersion
pgVersion150 = PgVersion 150000 "15.0" pgVersion150 = PgVersion 150000 "15.0" "15.0"