v2.0.3

* Fixed issue with transient columns and the auto select of columns.
yzzyx · May 29, 2015 · 826d6b1 · 826d6b1
1 parent 604f721
commit 826d6b1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,3 +1,7 @@
+## v2.0.3
+
+* Fixed issue with transient columns and the auto select of columns.
+
 ## v2.0.2
 
 * Changed references to "github.com/doug-martin/goqu" to "gopkg.in/doug-martin/goqu.v2"

diff --git a/dataset_select_test.go b/dataset_select_test.go
@@ -60,6 +60,7 @@ func (me *datasetTest) TestSelect() {
  Name string
  Address string `db:"address"`
  EmailAddress string `db:"email_address"`
+ FakeCol string `db:"-"`
  }
  sql, _, err = ds1.Select(&myStruct{}).ToSql()
  assert.NoError(t, err)
@@ -125,6 +126,7 @@ func (me *datasetTest) TestSelectDistinct() {
  Name string
  Address string `db:"address"`
  EmailAddress string `db:"email_address"`
+ FakeCol string `db:"-"`
  }
  sql, _, err = ds1.SelectDistinct(&myStruct{}).ToSql()
  assert.NoError(t, err)

diff --git a/expressions.go b/expressions.go
@@ -236,8 +236,10 @@ func cols(vals ...interface{}) ColumnList {
  panic(err.Error())
  }
  var structCols []string
- for key, _ := range cm {
- structCols = append(structCols, key)
+ for key, col := range cm {
+ if !col.Transient {
+ structCols = append(structCols, key)
+ }
  }
  sort.Strings(structCols)
  for _, col := range structCols {