From bb0cea10649d8129fb69f8f490c4c2b306e19c5a Mon Sep 17 00:00:00 2001 From: Oliver Tonnhofer Date: Thu, 12 Dec 2013 10:56:53 +0100 Subject: [PATCH] fix db schemas options with empty config --- config/config.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/config.go b/config/config.go index df138bb..68bae5f 100644 --- a/config/config.go +++ b/config/config.go @@ -66,13 +66,13 @@ func (o *_BaseOptions) updateFromConfig() error { } } - if o.Schemas.Import == defaultSchemaImport { + if conf.Schemas.Import != "" && o.Schemas.Import == defaultSchemaImport { o.Schemas.Import = conf.Schemas.Import } - if o.Schemas.Production == defaultSchemaProduction { + if conf.Schemas.Production != "" && o.Schemas.Production == defaultSchemaProduction { o.Schemas.Production = conf.Schemas.Production } - if o.Schemas.Backup == defaultSchemaBackup { + if conf.Schemas.Backup != "" && o.Schemas.Backup == defaultSchemaBackup { o.Schemas.Backup = conf.Schemas.Backup }