Merge pull request #140 from WnP/beego-dev-changes

update migration.Sql to migration.SQL to match beego develop
This commit is contained in:
astaxie 2015-11-10 10:41:18 +08:00
commit 7813d6aab0
3 changed files with 6 additions and 6 deletions

4
g.go
View File

@ -166,8 +166,8 @@ func generateCode(cmd *Command, args []string) int {
upsql := ""
downsql := ""
if fields != "" {
upsql = `m.Sql("CREATE TABLE ` + mname + "(" + generateSQLFromFields(fields.String()) + `)");`
downsql = `m.Sql("DROP TABLE ` + "`" + mname + "`" + `")`
upsql = `m.SQL("CREATE TABLE ` + mname + "(" + generateSQLFromFields(fields.String()) + `)");`
downsql = `m.SQL("DROP TABLE ` + "`" + mname + "`" + `")`
}
generateMigration(mname, upsql, downsql, curpath)
case "controller":

View File

@ -79,13 +79,13 @@ func init() {
// Run the migrations
func (m *{{StructName}}) Up() {
// use m.Sql("CREATE TABLE ...") to make schema update
// use m.SQL("CREATE TABLE ...") to make schema update
{{UpSQL}}
}
// Reverse the migrations
func (m *{{StructName}}) Down() {
// use m.Sql("DROP TABLE ...") to reverse schema update
// use m.SQL("DROP TABLE ...") to reverse schema update
{{DownSQL}}
}
`

View File

@ -28,8 +28,8 @@ func generateScaffold(sname, fields, crupath, driver, conn string) {
upsql := ""
downsql := ""
if fields != "" {
upsql = `m.Sql("CREATE TABLE ` + sname + "(" + generateSQLFromFields(fields) + `)");`
downsql = `m.Sql("DROP TABLE ` + "`" + sname + "`" + `")`
upsql = `m.SQL("CREATE TABLE ` + sname + "(" + generateSQLFromFields(fields) + `)");`
downsql = `m.SQL("DROP TABLE ` + "`" + sname + "`" + `")`
}
generateMigration(sname, upsql, downsql, crupath)
}