From b54a42fe7e0672e83b1929eda4890117ab0b60f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Carlos=20Nieto?= <jose.carlos@menteslibres.net>
Date: Sun, 22 Jun 2014 18:29:36 -0500
Subject: [PATCH] PostgreSQL: Fixing some golint issues.
---
postgresql/collection.go | 24 ++++++++++-----------
postgresql/database.go | 46 ++++++++++++++++++++--------------------
postgresql/result.go | 30 +++++++++++++-------------
postgresql/tx.go | 12 +++++------
4 files changed, 55 insertions(+), 57 deletions(-)
diff --git a/postgresql/collection.go b/postgresql/collection.go
index 892b69d0..bb4ecdea 100644
--- a/postgresql/collection.go
+++ b/postgresql/collection.go
@@ -36,9 +36,9 @@ import (
const defaultOperator = `=`
-type Table struct {
+type table struct {
sqlutil.T
- source *Source
+ source *source
names []string
}
@@ -107,9 +107,8 @@ func interfaceArgs(value interface{}) (args []interface{}) {
}
return args
- } else {
- return nil
}
+ return nil
default:
args = []interface{}{toInternal(value)}
}
@@ -176,10 +175,10 @@ func conditionValues(cond db.Cond) (columnValues sqlgen.ColumnValues, args []int
return columnValues, args
}
-func (self *Table) Find(terms ...interface{}) db.Result {
+func (self *table) Find(terms ...interface{}) db.Result {
where, arguments := whereValues(terms)
- result := &Result{
+ result := &result{
table: self,
where: where,
arguments: arguments,
@@ -188,7 +187,7 @@ func (self *Table) Find(terms ...interface{}) db.Result {
return result
}
-func (self *Table) tableN(i int) string {
+func (self *table) tableN(i int) string {
if len(self.names) > i {
chunks := strings.SplitN(self.names[i], " ", 2)
if len(chunks) > 0 {
@@ -199,7 +198,7 @@ func (self *Table) tableN(i int) string {
}
// Deletes all the rows within the collection.
-func (self *Table) Truncate() error {
+func (self *table) Truncate() error {
_, err := self.source.doExec(sqlgen.Statement{
Type: sqlgen.SqlTruncate,
@@ -214,7 +213,7 @@ func (self *Table) Truncate() error {
}
// Appends an item (map or struct) into the collection.
-func (self *Table) Append(item interface{}) (interface{}, error) {
+func (self *table) Append(item interface{}) (interface{}, error) {
cols, vals, err := self.FieldValues(item, toInternal)
@@ -267,14 +266,14 @@ func (self *Table) Append(item interface{}) (interface{}, error) {
}
// Returns true if the collection exists.
-func (self *Table) Exists() bool {
+func (self *table) Exists() bool {
if err := self.source.tableExists(self.names...); err != nil {
return false
}
return true
}
-func (self *Table) Name() string {
+func (self *table) Name() string {
return strings.Join(self.names, `, `)
}
@@ -290,9 +289,8 @@ func toInternal(val interface{}) interface{} {
case bool:
if t == true {
return `1`
- } else {
- return `0`
}
+ return `0`
}
return to.String(val)
}
diff --git a/postgresql/database.go b/postgresql/database.go
index a57fd2fb..f9839701 100644
--- a/postgresql/database.go
+++ b/postgresql/database.go
@@ -51,7 +51,7 @@ var (
sqlPlaceholder = sqlgen.Value{sqlgen.Raw{`?`}}
)
-type Source struct {
+type source struct {
config db.Settings
session *sql.DB
collections map[string]db.Collection
@@ -108,10 +108,10 @@ func init() {
pgsqlSelectCountLayout,
}
- db.Register(Adapter, &Source{})
+ db.Register(Adapter, &source{})
}
-func (self *Source) doExec(stmt sqlgen.Statement, args ...interface{}) (sql.Result, error) {
+func (self *source) doExec(stmt sqlgen.Statement, args ...interface{}) (sql.Result, error) {
var query string
var res sql.Result
var err error
@@ -140,7 +140,7 @@ func (self *Source) doExec(stmt sqlgen.Statement, args ...interface{}) (sql.Resu
return res, err
}
-func (self *Source) doQuery(stmt sqlgen.Statement, args ...interface{}) (*sql.Rows, error) {
+func (self *source) doQuery(stmt sqlgen.Statement, args ...interface{}) (*sql.Rows, error) {
var rows *sql.Rows
var query string
var err error
@@ -169,7 +169,7 @@ func (self *Source) doQuery(stmt sqlgen.Statement, args ...interface{}) (*sql.Ro
return rows, err
}
-func (self *Source) doQueryRow(stmt sqlgen.Statement, args ...interface{}) (*sql.Row, error) {
+func (self *source) doQueryRow(stmt sqlgen.Statement, args ...interface{}) (*sql.Row, error) {
var query string
var row *sql.Row
var err error
@@ -199,18 +199,18 @@ func (self *Source) doQueryRow(stmt sqlgen.Statement, args ...interface{}) (*sql
}
// Returns the string name of the database.
-func (self *Source) Name() string {
+func (self *source) Name() string {
return self.config.Database
}
// Ping verifies a connection to the database is still alive,
// establishing a connection if necessary.
-func (self *Source) Ping() error {
+func (self *source) Ping() error {
return self.session.Ping()
}
-func (self *Source) clone() (*Source, error) {
- src := &Source{}
+func (self *source) clone() (*source, error) {
+ src := &source{}
src.Setup(self.config)
if err := src.Open(); err != nil {
@@ -220,13 +220,13 @@ func (self *Source) clone() (*Source, error) {
return src, nil
}
-func (self *Source) Clone() (db.Database, error) {
+func (self *source) Clone() (db.Database, error) {
return self.clone()
}
-func (self *Source) Transaction() (db.Tx, error) {
+func (self *source) Transaction() (db.Tx, error) {
var err error
- var clone *Source
+ var clone *source
var sqlTx *sql.Tx
if sqlTx, err = self.session.Begin(); err != nil {
@@ -237,7 +237,7 @@ func (self *Source) Transaction() (db.Tx, error) {
return nil, err
}
- tx := &Tx{clone}
+ tx := &tx{clone}
clone.tx = sqlTx
@@ -245,19 +245,19 @@ func (self *Source) Transaction() (db.Tx, error) {
}
// Stores database settings.
-func (self *Source) Setup(config db.Settings) error {
+func (self *source) Setup(config db.Settings) error {
self.config = config
self.collections = make(map[string]db.Collection)
return self.Open()
}
// Returns the underlying *sql.DB instance.
-func (self *Source) Driver() interface{} {
+func (self *source) Driver() interface{} {
return self.session
}
// Attempts to connect to a database using the stored settings.
-func (self *Source) Open() error {
+func (self *source) Open() error {
var err error
if self.config.Host == "" {
@@ -301,7 +301,7 @@ func (self *Source) Open() error {
}
// Closes the current database session.
-func (self *Source) Close() error {
+func (self *source) Close() error {
if self.session != nil {
return self.session.Close()
}
@@ -309,13 +309,13 @@ func (self *Source) Close() error {
}
// Changes the active database.
-func (self *Source) Use(database string) error {
+func (self *source) Use(database string) error {
self.config.Database = database
return self.Open()
}
// Drops the currently active database.
-func (self *Source) Drop() error {
+func (self *source) Drop() error {
_, err := self.doQuery(sqlgen.Statement{
Type: sqlgen.SqlDropDatabase,
@@ -326,7 +326,7 @@ func (self *Source) Drop() error {
}
// Returns a list of all tables within the currently active database.
-func (self *Source) Collections() ([]string, error) {
+func (self *source) Collections() ([]string, error) {
var collections []string
var collection string
@@ -355,7 +355,7 @@ func (self *Source) Collections() ([]string, error) {
return collections, nil
}
-func (self *Source) tableExists(names ...string) error {
+func (self *source) tableExists(names ...string) error {
for _, name := range names {
rows, err := self.doQuery(sqlgen.Statement{
@@ -385,13 +385,13 @@ func (self *Source) tableExists(names ...string) error {
}
// Returns a collection instance by name.
-func (self *Source) Collection(names ...string) (db.Collection, error) {
+func (self *source) Collection(names ...string) (db.Collection, error) {
if len(names) == 0 {
return nil, db.ErrMissingCollectionName
}
- col := &Table{
+ col := &table{
source: self,
names: names,
}
diff --git a/postgresql/result.go b/postgresql/result.go
index 5976113b..8684d4a1 100644
--- a/postgresql/result.go
+++ b/postgresql/result.go
@@ -35,8 +35,8 @@ type counter_t struct {
Total uint64 `db:"_t"`
}
-type Result struct {
- table *Table
+type result struct {
+ table *table
cursor *sql.Rows // This is the main query cursor. It starts as a nil value.
limit sqlgen.Limit
offset sqlgen.Offset
@@ -47,7 +47,7 @@ type Result struct {
}
// Executes a SELECT statement that can feed Next(), All() or One().
-func (self *Result) setCursor() error {
+func (self *result) setCursor() error {
var err error
// We need a cursor, if the cursor does not exists yet then we create one.
if self.cursor == nil {
@@ -64,20 +64,20 @@ func (self *Result) setCursor() error {
}
// Sets conditions for reducing the working set.
-func (self *Result) Where(terms ...interface{}) db.Result {
+func (self *result) Where(terms ...interface{}) db.Result {
self.where, self.arguments = whereValues(terms)
return self
}
// Determines the maximum limit of results to be returned.
-func (self *Result) Limit(n uint) db.Result {
+func (self *result) Limit(n uint) db.Result {
self.limit = sqlgen.Limit(n)
return self
}
// Determines how many documents will be skipped before starting to grab
// results.
-func (self *Result) Skip(n uint) db.Result {
+func (self *result) Skip(n uint) db.Result {
self.offset = sqlgen.Offset(n)
return self
}
@@ -85,7 +85,7 @@ func (self *Result) Skip(n uint) db.Result {
// Determines sorting of results according to the provided names. Fields may be
// prefixed by - (minus) which means descending order, ascending order would be
// used otherwise.
-func (self *Result) Sort(fields ...string) db.Result {
+func (self *result) Sort(fields ...string) db.Result {
sortColumns := make(sqlgen.SortColumns, 0, len(fields))
@@ -115,7 +115,7 @@ func (self *Result) Sort(fields ...string) db.Result {
}
// Retrieves only the given fields.
-func (self *Result) Select(fields ...interface{}) db.Result {
+func (self *result) Select(fields ...interface{}) db.Result {
self.columns = make(sqlgen.Columns, 0, len(fields))
l := len(fields)
@@ -132,7 +132,7 @@ func (self *Result) Select(fields ...interface{}) db.Result {
}
// Dumps all results into a pointer to an slice of structs or maps.
-func (self *Result) All(dst interface{}) error {
+func (self *result) All(dst interface{}) error {
var err error
if self.cursor != nil {
@@ -155,7 +155,7 @@ func (self *Result) All(dst interface{}) error {
}
// Fetches only one result from the resultset.
-func (self *Result) One(dst interface{}) error {
+func (self *result) One(dst interface{}) error {
var err error
if self.cursor != nil {
@@ -170,7 +170,7 @@ func (self *Result) One(dst interface{}) error {
}
// Fetches the next result from the resultset.
-func (self *Result) Next(dst interface{}) error {
+func (self *result) Next(dst interface{}) error {
err := self.setCursor()
if err != nil {
self.Close()
@@ -187,7 +187,7 @@ func (self *Result) Next(dst interface{}) error {
}
// Removes the matching items from the collection.
-func (self *Result) Remove() error {
+func (self *result) Remove() error {
var err error
_, err = self.table.source.doExec(sqlgen.Statement{
Type: sqlgen.SqlDelete,
@@ -200,7 +200,7 @@ func (self *Result) Remove() error {
// Updates matching items from the collection with values of the given map or
// struct.
-func (self *Result) Update(values interface{}) error {
+func (self *result) Update(values interface{}) error {
ff, vv, err := self.table.FieldValues(values, toInternal)
@@ -225,7 +225,7 @@ func (self *Result) Update(values interface{}) error {
}
// Closes the result set.
-func (self *Result) Close() error {
+func (self *result) Close() error {
var err error
if self.cursor != nil {
err = self.cursor.Close()
@@ -235,7 +235,7 @@ func (self *Result) Close() error {
}
// Counting the elements that will be returned.
-func (self *Result) Count() (uint64, error) {
+func (self *result) Count() (uint64, error) {
rows, err := self.table.source.doQuery(sqlgen.Statement{
Type: sqlgen.SqlSelectCount,
diff --git a/postgresql/tx.go b/postgresql/tx.go
index c28e20a8..66f40581 100644
--- a/postgresql/tx.go
+++ b/postgresql/tx.go
@@ -21,14 +21,14 @@
package postgresql
-type Tx struct {
- *Source
+type tx struct {
+ *source
}
-func (self *Tx) Commit() error {
- return self.Source.tx.Commit()
+func (self *tx) Commit() error {
+ return self.source.tx.Commit()
}
-func (self *Tx) Rollback() error {
- return self.Source.tx.Rollback()
+func (self *tx) Rollback() error {
+ return self.source.tx.Rollback()
}
--
GitLab