lbsadmin/bee
1
0
Fork 0
mirror of https://github.com/beego/bee.git synced 2025-06-12 04:50:40 +00:00
Code Issues Releases Activity

Fixes configuration loading since last changes

Browse Source
This commit is contained in:
Faissal Elamraoui
2017-03-12 23:18:38 +00:00
parent 4ef1a0e80e
commit 426237fefe
5 changed files with 83 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cmd/commands/generate/generate.go
View File

@ -1,3 +1,16 @@
// Copyright 2013 bee authors
//
// Licensed under the Apache License, Version 2.0 (the "License"): you may
// not use this file except in compliance with the License. You may obtain
// a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
// License for the specific language governing permissions and limitations
// under the License.
package generate
import (
@ -104,6 +117,8 @@ func scaffold(cmd *commands.Command, args []string, currpath string) {
beeLogger.Log.Fatal("Wrong number of arguments. Run: bee help generate")
}
config.LoadConfig()
cmd.Flag.Parse(args[2:])
if generate.SQLDriver == "" {
generate.SQLDriver = utils.DocValue(config.Conf.Database.Driver)
@ -126,6 +141,8 @@ func scaffold(cmd *commands.Command, args []string, currpath string) {
}
func appCode(cmd *commands.Command, args []string, currpath string) {
config.LoadConfig()
cmd.Flag.Parse(args[1:])
if generate.SQLDriver == "" {
generate.SQLDriver = utils.DocValue(config.Conf.Database.Driver)