- add non-context version of methods for Conn struct

Author: rocketlaunchr-cto

conn.go

@@ -29,6 +29,11 @@ func (c *Conn) Unleak() {
 	c.connectionID = ""
 }
 
+// Begin starts a transaction. The default isolation level is dependent on the driver.
+func (c *Conn) Begin(opts *stdSql.TxOptions) (*Tx, error) {
+	return c.BeginTx(context.Background(), opts)
+}
+
 // BeginTx starts a transaction.
 //
 // The provided context is used until the transaction is committed or rolled back.
@@ -63,6 +68,12 @@ func (c *Conn) Close() error {
 	return nil
 }
 
+// Exec executes a query without returning any rows.
+// The args are for any placeholder parameters in the query.
+func (c *Conn) Exec(query string, args ...interface{}) (stdSql.Result, error) {
+	return c.ExecContext(context.Background(), query, args...)
+}
+
 // ExecContext executes a query without returning any rows.
 // The args are for any placeholder parameters in the query.
 func (c *Conn) ExecContext(ctx context.Context, query string, args ...interface{}) (stdSql.Result, error) {
@@ -106,6 +117,11 @@ func (c *Conn) ExecContext(ctx context.Context, query string, args ...interface{
 	}
 }
 
+// Ping verifies a connection to the database is still alive.
+func (c *Conn) Ping() error {
+	return c.PingContext(context.Background())
+}
+
 // PingContext verifies the connection to the database is still alive.
 func (c *Conn) PingContext(ctx context.Context) error {
 
@@ -141,6 +157,15 @@ func (c *Conn) PingContext(ctx context.Context) error {
 	}
 }
 
+// Prepare creates a prepared statement for later queries or executions.
+// Multiple queries or executions may be run concurrently from the
+// returned statement.
+// The caller must call the statement's Close method
+// when the statement is no longer needed.
+func (c *Conn) Prepare(query string) (*Stmt, error) {
+	return c.PrepareContext(context.Background(), query)
+}
+
 // PrepareContext creates a prepared statement for later queries or executions.
 // Multiple queries or executions may be run concurrently from the
 // returned statement.
@@ -191,6 +216,12 @@ func (c *Conn) PrepareContext(ctx context.Context, query string) (*Stmt, error)
 
 }
 
+// Query executes a query that returns rows, typically a SELECT.
+// The args are for any placeholder parameters in the query.
+func (c *Conn) Query(query string, args ...interface{}) (*stdSql.Rows, error) {
+	return c.QueryContext(context.Background(), query, args...)
+}
+
 // QueryContext executes a query that returns rows, typically a SELECT.
 // The args are for any placeholder parameters in the query.
 func (c *Conn) QueryContext(ctx context.Context, query string, args ...interface{}) (*stdSql.Rows, error) {
@@ -206,6 +237,14 @@ func (c *Conn) QueryContext(ctx context.Context, query string, args ...interface
 	return c.conn.QueryContext(ctx, query, args...)
 }
 
+// QueryRow executes a query that is expected to return at most one row.
+// QueryRow always returns a non-nil value. Errors are deferred until
+// Row's Scan method is called.
+// If the query selects no rows, the *Row's Scan will return ErrNoRows.
+// Otherwise, the *Row's Scan scans the first selected row and discards
+// the rest.
+func (c *Conn) QueryRow(query string, args ...interface{}) *stdSql.Row {
+	return c.QueryRowContext(context.Background(), query, args...)
 }
 
 // QueryRowContext executes a query that is expected to return at most one row.
@@ -223,6 +262,5 @@ func (c *Conn) QueryRowContext(ctx context.Context, query string, args ...interf
 		}
 	}()
 
-	row := c.conn.QueryRowContext(ctx, query, args...)
-	return row
+	return c.conn.QueryRowContext(ctx, query, args...)
 }

db.go

@@ -88,7 +88,6 @@ func (db *DB) Conn(ctx context.Context) (*Conn, error) {
 		return &Conn{conn, db.DB, connectionID}, nil
 	}
 	return &Conn{conn, db.KillerPool, connectionID}, nil
-
 }
 
 // Driver returns the database's underlying driver.

stmt.go

@@ -132,6 +132,5 @@ func (s *Stmt) QueryRowContext(ctx context.Context, args ...interface{}) *stdSql
 		}
 	}()
 
-	row := s.QueryRowContext(ctx, args...)
-	return row
+	return s.QueryRowContext(ctx, args...)
 }

tx.go

@@ -213,8 +213,7 @@ func (tx *Tx) QueryRowContext(ctx context.Context, query string, args ...interfa
 		}
 	}()
 
-	row := tx.tx.QueryRowContext(ctx, query, args...)
-	return row
+	return tx.tx.QueryRowContext(ctx, query, args...)
 }
 
 // Rollback aborts the transaction.