chore(popx): code simplification and refactoring

ory · Oct 7, 2024 · ba8aaae · ba8aaae
1 parent 1f956ac
commit ba8aaae
Show file tree

Hide file tree

Showing 13 changed files with 69 additions and 474 deletions.
diff --git a/pkgerx/file.go b/pkgerx/file.go
diff --git a/pkgerx/migration_box.go b/pkgerx/migration_box.go
diff --git a/pkgerx/migration_box_test.go b/pkgerx/migration_box_test.go
diff --git a/pkgerx/sql_template_funcs.go b/pkgerx/sql_template_funcs.go
diff --git a/pkgerx/testdata/0_sql_create_tablename_template.expected.sql b/pkgerx/testdata/0_sql_create_tablename_template.expected.sql
diff --git a/pkgerx/testdata/0_sql_create_tablename_template.up.sql b/pkgerx/testdata/0_sql_create_tablename_template.up.sql
diff --git a/popx/migration_box_gomigration_test.go b/popx/migration_box_gomigration_test.go
@@ -6,6 +6,7 @@ package popx_test
 import (
 	"context"
 	"database/sql"
+	"github.com/ory/x/dbal"
 	"math/rand"
 	"testing"
 	"time"
@@ -78,7 +79,7 @@ func TestGoMigrations(t *testing.T) {
 		called = make([]time.Time, len(goMigrations))
 
 		c, err := pop.NewConnection(&pop.ConnectionDetails{
-			URL: "sqlite://file::memory:?_fk=true",
+			URL: dbal.NewSQLiteTestDatabase(t),
 		})
 		require.NoError(t, err)
 		require.NoError(t, c.Open())
@@ -101,7 +102,7 @@ func TestGoMigrations(t *testing.T) {
 
 	t.Run("tc=errs_on_missing_down_migration", func(t *testing.T) {
 		c, err := pop.NewConnection(&pop.ConnectionDetails{
-			URL: "sqlite://file::memory:?_fk=true",
+			URL: dbal.NewSQLiteTestDatabase(t),
 		})
 		require.NoError(t, err)
 		require.NoError(t, c.Open())
@@ -112,7 +113,7 @@ func TestGoMigrations(t *testing.T) {
 
 	t.Run("tc=runs everything in one transaction", func(t *testing.T) {
 		c, err := pop.NewConnection(&pop.ConnectionDetails{
-			URL: "sqlite://file::memory:?_fk=true",
+			URL: dbal.NewSQLiteTestDatabase(t),
 		})
 		require.NoError(t, err)
 		require.NoError(t, c.Open())
@@ -223,7 +224,7 @@ func TestIncompatibleRunners(t *testing.T) {
 
 func TestNoTransaction(t *testing.T) {
 	c, err := pop.NewConnection(&pop.ConnectionDetails{
-		URL: "sqlite://file::memory:",
+		URL: dbal.NewSQLiteTestDatabase(t),
 	})
 	require.NoError(t, err)
 	require.NoError(t, c.Open())

diff --git a/popx/migration_box_template_test.go b/popx/migration_box_template_test.go
@@ -8,10 +8,10 @@ import (
 	"testing"
 
 	"github.com/gobuffalo/pop/v6"
-
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/ory/x/dbal"
 	"github.com/ory/x/logrusx"
 )
 
@@ -27,7 +27,7 @@ func TestMigrationBoxTemplating(t *testing.T) {
 	require.NoError(t, err)
 
 	c, err := pop.NewConnection(&pop.ConnectionDetails{
-		URL: "sqlite://file::memory:?_fk=true",
+		URL: dbal.NewSQLiteTestDatabase(t),
 	})
 	require.NoError(t, err)
 	require.NoError(t, c.Open())

diff --git a/popx/migration_box_testdata_test.go b/popx/migration_box_testdata_test.go
@@ -12,6 +12,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/ory/x/dbal"
 	"github.com/ory/x/logrusx"
 	"github.com/ory/x/popx"
 )
@@ -31,7 +32,7 @@ type testdata struct {
 
 func TestMigrationBoxWithTestdata(t *testing.T) {
 	c, err := pop.NewConnection(&pop.ConnectionDetails{
-		URL: "sqlite://file::memory:?_fk=true",
+		URL: dbal.NewSQLiteTestDatabase(t),
 	})
 	require.NoError(t, err)
 	require.NoError(t, c.Open())
@@ -56,7 +57,7 @@ func TestMigrationBoxWithTestdata(t *testing.T) {
 
 func TestMigrationBox_CheckNoErr(t *testing.T) {
 	c, err := pop.NewConnection(&pop.ConnectionDetails{
-		URL: "sqlite://file::memory:?_fk=true",
+		URL: dbal.NewSQLiteTestDatabase(t),
 	})
 	require.NoError(t, err)
 	require.NoError(t, c.Open())

diff --git a/popx/migration_info.go b/popx/migration_info.go
@@ -65,10 +65,11 @@ func (mfs Migrations) Swap(i, j int) {
 func (mfs Migrations) SortAndFilter(dialect string, modifiers ...func(sort.Interface) sort.Interface) Migrations {
 	// We need to sort mfs in order to push the dbType=="all" migrations
 	// to the back.
-	m := append(Migrations{}, mfs...)
+	m := make(Migrations, len(mfs))
+	copy(m, mfs)
 	sort.Sort(m)
 
-	vsf := make(Migrations, 0)
+	vsf := make(Migrations, 0, len(m))
 	for k, v := range m {
 		if v.DBType == "all" {
 			// Add "all" only if we can not find a more specific migration for the dialect.