Fixed connection string

Author: svera

internal/webserver/authentication_test.go

@@ -19,7 +19,7 @@ import (
 )
 
 func TestAuthentication(t *testing.T) {
-	db := infrastructure.Connect("file::memory:", 250)
+	db := infrastructure.Connect(":memory:", 250)
 	app := bootstrapApp(db, &infrastructure.SMTP{}, afero.NewMemMapFs(), webserver.Config{})
 
 	data := url.Values{
@@ -82,7 +82,7 @@ func TestAuthentication(t *testing.T) {
 }
 
 func TestRecoverNoEmailService(t *testing.T) {
-	db := infrastructure.Connect("file::memory:?cache=shared", 250)
+	db := infrastructure.Connect(":memory:?cache=shared", 250)
 	app := bootstrapApp(db, &infrastructure.NoEmail{}, afero.NewMemMapFs(), webserver.Config{})
 
 	req, err := http.NewRequest(http.MethodGet, "/en/recover", nil)
@@ -115,7 +115,7 @@ func TestRecover(t *testing.T) {
 			LibraryPath:           "fixtures/library",
 			UploadDocumentMaxSize: 1,
 		}
-		db = infrastructure.Connect("file::memory:?cache=shared", 250)
+		db = infrastructure.Connect(":memory:?cache=shared", 250)
 		smtpMock = &infrastructure.SMTPMock{}
 		app = bootstrapApp(db, smtpMock, afero.NewMemMapFs(), webserverConfig)
 

internal/webserver/document_detail_test.go

@@ -10,7 +10,7 @@ import (
 )
 
 func TestDocumentAndRead(t *testing.T) {
-	db := infrastructure.Connect("file::memory:", 250)
+	db := infrastructure.Connect(":memory:", 250)
 	smtpMock := &infrastructure.SMTPMock{}
 	app := bootstrapApp(db, smtpMock, afero.NewOsFs(), webserver.Config{})
 

internal/webserver/highlights_test.go

@@ -27,7 +27,7 @@ func TestHighlights(t *testing.T) {
 	reset := func() {
 		var err error
 
-		db = infrastructure.Connect("file::memory:", 250)
+		db = infrastructure.Connect(":memory:", 250)
 		appFS := loadFilesInMemoryFs([]string{"fixtures/library/metadata.epub"})
 		app = bootstrapApp(db, &infrastructure.NoEmail{}, appFS, webserver.Config{})
 		adminCookie, err = login(app, "[email protected]", "admin", t)

internal/webserver/infrastructure/sqlite.go

@@ -1,6 +1,7 @@
 package infrastructure
 
 import (
+	"fmt"
 	"log"
 	"os"
 	"strings"
@@ -12,24 +13,18 @@ import (
 )
 
 func Connect(path string, wordsPerMinute float64) *gorm.DB {
-	if _, err := os.Stat(path); os.IsNotExist(err) && !strings.Contains(path, "file::memory") {
+	if _, err := os.Stat(path); os.IsNotExist(err) && !strings.Contains(path, ":memory:") {
 		if _, err = os.Create(path); err != nil {
 			log.Fatal(err)
 		}
 		log.Printf("Created database at %s\n", path)
 	}
 
-	// Use the following line to connect when the temporary code block below is removed
-	//db, err := gorm.Open(sqlite.Open(fmt.Sprintf("%s?_pragma=foreign_keys(1)", path)), &gorm.Config{})
-	db, err := gorm.Open(sqlite.Open(path), &gorm.Config{})
+	db, err := gorm.Open(sqlite.Open(fmt.Sprintf("%s?_pragma=foreign_keys(1)", path)), &gorm.Config{})
 	if err != nil {
 		log.Fatal(err)
 	}
 
-	if res := db.Exec("PRAGMA foreign_keys(1)", nil); res.Error != nil {
-		log.Fatal(err)
-	}
-
 	if err := db.AutoMigrate(&model.User{}, &model.Highlight{}); err != nil {
 		log.Fatal(err)
 	}

internal/webserver/remove_document_test.go

@@ -15,7 +15,7 @@ import (
 )
 
 func TestRemoveDocument(t *testing.T) {
-	db := infrastructure.Connect("file::memory:", 250)
+	db := infrastructure.Connect(":memory:", 250)
 	smtpMock := &infrastructure.SMTPMock{}
 	appFS := loadDirInMemoryFs("fixtures/library")
 	app := bootstrapApp(db, smtpMock, appFS, webserver.Config{})

internal/webserver/search_test.go

@@ -11,7 +11,7 @@ import (
 )
 
 func TestSearch(t *testing.T) {
-	db := infrastructure.Connect("file::memory:", 250)
+	db := infrastructure.Connect(":memory:", 250)
 	smtpMock := &infrastructure.SMTPMock{}
 	appFS := loadDirInMemoryFs("fixtures/library")
 

internal/webserver/send_document_test.go

@@ -12,7 +12,7 @@ import (
 )
 
 func TestSendDocument(t *testing.T) {
-	db := infrastructure.Connect("file::memory:", 250)
+	db := infrastructure.Connect(":memory:", 250)
 	smtpMock := &infrastructure.SMTPMock{}
 	app := bootstrapApp(db, smtpMock, afero.NewOsFs(), webserver.Config{})
 

internal/webserver/upload_test.go

@@ -19,7 +19,7 @@ import (
 )
 
 func TestUpload(t *testing.T) {
-	db := infrastructure.Connect("file::memory:", 250)
+	db := infrastructure.Connect(":memory:", 250)
 	appFS := loadDirInMemoryFs("fixtures/library")
 	app := bootstrapApp(db, &infrastructure.NoEmail{}, appFS, webserver.Config{})
 

internal/webserver/user_management_test.go

@@ -32,7 +32,7 @@ func TestUserManagement(t *testing.T) {
 		t.Helper()
 
 		var err error
-		db = infrastructure.Connect("file::memory:", 250)
+		db = infrastructure.Connect(":memory:", 250)
 		app = bootstrapApp(db, &infrastructure.NoEmail{}, afero.NewMemMapFs(), webserver.Config{})
 
 		adminUser = model.User{}

internal/webserver/webserver_test.go

@@ -35,7 +35,7 @@ func TestGET(t *testing.T) {
 		{"Server returns not found if the user tries to access a non-existent URL", "/xx", http.StatusNotFound},
 	}
 
-	db := infrastructure.Connect("file::memory:", 250)
+	db := infrastructure.Connect(":memory:", 250)
 	app := bootstrapApp(db, &infrastructure.NoEmail{}, afero.NewMemMapFs(), webserver.Config{})
 
 	for _, tcase := range cases {