Updating database functions.

mongo/database.go

 /*
-  Copyright (c) 2012-2013 José Carlos Nieto, http://xiam.menteslibres.org/
+  Copyright (c) 2012-2013 José Carlos Nieto, https://menteslibres.net/xiam
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
@@ -26,117 +26,58 @@ package mongo
 import (
 	"fmt"
 	"labix.org/v2/mgo"
-	"upper.io/db"
 	"net/url"
 	"time"
+	"upper.io/db"
 )
 
 var Debug = false
 
+const driverName = `mongo`
+
 // Registers this driver.
 func init() {
-	db.Register("mongo", &Source{})
+	db.Register(driverName, &Source{})
 }
 
-// Mongodb datasource.
 type Source struct {
 	name     string
-	config   db.DataSource
+	config   db.Settings
 	session  *mgo.Session
 	database *mgo.Database
 }
 
-// Returns database name.
+// Returns the string name of the database.
 func (self *Source) Name() string {
 	return self.name
 }
 
-// Returns a datasource session that is not yet connected to the database.
-func Session(config db.DataSource) db.Database {
-	self := &Source{}
-	self.config = config
-	return self
-}
-
-// Opens a connection.
-func (self *Source) Setup(config db.DataSource) error {
+// Stores database settings.
+func (self *Source) Setup(config db.Settings) error {
 	self.config = config
 	return self.Open()
 }
 
-// Sets the active database.
-func (self *Source) Use(database string) error {
-	self.config.Database = database
-	self.name = database
-	self.database = self.session.DB(self.config.Database)
-	return nil
-}
-
-/*
-	Starts a transaction block.
-*/
-func (self *Source) Begin() error {
-	// TODO:
-	// MongoDB does not supports something like BEGIN and END statements.
-	return nil
-}
-
-/*
-	Ends a transaction block.
-*/
-func (self *Source) End() error {
-	// TODO:
-	// MongoDB does not supports something like BEGIN and END statements.
-	return nil
-}
-
-// Returns a collection from the current database.
-func (self *Source) Collection(name string) (db.Collection, error) {
-	var err error
-
-	col := &SourceCollection{}
-	col.parent = self
-	col.collection = self.database.C(name)
-
-	col.DB = self
-	col.SetName = name
-
-	if col.Exists() == false {
-		err = db.ErrCollectionDoesNotExists
-	}
-
-	return col, err
-}
-
-// Returns a collection from the current database. Panics if the collection does not exists.
-func (self *Source) ExistentCollection(name string) db.Collection {
-	col, err := self.Collection(name)
-	if err != nil {
-		panic(err.Error())
-	}
-	return col
-}
-
-// Returns the underlying driver (*mgo.Session).
+// Returns the underlying *mgo.Session instance.
 func (self *Source) Driver() interface{} {
 	return self.session
 }
 
-// Opens a connection to the datasource. See Session().
+// Attempts to connect to a database using the stored settings.
 func (self *Source) Open() error {
 	var err error
 
-	connURL := &url.URL{Scheme: "mongodb"}
+	connURL := &url.URL{Scheme: `mongodb`}
 
 	if self.config.Port == 0 {
 		self.config.Port = 27017
 	}
 
 	if self.config.Host == "" {
-		self.config.Host = "127.0.0.1"
+		self.config.Host = `127.0.0.1`
 	}
 
-	connURL.Host = fmt.Sprintf("%s:%d", self.config.Host, self.config.Port)
+	connURL.Host = fmt.Sprintf(`%s:%d`, self.config.Host, self.config.Port)
 
 	if self.config.User != "" {
 		connURL.User = url.UserPassword(self.config.User, self.config.Password)
@@ -159,13 +100,7 @@ func (self *Source) Open() error {
 	return nil
 }
 
-// Drops the active database and all its collections.
-func (self *Source) Drop() error {
-	err := self.database.DropDatabase()
-	return err
-}
-
-// Closes the connection to the database.
+// Closes the current database session.
 func (self *Source) Close() error {
 	if self.session != nil {
 		self.session.Close()
@@ -173,14 +108,63 @@ func (self *Source) Close() error {
 	return nil
 }
 
-// Returns the names of all collection in the current database.
-func (self *Source) Collections() []string {
+// Changes the active database.
+func (self *Source) Use(database string) error {
+	self.config.Database = database
+	self.name = database
+	self.database = self.session.DB(self.config.Database)
+	return nil
+}
+
+// Starts a transaction block.
+func (self *Source) Begin() error {
+	// TODO:
+	// MongoDB does not supports something like BEGIN and END statements.
+	return nil
+}
+
+// Ends a transaction block.
+func (self *Source) End() error {
+	// TODO:
+	// MongoDB does not supports something like BEGIN and END statements.
+	return nil
+}
+
+// Drops the currently active database.
+func (self *Source) Drop() error {
+	err := self.database.DropDatabase()
+	return err
+}
+
+// Returns a list of all tables within the currently active database.
+func (self *Source) Collections() ([]string, error) {
 	cols := []string{}
-	rawcols, _ := self.database.CollectionNames()
+	rawcols, err := self.database.CollectionNames()
+	if err != nil {
+		return nil, err
+	}
 	for _, col := range rawcols {
 		if col != "system.indexes" {
 			cols = append(cols, col)
 		}
 	}
-	return cols
+	return cols, nil
+}
+
+// Returns a collection instance by name.
+func (self *Source) Collection(name string) (db.Collection, error) {
+	var err error
+
+	col := &SourceCollection{}
+	col.parent = self
+	col.collection = self.database.C(name)
+
+	col.DB = self
+	col.SetName = name
+
+	if col.Exists() == false {
+		err = db.ErrCollectionDoesNotExists
+	}
+
+	return col, err
 }