add comment tag when database support

Author: lunny

xorm/go.go

@@ -17,7 +17,8 @@ import (
 )
 
 var (
-	GoLangTmpl LangTmpl = LangTmpl{
+	supportComment bool
+	GoLangTmpl     LangTmpl = LangTmpl{
 		template.FuncMap{"Mapper": mapper.Table2Obj,
 			"Type":    typestring,
 			"Tag":     tag,
@@ -223,6 +224,9 @@ func tag(table *core.Table, col *core.Column) string {
 	if col.IsUpdated {
 		res = append(res, "updated")
 	}
+	if supportComment && col.Comment != "" {
+		res = append(res, fmt.Sprintf("comment('%s')", col.Comment))
+	}
 
 	names := make([]string, 0, len(col.Indexes))
 	for name := range col.Indexes {

xorm/reverse.go

@@ -36,8 +36,8 @@ according database's tables and columns to generate codes for Go, C++ and etc.
     driverName        Database driver name, now supported four: mysql mymysql sqlite3 postgres
     datasourceName    Database connection uri, for detail infomation please visit driver's project page
     tmplPath          Template dir for generated. the default templates dir has provide 1 template
-    generatedPath     This parameter is optional, if blank, the default value is model, then will
-                      generated all codes in model dir
+    generatedPath     This parameter is optional, if blank, the default value is models, then will
+                      generated all codes in models dir
     tableFilterReg    Table name filter regexp
 `,
 }
@@ -60,7 +60,7 @@ func printReversePrompt(flag string) {
 type Tmpl struct {
 	Tables  []*core.Table
 	Imports map[string]string
-	Model   string
+	Models  string
 }
 
 func dirExists(dir string) bool {
@@ -120,7 +120,7 @@ func runReverse(cmd *Command, args []string) {
 			}
 		}
 	} else {
-		model = "model"
+		model = "models"
 		genDir = path.Join(curPath, model)
 	}
 
@@ -165,6 +165,8 @@ func runReverse(cmd *Command, args []string) {
 
 	os.MkdirAll(genDir, os.ModePerm)
 
+	supportComment = (args[0] == "mysql" || args[0] == "mymysql")
+
 	Orm, err := xorm.NewEngine(args[0], args[1])
 	if err != nil {
 		log.Errorf("%v", err)
@@ -236,7 +238,7 @@ func runReverse(cmd *Command, args []string) {
 
 			newbytes := bytes.NewBufferString("")
 
-			t := &Tmpl{Tables: tbls, Imports: imports, Model: model}
+			t := &Tmpl{Tables: tbls, Imports: imports, Models: model}
 			err = tmpl.Execute(newbytes, t)
 			if err != nil {
 				log.Errorf("%v", err)
@@ -271,15 +273,16 @@ func runReverse(cmd *Command, args []string) {
 				tbs := []*core.Table{table}
 				imports := langTmpl.GenImports(tbs)
 
-				w, err := os.Create(path.Join(genDir, unTitle(mapper.Table2Obj(table.Name))+ext))
+				w, err := os.Create(path.Join(genDir, table.Name+ext))
 				if err != nil {
 					log.Errorf("%v", err)
 					return err
 				}
+				defer w.Close()
 
 				newbytes := bytes.NewBufferString("")
 
-				t := &Tmpl{Tables: tbs, Imports: imports, Model: model}
+				t := &Tmpl{Tables: tbs, Imports: imports, Models: model}
 				err = tmpl.Execute(newbytes, t)
 				if err != nil {
 					log.Errorf("%v", err)

xorm/templates/go/struct.go.tpl

@@ -1,4 +1,4 @@
-package {{.Model}}
+package {{.Models}}
 
 import (
 	{{range .Imports}}"{{.}}"{{end}}

xorm/templates/gomeddler/struct.go.tpl

@@ -1,4 +1,4 @@
-package {{.Model}}
+package {{.Models}}
 
 {{$ilen := len .Imports}}
 {{if gt $ilen 0}}

xorm/templates/goxorm/struct.go.tpl

@@ -1,4 +1,4 @@
-package {{.Model}}
+package {{.Models}}
 
 {{$ilen := len .Imports}}
 {{if gt $ilen 0}}

xorm/xorm.go

@@ -21,7 +21,7 @@ import (
 // Test that go1.1 tag above is included in builds. main.go refers to this definition.
 const go11tag = true
 
-const version = "0.2.0524"
+const version = "0.3.0324"
 
 var supportedDrivers = map[string]string{
 	"mysql":    "github.com/go-sql-driver/mysql",