Skip to content

discover.exe: support beta/rc versions of postgresql #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 23, 2025
Merged

discover.exe: support beta/rc versions of postgresql #61

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion lib/config/discover.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,29 @@ let major_minor_from_pgconfig () =
in
Fun.protect ~finally:(fun () -> close_in ic) (fun () -> pg_major_minor ic)

let keep_digits =
let rec aux version_line len i =
if i < len then
match version_line.[i] with
| '0' .. '9' | '.' -> aux version_line len (i + 1)
| _ -> i
else i
in
fun version_line ->
let len = String.length version_line in
let cut = aux version_line len 0 in
String.sub version_line 0 cut

let major_minor_from_pkg_config () =
let bin = Sys.getenv_opt "PKG_CONFIG" |> Option.value ~default:"pkg-config" in
let args = Sys.getenv_opt "PKG_CONFIG_ARGN" |> Option.value ~default:"" in
let cmd = Format.asprintf "%s %s --modversion libpq" bin args in
let ic = Unix.open_process_in cmd in
Fun.protect ~finally:(fun () -> close_in ic) @@ fun () ->
let version_line = input_line ic in
match String.split_on_char '.' version_line with
match String.split_on_char '.' (keep_digits version_line) with
| [major] ->
("-DPG_OCAML_MAJOR_VERSION=" ^ major, "-DPG_OCAML_MINOR_VERSION=0")
| major :: minor :: _ ->
("-DPG_OCAML_MAJOR_VERSION=" ^ major, "-DPG_OCAML_MINOR_VERSION=" ^ minor)
| _ ->
Expand Down
Loading