fix: resolve conflict

agneum · agneum · commit 43a54e7707c8 · 2020-11-12T09:18:46.000+07:00
diff --git a/pkg/services/cloning/mode_base.go b/pkg/services/cloning/mode_base.go
@@ -586,7 +586,7 @@ func hasNotQueryActivity(session *resources.Session) (bool, error) {
 }
 
 func getSocketConnStr(session *resources.Session) string {
-	return fmt.Sprintf("host=%s user=%s port=%d dbname=%s", session.SocketHost, session.User, session.Port, defaultDatabaseName)
+	return fmt.Sprintf("host=%s user=%s port=%d dbname=postgres", session.SocketHost, session.User, session.Port)
 }
 
 // checkActiveQueryNotExists runs query to check a user activity.

Original file line number	Diff line number	Diff line change
`@@ -586,7 +586,7 @@ func hasNotQueryActivity(session *resources.Session) (bool, error) {`
`586`	`586`	`}`
`587`	`587`
`588`	`588`	`func getSocketConnStr(session *resources.Session) string {`
`589`		`- return fmt.Sprintf("host=%s user=%s port=%d dbname=%s", session.SocketHost, session.User, session.Port, defaultDatabaseName)`
	`589`	`+ return fmt.Sprintf("host=%s user=%s port=%d dbname=postgres", session.SocketHost, session.User, session.Port)`
`590`	`590`	`}`
`591`	`591`
`592`	`592`	`// checkActiveQueryNotExists runs query to check a user activity.`