From 13ef28c3c292ac98381324d498098835082c130c Mon Sep 17 00:00:00 2001 From: inGitDB Dev Date: Fri, 26 Jun 2026 19:43:38 +0100 Subject: [PATCH 1/2] refactor: use datatug/cliformat for --format flag in select command MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replaces local addFormatFlag helper with cliformat.AddFlag and cliformat.GetFormat — centralises flag registration and format reading. Co-Authored-By: Claude Sonnet 4.6 --- cmd/ingitdb/commands/flags.go | 6 ------ cmd/ingitdb/commands/select.go | 5 +++-- go.mod | 3 ++- go.sum | 18 ++++-------------- 4 files changed, 9 insertions(+), 23 deletions(-) diff --git a/cmd/ingitdb/commands/flags.go b/cmd/ingitdb/commands/flags.go index 033dc0b0..29b289f9 100644 --- a/cmd/ingitdb/commands/flags.go +++ b/cmd/ingitdb/commands/flags.go @@ -24,12 +24,6 @@ func addRemoteFlags(cmd *cobra.Command) { "explicit provider id (github, gitlab, bitbucket) — required for unknown hosts") } -// addFormatFlag adds --format flag with a caller-specified default. -// Used by: query (default "csv"), read record (default "yaml"), watch, migrate. -func addFormatFlag(cmd *cobra.Command, defaultValue string) { - cmd.Flags().String("format", defaultValue, "output format") -} - // addMaterializeFlags adds the flags shared by the ci command. func addMaterializeFlags(cmd *cobra.Command) { addPathFlag(cmd) diff --git a/cmd/ingitdb/commands/select.go b/cmd/ingitdb/commands/select.go index ea668106..d4ba2f48 100644 --- a/cmd/ingitdb/commands/select.go +++ b/cmd/ingitdb/commands/select.go @@ -9,6 +9,7 @@ import ( "sort" "strings" + "github.com/datatug/cliformat" "github.com/dal-go/dalgo/dal" "github.com/dal-go/dalgo/recordset" "github.com/spf13/cobra" @@ -49,7 +50,7 @@ func Select( if parseErr != nil { return parseErr } - format, _ := cmd.Flags().GetString("format") + format := cliformat.GetFormat(cmd) format = strings.ToLower(format) switch mode { @@ -69,7 +70,7 @@ func Select( sqlflags.RegisterFieldsFlag(cmd) sqlflags.RegisterMinAffectedFlag(cmd) cmd.Flags().Int("limit", 0, "maximum number of records to return (0 = no limit; set mode only)") - addFormatFlag(cmd, "") + cliformat.AddFlag(cmd, "") return cmd } diff --git a/go.mod b/go.mod index 6465ff13..b3b7337b 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,13 @@ module github.com/ingitdb/ingitdb-cli -go 1.26.0 +go 1.26.4 require ( charm.land/bubbletea/v2 v2.0.7 charm.land/fang/v2 v2.0.1 charm.land/lipgloss/v2 v2.0.4 github.com/charmbracelet/x/term v0.2.2 + github.com/datatug/cliformat v0.0.1 github.com/ingr-io/ingr-go v0.0.2 github.com/pelletier/go-toml/v2 v2.4.2 github.com/rivo/uniseg v0.4.7 diff --git a/go.sum b/go.sum index 3c5cdbd7..33712bb7 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,6 @@ charm.land/bubbletea/v2 v2.0.7 h1:7qw2tTAVar7m7klOPBYfTB0mniv/RuexsYwMRNxSeL0= charm.land/bubbletea/v2 v2.0.7/go.mod h1:DGW2q8gvzHnOpMpZTORs0aySVHCox5C+2Svk0fci1qs= charm.land/fang/v2 v2.0.1 h1:zQCM8JQJ1JnQX/66B5jlCYBUxL2as5JXQZ2KJ6EL0mY= charm.land/fang/v2 v2.0.1/go.mod h1:S1GmkpcvK+OB5w9caywUnJcsMew45Ot8FXqoz8ALrII= -charm.land/lipgloss/v2 v2.0.3 h1:yM2zJ4Cf5Y51b7RHIwioil4ApI/aypFXXVHSwlM6RzU= -charm.land/lipgloss/v2 v2.0.3/go.mod h1:7myLU9iG/3xluAWzpY/fSxYYHCgoKTie7laxk6ATwXA= charm.land/lipgloss/v2 v2.0.4 h1:lcPeVtcp23SNra7lHy8iYE4UC2aIipVQ47sbGyyxR5Q= charm.land/lipgloss/v2 v2.0.4/go.mod h1:0653x8epbZSzdDfO/XPS1a/uYPOBeSsCssOpJOqDzik= github.com/RoaringBitmap/roaring/v2 v2.18.2 h1:oPq3Cgx//iDuJQVp6xSInAKW34J9CEwE5GmLI2z+Eic= @@ -33,12 +31,10 @@ github.com/clipperhouse/displaywidth v0.11.0/go.mod h1:bkrFNkf81G8HyVqmKGxsPufD3 github.com/clipperhouse/uax29/v2 v2.7.0 h1:+gs4oBZ2gPfVrKPthwbMzWZDaAFPGYK72F0NJv2v7Vk= github.com/clipperhouse/uax29/v2 v2.7.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM= github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= -github.com/dal-go/dalgo v0.46.1 h1:evVl54N6bU2L4bHhNlnAzoBFgugZSqoPcLB6LiflcjM= -github.com/dal-go/dalgo v0.46.1/go.mod h1:HHMUuCMutAlYEblDTVws7jeZs56jvOCbOuxVs6I01tE= -github.com/dal-go/dalgo v0.62.2 h1:rA+k9QCgS0UnZV0oonvDtA+QoM3Wj1doVBWo1higBTw= -github.com/dal-go/dalgo v0.62.2/go.mod h1:wwaibB/UlzwAY1r9KZw5JCis+aroIwAu5WQJ/aoWZiU= github.com/dal-go/dalgo v0.62.7 h1:JF6v9I1VRq1DgkK+aElHk7gZkcMSSMRHv6M/DIyv26c= github.com/dal-go/dalgo v0.62.7/go.mod h1:NV0VJ+TQ6MXkz7uDPl5N3i7o/DWQBTftN5+HxGa3xQg= +github.com/datatug/cliformat v0.0.1 h1:bsMjxOnU4y7JKiP7FSkBieuLx8Au9VMA1oz3Vpbgoi4= +github.com/datatug/cliformat v0.0.1/go.mod h1:v5dCd13RU1PE9IQSEoeOHIfQ4130PQTmQ4zgk7bfYgw= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/gofrs/flock v0.13.0 h1:95JolYOvGMqeH31+FC7D2+uULf6mG61mEZ/A8dRYMzw= @@ -82,10 +78,6 @@ github.com/muesli/mango-pflag v0.2.0 h1:QViokgKDZQCzKhYe1zH8D+UlPJzBSGoP9yx0hBG0 github.com/muesli/mango-pflag v0.2.0/go.mod h1:X9LT1p/pbGA1wjvEbtwnixujKErkP0jVmrxwrw3fL0Y= github.com/muesli/roff v0.1.0 h1:YD0lalCotmYuF5HhZliKWlIx7IEhiXeSfq7hNjFqGF8= github.com/muesli/roff v0.1.0/go.mod h1:pjAHQM9hdUUwm/krAfrLGgJkXJ+YuhtsfZ42kieB2Ig= -github.com/pelletier/go-toml/v2 v2.3.1 h1:MYEvvGnQjeNkRF1qUuGolNtNExTDwct51yp7olPtrEc= -github.com/pelletier/go-toml/v2 v2.3.1/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= -github.com/pelletier/go-toml/v2 v2.4.0 h1:Mwu0mAkUKbittDs3/ADDWXqMmq3EOK2VHiuCkV00Row= -github.com/pelletier/go-toml/v2 v2.4.0/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= github.com/pelletier/go-toml/v2 v2.4.2 h1:M2fKKbmyvI+hGId/D0W64qDBMVhJnNR10O5gIbMc//Q= github.com/pelletier/go-toml/v2 v2.4.2/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -104,12 +96,10 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/strongo/random v0.0.1 h1:OZHJBb/3uEa7OX8L2Dv2pLnSeewRmXMyTACoeto6O8I= github.com/strongo/random v0.0.1/go.mod h1:/pSI+SjBNLBkjljNtVdYr6ERddA+LqSa87o0/s+9iuU= -github.com/strongo/validation v0.0.8 h1:LL3FODf1MTOROKa8fHJuwYxiKHcvd1W2Vs0OXc1H46U= -github.com/strongo/validation v0.0.8/go.mod h1:YUwoPEItLJd/Bc9X1OCUm03ofhvm3kwZvuihU7/jz58= +github.com/strongo/validation v0.0.9 h1:wO/aExTa4qZorJtQuGlqkTS8vfL4y9WQsCk9cP/nNjU= +github.com/strongo/validation v0.0.9/go.mod h1:YUwoPEItLJd/Bc9X1OCUm03ofhvm3kwZvuihU7/jz58= github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no= github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM= -go.starlark.net v0.0.0-20260522144826-ec58d4b459e2 h1:3cIeOhZXLdLHnBoLyKdJu4SEAEuM/av/VFzB5twLo8k= -go.starlark.net v0.0.0-20260522144826-ec58d4b459e2/go.mod h1:Iue6g6iirlfLoVi/DYCi5/x0h/bAOuWF3dULTKpt2Vo= go.starlark.net v0.0.0-20260613233743-8ba36ccb83fb h1:NGUBN0jbH0IR3msRslALnoxlySm+6YvVKvVDjdDJrlA= go.starlark.net v0.0.0-20260613233743-8ba36ccb83fb/go.mod h1:Iue6g6iirlfLoVi/DYCi5/x0h/bAOuWF3dULTKpt2Vo= go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y= From c7f7ddeb6d18f0ec43de99dcb6fd10d5b3c6e5b5 Mon Sep 17 00:00:00 2001 From: inGitDB Dev Date: Sat, 27 Jun 2026 08:16:25 +0100 Subject: [PATCH 2/2] ci: retrigger checks