chore: integrate sqllite tests

chore: cleanup

.github/workflows/go.yml

@@ -5,7 +5,6 @@ on:
   push:
     branches:
       - main
-      - feat/sqllite3_support
 
 jobs:
 

.github/workflows/linter.yml

@@ -1,7 +1,6 @@
 name: golangci-lint
 on:
   pull_request:
-  push:
 jobs:
   golangci:
     name: lint

Makefile

@@ -2,10 +2,10 @@ tidy_dependencies:
 	go mod tidy
 
 migrate:
-	migrate -path ./datastore/postgres/migrations/ -database "postgres://sdump:sdump@localhost:3432/sdump?sslmode=disable" up
+	migrate -path ./datastore/sql/migrations/ -database "postgres://sdump:sdump@localhost:3432/sdump?sslmode=disable" up
 
 migrate-down:
-	migrate -path ./datastore/postgres/migrations/ -database "postgres://sdump:sdump@localhost:3432/sdump?sslmode=disable" down
+	migrate -path ./datastore/sql/migrations/ -database "postgres://sdump:sdump@localhost:3432/sdump?sslmode=disable" down
 
 run-http:
 	go run cmd/*.go

datastore/sql/ingest_test.go

@@ -12,7 +12,7 @@ import (
 )
 
 func TestIngestRepository_Create(t *testing.T) {
-	client, teardownFunc := setupDatabase(t)
+	client, teardownFunc := setupPostgresDatabase(t)
 	defer teardownFunc()
 
 	ingestStore := NewIngestRepository(client)
@@ -31,3 +31,27 @@ func TestIngestRepository_Create(t *testing.T) {
 		},
 	}))
 }
+
+func TestIngestRepository_Sqllite_Create(t *testing.T) {
+	client, teardownFunc := setupSqlliteDatabase(t)
+	defer teardownFunc()
+
+	ingestStore := NewIngestRepository(client)
+
+	urlStore := NewURLRepositoryTable(client)
+
+	// the models use uuid, tricky bit now is setting up sqlite3 uuid support
+	// This currently fails as the migrations fail
+
+	endpoint, err := urlStore.Get(context.Background(), &sdump.FindURLOptions{
+		Reference: "cmltfm6g330l5l1vq110", // see fixtures/urls.yml
+	})
+	require.NoError(t, err)
+
+	require.NoError(t, ingestStore.Create(context.Background(), &sdump.IngestHTTPRequest{
+		UrlID: endpoint.ID,
+		Request: sdump.RequestDefinition{
+			Body: "{}",
+		},
+	}))
+}

datastore/postgres/postgres_test.go → datastore/sql/postgres_test.go

@@ -1,14 +1,15 @@
 //go:build integration
 // +build integration
 
-package postgres
+package sql
 
 import (
 	"context"
 	"database/sql"
 	"fmt"
 	"testing"
 
+	sdumpPostgres "github.com/adelowo/sdump/datastore/postgres"
 	testfixtures "github.com/go-testfixtures/testfixtures/v3"
 	"github.com/golang-migrate/migrate/v4"
 	"github.com/golang-migrate/migrate/v4/database/postgres"
@@ -19,7 +20,7 @@ import (
 	"github.com/uptrace/bun"
 )
 
-func prepareTestDatabase(t *testing.T, dsn string) {
+func preparePostgresTestDatabase(t *testing.T, dsn string) {
 	t.Helper()
 
 	var err error
@@ -50,9 +51,9 @@ func prepareTestDatabase(t *testing.T, dsn string) {
 	require.NoError(t, fixtures.Load())
 }
 
-// setupDatabase spins up a new Postgres container and returns a closure
+// setupPostgresDatabase spins up a new Postgres container and returns a closure
 // please always make sure to call the closure as it is the teardown function
-func setupDatabase(t *testing.T) (*bun.DB, func()) {
+func setupPostgresDatabase(t *testing.T) (*bun.DB, func()) {
 	t.Helper()
 
 	var dsn string
@@ -83,9 +84,9 @@ func setupDatabase(t *testing.T) (*bun.DB, func()) {
 	dsn = fmt.Sprintf("postgres://%s:%s@%s/%s?sslmode=disable", "sdump", "sdump",
 		fmt.Sprintf("localhost:%s", port.Port()), "sdumptest")
 
-	prepareTestDatabase(t, dsn)
+	preparePostgresTestDatabase(t, dsn)
 
-	client, err := New(dsn, false)
+	client, err := sdumpPostgres.New(dsn, false)
 	require.NoError(t, err)
 
 	return client, func() {

datastore/sqlite/sqlite_test.go → datastore/sql/sqlite_test.go

@@ -1,13 +1,14 @@
 //go:build integration
 // +build integration
 
-package sqlite
+package sql
 
 import (
 	"database/sql"
 	"fmt"
 	"testing"
 
+	sdumpSqllite "github.com/adelowo/sdump/datastore/sqlite"
 	testfixtures "github.com/go-testfixtures/testfixtures/v3"
 	"github.com/stretchr/testify/require"
 	"github.com/uptrace/bun"
@@ -17,7 +18,7 @@ import (
 	"github.com/golang-migrate/migrate/v4/database/sqlite3"
 )
 
-func prepareTestDatabase(t *testing.T, dsn string) {
+func prepareSqlliteTestDatabase(t *testing.T, dsn string) {
 	t.Helper()
 
 	var err error
@@ -48,14 +49,14 @@ func prepareTestDatabase(t *testing.T, dsn string) {
 	require.NoError(t, fixtures.Load())
 }
 
-func setupDatabase(t *testing.T) (*bun.DB, func()) {
+func setupSqlliteDatabase(t *testing.T) (*bun.DB, func()) {
 	t.Helper()
 
 	dsn := "file::memory:?cache=shared"
 
-	prepareTestDatabase(t, dsn)
+	prepareSqlliteTestDatabase(t, dsn)
 
-	client, err := New(dsn, false)
+	client, err := sdumpSqllite.New(dsn, false)
 	require.NoError(t, err)
 
 	return client, func() {

datastore/sql/url_test.go

@@ -16,7 +16,7 @@ import (
 var userID = uuid.MustParse("8511ac86-5079-42ae-a030-cb46e6dbfbda")
 
 func TestURLRepositoryTable_Create(t *testing.T) {
-	client, teardownFunc := setupDatabase(t)
+	client, teardownFunc := setupPostgresDatabase(t)
 	defer teardownFunc()
 
 	urlStore := NewURLRepositoryTable(client)
@@ -26,7 +26,7 @@ func TestURLRepositoryTable_Create(t *testing.T) {
 }
 
 func TestURLRepositoryTable_Get(t *testing.T) {
-	client, teardownFunc := setupDatabase(t)
+	client, teardownFunc := setupPostgresDatabase(t)
 	defer teardownFunc()
 
 	urlStore := NewURLRepositoryTable(client)
@@ -44,7 +44,7 @@ func TestURLRepositoryTable_Get(t *testing.T) {
 }
 
 func TestURLRepositoryTable_Latest(t *testing.T) {
-	client, teardownFunc := setupDatabase(t)
+	client, teardownFunc := setupPostgresDatabase(t)
 	defer teardownFunc()
 
 	urlStore := NewURLRepositoryTable(client)

datastore/sql/user_test.go

@@ -15,7 +15,7 @@ import (
 // var userID = uuid.MustParse("8511ac86-5079-42ae-a030-cb46e6dbfbda")
 
 func TestUserRepository_Create(t *testing.T) {
-	client, teardownFunc := setupDatabase(t)
+	client, teardownFunc := setupPostgresDatabase(t)
 	defer teardownFunc()
 
 	userStore := NewUserRepositoryTable(client)
@@ -27,7 +27,7 @@ func TestUserRepository_Create(t *testing.T) {
 }
 
 func TestUserRepository_Find(t *testing.T) {
-	client, teardownFunc := setupDatabase(t)
+	client, teardownFunc := setupPostgresDatabase(t)
 	defer teardownFunc()
 
 	userStore := NewUserRepositoryTable(client)