diff --git a/go.mod b/go.mod index 371391bb..fd829383 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/afocus/captcha v0.0.0-20191010092841-4bd1f21c8868 github.com/alimy/cfg v0.4.0 github.com/alimy/mir/v4 v4.0.0 - github.com/alimy/yesql v1.8.5 + github.com/alimy/yesql v1.9.0 github.com/aliyun/aliyun-oss-go-sdk v2.2.8+incompatible github.com/allegro/bigcache/v3 v3.1.0 github.com/bitbus/sqlx v1.6.0 diff --git a/go.sum b/go.sum index 12a35bc4..662f72e0 100644 --- a/go.sum +++ b/go.sum @@ -127,8 +127,8 @@ github.com/alimy/cfg v0.4.0 h1:SslKPndmxRViT1ePWLmNsEq7okYP0GVeuowQlRWZPkw= github.com/alimy/cfg v0.4.0/go.mod h1:rOxbasTH2srl6StAjNF5Vyi8bfrdkl3fLGmOYtSw81c= github.com/alimy/mir/v4 v4.0.0 h1:MzGfmoLjjvR69jbZEmpKJO3tUuqB0RGRv1UWPbtukBg= github.com/alimy/mir/v4 v4.0.0/go.mod h1:d58dBvw2KImcVbAUANrciEV/of0arMNsI9c/5UNCMMc= -github.com/alimy/yesql v1.8.5 h1:LD6veEOm+SKNQjWNc1SrfXgVE8ohq6HxJe6iComF3C8= -github.com/alimy/yesql v1.8.5/go.mod h1:ROvO5FnBWhyAMI+sSSGzoXi2q/cCs0cW3WuelHCkLlk= +github.com/alimy/yesql v1.9.0 h1:pk52k5alrzPduTpayjdZjYygk1iAR4xnDEumByq5gtM= +github.com/alimy/yesql v1.9.0/go.mod h1:ocPS5B8hYPaYo8Ru7HrDqhF+MFQI0PftT1Q4VMSYPt4= github.com/aliyun/aliyun-oss-go-sdk v2.2.8+incompatible h1:6JF1bjhT0WN2srEmijfOFtVWwV91KZ6dJY1/JbdtGrI= github.com/aliyun/aliyun-oss-go-sdk v2.2.8+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8= github.com/allegro/bigcache/v3 v3.1.0 h1:H2Vp8VOvxcrB91o86fUSVJFqeuz8kpyyB02eH3bSzwk= diff --git a/internal/dao/sakila/auto/ac/yesql.go b/internal/dao/sakila/auto/ac/ac.go similarity index 99% rename from internal/dao/sakila/auto/ac/yesql.go rename to internal/dao/sakila/auto/ac/ac.go index 46d8af7b..760d42d8 100644 --- a/internal/dao/sakila/auto/ac/yesql.go +++ b/internal/dao/sakila/auto/ac/ac.go @@ -1,6 +1,6 @@ // Code generated by Yesql. DO NOT EDIT. // versions: -// - Yesql v1.8.5 +// - Yesql v1.9.0 package ac diff --git a/internal/dao/sakila/auto/cc/yesql.go b/internal/dao/sakila/auto/cc/cc.go similarity index 99% rename from internal/dao/sakila/auto/cc/yesql.go rename to internal/dao/sakila/auto/cc/cc.go index ba6a86fa..f645c61d 100644 --- a/internal/dao/sakila/auto/cc/yesql.go +++ b/internal/dao/sakila/auto/cc/cc.go @@ -1,6 +1,6 @@ // Code generated by Yesql. DO NOT EDIT. // versions: -// - Yesql v1.8.5 +// - Yesql v1.9.0 package cc diff --git a/internal/dao/sakila/auto/pg/yesql.go b/internal/dao/sakila/auto/pg/pg.go similarity index 99% rename from internal/dao/sakila/auto/pg/yesql.go rename to internal/dao/sakila/auto/pg/pg.go index df9a886e..a06dc020 100644 --- a/internal/dao/sakila/auto/pg/yesql.go +++ b/internal/dao/sakila/auto/pg/pg.go @@ -1,6 +1,6 @@ // Code generated by Yesql. DO NOT EDIT. // versions: -// - Yesql v1.8.5 +// - Yesql v1.9.0 package pg diff --git a/internal/dao/sakila/auto/yesql.go b/internal/dao/sakila/auto/yesql.go index 48680f17..b6587d1e 100644 --- a/internal/dao/sakila/auto/yesql.go +++ b/internal/dao/sakila/auto/yesql.go @@ -1,6 +1,6 @@ // Code generated by Yesql. DO NOT EDIT. // versions: -// - Yesql v1.8.5 +// - Yesql v1.9.0 package yesql diff --git a/internal/dao/sakila/yesql/gen.go b/internal/dao/sakila/yesql/gen.go index 89eff8cd..f9fef31b 100644 --- a/internal/dao/sakila/yesql/gen.go +++ b/internal/dao/sakila/yesql/gen.go @@ -21,14 +21,7 @@ func main() { query.Query = strings.TrimRight(query.Query, ";") return query, nil }) - opt := yesql.SqlxPkgName("github.com/bitbus/sqlx") - sqlInfos := []yesql.SqlInfo{ - yesql.NewSqlInfo("yesql.sql", "../auto", "yesql"), - yesql.NewSqlInfo("yesql_ac.sql", "../auto/ac", "ac"), - yesql.NewSqlInfo("yesql_cc.sql", "../auto/cc", "cc"), - yesql.NewSqlInfo("yesql_pg.sql", "../auto/pg", "pg"), - } - if err := yesql.GenerateFrom(sqlInfos, opt); err != nil { + if err := yesql.Generate(); err != nil { log.Fatalf("generate code occurs error: %s", err) } log.Println("[Yesql] generate code finish") diff --git a/internal/dao/sakila/yesql/yesql.yaml b/internal/dao/sakila/yesql/yesql.yaml new file mode 100644 index 00000000..4dcf3c51 --- /dev/null +++ b/internal/dao/sakila/yesql/yesql.yaml @@ -0,0 +1,28 @@ +version: '1' + +generator: + engine: sqlx + sqlx_package: 'github.com/bitbus/sqlx' + default_struct_name: yesql + go_file_name: yesql + +sql: + - queries: yesql.sql + gen: + package: yesql + out: ../auto + - queries: yesql_ac.sql + gen: + package: ac + out: ../auto/ac + go_file_name: ac + - queries: yesql_cc.sql + gen: + package: cc + out: ../auto/cc + go_file_name: cc + - queries: yesql_pg.sql + gen: + package: pg + out: ../auto/pg + go_file_name: pg