Updating main test for MySQL.

main_test.go

@@ -35,7 +35,8 @@ import (
 	"gopkg.in/mgo.v2/bson"
 	"upper.io/db"
 	_ "upper.io/db/mongo"
-	//_ "upper.io/db/mysql"	// Disabled temporarily.
+
+	"upper.io/db/mysql"
 	"upper.io/db/postgresql"
 	// Temporary removing QL. It includes a _solaris.go file that produces
 	// compile time errors on < go1.3.
@@ -45,7 +46,7 @@ import (
 
 var wrappers = []string{
 	//`sqlite`,
-	//`mysql`,
+	`mysql`,
 	`postgresql`,
 	//`mongo`,
 	// `ql`,
@@ -87,11 +88,14 @@ func init() {
 			User:     `upperio`,
 			Password: `upperio`,
 		},
-		`mysql`: &db.Settings{
+		`mysql`: &mysql.ConnectionURL{
 			Database: `upperio_tests`,
-			Host:     host,
+			Address:  db.Host(host),
 			User:     `upperio`,
 			Password: `upperio`,
+			Options: map[string]string{
+				"parseTime": "true",
+			},
 		},
 		`postgresql`: &postgresql.ConnectionURL{
 			Database: `upperio_tests`,
@@ -240,8 +244,8 @@ var setupFn = map[string]func(driver interface{}) error{
 				return err
 			}
 			_, err = sqld.Exec(`CREATE TABLE CaSe_TesT (
-				ID BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, PRIMARY KEY(ID),
-				Case_Test VARCHAR(60)
+				id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT, PRIMARY KEY(id),
+				case_test VARCHAR(60)
 			) CHARSET=utf8`)
 			if err != nil {
 				return err

mysql/database.go

@@ -149,6 +149,8 @@ func (s *source) Open() error {
 		return err
 	}
 
+	s.session.Mapper = sqlutil.NewMapper()
+
 	if err = s.populateSchema(); err != nil {
 		return err
 	}

mysql/database_test.go

@@ -24,7 +24,6 @@ package mysql
 import (
 	"database/sql"
 	"errors"
-	"flag"
 	"fmt"
 	"math/rand"
 	"os"
@@ -62,7 +61,7 @@ var settings = ConnectionURL{
 	},
 }
 
-var host = flag.String("host", "testserver.local", "Testing server address.")
+var host string
 
 // Structure for testing conversions and datatypes.
 type testValuesStruct struct {
@@ -87,7 +86,7 @@ type testValuesStruct struct {
 	Date  time.Time  `db:"_date"`
 	DateN *time.Time `db:"_nildate"`
 	DateP *time.Time `db:"_ptrdate"`
-	DateD *time.Time `db:"_defaultdate"`
+	DateD *time.Time `db:"_defaultdate,omitempty"`
 	Time  int64      `db:"_time"`
 }
 
@@ -149,8 +148,11 @@ func init() {
 		int64(time.Second * 7331),
 	}
 
-	flag.Parse()
-	settings.Address = db.ParseAddress(*host)
+	if host = os.Getenv("TEST_HOST"); host == "" {
+		host = "localhost"
+	}
+
+	settings.Address = db.ParseAddress(host)
 }
 
 // Loggin some information to stdout (like the SQL query and its
@@ -178,7 +180,7 @@ func TestOpenWithWrongData(t *testing.T) {
 	// Attempt to open with safe settings.
 	rightSettings = db.Settings{
 		Database: database,
-		Host:     *host,
+		Host:     host,
 		User:     username,
 		Password: password,
 	}
@@ -192,7 +194,7 @@ func TestOpenWithWrongData(t *testing.T) {
 	// Attempt to open with wrong password.
 	wrongSettings = db.Settings{
 		Database: database,
-		Host:     *host,
+		Host:     host,
 		User:     username,
 		Password: "fail",
 	}
@@ -204,7 +206,7 @@ func TestOpenWithWrongData(t *testing.T) {
 	// Attempt to open with wrong database.
 	wrongSettings = db.Settings{
 		Database: "fail",
-		Host:     *host,
+		Host:     host,
 		User:     username,
 		Password: password,
 	}
@@ -216,7 +218,7 @@ func TestOpenWithWrongData(t *testing.T) {
 	// Attempt to open with wrong username.
 	wrongSettings = db.Settings{
 		Database: database,
-		Host:     *host,
+		Host:     host,
 		User:     "fail",
 		Password: password,
 	}
@@ -235,7 +237,7 @@ func TestOldSettings(t *testing.T) {
 		Database: database,
 		User:     username,
 		Password: password,
-		Host:     *host,
+		Host:     host,
 	}
 
 	// Opening database.

mysql/result.go

@@ -92,6 +92,7 @@ func (r *result) Group(fields ...interface{}) db.Result {
 	groupByColumns := make(sqlgen.GroupBy, 0, len(fields))
 
 	l := len(fields)
+
 	for i := 0; i < l; i++ {
 		switch value := fields[i].(type) {
 		// Maybe other types?
@@ -217,35 +218,31 @@ func (r *result) One(dst interface{}) error {
 }
 
 // Fetches the next result from the resultset.
-func (r *result) Next(dst interface{}) error {
-
-	var err error
-
-	// Current cursor.
-	err = r.setCursor()
+func (r *result) Next(dst interface{}) (err error) {
 
-	if err != nil {
+	if err = r.setCursor(); err != nil {
 		r.Close()
+		return err
 	}
 
-	// Fetching the next result from the cursor.
-	err = sqlutil.FetchRow(r.cursor, dst)
-
-	if err != nil {
+	if err = sqlutil.FetchRow(r.cursor, dst); err != nil {
 		r.Close()
+		return err
 	}
 
-	return err
+	return nil
 }
 
 // Removes the matching items from the collection.
 func (r *result) Remove() error {
 	var err error
+
 	_, err = r.table.source.doExec(sqlgen.Statement{
 		Type:  sqlgen.SqlDelete,
 		Table: sqlgen.Table{r.table.Name()},
 		Where: r.where,
 	}, r.arguments...)
+
 	return err
 
 }
@@ -255,6 +252,9 @@ func (r *result) Remove() error {
 func (r *result) Update(values interface{}) error {
 
 	ff, vv, err := r.table.FieldValues(values)
+	if err != nil {
+		return err
+	}
 
 	total := len(ff)
 
@@ -277,8 +277,7 @@ func (r *result) Update(values interface{}) error {
 }
 
 // Closes the result set.
-func (r *result) Close() error {
-	var err error
+func (r *result) Close() (err error) {
 	if r.cursor != nil {
 		err = r.cursor.Close()
 		r.cursor = nil
@@ -286,11 +285,11 @@ func (r *result) Close() error {
 	return err
 }
 
-// Counts matching elements.
+// Counts the elements within the main conditions of the set.
 func (r *result) Count() (uint64, error) {
 	var count counter
 
-	rows, err := r.table.source.doQuery(sqlgen.Statement{
+	row, err := r.table.source.doQueryRow(sqlgen.Statement{
 		Type:  sqlgen.SqlSelectCount,
 		Table: sqlgen.Table{r.table.Name()},
 		Where: r.where,
@@ -300,8 +299,8 @@ func (r *result) Count() (uint64, error) {
 		return 0, err
 	}
 
-	defer rows.Close()
-	if err = sqlutil.FetchRow(rows, &count); err != nil {
+	err = row.Scan(&count.Total)
+	if err != nil {
 		return 0, err
 	}