Merge pull request #2 from lunny/master

更新到最新版

base_test.go

@@ -331,37 +331,45 @@ func update(engine *Engine, t *testing.T) {
 		panic(err)
 	}
 
-	cnt, err = engine.Insert(&Article{0, "1", "2", "3", "4", "5", 2})
+	defer func() {
-	if err != nil {
-		t.Error(err)
-		panic(err)
-	}
-
-	if cnt != 1 {
-		err = errors.New("insert not returned 1")
-		t.Error(err)
-		panic(err)
-		return
-	}
-
-	cnt, err = engine.Id(1).Update(&Article{Name: "6"})
-	if err != nil {
-		t.Error(err)
-		panic(err)
-	}
-
-	if cnt != 1 {
-		err = errors.New("update not returned 1")
-		t.Error(err)
-		panic(err)
-		return
-	}
-
 		err = engine.DropTables(&Article{})
 		if err != nil {
 			t.Error(err)
 			panic(err)
 		}
+	}()
+
+	a := &Article{0, "1", "2", "3", "4", "5", 2}
+	cnt, err = engine.Insert(a)
+	if err != nil {
+		t.Error(err)
+		panic(err)
+	}
+
+	if cnt != 1 {
+		err = errors.New(fmt.Sprintf("insert not returned 1 but %d", cnt))
+		t.Error(err)
+		panic(err)
+	}
+
+	if a.Id == 0 {
+		err = errors.New("insert returned id is 0")
+		t.Error(err)
+		panic(err)
+	}
+
+	cnt, err = engine.Id(a.Id).Update(&Article{Name: "6"})
+	if err != nil {
+		t.Error(err)
+		panic(err)
+	}
+
+	if cnt != 1 {
+		err = errors.New(fmt.Sprintf("insert not returned 1 but %d", cnt))
+		t.Error(err)
+		panic(err)
+		return
+	}
 }
 
 func updateSameMapper(engine *Engine, t *testing.T) {

docs/QuickStart.md

@@ -681,6 +681,8 @@ if err != nil {
 }
 ```
 
+* 注意如果您使用的是mysql，数据库引擎为innodb事务才有效，myisam引擎是不支持事务的。
+
 <a name="120" id="120"></a>
 ## 11.缓存
 

xorm/reverse.go

@@ -3,12 +3,6 @@ package main
 import (
 	"bytes"
 	"fmt"
-	_ "github.com/bylevel/pq"
-	"github.com/dvirsky/go-pylog/logging"
-	_ "github.com/go-sql-driver/mysql"
-	"github.com/lunny/xorm"
-	_ "github.com/mattn/go-sqlite3"
-	_ "github.com/ziutek/mymysql/godrv"
 	"io/ioutil"
 	"os"
 	"path"
@@ -16,6 +10,13 @@ import (
 	"strconv"
 	"strings" //[SWH|+]
 	"text/template"
+
+	"github.com/dvirsky/go-pylog/logging"
+	_ "github.com/go-sql-driver/mysql"
+	_ "github.com/lib/pq"
+	"github.com/lunny/xorm"
+	_ "github.com/mattn/go-sqlite3"
+	_ "github.com/ziutek/mymysql/godrv"
 )
 
 var CmdReverse = &Command{