Merge pull request #11 from go-gorm/dev

Dev

README.md

@@ -1 +1,10 @@
-# gen
+# GORM/GEN
+
+## Overview
+
+* Code generator
+* Developer Friendly
+
+## License
+
+Released under the [MIT License](https://github.com/go-gorm/gen/blob/master/License)

internal/check/checkstruct.go

@@ -42,18 +42,23 @@ func (b *BaseStruct) getTableName(st interface{}) {
 	b.TableName = stmt.Table
 }
 
-// check if struct is exportable and if member's type is regular
+// check if struct is exportable and if struct in main package and if member's type is regular
 func (b *BaseStruct) check() (err error) {
+	if b.StructInfo.InMainPkg() {
+		err = fmt.Errorf("can't generated data object for struct in main package,ignored:%s", b.StructName)
+		log.Println(err)
+		return
+	}
 	if !isCapitalize(b.StructName) {
-		err = fmt.Errorf("ignoring non exportable struct name:%s", b.NewStructName)
+		err = fmt.Errorf("can't generated data object for non-exportable struct,ignore:%s", b.NewStructName)
 		log.Println(err)
 		return
 	}
 	for index, m := range b.Members {
 		if !allowType(m.Type) {
 			b.Members[index].Type = "field"
 		}
-		b.Members[index].NewType = getTypeName(m.Type)
+		b.Members[index].NewType = getNewTypeName(m.Type)
 	}
 	return nil
 }

internal/check/export.go

@@ -18,7 +18,7 @@ func CheckStructs(db *gorm.DB, structs ...interface{}) (bases []*BaseStruct, err
 
 	for _, st := range structs {
 		structType := reflect.TypeOf(st)
-		name := getTypeName(structType.String())
+		name := getStructName(structType.String())
 		base := &BaseStruct{
 			S:             GetSimpleName(name),
 			StructName:    name,

internal/check/utils.go

@@ -79,10 +79,13 @@ func GetSimpleName(s string) string {
 	return string(strings.ToLower(DelPointerSym(s))[0])
 }
 
-func getTypeName(t string) string {
-	var res string
-	for _, s := range strings.Split(t, ".") {
-		res = s
-	}
-	return strings.Title(res)
+func getNewTypeName(t string) string {
+	list := strings.Split(t, ".")
+	return strings.Title(list[len(list)-1])
+}
+
+// not need capitalize
+func getStructName(t string) string {
+	list := strings.Split(t, ".")
+	return list[len(list)-1]
 }

internal/parser/export.go

@@ -34,7 +34,7 @@ func GetInterfacePath(v interface{}) (paths []*InterfacePath, err error) {
 		}
 
 		if strings.Split(arg.String(), ".")[0] == "main" {
-			_, file, _, ok := runtime.Caller(2)
+			_, file, _, ok := runtime.Caller(3)
 			if ok {
 				path.Files = append(path.Files, file)
 			}

internal/parser/parser.go

@@ -120,6 +120,10 @@ func (p *Param) IsNull() bool {
 	return p.Package == "" && p.Type == "" && p.Name == ""
 }
 
+func (p *Param) InMainPkg() bool {
+	return p.Package == "main"
+}
+
 func (p *Param) IsTime() bool {
 	return p.Package == "time" && p.Type == "Time"
 }