From 53dfd1647ae7f2e6f66b7b110f432972a7a9ffd7 Mon Sep 17 00:00:00 2001
From: Michael Mayer <michael@liquidbytes.net>
Date: Fri, 9 Nov 2018 19:06:03 +0100
Subject: [PATCH] Preparation for using an embedded database #55

---
 .travis.yml                        | 4 ++--
 assets/database/.gitignore         | 2 ++
 internal/photoprism/config.go      | 1 -
 internal/photoprism/config_test.go | 5 +++++
 4 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 assets/database/.gitignore

diff --git a/.travis.yml b/.travis.yml
index 7a44bb541..4923cba58 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,8 +14,8 @@ before_script:
   - docker-compose -f docker-compose.travis.yml up -d --build
 
 script:
-  - if [ "$TRAVIS_BRANCH" == "develop" ]; then docker-compose -f docker-compose.travis.yml exec photoprism make all migrate test-codecov; fi
-  - if [ "$TRAVIS_BRANCH" != "develop" ]; then docker-compose -f docker-compose.travis.yml exec photoprism make all migrate test; fi
+  - if [ "$TRAVIS_BRANCH" == "develop" ]; then docker-compose -f docker-compose.travis.yml exec photoprism make all install migrate test-codecov; fi
+  - if [ "$TRAVIS_BRANCH" != "develop" ]; then docker-compose -f docker-compose.travis.yml exec photoprism make all install migrate test; fi
 
 after_script:
   - docker-compose -f docker-compose.travis.yml down
diff --git a/assets/database/.gitignore b/assets/database/.gitignore
new file mode 100644
index 000000000..c96a04f00
--- /dev/null
+++ b/assets/database/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/internal/photoprism/config.go b/internal/photoprism/config.go
index dc432a18b..63ddbdd62 100644
--- a/internal/photoprism/config.go
+++ b/internal/photoprism/config.go
@@ -8,7 +8,6 @@ import (
 	"time"
 
 	"github.com/jinzhu/gorm"
-	_ "github.com/jinzhu/gorm/dialects/mssql" // Import gorm drivers
 	_ "github.com/jinzhu/gorm/dialects/mysql"
 	_ "github.com/jinzhu/gorm/dialects/postgres"
 	_ "github.com/jinzhu/gorm/dialects/sqlite"
diff --git a/internal/photoprism/config_test.go b/internal/photoprism/config_test.go
index e3c276903..33dd7aa8b 100644
--- a/internal/photoprism/config_test.go
+++ b/internal/photoprism/config_test.go
@@ -32,6 +32,11 @@ var exportPath = GetExpandedFilename(testDataPath + "/export")
 var databaseDriver = "mysql"
 var databaseDsn = "photoprism:photoprism@tcp(database:3306)/photoprism?parseTime=true"
 
+func init() {
+	conf := NewTestConfig()
+	conf.MigrateDb()
+}
+
 func (c *Config) RemoveTestData(t *testing.T) {
 	os.RemoveAll(c.ImportPath)
 	os.RemoveAll(c.ExportPath)