diff options
author | =Corey Hulen <corey@hulen.com> | 2015-11-23 15:53:48 -0800 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-11-23 15:53:48 -0800 |
commit | 4f4cd5e63573da4d6edcc7d4213afaca67c19f88 (patch) | |
tree | cefbc7af53629d97644ca2f6b2369e9d879f0101 /Godeps/_workspace/src/github.com/go-sql-driver/mysql/rows.go | |
parent | f8a3c9a14edca6df0647d89cf225f2470cbe025c (diff) | |
download | chat-4f4cd5e63573da4d6edcc7d4213afaca67c19f88.tar.gz chat-4f4cd5e63573da4d6edcc7d4213afaca67c19f88.tar.bz2 chat-4f4cd5e63573da4d6edcc7d4213afaca67c19f88.zip |
upgrading libs
Diffstat (limited to 'Godeps/_workspace/src/github.com/go-sql-driver/mysql/rows.go')
-rw-r--r-- | Godeps/_workspace/src/github.com/go-sql-driver/mysql/rows.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/rows.go b/Godeps/_workspace/src/github.com/go-sql-driver/mysql/rows.go index 9d97d6d4f..ba606e146 100644 --- a/Godeps/_workspace/src/github.com/go-sql-driver/mysql/rows.go +++ b/Godeps/_workspace/src/github.com/go-sql-driver/mysql/rows.go @@ -40,7 +40,11 @@ func (rows *mysqlRows) Columns() []string { columns := make([]string, len(rows.columns)) if rows.mc.cfg.columnsWithAlias { for i := range columns { - columns[i] = rows.columns[i].tableName + "." + rows.columns[i].name + if tableName := rows.columns[i].tableName; len(tableName) > 0 { + columns[i] = tableName + "." + rows.columns[i].name + } else { + columns[i] = rows.columns[i].name + } } } else { for i := range columns { |