From 9f0de4e9a98f0a1feb84a1dace34e6239b1fe119 Mon Sep 17 00:00:00 2001 From: Joseph Ferano Date: Thu, 24 Feb 2022 18:25:01 +0700 Subject: [PATCH] Replace postgres uri --- Bot/GuildEnvironment.fs | 2 +- DbService/DbService.fs | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Bot/GuildEnvironment.fs b/Bot/GuildEnvironment.fs index a81a5a0..74ca022 100644 --- a/Bot/GuildEnvironment.fs +++ b/Bot/GuildEnvironment.fs @@ -11,7 +11,7 @@ DotEnv.Load(DotEnvOptions(envFilePaths = [ "../../../../.dev.env" ], overwriteEx let getVar str = Environment.GetEnvironmentVariable(str) let getId str = getVar str |> uint64 -let pgDb = getVar "DATABASE_URL" +let pgDb = (getVar "DATABASE_URL").Replace("postgresql://", "postgres://") let guildId = getId "DISCORD_GUILD" let tokenPlayerInteractions = getVar "TOKEN_PLAYER_INTERACTIONS" diff --git a/DbService/DbService.fs b/DbService/DbService.fs index 70b01c6..2d4170c 100644 --- a/DbService/DbService.fs +++ b/DbService/DbService.fs @@ -1,5 +1,6 @@ module Degenz.DbService +open System.Security.Cryptography.X509Certificates open Degenz.Types open System @@ -53,8 +54,14 @@ let tryFindPlayer connStr (discordId : uint64) = async { try let! user = +// use cert = new X509Certificate2("~/Downloads/ca-certificate.crt") +// (Uri connStr) +// |> Sql.fromUriToConfig +// |> Sql.requireSslMode +// |> Sql.formatConnectionString connStr |> Sql.connect +// |> Sql.clientCertificate cert |> Sql.parameters [ "did", Sql.string (string discordId) ] |> Sql.query """ SELECT discord_id, display_name, gbt, strength, inventory FROM "user" WHERE discord_id = @did