return the address of non-struct pointer fields rather than the point…

…ers; fixes problems scanning into pointer fields in structs

sqlx.go

@@ -880,7 +880,7 @@ func getValues(v reflect.Value) []interface{} {
 					queue = append(queue, v)
 				}
 			} else {
-				if isPtr || !returnAddrs {
+				if !returnAddrs {
 					values[i] = v.Interface()
 				} else if returnAddrs {
 					values[i] = v.Addr().Interface()

sqlx_test.go

@@ -184,6 +184,12 @@ type Place struct {
 	TelCode int
 }
 
+type PlacePtr struct {
+	Country string
+	City    *string
+	TelCode int
+}
+
 type PersonPlace struct {
 	Person
 	Place
@@ -435,6 +441,13 @@ func TestUsage(t *testing.T) {
 			t.Errorf("Expected integer telcodes to work, got %#v", places)
 		}
 
+		placesptr := []PlacePtr{}
+		err = db.Select(&placesptr, "SELECT * FROM place ORDER BY telcode ASC")
+		if err != nil {
+			t.Error(err)
+		}
+		//fmt.Printf("%#v\n%#v\n%#v\n", placesptr[0], placesptr[1], placesptr[2])
+
 		// if you have null fields and use SELECT *, you must use sql.Null* in your struct
 		// this test also verifies that you can use either a []Struct{} or a []*Struct{}
 		places2 := []Place{}