LBRYCommunity/sqlboiler
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Merge conflict resolution (late)

Browse source
This commit is contained in:
Aaron L 2016-06-27 00:02:10 -07:00
parent 41ce2b511b
commit 85ff9a797a
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
templates_test/main_test/postgres_main.tpl
View file

@ -10,12 +10,6 @@ type Config struct {
Postgres PostgresCfg `toml:"postgres"` Postgres PostgresCfg `toml:"postgres"`
} }
var (
cfg *Config
testCfg *Config
dbConn *sql.DB
)
func TestMain(m *testing.M) { func TestMain(m *testing.M) {
rand.Seed(time.Now().UnixNano()) rand.Seed(time.Now().UnixNano())

9
templates_test/singleton/main_helper_funcs.tpl
View file

@ -1,6 +1,7 @@
var testCfg *Config var (
testCfg *Config
var dbConn *sql.DB dbConn *sql.DB
)
func InitViper() error { func InitViper() error {
var err error var err error
@ -16,7 +17,7 @@ func InitViper() error {
} else { } else {
wd = wd + "/.." wd = wd + "/.."
} }
fmt.Println(wd) fmt.Println(wd)
configPaths := []string{wd} configPaths := []string{wd}
if len(configHome) > 0 { if len(configHome) > 0 {
configPaths = append(configPaths, filepath.Join(configHome, "sqlboiler")) configPaths = append(configPaths, filepath.Join(configHome, "sqlboiler"))