Adding tests for filter count.

db.go

@@ -220,7 +220,7 @@ type Result interface {
 	Update(interface{}) error
 
 	// Counts all items within the result set.
-	Count() (int, error)
+	Count() (uint64, error)
 
 	// Fetches all the results of the query into the given pointer.
 	//

sqlite/collection.go

@@ -41,8 +41,6 @@ type Table struct {
 // Creates a filter with the given terms.
 func (self *Table) Filter(terms ...interface{}) (db.Result, error) {
 
-	var err error
-
 	queryChunks := sqlutil.NewQueryChunks()
 
 	// Analyzing given terms.
@@ -95,6 +93,7 @@ func (self *Table) Filter(terms ...interface{}) (db.Result, error) {
 		queryChunks.Conditions = `1 = 1`
 	}
 
+	/*
 		// Actually executing query.
 		rows, err := self.source.doQuery(
 			// Mandatory
@@ -107,10 +106,14 @@ func (self *Table) Filter(terms ...interface{}) (db.Result, error) {
 		if err != nil {
 			return nil, err
 		}
+	*/
 
 	result := &Result{
+		self,
+		queryChunks,
 		sqlutil.Result{
-			Rows:  rows,
+			//Rows:  rows,
+
 			Table: &self.T,
 		},
 	}

sqlite/database_test.go

@@ -104,6 +104,7 @@ func TestTruncate(t *testing.T) {
 
 // Appends some artists, albums and tracks.
 func TestAppend(t *testing.T) {
+
 	var err error
 	var id interface{}
 
@@ -154,6 +155,39 @@ func TestAppend(t *testing.T) {
 
 }
 
+func TestResult(t *testing.T) {
+
+	var err error
+	var res db.Result
+
+	sess, err := db.Open(wrapperName, settings)
+
+	if err != nil {
+		t.Fatalf(err.Error())
+	}
+
+	defer sess.Close()
+
+	artist, _ := sess.Collection("artist")
+
+	res, err = artist.Filter()
+
+	if err != nil {
+		t.Fatalf(err.Error())
+	}
+
+	total, err := res.Count()
+
+	if err != nil {
+		t.Fatalf(err.Error())
+	}
+
+	if total == 0 {
+		t.Fatalf("Should not be empty, we've just added some rows.")
+	}
+
+}
+
 /*
 // Appends maps and structs.
 func TestAppend(t *testing.T) {

sqlite/result.go

@@ -24,10 +24,17 @@
 package sqlite
 
 import (
+	"fmt"
 	"menteslibres.net/gosexy/db/util/sqlutil"
 )
 
+type counter struct {
+	Total uint64 `field:"total"`
+}
+
 type Result struct {
+	t           *Table
+	queryChunks *sqlutil.QueryChunks
 	sqlutil.Result
 }
 
@@ -51,6 +58,23 @@ func (self *Result) Update(terms interface{}) error {
 	return nil
 }
 
-func (self *Result) Count() (int, error) {
-	return 0, nil
+func (self *Result) Count() (uint64, error) {
+
+	rows, err := self.t.source.doQuery(
+		fmt.Sprintf(
+			`SELECT COUNT(1) AS total FROM %s WHERE %s`,
+			self.t.Name(),
+			self.queryChunks.Conditions,
+		),
+		self.queryChunks.Arguments,
+	)
+
+	if err != nil {
+		return 0, err
+	}
+
+	dst := counter{}
+	self.Table.FetchRow(&dst, rows)
+
+	return dst.Total, nil
 }