Moving errors to a sane location.

gosexy · May 15, 2013 · f63b759 · f63b759
1 parent 6eea564
commit f63b759
Show file tree

Hide file tree

Showing 11 changed files with 67 additions and 69 deletions.
diff --git a/db.go b/db.go
@@ -30,6 +30,7 @@
 package db
 
 import (
+	"errors"
 	"fmt"
 	"reflect"
 )
@@ -410,6 +411,23 @@ type MultiFlag bool
 type SqlValues []string
 type SqlArgs []string
 
+// Error messages
+var (
+	ErrExpectingPointer        = errors.New(`Expecting a pointer destination (dst interface{}).`)
+	ErrExpectingSlicePointer   = errors.New(`Expecting a pointer to an slice (dst interface{}).`)
+	ErrExpectingSliceMapStruct = errors.New(`Expecting a pointer to an slice of maps or structs (dst interface{}).`)
+	ErrExpectingMapOrStruct    = errors.New(`Expecting either a pointer to a map or a pointer to a struct.`)
+	ErrNoMoreRows              = errors.New(`There are no more rows in this result set.`)
+	ErrNotConnected            = errors.New(`You're currently not connected.`)
+	ErrMissingDatabaseName     = errors.New(`Missing a database name.`)
+	ErrCollectionDoesNotExists = errors.New(`Collection does not exists.`)
+	ErrSockerOrHost            = errors.New(`You can connect either to a socket or a host but not both.`)
+	ErrQueryLimitParam         = errors.New(`A query can accept only one db.Limit() parameter.`)
+	ErrQuerySortParam          = errors.New(`A query can accept only one db.Sort{} parameter.`)
+	ErrQueryOffsetParam        = errors.New(`A query can accept only one db.Offset() parameter.`)
+	ErrMissingConditions       = errors.New(`Missing selector conditions.`)
+)
+
 // Registered wrappers.
 var wrappers = make(map[string]Database)
 

diff --git a/mongo/mongo.go b/mongo/mongo.go
@@ -25,8 +25,8 @@ package mongo
 
 import (
 	"fmt"
-	"menteslibres.net/gosexy/db"
 	"labix.org/v2/mgo"
+	"menteslibres.net/gosexy/db"
 	"net/url"
 	"time"
 )
@@ -84,7 +84,7 @@ func (self *Source) Collection(name string) (db.Collection, error) {
 	col.SetName = name
 
 	if col.Exists() == false {
-		err = fmt.Errorf("Collection %s does not exists.", name)
+		err = db.ErrCollectionDoesNotExists
 	}
 
 	return col, err
@@ -131,7 +131,7 @@ func (self *Source) Open() error {
 	self.session, err = mgo.DialWithTimeout(connURL.String(), 5*time.Second)
 
 	if err != nil {
-		return fmt.Errorf("Could not connect to %s: %s.", self.config.Host, err.Error())
+		return err
 	}
 
 	if self.config.Database != "" {

diff --git a/mongo/result.go b/mongo/result.go
@@ -24,10 +24,9 @@
 package mongo
 
 import (
-	"errors"
+	"labix.org/v2/mgo"
 	"menteslibres.net/gosexy/db"
 	"menteslibres.net/gosexy/db/util"
-	"labix.org/v2/mgo"
 )
 
 type Result struct {
@@ -61,7 +60,7 @@ func (self *Result) All(dst interface{}) error {
 func (self *Result) Next(dst interface{}) error {
 
 	if self.iter.Next(dst) == false {
-		return errors.New("No more results.")
+		return db.ErrNoMoreRows
 	}
 
 	if self.iter.Err() != nil {

diff --git a/mysql/collection.go b/mysql/collection.go
@@ -24,7 +24,6 @@
 package mysql
 
 import (
-	"errors"
 	"fmt"
 	_ "github.com/go-sql-driver/mysql"
 	"menteslibres.net/gosexy/db"
@@ -54,7 +53,7 @@ func (self *Table) Query(terms ...interface{}) (db.Result, error) {
 			if queryChunks.Limit == "" {
 				queryChunks.Limit = fmt.Sprintf("LIMIT %d", v)
 			} else {
-				return nil, errors.New("A query can accept only one db.Limit() parameter.")
+				return nil, db.ErrQueryLimitParam
 			}
 		case db.Sort:
 			if queryChunks.Sort == "" {
@@ -73,13 +72,13 @@ func (self *Table) Query(terms ...interface{}) (db.Result, error) {
 				}
 				queryChunks.Sort = fmt.Sprintf("ORDER BY %s", strings.Join(sortChunks, ", "))
 			} else {
-				return nil, errors.New("A query can accept only one db.Sort{} parameter.")
+				return nil, db.ErrQuerySortParam
 			}
 		case db.Offset:
 			if queryChunks.Offset == "" {
 				queryChunks.Offset = fmt.Sprintf("OFFSET %d", v)
 			} else {
-				return nil, errors.New("A query can accept only one db.Offset() parameter.")
+				return nil, db.ErrQueryOffsetParam
 			}
 		case db.Fields:
 			queryChunks.Fields = append(queryChunks.Fields, v...)
@@ -264,7 +263,7 @@ func (self *Table) Update(selector interface{}, update interface{}) error {
 	selectorConds, selectorArgs := self.compileConditions(selector)
 
 	if selectorConds == "" {
-		return errors.New("Received no conditions.")
+		return db.ErrMissingConditions
 	}
 
 	fields, values, err := self.FieldValues(update, toInternal)

diff --git a/mysql/mysql.go b/mysql/mysql.go
@@ -25,7 +25,6 @@ package mysql
 
 import (
 	"database/sql"
-	"errors"
 	"fmt"
 	_ "github.com/go-sql-driver/mysql"
 	"menteslibres.net/gosexy/db"
@@ -113,7 +112,7 @@ func (self *Source) Name() string {
 // Wraps sql.DB.QueryRow
 func (self *Source) doQueryRow(terms ...interface{}) (*sql.Row, error) {
 	if self.session == nil {
-		return nil, errors.New("You're currently not connected.")
+		return nil, db.ErrNotConnected
 	}
 
 	chunks := sqlCompile(terms)
@@ -131,7 +130,7 @@ func (self *Source) doQueryRow(terms ...interface{}) (*sql.Row, error) {
 // Wraps sql.DB.Query
 func (self *Source) doQuery(terms ...interface{}) (*sql.Rows, error) {
 	if self.session == nil {
-		return nil, fmt.Errorf("You're currently not connected.")
+		return nil, db.ErrNotConnected
 	}
 
 	chunks := sqlCompile(terms)
@@ -149,7 +148,7 @@ func (self *Source) doQuery(terms ...interface{}) (*sql.Rows, error) {
 // Wraps sql.DB.Exec
 func (self *Source) doExec(terms ...interface{}) (sql.Result, error) {
 	if self.session == nil {
-		return nil, fmt.Errorf("You're currently not connected.")
+		return nil, db.ErrNotConnected
 	}
 
 	chunks := sqlCompile(terms)
@@ -201,11 +200,11 @@ func (self *Source) Open() error {
 	}
 
 	if self.config.Database == "" {
-		return fmt.Errorf("Database name is required.")
+		return db.ErrMissingDatabaseName
 	}
 
 	if self.config.Socket != "" && self.config.Host != "" {
-		return errors.New("Socket or Host are mutually exclusive.")
+		return db.ErrSockerOrHost
 	}
 
 	if self.config.Charset == "" {
@@ -303,7 +302,7 @@ func (self *Source) Collection(name string) (db.Collection, error) {
 
 	// Table exists?
 	if table.Exists() == false {
-		return table, fmt.Errorf("Table %s does not exists.", name)
+		return table, db.ErrCollectionDoesNotExists
 	}
 
 	// Fetching table datatypes and mapping to internal gotypes.

diff --git a/postgresql/collection.go b/postgresql/collection.go
@@ -24,7 +24,6 @@
 package postgresql
 
 import (
-	"errors"
 	"fmt"
 	"menteslibres.net/gosexy/db"
 	"menteslibres.net/gosexy/db/util/sqlutil"
@@ -53,7 +52,7 @@ func (self *Table) Query(terms ...interface{}) (db.Result, error) {
 			if queryChunks.Limit == "" {
 				queryChunks.Limit = fmt.Sprintf("LIMIT %d", v)
 			} else {
-				return nil, errors.New("A query can accept only one db.Limit() parameter.")
+				return nil, db.ErrQueryLimitParam
 			}
 		case db.Sort:
 			if queryChunks.Sort == "" {
@@ -72,13 +71,13 @@ func (self *Table) Query(terms ...interface{}) (db.Result, error) {
 				}
 				queryChunks.Sort = fmt.Sprintf("ORDER BY %s", strings.Join(sortChunks, ", "))
 			} else {
-				return nil, errors.New("A query can accept only one db.Sort{} parameter.")
+				return nil, db.ErrQuerySortParam
 			}
 		case db.Offset:
 			if queryChunks.Offset == "" {
 				queryChunks.Offset = fmt.Sprintf("OFFSET %d", v)
 			} else {
-				return nil, errors.New("A query can accept only one db.Offset() parameter.")
+				return nil, db.ErrQueryOffsetParam
 			}
 		case db.Fields:
 			queryChunks.Fields = append(queryChunks.Fields, v...)
@@ -287,7 +286,7 @@ func (self *Table) Update(selector interface{}, update interface{}) error {
 	selectorConds, selectorArgs := self.compileConditions(selector)
 
 	if selectorConds == "" {
-		return errors.New("Received no conditions.")
+		return db.ErrMissingConditions
 	}
 
 	fields, values, err := self.FieldValues(update, toInternal)

diff --git a/postgresql/postgresql.go b/postgresql/postgresql.go
@@ -25,7 +25,6 @@ package postgresql
 
 import (
 	"database/sql"
-	"errors"
 	"fmt"
 	_ "github.com/xiam/gopostgresql"
 	"menteslibres.net/gosexy/db"
@@ -110,7 +109,7 @@ func (self *Source) Name() string {
 // Wraps sql.DB.QueryRow
 func (self *Source) doQueryRow(terms ...interface{}) (*sql.Row, error) {
 	if self.session == nil {
-		return nil, fmt.Errorf("You're currently not connected.")
+		return nil, db.ErrNotConnected
 	}
 
 	chunks := sqlCompile(terms)
@@ -132,7 +131,7 @@ func (self *Source) doQueryRow(terms ...interface{}) (*sql.Row, error) {
 // Wraps sql.DB.Query
 func (self *Source) doQuery(terms ...interface{}) (*sql.Rows, error) {
 	if self.session == nil {
-		return nil, fmt.Errorf("You're currently not connected.")
+		return nil, db.ErrNotConnected
 	}
 
 	chunks := sqlCompile(terms)
@@ -154,7 +153,7 @@ func (self *Source) doQuery(terms ...interface{}) (*sql.Rows, error) {
 // Wraps sql.DB.Exec
 func (self *Source) doExec(terms ...interface{}) (sql.Result, error) {
 	if self.session == nil {
-		return nil, fmt.Errorf("You're currently not connected.")
+		return nil, db.ErrNotConnected
 	}
 
 	chunks := sqlCompile(terms)
@@ -209,11 +208,11 @@ func (self *Source) Open() error {
 	}
 
 	if self.config.Database == "" {
-		return fmt.Errorf("Database name is required.")
+		return db.ErrMissingDatabaseName
 	}
 
 	if self.config.Socket != "" && self.config.Host != "" {
-		return errors.New("Socket or Host are mutually exclusive.")
+		return db.ErrSockerOrHost
 	}
 
 	var conn string
@@ -227,7 +226,7 @@ func (self *Source) Open() error {
 	self.session, err = sql.Open("postgres", conn)
 
 	if err != nil {
-		return fmt.Errorf("Could not connect to %s: %s", self.config.Host, err.Error())
+		return err
 	}
 
 	return nil
@@ -307,7 +306,7 @@ func (self *Source) Collection(name string) (db.Collection, error) {
 
 	// Table exists?
 	if table.Exists() == false {
-		return table, fmt.Errorf("Table %s does not exists.", name)
+		return table, db.ErrCollectionDoesNotExists
 	}
 
 	// Fetching table datatypes and mapping to internal gotypes.

diff --git a/sqlite/collection.go b/sqlite/collection.go
@@ -24,7 +24,6 @@
 package sqlite
 
 import (
-	"errors"
 	"fmt"
 	"menteslibres.net/gosexy/db"
 	"menteslibres.net/gosexy/db/util/sqlutil"
@@ -55,7 +54,7 @@ func (self *Table) Query(terms ...interface{}) (db.Result, error) {
 			if queryChunks.Limit == "" {
 				queryChunks.Limit = fmt.Sprintf("LIMIT %d", v)
 			} else {
-				return nil, errors.New("A query can accept only one db.Limit() parameter.")
+				return nil, db.ErrQueryLimitParam
 			}
 		case db.Sort:
 			if queryChunks.Sort == "" {
@@ -74,13 +73,13 @@ func (self *Table) Query(terms ...interface{}) (db.Result, error) {
 				}
 				queryChunks.Sort = fmt.Sprintf("ORDER BY %s", strings.Join(sortChunks, ", "))
 			} else {
-				return nil, errors.New("A query can accept only one db.Sort{} parameter.")
+				return nil, db.ErrQuerySortParam
 			}
 		case db.Offset:
 			if queryChunks.Offset == "" {
 				queryChunks.Offset = fmt.Sprintf("OFFSET %d", v)
 			} else {
-				return nil, errors.New("A query can accept only one db.Offset() parameter.")
+				return nil, ErrQueryOffsetParam
 			}
 		case db.Fields:
 			queryChunks.Fields = append(queryChunks.Fields, v...)
@@ -265,7 +264,7 @@ func (self *Table) Update(selector interface{}, update interface{}) error {
 	selectorConds, selectorArgs := self.compileConditions(selector)
 
 	if selectorConds == "" {
-		return errors.New("Received no conditions.")
+		return db.ErrMissingConditions
 	}
 
 	fields, values, err := self.FieldValues(update, toInternal)

diff --git a/sqlite/sqlite.go b/sqlite/sqlite.go
@@ -25,7 +25,6 @@ package sqlite
 
 import (
 	"database/sql"
-	"errors"
 	"fmt"
 	_ "github.com/xiam/gosqlite3"
 	"menteslibres.net/gosexy/db"
@@ -115,7 +114,7 @@ func (self *Source) Name() string {
 func (self *Source) doQueryRow(terms ...interface{}) (*sql.Row, error) {
 
 	if self.session == nil {
-		return nil, errors.New("You're currently not connected.")
+		return nil, db.ErrNotConnected
 	}
 
 	chunks := sqlCompile(terms)
@@ -135,7 +134,7 @@ func (self *Source) doQueryRow(terms ...interface{}) (*sql.Row, error) {
 */
 func (self *Source) doQuery(terms ...interface{}) (*sql.Rows, error) {
 	if self.session == nil {
-		return nil, fmt.Errorf("You're currently not connected.")
+		return nil, db.ErrNotConnected
 	}
 
 	chunks := sqlCompile(terms)
@@ -155,7 +154,7 @@ func (self *Source) doQuery(terms ...interface{}) (*sql.Rows, error) {
 */
 func (self *Source) doExec(terms ...interface{}) (sql.Result, error) {
 	if self.session == nil {
-		return nil, fmt.Errorf("You're currently not connected.")
+		return nil, db.ErrNotConnected
 	}
 
 	chunks := sqlCompile(terms)
@@ -193,13 +192,13 @@ func (self *Source) Open() error {
 	var err error
 
 	if self.config.Database == "" {
-		return fmt.Errorf("Missing database path.")
+		return db.ErrMissingDatabaseName
 	}
 
 	self.session, err = sql.Open("sqlite3", self.config.Database)
 
 	if err != nil {
-		return fmt.Errorf("Could not open %s: %s", self.config.Database, err.Error())
+		return err
 	}
 
 	return nil
@@ -282,7 +281,7 @@ func (self *Source) Collection(name string) (db.Collection, error) {
 
 	// Table exists?
 	if table.Exists() == false {
-		return table, fmt.Errorf("Table %s does not exists.", name)
+		return table, db.ErrCollectionDoesNotExists
 	}
 
 	// Fetching table datatypes and mapping to internal gotypes.