add option to skip auto patch

mpoegel · May 9, 2024 · ef85c67 · ef85c67
1 parent 6410bad
commit ef85c67
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 13 deletions.
diff --git a/go.mod b/go.mod
@@ -39,7 +39,6 @@ require (
 	github.com/prometheus/procfs v0.9.0 // indirect
 	github.com/rogpeppe/go-internal v1.10.0 // indirect
 	github.com/segmentio/ksuid v1.0.4 // indirect
-	github.com/stretchr/objx v0.5.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect

diff --git a/go.sum b/go.sum
@@ -99,7 +99,6 @@ github.com/segmentio/ksuid v1.0.4 h1:sBo2BdShXjmcugAMwjugoGUdUV0pcxY5mW4xKRn3v4c
 github.com/segmentio/ksuid v1.0.4/go.mod h1:/XUiZBD3kVx5SmUOl55voK5yeAbBNNIed+2O73XgrPE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=

diff --git a/pkg/pizza/edit.go b/pkg/pizza/edit.go
@@ -26,7 +26,7 @@ func Edit(args []string) {
 	config := LoadConfigEnv()
 	var accessor Accessor
 	var err error
-	accessor, err = NewSQLAccessor(config.DBFile)
+	accessor, err = NewSQLAccessor(config.DBFile, false)
 	if err != nil {
 		Log.Fatal("sql accessor init failure", zap.Error(err))
 	}

diff --git a/pkg/pizza/patch.go b/pkg/pizza/patch.go
@@ -18,7 +18,7 @@ func Patch(args []string) {
 	config := LoadConfigEnv()
 	var accessor *SQLAccessor
 	var err error
-	accessor, err = NewSQLAccessor(config.DBFile)
+	accessor, err = NewSQLAccessor(config.DBFile, true)
 	if err != nil {
 		Log.Fatal("sql accessor init failure", zap.Error(err))
 	}

diff --git a/pkg/pizza/server.go b/pkg/pizza/server.go
@@ -50,7 +50,7 @@ func NewServer(config Config, metricsReg MetricsRegistry) (*Server, error) {
 	var accessor Accessor
 	var err error
 	Log.Info("using the sqlite accessor")
-	accessor, err = NewSQLAccessor(config.DBFile)
+	accessor, err = NewSQLAccessor(config.DBFile, false)
 	if err != nil {
 		return nil, err
 	}

diff --git a/pkg/pizza/sql_acccessor_test.go b/pkg/pizza/sql_acccessor_test.go
@@ -14,7 +14,7 @@ func TestSqlAccessor_IsFriendAllowed(t *testing.T) {
 	// GIVEN
 	sqlfile := "test.db"
 	os.Remove(sqlfile)
-	accessor, err := pizza.NewSQLAccessor(sqlfile)
+	accessor, err := pizza.NewSQLAccessor(sqlfile, false)
 	require.Nil(t, err)
 	defer accessor.Close()
 	require.Nil(t, accessor.CreateTables())
@@ -39,7 +39,7 @@ func TestSqlAccessor_GetFriendName(t *testing.T) {
 	// GIVEN
 	sqlfile := "test.db"
 	os.Remove(sqlfile)
-	accessor, err := pizza.NewSQLAccessor(sqlfile)
+	accessor, err := pizza.NewSQLAccessor(sqlfile, false)
 	require.Nil(t, err)
 	defer accessor.Close()
 	require.Nil(t, accessor.CreateTables())
@@ -64,7 +64,7 @@ func TestSqlAccessor_GetUpcomingFridays(t *testing.T) {
 	// GIVEN
 	sqlfile := "test.db"
 	os.Remove(sqlfile)
-	accessor, err := pizza.NewSQLAccessor(sqlfile)
+	accessor, err := pizza.NewSQLAccessor(sqlfile, false)
 	require.Nil(t, err)
 	defer accessor.Close()
 	require.Nil(t, accessor.CreateTables())
@@ -88,7 +88,7 @@ func TestSqlAccessor_ListFriends(t *testing.T) {
 	// GIVEN
 	sqlfile := "test.db"
 	os.Remove(sqlfile)
-	accessor, err := pizza.NewSQLAccessor(sqlfile)
+	accessor, err := pizza.NewSQLAccessor(sqlfile, false)
 	require.Nil(t, err)
 	defer accessor.Close()
 	require.Nil(t, accessor.CreateTables())
@@ -112,7 +112,7 @@ func TestSqlAccessor_ListFridays(t *testing.T) {
 	// GIVEN
 	sqlfile := "test.db"
 	os.Remove(sqlfile)
-	accessor, err := pizza.NewSQLAccessor(sqlfile)
+	accessor, err := pizza.NewSQLAccessor(sqlfile, false)
 	require.Nil(t, err)
 	defer accessor.Close()
 	require.Nil(t, accessor.CreateTables())
@@ -137,7 +137,7 @@ func TestSqlAccessor_RemoveFriend(t *testing.T) {
 	// GIVEN
 	sqlfile := "test.db"
 	os.Remove(sqlfile)
-	accessor, err := pizza.NewSQLAccessor(sqlfile)
+	accessor, err := pizza.NewSQLAccessor(sqlfile, false)
 	require.Nil(t, err)
 	defer accessor.Close()
 	require.Nil(t, accessor.CreateTables())
@@ -161,7 +161,7 @@ func TestSqlAccessor_RemoveFriday(t *testing.T) {
 	// GIVEN
 	sqlfile := "test.db"
 	os.Remove(sqlfile)
-	accessor, err := pizza.NewSQLAccessor(sqlfile)
+	accessor, err := pizza.NewSQLAccessor(sqlfile, false)
 	require.Nil(t, err)
 	defer accessor.Close()
 	require.Nil(t, accessor.CreateTables())

diff --git a/pkg/pizza/sql_accessor.go b/pkg/pizza/sql_accessor.go
@@ -11,12 +11,15 @@ type SQLAccessor struct {
 	db *sql.DB
 }
 
-func NewSQLAccessor(dbfile string) (*SQLAccessor, error) {
+func NewSQLAccessor(dbfile string, skipPatch bool) (*SQLAccessor, error) {
 	db, err := sql.Open("sqlite3", dbfile)
 	if err != nil {
 		return nil, err
 	}
 	a := &SQLAccessor{db}
+	if skipPatch {
+		return a, nil
+	}
 	return a, a.PatchTables()
 }