Removing Connect and Connect2 methods from Conn, the only way to establish connection is with connection string, and calling NewConn, or better NewConnPool.

Author: ianic

README.md

@@ -106,7 +106,7 @@ Each row is array of values. Each column is array of ResultColumn objects.
 
 Execute query with params:
 ```go
-  rst, err := conn.ExecuteSql("select au_id, au_lname, au_fname from authors where au_id = ?", "998-72-3567")
+rst, err := conn.ExecuteSql("select au_id, au_lname, au_fname from authors where au_id = ?", "998-72-3567")
 ```
 
 

conn.go

@@ -86,22 +86,12 @@ func (conn *Conn) addError(err string) {
 	conn.Error += err
 }
 
-//Connect to the database, returns new connection or error.
-func Connect(user, pwd, host, database string) (*Conn, error) {
-	return connectWithCredentials(&credentials{user: user, pwd: pwd, host: host, database: database})
-}
-
-//Connect to the database with mirroring support, returns new connection or error.
-func Connect2(user, pwd, host, mirrorHost, database string) (*Conn, error) {
-	return connectWithCredentials(&credentials{user: user, pwd: pwd, host: host, database: database, mirrorHost: mirrorHost})
-}
-
 //Connect to the database with connection string, returns new connection or error.
 //Example:
-//  conn, err := ConnectWithConnectionString("host=myServerA;database=myDataBase;user=myUsername;pwd=myPassword;mirror=myMirror")
+//  conn, err := NewConn("host=myServerA;database=myDataBase;user=myUsername;pwd=myPassword;mirror=myMirror")
 //
 //Mirror is optional, other params are mandatory.
-func ConnectWithConnectionString(connStr string) (*Conn, error) {
+func NewConn(connStr string) (*Conn, error) { 
 	return connectWithCredentials(NewCredentials(connStr))
 }
 

conn_pool.go

@@ -46,6 +46,9 @@ type ConnPool struct {
 //There is always one connection in the pool.
 //
 //Returns err if fails to create initial connection.
+//Valid connection string examples:
+//   "host=myServerA;database=myDataBase;user=myUsername;pwd=myPassword;"
+//   "host=myServerA;database=myDataBase;user=myUsername;pwd=myPassword;mirror=myMirror"
 func NewConnPool(connStr string) (*ConnPool, error) {
 	p := &ConnPool{
 		connStr:       connStr,
@@ -70,7 +73,7 @@ func NewConnPool(connStr string) (*ConnPool, error) {
 }
 
 func (p *ConnPool) newConn() (*Conn, error) {
-	conn, err := ConnectWithConnectionString(p.connStr)
+	conn, err := NewConn(p.connStr)
 	if err == nil {
 		conn.belongsToPool = p
 		//share stored procedure params cache between connections in the pool

conn_test.go

@@ -51,7 +51,7 @@ create procedure freetds_return_value as
   return -5`}
 
 func ConnectToTestDb(t *testing.T) *Conn {
-	conn, err := ConnectWithConnectionString(testDbConnStr(1))
+	conn, err := NewConn(testDbConnStr(1))
 	if err != nil {
 		t.Errorf("can't connect to the test database")
 		return nil

mssql_conn.go

@@ -15,7 +15,7 @@ type MssqlDriver struct{}
 
 //implements Open for Driver interface from http://golang.org/src/pkg/database/sql/driver/driver.go
 func (d *MssqlDriver) Open(dsn string) (driver.Conn, error) {
-	conn, err := ConnectWithConnectionString(dsn)
+	conn, err := NewConn(dsn)
 	if err != nil {
 		return nil, err
 	}