fix tx

generator/client/golang/templates/queryx.gotmpl

@@ -82,18 +82,11 @@ func (c *QXClient) Transaction(f func(t *Tx) error) error {
 	if err != nil {
 		return err
 	}
-	err = f(tx)
-	if err != nil {
-		err = tx.Rollback()
-		if err != nil {
-			return err
-		}
-	}
-	err = tx.Commit()
-	if err != nil {
+	defer tx.Rollback()
+	if err = f(tx);err != nil {
 		return err
 	}
-	return nil
+    return tx.Commit()
 }
 
 type Tx struct {

internal/integration/client_test.go

@@ -430,8 +430,8 @@ func TestManualTransaction(t *testing.T) {
 	require.Equal(t, "tag1-updated", tag1.Name.Val)
 }
 
-func TestAutomaticTransaction(t *testing.T) {
-	transactionErr := errors.New("sql: transaction has already been committed or rolled back")
+func TestTransactionBlock(t *testing.T) {
+	transactionErr := errors.New("test transaction")
 	err := c.Transaction(func(tran *db.Tx) error {
 		_, err := tran.QueryPost().Create(tran.ChangePost().SetTitle("post title .."))
 		if err != nil {
@@ -441,7 +441,7 @@ func TestAutomaticTransaction(t *testing.T) {
 		if err != nil {
 			return err
 		}
-		return errors.New("test transaction")
+		return transactionErr
 	})
 	require.Equal(t, err, transactionErr)