From bcdafe17be0616d8131793d0f7cedab83fabb640 Mon Sep 17 00:00:00 2001 From: Janez Troha Date: Mon, 2 Oct 2023 13:13:30 +0200 Subject: [PATCH] Fix typos --- Makefile | 11 ++++++++++- flake.lock | 24 ++++++++++++------------ subsetter/sync.go | 24 ++++++++++++------------ 3 files changed, 34 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index 7356abb..c237dd6 100644 --- a/Makefile +++ b/Makefile @@ -21,4 +21,13 @@ build: goreleaser build --snapshot --clean lint: - golangci-lint run \ No newline at end of file + golangci-lint run + +dump: + pg_dump --no-acl --schema-only -n public -x -O -f ./dump.sql $(filter-out $@,$(MAKECMDGOALS)) + +restore: + psql -f ./dump.sql "postgres://test_target@localhost:5432/test_target?sslmode=disable" + +clear: + psql -c "DROP OWNED BY CURRENT_USER;" "postgres://test_target@localhost:5432/test_target?sslmode=disable" diff --git a/flake.lock b/flake.lock index 65c3c87..839bbcf 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1694422554, - "narHash": "sha256-s5NTPzT66yIMmau+ZGP7q9z4NjgceDETL4xZ6HJ/TBg=", + "lastModified": 1695635472, + "narHash": "sha256-+0lqQZmbzdglPh8JoMAZzP1XXanhBg9BcbjVXnwEC5E=", "owner": "cachix", "repo": "devenv", - "rev": "63d20fe09aa09060ea9ec9bb6d582c025402ba15", + "rev": "42a26aa1b2265cf505df056e040e2b1ef8073b76", "type": "github" }, "original": { @@ -44,11 +44,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1693611461, - "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", + "lastModified": 1696203690, + "narHash": "sha256-774XMEL7VHSTLDYVkqrbl5GCdmkVKsjMs+KLM4N4t7k=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", + "rev": "21928e6758af0a258002647d14363d5ffc85545b", "type": "github" }, "original": { @@ -153,11 +153,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1694422566, - "narHash": "sha256-lHJ+A9esOz9vln/3CJG23FV6Wd2OoOFbDeEs4cMGMqc=", + "lastModified": 1696019113, + "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3a2786eea085f040a66ecde1bc3ddc7099f6dbeb", + "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", "type": "github" }, "original": { @@ -170,11 +170,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1693471703, - "narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=", + "lastModified": 1696019113, + "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85", + "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", "type": "github" }, "original": { diff --git a/subsetter/sync.go b/subsetter/sync.go index 726679a..716aee2 100644 --- a/subsetter/sync.go +++ b/subsetter/sync.go @@ -53,7 +53,7 @@ func (r *Rule) Query(exclude []string) string { } func (r *Rule) Copy(s *Sync) (err error) { - log.Debug().Str("query", r.Where).Msgf("Transfering forced rows for table %s", r.Table) + log.Debug().Str("query", r.Where).Msgf("Transferring forced rows for table %s", r.Table) var data string keyName, err := GetPrimaryKeyName(r.Table, s.destination) @@ -118,9 +118,9 @@ func (s *Sync) Close() { // copyTableData copies the data from a table in the source database to the destination database func copyTableData(table Table, relatedQueries []string, withLimit bool, source *pgxpool.Pool, destination *pgxpool.Pool) (err error) { // Backtrace the inserted ids from main table to related table - subselectQeury := "" + subSelectQuery := "" if len(relatedQueries) > 0 { - subselectQeury = "WHERE " + strings.Join(relatedQueries, " AND ") + subSelectQuery = "WHERE " + strings.Join(relatedQueries, " AND ") } limit := "" @@ -129,7 +129,7 @@ func copyTableData(table Table, relatedQueries []string, withLimit bool, source } var data string - if data, err = CopyTableToString(table.Name, limit, subselectQeury, source); err != nil { + if data, err = CopyTableToString(table.Name, limit, subSelectQuery, source); err != nil { //log.Error().Err(err).Str("table", table.Name).Msg("Error getting table data") return } @@ -214,7 +214,7 @@ func RelationalCopy( relatedTable := TableByName(tables, tableName) *visitedTables = append(*visitedTables, relatedTable.Name) - // Use realized query to get priamry keys that are already in the destination for all related tables + // Use realized query to get primary keys that are already in the destination for all related tables // Selection query for this table relatedQueries := []string{} @@ -227,7 +227,7 @@ func RelationalCopy( } if len(relatedQueries) > 0 { - log.Debug().Str("table", relatedTable.Name).Strs("relatedQueries", relatedQueries).Msg("Transfering with RelationalCopy") + log.Debug().Str("table", relatedTable.Name).Strs("relatedQueries", relatedQueries).Msg("Transferring with RelationalCopy") } if err = copyTableData(relatedTable, relatedQueries, false, source, destination); err != nil { @@ -252,7 +252,7 @@ func (s *Sync) CopyTables(tables []Table) (err error) { for _, table := range lo.Filter(tables, func(table Table, _ int) bool { return len(table.Relations) == 0 }) { - log.Info().Str("table", table.Name).Msg("Transfering") + log.Info().Str("table", table.Name).Msg("Transferring") if err = copyTableData(table, []string{}, true, s.source, s.destination); err != nil { return errors.Wrapf(err, "Error copying table %s", table.Name) } @@ -277,15 +277,15 @@ func (s *Sync) CopyTables(tables []Table) (err error) { for _, complexTable := range lo.Filter(tables, func(table Table, _ int) bool { return len(table.Relations) > 0 }) { - log.Info().Str("table", complexTable.Name).Msg("Transfering") + log.Info().Str("table", complexTable.Name).Msg("Transferring") if err := RelationalCopy(&depth, tables, complexTable, &visitedTables, s.source, s.destination); err != nil { - log.Info().Str("table", complexTable.Name).Msgf("Transfering failed, retrying later") + log.Info().Str("table", complexTable.Name).Msgf("Transferring failed, retrying later") maybeRetry = append(maybeRetry, complexTable) } for _, include := range s.include { if include.Table == complexTable.Name { - log.Warn().Str("table", complexTable.Name).Msgf("Transfering forced rows for relational table is not supported.") + log.Warn().Str("table", complexTable.Name).Msgf("Transferring forced rows for relational table is not supported.") } } } @@ -293,9 +293,9 @@ func (s *Sync) CopyTables(tables []Table) (err error) { // Retry tables with relations visitedRetriedTables := []string{} for _, retiredTable := range maybeRetry { - log.Info().Str("table", retiredTable.Name).Msg("Transfering") + log.Info().Str("table", retiredTable.Name).Msg("Transferring") if err := RelationalCopy(&depth, tables, retiredTable, &visitedRetriedTables, s.source, s.destination); err != nil { - log.Warn().Str("table", retiredTable.Name).Msgf("Transfering failed, try increasing fraction percentage") + log.Warn().Str("table", retiredTable.Name).Msgf("Transferring failed, try increasing fraction percentage") } }