resolved merge conflict

z5labs · May 24, 2020 · 7bc8a37 · 7bc8a37
2 parents 7f628e7 + 4688d26
commit 7bc8a37
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -18,7 +18,7 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 name: Go
-on: [push]
+on: [push, pull_request]
 jobs:
 
   build:

diff --git a/config.go b/config.go
@@ -22,6 +22,7 @@ package gogm
 import (
 	"errors"
 	"fmt"
+	"net/url"
 	"reflect"
 
 	"github.com/cornelk/hashmap"
@@ -84,8 +85,9 @@ func (c *Config) ConnectionString() string {
 	} else {
 		protocol = "bolt"
 	}
-
-	return fmt.Sprintf("%s://%s:%s@%s:%v", protocol, c.Username, c.Password, c.Host, c.Port)
+	// In case of special characters in password string
+	password := url.QueryEscape(c.Password)
+	return fmt.Sprintf("%s://%s:%s@%s:%v", protocol, c.Username, password, c.Host, c.Port)
 }
 
 // Index Strategy typedefs int to define different index approaches