Merge pull request #28 from mackee/feature/table-annotation-for-go1.19

add: support new annotation for go1.19

_example/user.go

@@ -13,7 +13,7 @@ import (
 
 type UserId uint64
 
-//+table: user
+// +table: user
 type User struct {
 	Id        UserId         `db:"id,primarykey,autoincrement"`
 	Name      string         `db:"name"`

_example/user_external.go

@@ -4,7 +4,7 @@ import "time"
 
 //go:generate go run ../cmd/sqlla/main.go
 
-//+table: user_external
+// +table: user_external
 type UserExternal struct {
 	Id        uint64    `db:"id,primarykey"`
 	UserId    uint64    `db:"user_id"`

_example/user_item.go

@@ -6,7 +6,7 @@ import (
 
 //go:generate go run ../cmd/sqlla/main.go
 
-//+table: user_item
+// +table: user_item
 type UserItem struct {
 	Id           uint64       `db:"id,primarykey,autoincrement"`
 	UserId       uint64       `db:"user_id"`

cmd/mysql2schema/main.go

@@ -175,7 +175,7 @@ func outputSchema(db *sql.DB, table string, out io.Writer) error {
 	}
 
 	outBuf := new(bytes.Buffer)
-	outBuf.WriteString("//+table: " + table + "\n")
+	outBuf.WriteString("// +table: " + table + "\n")
 	outBuf.WriteString("type ")
 	outBuf.WriteString(snaker.SnakeToCamel(table))
 	outBuf.WriteString(" struct {\n")

main.go

@@ -44,7 +44,7 @@ func Run(from, ext string) {
 				var hasAnnotation bool
 				var annotationComment string
 				for _, comment := range genDecl.Doc.List {
-					if strings.HasPrefix(comment.Text, "//+table:") {
+					if trimmed := trimAnnotation(comment.Text); trimmed != comment.Text {
 						hasAnnotation = true
 						annotationComment = comment.Text
 						break
@@ -90,7 +90,7 @@ func toTable(tablePkg *types.Package, annotationComment string, gd *ast.GenDecl,
 	table.Package = tablePkg
 	table.PackageName = tablePkg.Name()
 
-	tableName := strings.TrimPrefix(annotationComment, "//+table: ")
+	tableName := trimAnnotation(annotationComment)
 	table.Name = tableName
 
 	spec := gd.Specs[0]
@@ -155,3 +155,13 @@ func toTable(tablePkg *types.Package, annotationComment string, gd *ast.GenDecl,
 
 	return table, nil
 }
+
+func trimAnnotation(comment string) string {
+	prefixes := []string{"//+table: ", "// +table: ", "//sqlla:table "}
+	for _, prefix := range prefixes {
+		if trimmed := strings.TrimPrefix(comment, prefix); trimmed != comment {
+			return trimmed
+		}
+	}
+	return comment
+}