Merge pull request #46 from merixzon/master

Allow specifying columns with Select() also when using Find()

beedb.go

@@ -150,10 +150,13 @@ func (orm *Model) Find(output interface{}) error {
 	if orm.TableName == "" {
 		orm.TableName = getTableName(StructName(output))
 	}
-	for key, _ := range results {
-		keys = append(keys, key)
+	// If we've already specific columns with Select(), use that
+	if orm.ColumnStr == "*" {
+		for key, _ := range results {
+			keys = append(keys, key)
+		}
+		orm.ColumnStr = strings.Join(keys, ", ")
 	}
-	orm.ColumnStr = strings.Join(keys, ", ")
 	orm.Limit(1)
 	resultsSlice, err := orm.FindMap()
 	if err != nil {
@@ -191,13 +194,13 @@ func (orm *Model) FindAll(rowsSlicePtr interface{}) error {
 	if orm.TableName == "" {
 		orm.TableName = getTableName(getTypeName(rowsSlicePtr))
 	}
-	// If we've already specific columns with Select(), use that
-	if orm.ColumnStr == "*" {
-		for key, _ := range results {
-			keys = append(keys, key)
-		}
-		orm.ColumnStr = strings.Join(keys, ", ")
-	}
+	// If we've already specific columns with Select(), use that
+	if orm.ColumnStr == "*" {
+		for key, _ := range results {
+			keys = append(keys, key)
+		}
+		orm.ColumnStr = strings.Join(keys, ", ")
+	}
 	resultsSlice, err := orm.FindMap()
 	if err != nil {
 		return err