add test and fix alexbrainman#127, alexbrainman#81

Author: wege

mssql_test.go

@@ -1799,6 +1799,47 @@ func TestMSSQLNextResultSet(t *testing.T) {
 		})
 }
 
+func TestMSSQLNextResultSetWithDifferentColumnsInResultSets(t *testing.T) {
+	db, sc, err := mssqlConnect()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer closeDB(t, db, sc, sc)
+	rows, err := db.Query("select 1 select 2,3")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer rows.Close()
+	if !rows.Next() {
+		t.Fatal("expected at least 1 result")
+	}
+	var v1, v2 int
+	err = rows.Scan(&v1)
+	if err != nil {
+		t.Fatalf("unable to scan select 1 underlying error: %v", err)
+	}
+	if v1 != 1 {
+		t.Fatalf("expected: %v got %v", 1, v1)
+	}
+	if rows.Next() {
+		t.Fatal("unexpected row")
+	}
+	if !rows.NextResultSet() {
+		t.Fatal("expected another result set")
+	}
+	if !rows.Next() {
+		t.Fatal("expected a single row")
+	}
+	err = rows.Scan(&v1, &v2)
+	if err != nil {
+		t.Fatalf("unable to scan select 2,3 underlying error: %v", err)
+	}
+	if v1 != 2 || v2 != 3 {
+		t.Fatalf("got wrong values expected v1=%v v2=%v. got v1=%v v2=%v", 2, 3, v1, v2)
+	}
+
+}
+
 func TestMSSQLHasNextResultSet(t *testing.T) {
 	checkName := func(rows *sql.Rows, name string) {
 		var reccount int

rows.go

@@ -57,10 +57,10 @@ func (r *Rows) NextResultSet() error {
 	if IsError(ret) {
 		return NewError("SQLMoreResults", r.os.h)
 	}
-	// TODO: !!!!!!!!!!!!!!! maybe need to call r.os.BindColumns here !!!!!
-	//err := r.os.BindColumns()
-	//if err != nil {
-	//	return err
-	//}
+
+	err := r.os.BindColumns()
+	if err != nil {
+		return err
+	}
 	return nil
 }

stmt.go

@@ -65,12 +65,19 @@ func (s *Stmt) Exec(args []driver.Value) (driver.Result, error) {
 	if err != nil {
 		return nil, err
 	}
-	var c api.SQLLEN
-	ret := api.SQLRowCount(s.os.h, &c)
-	if IsError(ret) {
-		return nil, NewError("SQLRowCount", s.os.h)
+	var sumRowCount int64
+	for {
+		var c api.SQLLEN
+		ret := api.SQLRowCount(s.os.h, &c)
+		if IsError(ret) {
+			return nil, NewError("SQLRowCount", s.os.h)
+		}
+		sumRowCount += int64(c)
+		if ret = api.SQLMoreResults(s.os.h); ret == api.SQL_NO_DATA {
+			break
+		}
 	}
-	return &Result{rowCount: int64(c)}, nil
+	return &Result{rowCount: sumRowCount}, nil
 }
 
 func (s *Stmt) Query(args []driver.Value) (driver.Rows, error) {