Compare commits
No commits in common. "main" and "v0.9.0-b06" have entirely different histories.
main
...
v0.9.0-b06
|
@ -41,15 +41,13 @@ let fetchPost (postId : string) =
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
### A standard way to translate JSON or a URI into a strongly-typed configuration
|
### A standard way to translate JSON into a strongly-typed configuration
|
||||||
|
|
||||||
```fsharp
|
```fsharp
|
||||||
/// type: DataConfig
|
/// type: DataConfig
|
||||||
let config = DataConfig.fromJsonFile "data-config.json"
|
let config = DataConfig.fromJsonFile "data-config.json"
|
||||||
// OR
|
// OR
|
||||||
let config = DataConfig.fromConfiguration (config.GetSection "RethinkDB")
|
let config = DataConfig.fromConfiguration (config.GetSection "RethinkDB")
|
||||||
// OR
|
|
||||||
let config = DataConfig.fromUri (config.GetConnectionString "RethinkDB")
|
|
||||||
|
|
||||||
/// type: IConnection
|
/// type: IConnection
|
||||||
let conn = config.Connect ()
|
let conn = config.Connect ()
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
namespace RethinkDb.Driver.FSharp
|
namespace RethinkDb.Driver.FSharp
|
||||||
|
|
||||||
open System
|
|
||||||
open Microsoft.Extensions.Configuration
|
open Microsoft.Extensions.Configuration
|
||||||
open Microsoft.Extensions.Logging
|
|
||||||
open Newtonsoft.Json.Linq
|
open Newtonsoft.Json.Linq
|
||||||
open RethinkDb.Driver
|
open RethinkDb.Driver
|
||||||
open RethinkDb.Driver.Net
|
open RethinkDb.Driver.Net
|
||||||
|
@ -38,30 +36,17 @@ type DataConfig =
|
||||||
static member empty =
|
static member empty =
|
||||||
{ Parameters = [] }
|
{ Parameters = [] }
|
||||||
|
|
||||||
/// Build the connection from the given parameters
|
|
||||||
member private this.BuildConnection () =
|
|
||||||
this.Parameters
|
|
||||||
|> Seq.fold ConnectionBuilder.build (RethinkDB.R.Connection ())
|
|
||||||
|
|
||||||
/// Create a RethinkDB connection
|
/// Create a RethinkDB connection
|
||||||
member this.CreateConnection () : IConnection =
|
member this.CreateConnection () : IConnection =
|
||||||
(this.BuildConnection ()).Connect ()
|
this.Parameters
|
||||||
|
|> Seq.fold ConnectionBuilder.build (RethinkDB.R.Connection ())
|
||||||
/// Create a RethinkDB connection, logging the connection settings
|
|> function builder -> builder.Connect ()
|
||||||
member this.CreateConnection (log : ILogger) : IConnection =
|
|
||||||
let builder = this.BuildConnection ()
|
|
||||||
if not (isNull log) then log.LogInformation $"Connecting to {this.EffectiveUri}"
|
|
||||||
builder.Connect ()
|
|
||||||
|
|
||||||
/// Create a RethinkDB connection
|
/// Create a RethinkDB connection
|
||||||
member this.CreateConnectionAsync () : Task<Connection> =
|
member this.CreateConnectionAsync () : Task<Connection> =
|
||||||
(this.BuildConnection ()).ConnectAsync ()
|
this.Parameters
|
||||||
|
|> Seq.fold ConnectionBuilder.build (RethinkDB.R.Connection ())
|
||||||
/// Create a RethinkDB connection, logging the connection settings
|
|> function builder -> builder.ConnectAsync ()
|
||||||
member this.CreateConnectionAsync (log : ILogger) : Task<Connection> =
|
|
||||||
let builder = this.BuildConnection ()
|
|
||||||
if not (isNull log) then log.LogInformation $"Connecting to {this.EffectiveUri}"
|
|
||||||
builder.ConnectAsync ()
|
|
||||||
|
|
||||||
/// The effective hostname
|
/// The effective hostname
|
||||||
member this.Hostname =
|
member this.Hostname =
|
||||||
|
@ -87,20 +72,6 @@ type DataConfig =
|
||||||
| Some (Database x) -> x
|
| Some (Database x) -> x
|
||||||
| _ -> RethinkDBConstants.DefaultDbName
|
| _ -> RethinkDBConstants.DefaultDbName
|
||||||
|
|
||||||
/// The effective configuration URI (excludes password / auth key)
|
|
||||||
member this.EffectiveUri =
|
|
||||||
seq {
|
|
||||||
"rethinkdb://"
|
|
||||||
match this.Parameters |> List.tryPick (fun x -> match x with User _ -> Some x | _ -> None) with
|
|
||||||
| Some (User (username, _)) -> $"{username}:***pw***@"
|
|
||||||
| _ ->
|
|
||||||
match this.Parameters |> List.tryPick (fun x -> match x with AuthKey _ -> Some x | _ -> None) with
|
|
||||||
| Some (AuthKey _) -> "****key****@"
|
|
||||||
| _ -> ()
|
|
||||||
$"{this.Hostname}:{this.Port}/{this.Database}?timeout={this.Timeout}"
|
|
||||||
}
|
|
||||||
|> String.concat ""
|
|
||||||
|
|
||||||
/// Parse settings from JSON
|
/// Parse settings from JSON
|
||||||
///
|
///
|
||||||
/// A sample JSON object with all the possible properties filled in:
|
/// A sample JSON object with all the possible properties filled in:
|
||||||
|
@ -118,14 +89,14 @@ type DataConfig =
|
||||||
static member FromJson json =
|
static member FromJson json =
|
||||||
let parsed = JObject.Parse json
|
let parsed = JObject.Parse json
|
||||||
{ Parameters =
|
{ Parameters =
|
||||||
[ match parsed["hostname"] with null -> () | x -> Hostname <| x.Value<string> ()
|
[ match parsed["hostname"] with null -> () | x -> Hostname <| x.Value<string> ()
|
||||||
match parsed["port"] with null -> () | x -> Port <| x.Value<int> ()
|
match parsed["port"] with null -> () | x -> Port <| x.Value<int> ()
|
||||||
match parsed["auth-key"] with null -> () | x -> AuthKey <| x.Value<string> ()
|
match parsed["auth-key"] with null -> () | x -> AuthKey <| x.Value<string> ()
|
||||||
match parsed["timeout"] with null -> () | x -> Timeout <| x.Value<int> ()
|
match parsed["timeout"] with null -> () | x -> Timeout <| x.Value<int> ()
|
||||||
match parsed["database"] with null -> () | x -> Database <| x.Value<string> ()
|
match parsed["database"] with null -> () | x -> Database <| x.Value<string> ()
|
||||||
match parsed["username"], parsed["password"] with
|
match parsed["username"], parsed["password"] with
|
||||||
| null, _ | _, null -> ()
|
| null, _ | _, null -> ()
|
||||||
| userName, password -> User (userName.Value<string> (), password.Value<string> ())
|
| userName, password -> User (userName.Value<string> (), password.Value<string> ())
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -137,34 +108,11 @@ type DataConfig =
|
||||||
/// Parse settings from application configuration
|
/// Parse settings from application configuration
|
||||||
static member FromConfiguration (cfg : IConfigurationSection) =
|
static member FromConfiguration (cfg : IConfigurationSection) =
|
||||||
{ Parameters =
|
{ Parameters =
|
||||||
[ match cfg["hostname"] with null -> () | host -> Hostname host
|
[ match cfg["hostname"] with null -> () | host -> Hostname host
|
||||||
match cfg["port"] with null -> () | port -> Port (int port)
|
match cfg["port"] with null -> () | port -> Port (int port)
|
||||||
match cfg["auth-key"] with null -> () | key -> AuthKey key
|
match cfg["auth-key"] with null -> () | key -> AuthKey key
|
||||||
match cfg["timeout"] with null -> () | time -> Timeout (int time)
|
match cfg["timeout"] with null -> () | time -> Timeout (int time)
|
||||||
match cfg["database"] with null -> () | db -> Database db
|
match cfg["database"] with null -> () | db -> Database db
|
||||||
match cfg["username"], cfg["password"] with null, _ | _, null -> () | user -> User user
|
match cfg["username"], cfg["password"] with null, _ | _, null -> () | user -> User user
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Parse settings from a URI
|
|
||||||
///
|
|
||||||
/// rethinkdb://user:password@host:port/database?timeout=##
|
|
||||||
/// OR
|
|
||||||
/// rethinkdb://authkey@host:port/database?timeout=##
|
|
||||||
///
|
|
||||||
/// Scheme and host are required; all other settings optional
|
|
||||||
static member FromUri (uri : string) =
|
|
||||||
let it = Uri uri
|
|
||||||
if it.Scheme <> "rethinkdb" then invalidArg "Scheme" $"""URI scheme must be "rethinkdb" (was {it.Scheme})"""
|
|
||||||
{ Parameters =
|
|
||||||
[ Hostname it.Host
|
|
||||||
if it.Port <> -1 then Port it.Port
|
|
||||||
if it.UserInfo <> "" then
|
|
||||||
if it.UserInfo.Contains ":" then
|
|
||||||
let parts = it.UserInfo.Split ':' |> Array.truncate 2
|
|
||||||
User (parts[0], parts[1])
|
|
||||||
else AuthKey it.UserInfo
|
|
||||||
if it.Segments.Length > 1 then Database it.Segments[1]
|
|
||||||
if it.Query.Contains "?timeout=" then Timeout (int it.Query[9..])
|
|
||||||
]
|
]
|
||||||
}
|
}
|
|
@ -10,8 +10,6 @@ open RethinkDb.Driver.FSharp
|
||||||
let dataCfg = DataConfig.fromJson "rethink-config.json"
|
let dataCfg = DataConfig.fromJson "rethink-config.json"
|
||||||
// - or -
|
// - or -
|
||||||
let dataCfg = DataConfig.fromConfiguration [config-section]
|
let dataCfg = DataConfig.fromConfiguration [config-section]
|
||||||
// - or -
|
|
||||||
let dataCfg = DataConfig.fromUri [connection-string]
|
|
||||||
|
|
||||||
let conn = dataCfg.CreateConnection () // IConnection
|
let conn = dataCfg.CreateConnection () // IConnection
|
||||||
```
|
```
|
||||||
|
|
|
@ -14,9 +14,9 @@
|
||||||
<Copyright>See LICENSE</Copyright>
|
<Copyright>See LICENSE</Copyright>
|
||||||
<PackageTags>RethinkDB document F#</PackageTags>
|
<PackageTags>RethinkDB document F#</PackageTags>
|
||||||
<VersionPrefix>0.9.0</VersionPrefix>
|
<VersionPrefix>0.9.0</VersionPrefix>
|
||||||
<VersionSuffix>beta-07</VersionSuffix>
|
<VersionSuffix>beta-06</VersionSuffix>
|
||||||
<PackageReleaseNotes>
|
<PackageReleaseNotes>
|
||||||
Add URI config option and logging CreateConnection overloads
|
Add optional arguments for tableCreate
|
||||||
</PackageReleaseNotes>
|
</PackageReleaseNotes>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user