From ea23fabafab7d6f5bb2e2a758d3d746594bc9e2c Mon Sep 17 00:00:00 2001 From: Kalissaac Date: Tue, 1 Dec 2020 16:12:51 -0800 Subject: [PATCH] Rename Connection to ConnectionURL --- mongodb/README.md | 22 +++++++++++----------- mongodb/config.go | 14 +++++++------- mongodb/mongodb.go | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/mongodb/README.md b/mongodb/README.md index 8ea75589..5322bb20 100644 --- a/mongodb/README.md +++ b/mongodb/README.md @@ -50,10 +50,10 @@ store := mongodb.New(mongodb.Config{ // Initialize custom config using connection string store := mongodb.New(mongodb.Config{ - Connection: "mongodb://user:password@127.0.0.1:27017", - Database: "fiber", - Collection: "fiber_storage", - Reset: false, + ConnectionURI: "mongodb://user:password@127.0.0.1:27017", + Database: "fiber", + Collection: "fiber_storage", + Reset: false, }) ``` @@ -64,7 +64,7 @@ type Config struct { // Connection string to use for DB. Will override all other authentication values if used // // Optional. Default is "" - Connection string + ConnectionURI string // Host name where the DB is hosted // @@ -106,11 +106,11 @@ type Config struct { ### Default Config ```go var ConfigDefault = Config{ - Connection: "", - Host: "127.0.0.1", - Port: 27017, - Database: "fiber", - Collection: "fiber_storage", - Reset: false, + ConnectionURI: "", + Host: "127.0.0.1", + Port: 27017, + Database: "fiber", + Collection: "fiber_storage", + Reset: false, } ``` diff --git a/mongodb/config.go b/mongodb/config.go index 7c11bda4..7e496bc8 100644 --- a/mongodb/config.go +++ b/mongodb/config.go @@ -5,7 +5,7 @@ type Config struct { // Connection string to use for DB. Will override all other authentication values if used // // Optional. Default is "" - Connection string + ConnectionURI string // Host name where the DB is hosted // @@ -45,12 +45,12 @@ type Config struct { // ConfigDefault is the default config var ConfigDefault = Config{ - Connection: "", - Host: "127.0.0.1", - Port: 27017, - Database: "fiber", - Collection: "fiber_storage", - Reset: false, + ConnectionURI: "", + Host: "127.0.0.1", + Port: 27017, + Database: "fiber", + Collection: "fiber_storage", + Reset: false, } // Helper function to set default values diff --git a/mongodb/mongodb.go b/mongodb/mongodb.go index fc9c05cb..b33c9974 100644 --- a/mongodb/mongodb.go +++ b/mongodb/mongodb.go @@ -36,8 +36,8 @@ func New(config ...Config) *Storage { var dsn string // Check if user supplied connection string - if cfg.Connection != "" { - dsn = cfg.Connection + if cfg.ConnectionURI != "" { + dsn = cfg.ConnectionURI } else { dsn = "mongodb://" if cfg.Username != "" {