From 346681289d6b5ee80b48a7a33e59f4597fea1b9e Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Thu, 16 Jan 2014 23:03:56 +0800
Subject: [PATCH] bug fixed #51

---
 base_test.go | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 engine.go    |  7 +++++--
 postgres.go  |  2 +-
 3 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/base_test.go b/base_test.go
index eba9d3bc..c5d88c86 100644
--- a/base_test.go
+++ b/base_test.go
@@ -267,6 +267,16 @@ func insertTwoTable(engine *Engine, t *testing.T) {
 	}
 }
 
+type Article struct {
+	Id      int32  `xorm:"pk INT autoincr"`
+	Name    string `xorm:"VARCHAR(45)"`
+	Img     string `xorm:"VARCHAR(100)"`
+	Aside   string `xorm:"VARCHAR(200)"`
+	Desc    string `xorm:"VARCHAR(200)"`
+	Content string `xorm:"TEXT"`
+	Status  int8   `xorm:"TINYINT(4)"`
+}
+
 type Condi map[string]interface{}
 
 func update(engine *Engine, t *testing.T) {
@@ -314,6 +324,44 @@ func update(engine *Engine, t *testing.T) {
 		panic(err)
 		return
 	}
+
+	err = engine.Sync(&Article{})
+	if err != nil {
+		t.Error(err)
+		panic(err)
+	}
+
+	cnt, err = engine.Insert(&Article{0, "1", "2", "3", "4", "5", 2})
+	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)
+	}
 }
 
 func updateSameMapper(engine *Engine, t *testing.T) {
diff --git a/engine.go b/engine.go
index b5fd317f..93494048 100644
--- a/engine.go
+++ b/engine.go
@@ -482,6 +482,7 @@ func (engine *Engine) mapType(t reflect.Type) *Table {
 				}
 				var indexType int
 				var indexName string
+				var preKey string
 				for j, key := range tags {
 					k := strings.ToUpper(key)
 					switch {
@@ -520,12 +521,13 @@ func (engine *Engine) mapType(t reflect.Type) *Table {
 					case k == "NOT":
 					default:
 						if strings.HasPrefix(k, "'") && strings.HasSuffix(k, "'") {
-							if key != col.Default {
+							if preKey != "DEFAULT" {
 								col.Name = key[1 : len(key)-1]
 							}
 						} else if strings.Contains(k, "(") && strings.HasSuffix(k, ")") {
 							fs := strings.Split(k, "(")
 							if _, ok := sqlTypes[fs[0]]; !ok {
+								preKey = k
 								continue
 							}
 							col.SQLType = SQLType{fs[0], 0, 0}
@@ -539,12 +541,13 @@ func (engine *Engine) mapType(t reflect.Type) *Table {
 						} else {
 							if _, ok := sqlTypes[k]; ok {
 								col.SQLType = SQLType{k, 0, 0}
-							} else if key != col.Default {
+							} else if preKey != "DEFAULT" {
 								col.Name = key
 							}
 						}
 						engine.SqlType(col)
 					}
+					preKey = k
 				}
 				if col.SQLType.Name == "" {
 					col.SQLType = Type2SQLType(fieldType)
diff --git a/postgres.go b/postgres.go
index 9e12b009..97550543 100644
--- a/postgres.go
+++ b/postgres.go
@@ -67,7 +67,7 @@ func (db *postgres) SqlType(c *Column) string {
 	switch t := c.SQLType.Name; t {
 	case TinyInt:
 		res = SmallInt
-
+		return res
 	case MediumInt, Int, Integer:
 		if c.IsAutoIncrement {
 			return Serial