From 87ef38a0dec2dc8f7796720498d9295f0e29a017 Mon Sep 17 00:00:00 2001 From: Chris Pine Date: Tue, 1 Sep 2020 13:27:31 -0700 Subject: [PATCH 1/8] add campaigns git commit author data --- enterprise/internal/campaigns/reconciler.go | 14 +++++- internal/campaigns/types.go | 30 +++++++++++- .../1528395713_add_git_commit_author.down.sql | 5 ++ .../1528395713_add_git_commit_author.up.sql | 7 +++ migrations/bindata.go | 46 +++++++++++++++++++ schema/campaign_spec.schema.json | 18 ++++++++ schema/campaign_spec_stringdata.go | 18 ++++++++ schema/changeset_spec.schema.json | 11 ++++- schema/changeset_spec_stringdata.go | 11 ++++- schema/schema.go | 14 ++++++ 10 files changed, 168 insertions(+), 6 deletions(-) create mode 100644 migrations/1528395713_add_git_commit_author.down.sql create mode 100644 migrations/1528395713_add_git_commit_author.up.sql diff --git a/enterprise/internal/campaigns/reconciler.go b/enterprise/internal/campaigns/reconciler.go index 2f2ef01ba8d5..2cc3aae65bc8 100644 --- a/enterprise/internal/campaigns/reconciler.go +++ b/enterprise/internal/campaigns/reconciler.go @@ -340,6 +340,16 @@ func buildCommitOpts(repo *repos.Repo, spec *campaigns.ChangesetSpec) (protocol. return opts, err } + commitAuthorName, err := desc.AuthorName() + if err != nil { + return opts, err + } + + commitAuthorEmail, err := desc.AuthorEmail() + if err != nil { + return opts, err + } + opts = protocol.CreateCommitFromPatchRequest{ Repo: api.RepoName(repo.Name), BaseCommit: api.CommitID(desc.BaseRev), @@ -356,8 +366,8 @@ func buildCommitOpts(repo *repos.Repo, spec *campaigns.ChangesetSpec) (protocol. CommitInfo: protocol.PatchCommitInfo{ Message: commitMessage, - AuthorName: "Sourcegraph", - AuthorEmail: "campaigns@sourcegraph.com", + AuthorName: commitAuthorName, + AuthorEmail: commitAuthorEmail, Date: spec.CreatedAt, }, // We use unified diffs, not git diffs, which means they're missing the diff --git a/internal/campaigns/types.go b/internal/campaigns/types.go index f2419ad9932a..4bce37ebed96 100644 --- a/internal/campaigns/types.go +++ b/internal/campaigns/types.go @@ -1956,9 +1956,35 @@ func (d *ChangesetSpecDescription) CommitMessage() (string, error) { return d.Commits[0].Message, nil } +// AuthorName returns the author name of the first GitCommitDescription in Commits. If the +// ChangesetSpecDescription doesn't have Commits it returns ErrNoCommits. +// +// We currently only support a single commit in Commits. Once we support more, +// this method will need to be revisited. +func (d *ChangesetSpecDescription) AuthorName() (string, error) { + if len(d.Commits) == 0 { + return "", ErrNoCommits + } + return d.Commits[0].AuthorName, nil +} + +// AuthorEmail returns the author email of the first GitCommitDescription in Commits. If the +// ChangesetSpecDescription doesn't have Commits it returns ErrNoCommits. +// +// We currently only support a single commit in Commits. Once we support more, +// this method will need to be revisited. +func (d *ChangesetSpecDescription) AuthorEmail() (string, error) { + if len(d.Commits) == 0 { + return "", ErrNoCommits + } + return d.Commits[0].AuthorEmail, nil +} + type GitCommitDescription struct { - Message string `json:"message,omitempty"` - Diff string `json:"diff,omitempty"` + Message string `json:"message,omitempty"` + Diff string `json:"diff,omitempty"` + AuthorName string `json:"authorName,omitempty"` + AuthorEmail string `json:"authorEmail,omitempty"` } // unmarshalValidate validates the input, which can be YAML or JSON, against diff --git a/migrations/1528395713_add_git_commit_author.down.sql b/migrations/1528395713_add_git_commit_author.down.sql new file mode 100644 index 000000000000..d30f02568e8a --- /dev/null +++ b/migrations/1528395713_add_git_commit_author.down.sql @@ -0,0 +1,5 @@ +BEGIN; + +-- Nothing needed, non-destructive operation + +COMMIT; diff --git a/migrations/1528395713_add_git_commit_author.up.sql b/migrations/1528395713_add_git_commit_author.up.sql new file mode 100644 index 000000000000..aff1b8037e80 --- /dev/null +++ b/migrations/1528395713_add_git_commit_author.up.sql @@ -0,0 +1,7 @@ +BEGIN; + +-- Add default values for git commit author (name and email) + +UPDATE changeset_specs SET spec = spec || '{ "commits": [{"authorName": "Sourcegraph", "authorEmail": "campaigns@sourcegraph.com"}] }' WHERE spec->'externalId' IS NULL; + +COMMIT; diff --git a/migrations/bindata.go b/migrations/bindata.go index d8e7b3ccce8e..a37dc4e3cb28 100644 --- a/migrations/bindata.go +++ b/migrations/bindata.go @@ -126,6 +126,8 @@ // 1528395711_add_soft_deleted_repository_name_func.up.sql (286B) // 1528395712_add_closing_flag_to_changesets.down.sql (71B) // 1528395712_add_closing_flag_to_changesets.up.sql (105B) +// 1528395713_add_git_commit_author.down.sql (62B) +// 1528395713_add_git_commit_author.up.sql (248B) // 1528395713_add_trigger_to_delete_orphan_repos.down.sql (102B) // 1528395713_add_trigger_to_delete_orphan_repos.up.sql (861B) // 1528395714_worker_num_failures.down.sql (1.573kB) @@ -2720,6 +2722,46 @@ func _1528395712_add_closing_flag_to_changesetsUpSql() (*asset, error) { return a, nil } +var __1528395713_add_git_commit_authorDownSql = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x72\x72\x75\xf7\xf4\xb3\xe6\xe2\xd2\xd5\x55\xf0\xcb\x2f\xc9\xc8\xcc\x4b\x57\xc8\x4b\x4d\x4d\x49\x4d\xd1\x51\xc8\xcb\xcf\xd3\x4d\x49\x2d\x2e\x29\x2a\x4d\x2e\xc9\x2c\x4b\x55\xc8\x2f\x48\x2d\x4a\x2c\xc9\xcc\xcf\xe3\xe2\x72\xf6\xf7\xf5\xf5\x0c\xb1\xe6\x02\x04\x00\x00\xff\xff\x58\x72\x8a\x01\x3e\x00\x00\x00") + +func _1528395713_add_git_commit_authorDownSqlBytes() ([]byte, error) { + return bindataRead( + __1528395713_add_git_commit_authorDownSql, + "1528395713_add_git_commit_author.down.sql", + ) +} + +func _1528395713_add_git_commit_authorDownSql() (*asset, error) { + bytes, err := _1528395713_add_git_commit_authorDownSqlBytes() + if err != nil { + return nil, err + } + + info := bindataFileInfo{name: "1528395713_add_git_commit_author.down.sql", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x50, 0x99, 0xc6, 0x3c, 0x73, 0x61, 0xb5, 0x22, 0xbf, 0x89, 0x69, 0x28, 0x29, 0x6c, 0xc6, 0x1b, 0x96, 0xa0, 0xee, 0x16, 0xd3, 0x9d, 0x28, 0x4, 0x41, 0x9a, 0xa4, 0xae, 0x88, 0x1c, 0xda, 0x6b}} + return a, nil +} + +var __1528395713_add_git_commit_authorUpSql = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x44\x8d\xd1\x4a\xc3\x30\x14\x86\xef\xf3\x14\x3f\xb9\xa9\x82\xf5\x01\x56\x14\xa7\x06\x2d\x6c\x55\x6c\x87\x17\x22\x72\x48\xce\xda\x42\x93\x94\x24\x15\x61\xdb\xbb\x4b\xad\xb0\xab\x73\xe0\xfb\xf9\xbe\x7b\xf5\x54\x56\x85\x10\x79\x8e\xb5\x31\x30\xbc\xa7\x69\x48\xf8\xa6\x61\xe2\x88\xbd\x0f\x68\xfb\x04\xed\xad\xed\x13\x68\x4a\x9d\x0f\xb8\x70\x64\x19\xe4\x0c\xd8\x52\x3f\x5c\x0a\xb1\x7b\x7d\x5c\x37\x0a\xba\x23\xd7\x72\xe4\xf4\x15\x47\xd6\x11\xb5\x6a\x30\x7f\xb8\x59\xce\xf1\x88\xec\x00\xb9\xd8\xa2\x5c\xe1\xe3\x20\x17\x67\x45\x96\xe5\x0a\xb2\xf6\x53\xd0\xdc\x06\x1a\x3b\x79\x85\x7f\xa8\xe6\xca\x4c\x35\xd9\x91\xfa\xd6\xc5\xbb\x78\xde\x5d\x6b\x6f\xe5\xe9\x13\xa7\x0c\xef\xcf\xea\x4d\xfd\xa5\xf2\xdb\x8c\x7f\x12\x07\x47\x43\x69\x32\x94\x35\xaa\xdd\x66\x53\x08\xf1\xf0\xb2\xdd\x96\x4d\x21\x7e\x03\x00\x00\xff\xff\x4f\x11\x02\x86\xf8\x00\x00\x00") + +func _1528395713_add_git_commit_authorUpSqlBytes() ([]byte, error) { + return bindataRead( + __1528395713_add_git_commit_authorUpSql, + "1528395713_add_git_commit_author.up.sql", + ) +} + +func _1528395713_add_git_commit_authorUpSql() (*asset, error) { + bytes, err := _1528395713_add_git_commit_authorUpSqlBytes() + if err != nil { + return nil, err + } + + info := bindataFileInfo{name: "1528395713_add_git_commit_author.up.sql", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xc8, 0x82, 0x89, 0xe3, 0x7d, 0xec, 0xc9, 0x27, 0xcf, 0x21, 0xa4, 0xc4, 0xf7, 0x9b, 0x47, 0x81, 0x3b, 0xd1, 0x21, 0x8f, 0x22, 0xc0, 0xb4, 0x52, 0x33, 0x2, 0xf3, 0xaf, 0xe2, 0x70, 0x19, 0xb4}} + return a, nil +} + var __1528395713_add_trigger_to_delete_orphan_reposDownSql = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x72\x72\x75\xf7\xf4\xb3\xe6\xe2\x72\x09\xf2\x0f\x50\x70\x0b\xf5\x73\x0e\xf1\xf4\xf7\x53\xf0\x74\x53\x70\x8d\xf0\x0c\x0e\x09\x56\x28\xce\x4f\x2b\x89\x4f\x49\xcd\x49\x2d\x49\x8d\xcf\x2f\x2a\xc8\x48\xcc\x8b\x2f\x4a\x2d\xc8\x8f\x4f\xaa\x8c\x4f\xad\x28\x49\x2d\xca\x4b\xcc\x89\x2f\x4e\x2d\x2a\xcb\x4c\x4e\x05\x4b\x14\x6b\x68\x2a\x38\x3b\x06\x3b\x3b\xba\xb8\x5a\x73\x71\x39\xfb\xfb\xfa\x7a\x86\x58\x73\x01\x02\x00\x00\xff\xff\x5d\x64\x99\x19\x66\x00\x00\x00") func _1528395713_add_trigger_to_delete_orphan_reposDownSqlBytes() ([]byte, error) { @@ -3057,6 +3099,8 @@ var _bindata = map[string]func() (*asset, error){ "1528395711_add_soft_deleted_repository_name_func.up.sql": _1528395711_add_soft_deleted_repository_name_funcUpSql, "1528395712_add_closing_flag_to_changesets.down.sql": _1528395712_add_closing_flag_to_changesetsDownSql, "1528395712_add_closing_flag_to_changesets.up.sql": _1528395712_add_closing_flag_to_changesetsUpSql, + "1528395713_add_git_commit_author.down.sql": _1528395713_add_git_commit_authorDownSql, + "1528395713_add_git_commit_author.up.sql": _1528395713_add_git_commit_authorUpSql, "1528395713_add_trigger_to_delete_orphan_repos.down.sql": _1528395713_add_trigger_to_delete_orphan_reposDownSql, "1528395713_add_trigger_to_delete_orphan_repos.up.sql": _1528395713_add_trigger_to_delete_orphan_reposUpSql, "1528395714_worker_num_failures.down.sql": _1528395714_worker_num_failuresDownSql, @@ -3235,6 +3279,8 @@ var _bintree = &bintree{nil, map[string]*bintree{ "1528395711_add_soft_deleted_repository_name_func.up.sql": {_1528395711_add_soft_deleted_repository_name_funcUpSql, map[string]*bintree{}}, "1528395712_add_closing_flag_to_changesets.down.sql": {_1528395712_add_closing_flag_to_changesetsDownSql, map[string]*bintree{}}, "1528395712_add_closing_flag_to_changesets.up.sql": {_1528395712_add_closing_flag_to_changesetsUpSql, map[string]*bintree{}}, + "1528395713_add_git_commit_author.down.sql": {_1528395713_add_git_commit_authorDownSql, map[string]*bintree{}}, + "1528395713_add_git_commit_author.up.sql": {_1528395713_add_git_commit_authorUpSql, map[string]*bintree{}}, "1528395713_add_trigger_to_delete_orphan_repos.down.sql": {_1528395713_add_trigger_to_delete_orphan_reposDownSql, map[string]*bintree{}}, "1528395713_add_trigger_to_delete_orphan_repos.up.sql": {_1528395713_add_trigger_to_delete_orphan_reposUpSql, map[string]*bintree{}}, "1528395714_worker_num_failures.down.sql": {_1528395714_worker_num_failuresDownSql, map[string]*bintree{}}, diff --git a/schema/campaign_spec.schema.json b/schema/campaign_spec.schema.json index eac8531d0f10..463acb129b6d 100644 --- a/schema/campaign_spec.schema.json +++ b/schema/campaign_spec.schema.json @@ -131,6 +131,24 @@ "message": { "type": "string", "description": "The Git commit message." + }, + "author": { + "title": "GitCommitAuthor", + "type": "object", + "description": "The author of the Git commit.", + "additionalProperties": false, + "required": ["name", "email"], + "properties": { + "name": { + "type": "string", + "description": "The Git commit author name." + }, + "email": { + "type": "string", + "format": "email", + "description": "The Git commit author email." + } + } } } }, diff --git a/schema/campaign_spec_stringdata.go b/schema/campaign_spec_stringdata.go index 001e77876c89..0c273486fb78 100644 --- a/schema/campaign_spec_stringdata.go +++ b/schema/campaign_spec_stringdata.go @@ -136,6 +136,24 @@ const CampaignSpecSchemaJSON = `{ "message": { "type": "string", "description": "The Git commit message." + }, + "author": { + "title": "GitCommitAuthor", + "type": "object", + "description": "The author of the Git commit.", + "additionalProperties": false, + "required": ["name", "email"], + "properties": { + "name": { + "type": "string", + "description": "The Git commit author name." + }, + "email": { + "type": "string", + "format": "email", + "description": "The Git commit author email." + } + } } } }, diff --git a/schema/changeset_spec.schema.json b/schema/changeset_spec.schema.json index a7e2157ce4ff..207d8cd019e0 100644 --- a/schema/changeset_spec.schema.json +++ b/schema/changeset_spec.schema.json @@ -59,7 +59,7 @@ "type": "object", "description": "The Git commit to create with the changes.", "additionalProperties": false, - "required": ["message", "diff"], + "required": ["message", "diff", "authorName", "authorEmail"], "properties": { "message": { "type": "string", @@ -68,6 +68,15 @@ "diff": { "type": "string", "description": "The commit diff (in unified diff format)." + }, + "authorName": { + "type": "string", + "description": "The Git commit author name." + }, + "authorEmail": { + "type": "string", + "format": "email", + "description": "The Git commit author email." } } } diff --git a/schema/changeset_spec_stringdata.go b/schema/changeset_spec_stringdata.go index c43e1c6539a5..2b695e3347ac 100644 --- a/schema/changeset_spec_stringdata.go +++ b/schema/changeset_spec_stringdata.go @@ -64,7 +64,7 @@ const ChangesetSpecSchemaJSON = `{ "type": "object", "description": "The Git commit to create with the changes.", "additionalProperties": false, - "required": ["message", "diff"], + "required": ["message", "diff", "authorName", "authorEmail"], "properties": { "message": { "type": "string", @@ -73,6 +73,15 @@ const ChangesetSpecSchemaJSON = `{ "diff": { "type": "string", "description": "The commit diff (in unified diff format)." + }, + "authorName": { + "type": "string", + "description": "The Git commit author name." + }, + "authorEmail": { + "type": "string", + "format": "email", + "description": "The Git commit author email." } } } diff --git a/schema/schema.go b/schema/schema.go index c1563b8f4863..c4bac38bef68 100644 --- a/schema/schema.go +++ b/schema/schema.go @@ -409,6 +409,8 @@ type ExcludedGitoliteRepo struct { // ExpandedGitCommitDescription description: The Git commit to create with the changes. type ExpandedGitCommitDescription struct { + // Author description: The author of the Git commit. + Author *GitCommitAuthor `json:"author,omitempty"` // Message description: The Git commit message. Message string `json:"message"` } @@ -460,8 +462,20 @@ type ExternalIdentity struct { Type string `json:"type"` } +// GitCommitAuthor description: The author of the Git commit. +type GitCommitAuthor struct { + // Email description: The Git commit author email. + Email string `json:"email"` + // Name description: The Git commit author name. + Name string `json:"name"` +} + // GitCommitDescription description: The Git commit to create with the changes. type GitCommitDescription struct { + // AuthorEmail description: The Git commit author email. + AuthorEmail string `json:"authorEmail"` + // AuthorName description: The Git commit author name. + AuthorName string `json:"authorName"` // Diff description: The commit diff (in unified diff format). Diff string `json:"diff"` // Message description: The Git commit message. From b941ec8f7a134158da44ac48b7f6f7e738159b6c Mon Sep 17 00:00:00 2001 From: Chris Pine Date: Wed, 2 Sep 2020 13:20:35 -0700 Subject: [PATCH 2/8] db migration that actually works! --- migrations/1528395713_add_git_commit_author.up.sql | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/migrations/1528395713_add_git_commit_author.up.sql b/migrations/1528395713_add_git_commit_author.up.sql index aff1b8037e80..ee686c6f888d 100644 --- a/migrations/1528395713_add_git_commit_author.up.sql +++ b/migrations/1528395713_add_git_commit_author.up.sql @@ -1,7 +1,11 @@ BEGIN; - -- Add default values for git commit author (name and email) - -UPDATE changeset_specs SET spec = spec || '{ "commits": [{"authorName": "Sourcegraph", "authorEmail": "campaigns@sourcegraph.com"}] }' WHERE spec->'externalId' IS NULL; - +UPDATE changeset_specs +SET spec = spec || json_build_object( + 'commits', + json_build_array( + spec->'commits'->0 || '{"authorName": "Sourcegraph", "authorEmail": "campaigns@sourcegraph.com"}' + ) + )::jsonb +WHERE jsonb_array_length(spec->'commits') > 0; COMMIT; From bff2d6402bae15e12f44a1822114bf80d6d27a8a Mon Sep 17 00:00:00 2001 From: Chris Pine Date: Wed, 2 Sep 2020 15:08:57 -0700 Subject: [PATCH 3/8] tests now pass --- enterprise/internal/campaigns/testing/specs.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enterprise/internal/campaigns/testing/specs.go b/enterprise/internal/campaigns/testing/specs.go index 3856e1a10809..164064a5429f 100644 --- a/enterprise/internal/campaigns/testing/specs.go +++ b/enterprise/internal/campaigns/testing/specs.go @@ -91,7 +91,7 @@ index e5af166..d44c3fc 100644 "published": false, "commits": [ - {"message": "git commit message", "diff": %q}] + {"message": "git commit message", "diff": %q, "authorName": "Mary McButtons", "authorEmail": "mary@example.com"}] }` return fmt.Sprintf(tmpl, repo, baseRev, repo, diff) From 098a8e90e6d8996026e48d64617ee05bc08d68c7 Mon Sep 17 00:00:00 2001 From: Chris Pine Date: Thu, 3 Sep 2020 11:05:10 -0700 Subject: [PATCH 4/8] more tests now pass --- internal/campaigns/types_test.go | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/internal/campaigns/types_test.go b/internal/campaigns/types_test.go index dbad8ca497a3..dcfc104cf1f4 100644 --- a/internal/campaigns/types_test.go +++ b/internal/campaigns/types_test.go @@ -998,7 +998,9 @@ func TestChangesetSpecUnmarshalValidate(t *testing.T) { "published": false, "commits": [{ "message": "commit message", - "diff": "the diff" + "diff": "the diff", + "authorName": "Mary McButtons", + "authorEmail": "mary@example.com" }] }`, }, @@ -1012,7 +1014,9 @@ func TestChangesetSpecUnmarshalValidate(t *testing.T) { "title": "my title", "published": false, "commits": [{ - "diff": "the diff" + "diff": "the diff", + "authorName": "Mary McButtons", + "authorEmail": "mary@example.com" }] }`, err: "4 errors occurred:\n\t* Must validate one and only one schema (oneOf)\n\t* baseRev is required\n\t* body is required\n\t* commits.0: message is required\n\n", @@ -1037,7 +1041,9 @@ func TestChangesetSpecUnmarshalValidate(t *testing.T) { "published": false, "commits": [{ "message": "commit message", - "diff": "the diff" + "diff": "the diff", + "authorName": "Mary McButtons", + "authorEmail": "mary@example.com" }] }`, err: ErrHeadBaseMismatch.Error(), @@ -1056,11 +1062,15 @@ func TestChangesetSpecUnmarshalValidate(t *testing.T) { "commits": [ { "message": "commit message", - "diff": "the diff" + "diff": "the diff", + "authorName": "Mary McButtons", + "authorEmail": "mary@example.com" }, { "message": "commit message2", - "diff": "the diff2" + "diff": "the diff2", + "authorName": "Mary McButtons", + "authorEmail": "mary@example.com" } ] }`, From 532ecf6e3123b33a9d2bd617f10266dea508f6a1 Mon Sep 17 00:00:00 2001 From: Chris Pine Date: Thu, 3 Sep 2020 11:16:40 -0700 Subject: [PATCH 5/8] forgot to regenerate after changing migrations --- migrations/bindata.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/migrations/bindata.go b/migrations/bindata.go index a37dc4e3cb28..853124debac2 100644 --- a/migrations/bindata.go +++ b/migrations/bindata.go @@ -127,7 +127,7 @@ // 1528395712_add_closing_flag_to_changesets.down.sql (71B) // 1528395712_add_closing_flag_to_changesets.up.sql (105B) // 1528395713_add_git_commit_author.down.sql (62B) -// 1528395713_add_git_commit_author.up.sql (248B) +// 1528395713_add_git_commit_author.up.sql (362B) // 1528395713_add_trigger_to_delete_orphan_repos.down.sql (102B) // 1528395713_add_trigger_to_delete_orphan_repos.up.sql (861B) // 1528395714_worker_num_failures.down.sql (1.573kB) @@ -2742,7 +2742,7 @@ func _1528395713_add_git_commit_authorDownSql() (*asset, error) { return a, nil } -var __1528395713_add_git_commit_authorUpSql = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x44\x8d\xd1\x4a\xc3\x30\x14\x86\xef\xf3\x14\x3f\xb9\xa9\x82\xf5\x01\x56\x14\xa7\x06\x2d\x6c\x55\x6c\x87\x17\x22\x72\x48\xce\xda\x42\x93\x94\x24\x15\x61\xdb\xbb\x4b\xad\xb0\xab\x73\xe0\xfb\xf9\xbe\x7b\xf5\x54\x56\x85\x10\x79\x8e\xb5\x31\x30\xbc\xa7\x69\x48\xf8\xa6\x61\xe2\x88\xbd\x0f\x68\xfb\x04\xed\xad\xed\x13\x68\x4a\x9d\x0f\xb8\x70\x64\x19\xe4\x0c\xd8\x52\x3f\x5c\x0a\xb1\x7b\x7d\x5c\x37\x0a\xba\x23\xd7\x72\xe4\xf4\x15\x47\xd6\x11\xb5\x6a\x30\x7f\xb8\x59\xce\xf1\x88\xec\x00\xb9\xd8\xa2\x5c\xe1\xe3\x20\x17\x67\x45\x96\xe5\x0a\xb2\xf6\x53\xd0\xdc\x06\x1a\x3b\x79\x85\x7f\xa8\xe6\xca\x4c\x35\xd9\x91\xfa\xd6\xc5\xbb\x78\xde\x5d\x6b\x6f\xe5\xe9\x13\xa7\x0c\xef\xcf\xea\x4d\xfd\xa5\xf2\xdb\x8c\x7f\x12\x07\x47\x43\x69\x32\x94\x35\xaa\xdd\x66\x53\x08\xf1\xf0\xb2\xdd\x96\x4d\x21\x7e\x03\x00\x00\xff\xff\x4f\x11\x02\x86\xf8\x00\x00\x00") +var __1528395713_add_git_commit_authorUpSql = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x5c\x8e\x5f\x4b\xc3\x30\x14\xc5\xdf\xf3\x29\x2e\x7d\xe9\x0a\xab\xec\xb9\xc5\xe2\xd4\xa0\x7b\xd8\x14\x57\xf1\xb1\xdc\xa6\x77\x6d\x47\x93\x94\xfc\x11\xc4\xf9\xdd\x25\xeb\xe8\xc4\xf3\x92\x43\xce\x49\xce\xef\x9e\x3f\x6d\x76\x39\x4b\x53\x58\x37\x0d\x34\x74\x40\x3f\x38\xf8\xc4\xc1\x93\x85\x83\x36\xd0\xf6\x0e\x84\x96\xb2\x77\x80\xde\x75\xda\xc0\x42\xa1\x24\x40\xd5\x00\x49\xec\x87\x84\xbd\xbf\x3e\xae\x4b\x0e\xa2\x43\xd5\x92\x25\x57\xd9\x91\x84\x65\x7b\x5e\x42\x70\x70\x3b\x1d\xa7\x13\x1c\xad\x56\x55\xed\xfb\xa1\xa9\x74\x7d\x24\xe1\x16\x0c\x2e\x8a\xa7\x11\x1b\x2f\xe7\xab\x3f\x6d\x34\x06\xbf\xae\xe5\xa0\xf0\x67\x5a\xcc\xcf\xd2\x62\x15\x16\xe2\xef\x68\xc2\xdc\xa1\xa4\x28\x83\x68\xaf\xbd\x11\xd4\x1a\x1c\xbb\x68\x09\x97\x90\x07\xf0\x90\x0a\x94\x23\xf6\xad\xb2\x77\xf6\xda\xbb\x11\x5a\x46\x3f\xf1\xbc\x96\x9c\x5d\x92\x65\x01\xa8\x66\x1f\xcf\xfc\x8d\x9f\xe1\xea\x89\xab\x1a\x48\xb5\xae\x5b\xfc\x23\x4a\xa0\x80\x55\xce\x1e\x5e\xb6\xdb\x4d\x99\xb3\xdf\x00\x00\x00\xff\xff\x7f\xc5\x59\x30\x6a\x01\x00\x00") func _1528395713_add_git_commit_authorUpSqlBytes() ([]byte, error) { return bindataRead( @@ -2758,7 +2758,7 @@ func _1528395713_add_git_commit_authorUpSql() (*asset, error) { } info := bindataFileInfo{name: "1528395713_add_git_commit_author.up.sql", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xc8, 0x82, 0x89, 0xe3, 0x7d, 0xec, 0xc9, 0x27, 0xcf, 0x21, 0xa4, 0xc4, 0xf7, 0x9b, 0x47, 0x81, 0x3b, 0xd1, 0x21, 0x8f, 0x22, 0xc0, 0xb4, 0x52, 0x33, 0x2, 0xf3, 0xaf, 0xe2, 0x70, 0x19, 0xb4}} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xa, 0xeb, 0xc6, 0xc6, 0xdc, 0x34, 0x81, 0x95, 0x11, 0x57, 0xb8, 0x10, 0x60, 0xe3, 0x16, 0x70, 0xd, 0xc9, 0x9b, 0x8b, 0x60, 0xb7, 0xe6, 0xe8, 0x94, 0x1c, 0x89, 0xe3, 0xc, 0xb6, 0x39, 0x1f}} return a, nil } From 8c17d97ef5c18d5cffbde4a147a18b8f5e683a40 Mon Sep 17 00:00:00 2001 From: Chris Pine Date: Tue, 8 Sep 2020 14:33:25 -0700 Subject: [PATCH 6/8] regenerate migrations after rebase --- migrations/bindata.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/migrations/bindata.go b/migrations/bindata.go index 853124debac2..83f9e25a3f8c 100644 --- a/migrations/bindata.go +++ b/migrations/bindata.go @@ -126,8 +126,6 @@ // 1528395711_add_soft_deleted_repository_name_func.up.sql (286B) // 1528395712_add_closing_flag_to_changesets.down.sql (71B) // 1528395712_add_closing_flag_to_changesets.up.sql (105B) -// 1528395713_add_git_commit_author.down.sql (62B) -// 1528395713_add_git_commit_author.up.sql (362B) // 1528395713_add_trigger_to_delete_orphan_repos.down.sql (102B) // 1528395713_add_trigger_to_delete_orphan_repos.up.sql (861B) // 1528395714_worker_num_failures.down.sql (1.573kB) From b4a4d9f98f7c8e027989f2d7835aadde98096dd5 Mon Sep 17 00:00:00 2001 From: Chris Pine Date: Wed, 9 Sep 2020 11:06:13 -0700 Subject: [PATCH 7/8] regenerate migrations after rebase --- ...1528395715_add_git_commit_author.down.sql} | 0 ...> 1528395715_add_git_commit_author.up.sql} | 0 migrations/bindata.go | 104 ++++++++++-------- 3 files changed, 58 insertions(+), 46 deletions(-) rename migrations/{1528395713_add_git_commit_author.down.sql => 1528395715_add_git_commit_author.down.sql} (100%) rename migrations/{1528395713_add_git_commit_author.up.sql => 1528395715_add_git_commit_author.up.sql} (100%) diff --git a/migrations/1528395713_add_git_commit_author.down.sql b/migrations/1528395715_add_git_commit_author.down.sql similarity index 100% rename from migrations/1528395713_add_git_commit_author.down.sql rename to migrations/1528395715_add_git_commit_author.down.sql diff --git a/migrations/1528395713_add_git_commit_author.up.sql b/migrations/1528395715_add_git_commit_author.up.sql similarity index 100% rename from migrations/1528395713_add_git_commit_author.up.sql rename to migrations/1528395715_add_git_commit_author.up.sql diff --git a/migrations/bindata.go b/migrations/bindata.go index 83f9e25a3f8c..ecc45b9d2a93 100644 --- a/migrations/bindata.go +++ b/migrations/bindata.go @@ -130,8 +130,8 @@ // 1528395713_add_trigger_to_delete_orphan_repos.up.sql (861B) // 1528395714_worker_num_failures.down.sql (1.573kB) // 1528395714_worker_num_failures.up.sql (1.704kB) -// 1528395715_repo_name_index_take_2.down.sql (51B) -// 1528395715_repo_name_index_take_2.up.sql (127B) +// 1528395715_add_git_commit_author.down.sql (62B) +// 1528395715_add_git_commit_author.up.sql (362B) package migrations @@ -2720,46 +2720,6 @@ func _1528395712_add_closing_flag_to_changesetsUpSql() (*asset, error) { return a, nil } -var __1528395713_add_git_commit_authorDownSql = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x72\x72\x75\xf7\xf4\xb3\xe6\xe2\xd2\xd5\x55\xf0\xcb\x2f\xc9\xc8\xcc\x4b\x57\xc8\x4b\x4d\x4d\x49\x4d\xd1\x51\xc8\xcb\xcf\xd3\x4d\x49\x2d\x2e\x29\x2a\x4d\x2e\xc9\x2c\x4b\x55\xc8\x2f\x48\x2d\x4a\x2c\xc9\xcc\xcf\xe3\xe2\x72\xf6\xf7\xf5\xf5\x0c\xb1\xe6\x02\x04\x00\x00\xff\xff\x58\x72\x8a\x01\x3e\x00\x00\x00") - -func _1528395713_add_git_commit_authorDownSqlBytes() ([]byte, error) { - return bindataRead( - __1528395713_add_git_commit_authorDownSql, - "1528395713_add_git_commit_author.down.sql", - ) -} - -func _1528395713_add_git_commit_authorDownSql() (*asset, error) { - bytes, err := _1528395713_add_git_commit_authorDownSqlBytes() - if err != nil { - return nil, err - } - - info := bindataFileInfo{name: "1528395713_add_git_commit_author.down.sql", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x50, 0x99, 0xc6, 0x3c, 0x73, 0x61, 0xb5, 0x22, 0xbf, 0x89, 0x69, 0x28, 0x29, 0x6c, 0xc6, 0x1b, 0x96, 0xa0, 0xee, 0x16, 0xd3, 0x9d, 0x28, 0x4, 0x41, 0x9a, 0xa4, 0xae, 0x88, 0x1c, 0xda, 0x6b}} - return a, nil -} - -var __1528395713_add_git_commit_authorUpSql = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x5c\x8e\x5f\x4b\xc3\x30\x14\xc5\xdf\xf3\x29\x2e\x7d\xe9\x0a\xab\xec\xb9\xc5\xe2\xd4\xa0\x7b\xd8\x14\x57\xf1\xb1\xdc\xa6\x77\x6d\x47\x93\x94\xfc\x11\xc4\xf9\xdd\x25\xeb\xe8\xc4\xf3\x92\x43\xce\x49\xce\xef\x9e\x3f\x6d\x76\x39\x4b\x53\x58\x37\x0d\x34\x74\x40\x3f\x38\xf8\xc4\xc1\x93\x85\x83\x36\xd0\xf6\x0e\x84\x96\xb2\x77\x80\xde\x75\xda\xc0\x42\xa1\x24\x40\xd5\x00\x49\xec\x87\x84\xbd\xbf\x3e\xae\x4b\x0e\xa2\x43\xd5\x92\x25\x57\xd9\x91\x84\x65\x7b\x5e\x42\x70\x70\x3b\x1d\xa7\x13\x1c\xad\x56\x55\xed\xfb\xa1\xa9\x74\x7d\x24\xe1\x16\x0c\x2e\x8a\xa7\x11\x1b\x2f\xe7\xab\x3f\x6d\x34\x06\xbf\xae\xe5\xa0\xf0\x67\x5a\xcc\xcf\xd2\x62\x15\x16\xe2\xef\x68\xc2\xdc\xa1\xa4\x28\x83\x68\xaf\xbd\x11\xd4\x1a\x1c\xbb\x68\x09\x97\x90\x07\xf0\x90\x0a\x94\x23\xf6\xad\xb2\x77\xf6\xda\xbb\x11\x5a\x46\x3f\xf1\xbc\x96\x9c\x5d\x92\x65\x01\xa8\x66\x1f\xcf\xfc\x8d\x9f\xe1\xea\x89\xab\x1a\x48\xb5\xae\x5b\xfc\x23\x4a\xa0\x80\x55\xce\x1e\x5e\xb6\xdb\x4d\x99\xb3\xdf\x00\x00\x00\xff\xff\x7f\xc5\x59\x30\x6a\x01\x00\x00") - -func _1528395713_add_git_commit_authorUpSqlBytes() ([]byte, error) { - return bindataRead( - __1528395713_add_git_commit_authorUpSql, - "1528395713_add_git_commit_author.up.sql", - ) -} - -func _1528395713_add_git_commit_authorUpSql() (*asset, error) { - bytes, err := _1528395713_add_git_commit_authorUpSqlBytes() - if err != nil { - return nil, err - } - - info := bindataFileInfo{name: "1528395713_add_git_commit_author.up.sql", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xa, 0xeb, 0xc6, 0xc6, 0xdc, 0x34, 0x81, 0x95, 0x11, 0x57, 0xb8, 0x10, 0x60, 0xe3, 0x16, 0x70, 0xd, 0xc9, 0x9b, 0x8b, 0x60, 0xb7, 0xe6, 0xe8, 0x94, 0x1c, 0x89, 0xe3, 0xc, 0xb6, 0x39, 0x1f}} - return a, nil -} - var __1528395713_add_trigger_to_delete_orphan_reposDownSql = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x72\x72\x75\xf7\xf4\xb3\xe6\xe2\x72\x09\xf2\x0f\x50\x70\x0b\xf5\x73\x0e\xf1\xf4\xf7\x53\xf0\x74\x53\x70\x8d\xf0\x0c\x0e\x09\x56\x28\xce\x4f\x2b\x89\x4f\x49\xcd\x49\x2d\x49\x8d\xcf\x2f\x2a\xc8\x48\xcc\x8b\x2f\x4a\x2d\xc8\x8f\x4f\xaa\x8c\x4f\xad\x28\x49\x2d\xca\x4b\xcc\x89\x2f\x4e\x2d\x2a\xcb\x4c\x4e\x05\x4b\x14\x6b\x68\x2a\x38\x3b\x06\x3b\x3b\xba\xb8\x5a\x73\x71\x39\xfb\xfb\xfa\x7a\x86\x58\x73\x01\x02\x00\x00\xff\xff\x5d\x64\x99\x19\x66\x00\x00\x00") func _1528395713_add_trigger_to_delete_orphan_reposDownSqlBytes() ([]byte, error) { @@ -2840,6 +2800,7 @@ func _1528395714_worker_num_failuresUpSql() (*asset, error) { return a, nil } +<<<<<<< HEAD var __1528395715_repo_name_index_take_2DownSql = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x72\x72\x75\xf7\xf4\xb3\xe6\x72\x09\xf2\x0f\x50\xf0\xf4\x73\x71\x8d\x50\xf0\x74\x53\x70\x8d\xf0\x0c\x0e\x09\x56\x28\x4a\x2d\xc8\x8f\xcf\x4b\xcc\x4d\x8d\xcf\x4c\xa9\xb0\xe6\x72\xf6\xf7\xf5\xf5\x0c\xb1\xe6\x02\x04\x00\x00\xff\xff\x46\xe0\x5c\x8d\x33\x00\x00\x00") func _1528395715_repo_name_index_take_2DownSqlBytes() ([]byte, error) { @@ -2880,6 +2841,49 @@ func _1528395715_repo_name_index_take_2UpSql() (*asset, error) { return a, nil } +||||||| constructed merge base +======= +var __1528395715_add_git_commit_authorDownSql = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x72\x72\x75\xf7\xf4\xb3\xe6\xe2\xd2\xd5\x55\xf0\xcb\x2f\xc9\xc8\xcc\x4b\x57\xc8\x4b\x4d\x4d\x49\x4d\xd1\x51\xc8\xcb\xcf\xd3\x4d\x49\x2d\x2e\x29\x2a\x4d\x2e\xc9\x2c\x4b\x55\xc8\x2f\x48\x2d\x4a\x2c\xc9\xcc\xcf\xe3\xe2\x72\xf6\xf7\xf5\xf5\x0c\xb1\xe6\x02\x04\x00\x00\xff\xff\x58\x72\x8a\x01\x3e\x00\x00\x00") + +func _1528395715_add_git_commit_authorDownSqlBytes() ([]byte, error) { + return bindataRead( + __1528395715_add_git_commit_authorDownSql, + "1528395715_add_git_commit_author.down.sql", + ) +} + +func _1528395715_add_git_commit_authorDownSql() (*asset, error) { + bytes, err := _1528395715_add_git_commit_authorDownSqlBytes() + if err != nil { + return nil, err + } + + info := bindataFileInfo{name: "1528395715_add_git_commit_author.down.sql", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x50, 0x99, 0xc6, 0x3c, 0x73, 0x61, 0xb5, 0x22, 0xbf, 0x89, 0x69, 0x28, 0x29, 0x6c, 0xc6, 0x1b, 0x96, 0xa0, 0xee, 0x16, 0xd3, 0x9d, 0x28, 0x4, 0x41, 0x9a, 0xa4, 0xae, 0x88, 0x1c, 0xda, 0x6b}} + return a, nil +} + +var __1528395715_add_git_commit_authorUpSql = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x5c\x8e\x5f\x4b\xc3\x30\x14\xc5\xdf\xf3\x29\x2e\x7d\xe9\x0a\xab\xec\xb9\xc5\xe2\xd4\xa0\x7b\xd8\x14\x57\xf1\xb1\xdc\xa6\x77\x6d\x47\x93\x94\xfc\x11\xc4\xf9\xdd\x25\xeb\xe8\xc4\xf3\x92\x43\xce\x49\xce\xef\x9e\x3f\x6d\x76\x39\x4b\x53\x58\x37\x0d\x34\x74\x40\x3f\x38\xf8\xc4\xc1\x93\x85\x83\x36\xd0\xf6\x0e\x84\x96\xb2\x77\x80\xde\x75\xda\xc0\x42\xa1\x24\x40\xd5\x00\x49\xec\x87\x84\xbd\xbf\x3e\xae\x4b\x0e\xa2\x43\xd5\x92\x25\x57\xd9\x91\x84\x65\x7b\x5e\x42\x70\x70\x3b\x1d\xa7\x13\x1c\xad\x56\x55\xed\xfb\xa1\xa9\x74\x7d\x24\xe1\x16\x0c\x2e\x8a\xa7\x11\x1b\x2f\xe7\xab\x3f\x6d\x34\x06\xbf\xae\xe5\xa0\xf0\x67\x5a\xcc\xcf\xd2\x62\x15\x16\xe2\xef\x68\xc2\xdc\xa1\xa4\x28\x83\x68\xaf\xbd\x11\xd4\x1a\x1c\xbb\x68\x09\x97\x90\x07\xf0\x90\x0a\x94\x23\xf6\xad\xb2\x77\xf6\xda\xbb\x11\x5a\x46\x3f\xf1\xbc\x96\x9c\x5d\x92\x65\x01\xa8\x66\x1f\xcf\xfc\x8d\x9f\xe1\xea\x89\xab\x1a\x48\xb5\xae\x5b\xfc\x23\x4a\xa0\x80\x55\xce\x1e\x5e\xb6\xdb\x4d\x99\xb3\xdf\x00\x00\x00\xff\xff\x7f\xc5\x59\x30\x6a\x01\x00\x00") + +func _1528395715_add_git_commit_authorUpSqlBytes() ([]byte, error) { + return bindataRead( + __1528395715_add_git_commit_authorUpSql, + "1528395715_add_git_commit_author.up.sql", + ) +} + +func _1528395715_add_git_commit_authorUpSql() (*asset, error) { + bytes, err := _1528395715_add_git_commit_authorUpSqlBytes() + if err != nil { + return nil, err + } + + info := bindataFileInfo{name: "1528395715_add_git_commit_author.up.sql", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xa, 0xeb, 0xc6, 0xc6, 0xdc, 0x34, 0x81, 0x95, 0x11, 0x57, 0xb8, 0x10, 0x60, 0xe3, 0x16, 0x70, 0xd, 0xc9, 0x9b, 0x8b, 0x60, 0xb7, 0xe6, 0xe8, 0x94, 0x1c, 0x89, 0xe3, 0xc, 0xb6, 0x39, 0x1f}} + return a, nil +} + +>>>>>>> regenerate migrations after rebase // Asset loads and returns the asset for the given name. // It returns an error if the asset could not be found or // could not be loaded. @@ -3097,14 +3101,18 @@ var _bindata = map[string]func() (*asset, error){ "1528395711_add_soft_deleted_repository_name_func.up.sql": _1528395711_add_soft_deleted_repository_name_funcUpSql, "1528395712_add_closing_flag_to_changesets.down.sql": _1528395712_add_closing_flag_to_changesetsDownSql, "1528395712_add_closing_flag_to_changesets.up.sql": _1528395712_add_closing_flag_to_changesetsUpSql, - "1528395713_add_git_commit_author.down.sql": _1528395713_add_git_commit_authorDownSql, - "1528395713_add_git_commit_author.up.sql": _1528395713_add_git_commit_authorUpSql, "1528395713_add_trigger_to_delete_orphan_repos.down.sql": _1528395713_add_trigger_to_delete_orphan_reposDownSql, "1528395713_add_trigger_to_delete_orphan_repos.up.sql": _1528395713_add_trigger_to_delete_orphan_reposUpSql, "1528395714_worker_num_failures.down.sql": _1528395714_worker_num_failuresDownSql, "1528395714_worker_num_failures.up.sql": _1528395714_worker_num_failuresUpSql, +<<<<<<< HEAD "1528395715_repo_name_index_take_2.down.sql": _1528395715_repo_name_index_take_2DownSql, "1528395715_repo_name_index_take_2.up.sql": _1528395715_repo_name_index_take_2UpSql, +||||||| constructed merge base +======= + "1528395715_add_git_commit_author.down.sql": _1528395715_add_git_commit_authorDownSql, + "1528395715_add_git_commit_author.up.sql": _1528395715_add_git_commit_authorUpSql, +>>>>>>> regenerate migrations after rebase } // AssetDebug is true if the assets were built with the debug flag enabled. @@ -3277,14 +3285,18 @@ var _bintree = &bintree{nil, map[string]*bintree{ "1528395711_add_soft_deleted_repository_name_func.up.sql": {_1528395711_add_soft_deleted_repository_name_funcUpSql, map[string]*bintree{}}, "1528395712_add_closing_flag_to_changesets.down.sql": {_1528395712_add_closing_flag_to_changesetsDownSql, map[string]*bintree{}}, "1528395712_add_closing_flag_to_changesets.up.sql": {_1528395712_add_closing_flag_to_changesetsUpSql, map[string]*bintree{}}, - "1528395713_add_git_commit_author.down.sql": {_1528395713_add_git_commit_authorDownSql, map[string]*bintree{}}, - "1528395713_add_git_commit_author.up.sql": {_1528395713_add_git_commit_authorUpSql, map[string]*bintree{}}, "1528395713_add_trigger_to_delete_orphan_repos.down.sql": {_1528395713_add_trigger_to_delete_orphan_reposDownSql, map[string]*bintree{}}, "1528395713_add_trigger_to_delete_orphan_repos.up.sql": {_1528395713_add_trigger_to_delete_orphan_reposUpSql, map[string]*bintree{}}, "1528395714_worker_num_failures.down.sql": {_1528395714_worker_num_failuresDownSql, map[string]*bintree{}}, "1528395714_worker_num_failures.up.sql": {_1528395714_worker_num_failuresUpSql, map[string]*bintree{}}, +<<<<<<< HEAD "1528395715_repo_name_index_take_2.down.sql": {_1528395715_repo_name_index_take_2DownSql, map[string]*bintree{}}, "1528395715_repo_name_index_take_2.up.sql": {_1528395715_repo_name_index_take_2UpSql, map[string]*bintree{}}, +||||||| constructed merge base +======= + "1528395715_add_git_commit_author.down.sql": {_1528395715_add_git_commit_authorDownSql, map[string]*bintree{}}, + "1528395715_add_git_commit_author.up.sql": {_1528395715_add_git_commit_authorUpSql, map[string]*bintree{}}, +>>>>>>> regenerate migrations after rebase }} // RestoreAsset restores an asset under the given directory. From 27eb31db7ce585c4ba69505d21ea7bed333276fc Mon Sep 17 00:00:00 2001 From: Chris Pine Date: Wed, 9 Sep 2020 11:20:42 -0700 Subject: [PATCH 8/8] rebase again; regenerate migrations --- ...1528395716_add_git_commit_author.down.sql} | 0 ...> 1528395716_add_git_commit_author.up.sql} | 0 migrations/bindata.go | 54 ++++++++----------- 3 files changed, 22 insertions(+), 32 deletions(-) rename migrations/{1528395715_add_git_commit_author.down.sql => 1528395716_add_git_commit_author.down.sql} (100%) rename migrations/{1528395715_add_git_commit_author.up.sql => 1528395716_add_git_commit_author.up.sql} (100%) diff --git a/migrations/1528395715_add_git_commit_author.down.sql b/migrations/1528395716_add_git_commit_author.down.sql similarity index 100% rename from migrations/1528395715_add_git_commit_author.down.sql rename to migrations/1528395716_add_git_commit_author.down.sql diff --git a/migrations/1528395715_add_git_commit_author.up.sql b/migrations/1528395716_add_git_commit_author.up.sql similarity index 100% rename from migrations/1528395715_add_git_commit_author.up.sql rename to migrations/1528395716_add_git_commit_author.up.sql diff --git a/migrations/bindata.go b/migrations/bindata.go index ecc45b9d2a93..27c8fb21a18a 100644 --- a/migrations/bindata.go +++ b/migrations/bindata.go @@ -130,8 +130,10 @@ // 1528395713_add_trigger_to_delete_orphan_repos.up.sql (861B) // 1528395714_worker_num_failures.down.sql (1.573kB) // 1528395714_worker_num_failures.up.sql (1.704kB) -// 1528395715_add_git_commit_author.down.sql (62B) -// 1528395715_add_git_commit_author.up.sql (362B) +// 1528395715_repo_name_index_take_2.down.sql (51B) +// 1528395715_repo_name_index_take_2.up.sql (127B) +// 1528395716_add_git_commit_author.down.sql (62B) +// 1528395716_add_git_commit_author.up.sql (362B) package migrations @@ -2800,7 +2802,6 @@ func _1528395714_worker_num_failuresUpSql() (*asset, error) { return a, nil } -<<<<<<< HEAD var __1528395715_repo_name_index_take_2DownSql = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x72\x72\x75\xf7\xf4\xb3\xe6\x72\x09\xf2\x0f\x50\xf0\xf4\x73\x71\x8d\x50\xf0\x74\x53\x70\x8d\xf0\x0c\x0e\x09\x56\x28\x4a\x2d\xc8\x8f\xcf\x4b\xcc\x4d\x8d\xcf\x4c\xa9\xb0\xe6\x72\xf6\xf7\xf5\xf5\x0c\xb1\xe6\x02\x04\x00\x00\xff\xff\x46\xe0\x5c\x8d\x33\x00\x00\x00") func _1528395715_repo_name_index_take_2DownSqlBytes() ([]byte, error) { @@ -2841,49 +2842,46 @@ func _1528395715_repo_name_index_take_2UpSql() (*asset, error) { return a, nil } -||||||| constructed merge base -======= -var __1528395715_add_git_commit_authorDownSql = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x72\x72\x75\xf7\xf4\xb3\xe6\xe2\xd2\xd5\x55\xf0\xcb\x2f\xc9\xc8\xcc\x4b\x57\xc8\x4b\x4d\x4d\x49\x4d\xd1\x51\xc8\xcb\xcf\xd3\x4d\x49\x2d\x2e\x29\x2a\x4d\x2e\xc9\x2c\x4b\x55\xc8\x2f\x48\x2d\x4a\x2c\xc9\xcc\xcf\xe3\xe2\x72\xf6\xf7\xf5\xf5\x0c\xb1\xe6\x02\x04\x00\x00\xff\xff\x58\x72\x8a\x01\x3e\x00\x00\x00") +var __1528395716_add_git_commit_authorDownSql = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x72\x72\x75\xf7\xf4\xb3\xe6\xe2\xd2\xd5\x55\xf0\xcb\x2f\xc9\xc8\xcc\x4b\x57\xc8\x4b\x4d\x4d\x49\x4d\xd1\x51\xc8\xcb\xcf\xd3\x4d\x49\x2d\x2e\x29\x2a\x4d\x2e\xc9\x2c\x4b\x55\xc8\x2f\x48\x2d\x4a\x2c\xc9\xcc\xcf\xe3\xe2\x72\xf6\xf7\xf5\xf5\x0c\xb1\xe6\x02\x04\x00\x00\xff\xff\x58\x72\x8a\x01\x3e\x00\x00\x00") -func _1528395715_add_git_commit_authorDownSqlBytes() ([]byte, error) { +func _1528395716_add_git_commit_authorDownSqlBytes() ([]byte, error) { return bindataRead( - __1528395715_add_git_commit_authorDownSql, - "1528395715_add_git_commit_author.down.sql", + __1528395716_add_git_commit_authorDownSql, + "1528395716_add_git_commit_author.down.sql", ) } -func _1528395715_add_git_commit_authorDownSql() (*asset, error) { - bytes, err := _1528395715_add_git_commit_authorDownSqlBytes() +func _1528395716_add_git_commit_authorDownSql() (*asset, error) { + bytes, err := _1528395716_add_git_commit_authorDownSqlBytes() if err != nil { return nil, err } - info := bindataFileInfo{name: "1528395715_add_git_commit_author.down.sql", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} + info := bindataFileInfo{name: "1528395716_add_git_commit_author.down.sql", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x50, 0x99, 0xc6, 0x3c, 0x73, 0x61, 0xb5, 0x22, 0xbf, 0x89, 0x69, 0x28, 0x29, 0x6c, 0xc6, 0x1b, 0x96, 0xa0, 0xee, 0x16, 0xd3, 0x9d, 0x28, 0x4, 0x41, 0x9a, 0xa4, 0xae, 0x88, 0x1c, 0xda, 0x6b}} return a, nil } -var __1528395715_add_git_commit_authorUpSql = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x5c\x8e\x5f\x4b\xc3\x30\x14\xc5\xdf\xf3\x29\x2e\x7d\xe9\x0a\xab\xec\xb9\xc5\xe2\xd4\xa0\x7b\xd8\x14\x57\xf1\xb1\xdc\xa6\x77\x6d\x47\x93\x94\xfc\x11\xc4\xf9\xdd\x25\xeb\xe8\xc4\xf3\x92\x43\xce\x49\xce\xef\x9e\x3f\x6d\x76\x39\x4b\x53\x58\x37\x0d\x34\x74\x40\x3f\x38\xf8\xc4\xc1\x93\x85\x83\x36\xd0\xf6\x0e\x84\x96\xb2\x77\x80\xde\x75\xda\xc0\x42\xa1\x24\x40\xd5\x00\x49\xec\x87\x84\xbd\xbf\x3e\xae\x4b\x0e\xa2\x43\xd5\x92\x25\x57\xd9\x91\x84\x65\x7b\x5e\x42\x70\x70\x3b\x1d\xa7\x13\x1c\xad\x56\x55\xed\xfb\xa1\xa9\x74\x7d\x24\xe1\x16\x0c\x2e\x8a\xa7\x11\x1b\x2f\xe7\xab\x3f\x6d\x34\x06\xbf\xae\xe5\xa0\xf0\x67\x5a\xcc\xcf\xd2\x62\x15\x16\xe2\xef\x68\xc2\xdc\xa1\xa4\x28\x83\x68\xaf\xbd\x11\xd4\x1a\x1c\xbb\x68\x09\x97\x90\x07\xf0\x90\x0a\x94\x23\xf6\xad\xb2\x77\xf6\xda\xbb\x11\x5a\x46\x3f\xf1\xbc\x96\x9c\x5d\x92\x65\x01\xa8\x66\x1f\xcf\xfc\x8d\x9f\xe1\xea\x89\xab\x1a\x48\xb5\xae\x5b\xfc\x23\x4a\xa0\x80\x55\xce\x1e\x5e\xb6\xdb\x4d\x99\xb3\xdf\x00\x00\x00\xff\xff\x7f\xc5\x59\x30\x6a\x01\x00\x00") +var __1528395716_add_git_commit_authorUpSql = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x5c\x8e\x5f\x4b\xc3\x30\x14\xc5\xdf\xf3\x29\x2e\x7d\xe9\x0a\xab\xec\xb9\xc5\xe2\xd4\xa0\x7b\xd8\x14\x57\xf1\xb1\xdc\xa6\x77\x6d\x47\x93\x94\xfc\x11\xc4\xf9\xdd\x25\xeb\xe8\xc4\xf3\x92\x43\xce\x49\xce\xef\x9e\x3f\x6d\x76\x39\x4b\x53\x58\x37\x0d\x34\x74\x40\x3f\x38\xf8\xc4\xc1\x93\x85\x83\x36\xd0\xf6\x0e\x84\x96\xb2\x77\x80\xde\x75\xda\xc0\x42\xa1\x24\x40\xd5\x00\x49\xec\x87\x84\xbd\xbf\x3e\xae\x4b\x0e\xa2\x43\xd5\x92\x25\x57\xd9\x91\x84\x65\x7b\x5e\x42\x70\x70\x3b\x1d\xa7\x13\x1c\xad\x56\x55\xed\xfb\xa1\xa9\x74\x7d\x24\xe1\x16\x0c\x2e\x8a\xa7\x11\x1b\x2f\xe7\xab\x3f\x6d\x34\x06\xbf\xae\xe5\xa0\xf0\x67\x5a\xcc\xcf\xd2\x62\x15\x16\xe2\xef\x68\xc2\xdc\xa1\xa4\x28\x83\x68\xaf\xbd\x11\xd4\x1a\x1c\xbb\x68\x09\x97\x90\x07\xf0\x90\x0a\x94\x23\xf6\xad\xb2\x77\xf6\xda\xbb\x11\x5a\x46\x3f\xf1\xbc\x96\x9c\x5d\x92\x65\x01\xa8\x66\x1f\xcf\xfc\x8d\x9f\xe1\xea\x89\xab\x1a\x48\xb5\xae\x5b\xfc\x23\x4a\xa0\x80\x55\xce\x1e\x5e\xb6\xdb\x4d\x99\xb3\xdf\x00\x00\x00\xff\xff\x7f\xc5\x59\x30\x6a\x01\x00\x00") -func _1528395715_add_git_commit_authorUpSqlBytes() ([]byte, error) { +func _1528395716_add_git_commit_authorUpSqlBytes() ([]byte, error) { return bindataRead( - __1528395715_add_git_commit_authorUpSql, - "1528395715_add_git_commit_author.up.sql", + __1528395716_add_git_commit_authorUpSql, + "1528395716_add_git_commit_author.up.sql", ) } -func _1528395715_add_git_commit_authorUpSql() (*asset, error) { - bytes, err := _1528395715_add_git_commit_authorUpSqlBytes() +func _1528395716_add_git_commit_authorUpSql() (*asset, error) { + bytes, err := _1528395716_add_git_commit_authorUpSqlBytes() if err != nil { return nil, err } - info := bindataFileInfo{name: "1528395715_add_git_commit_author.up.sql", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} + info := bindataFileInfo{name: "1528395716_add_git_commit_author.up.sql", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xa, 0xeb, 0xc6, 0xc6, 0xdc, 0x34, 0x81, 0x95, 0x11, 0x57, 0xb8, 0x10, 0x60, 0xe3, 0x16, 0x70, 0xd, 0xc9, 0x9b, 0x8b, 0x60, 0xb7, 0xe6, 0xe8, 0x94, 0x1c, 0x89, 0xe3, 0xc, 0xb6, 0x39, 0x1f}} return a, nil } ->>>>>>> regenerate migrations after rebase // Asset loads and returns the asset for the given name. // It returns an error if the asset could not be found or // could not be loaded. @@ -3105,14 +3103,10 @@ var _bindata = map[string]func() (*asset, error){ "1528395713_add_trigger_to_delete_orphan_repos.up.sql": _1528395713_add_trigger_to_delete_orphan_reposUpSql, "1528395714_worker_num_failures.down.sql": _1528395714_worker_num_failuresDownSql, "1528395714_worker_num_failures.up.sql": _1528395714_worker_num_failuresUpSql, -<<<<<<< HEAD "1528395715_repo_name_index_take_2.down.sql": _1528395715_repo_name_index_take_2DownSql, "1528395715_repo_name_index_take_2.up.sql": _1528395715_repo_name_index_take_2UpSql, -||||||| constructed merge base -======= - "1528395715_add_git_commit_author.down.sql": _1528395715_add_git_commit_authorDownSql, - "1528395715_add_git_commit_author.up.sql": _1528395715_add_git_commit_authorUpSql, ->>>>>>> regenerate migrations after rebase + "1528395716_add_git_commit_author.down.sql": _1528395716_add_git_commit_authorDownSql, + "1528395716_add_git_commit_author.up.sql": _1528395716_add_git_commit_authorUpSql, } // AssetDebug is true if the assets were built with the debug flag enabled. @@ -3289,14 +3283,10 @@ var _bintree = &bintree{nil, map[string]*bintree{ "1528395713_add_trigger_to_delete_orphan_repos.up.sql": {_1528395713_add_trigger_to_delete_orphan_reposUpSql, map[string]*bintree{}}, "1528395714_worker_num_failures.down.sql": {_1528395714_worker_num_failuresDownSql, map[string]*bintree{}}, "1528395714_worker_num_failures.up.sql": {_1528395714_worker_num_failuresUpSql, map[string]*bintree{}}, -<<<<<<< HEAD "1528395715_repo_name_index_take_2.down.sql": {_1528395715_repo_name_index_take_2DownSql, map[string]*bintree{}}, "1528395715_repo_name_index_take_2.up.sql": {_1528395715_repo_name_index_take_2UpSql, map[string]*bintree{}}, -||||||| constructed merge base -======= - "1528395715_add_git_commit_author.down.sql": {_1528395715_add_git_commit_authorDownSql, map[string]*bintree{}}, - "1528395715_add_git_commit_author.up.sql": {_1528395715_add_git_commit_authorUpSql, map[string]*bintree{}}, ->>>>>>> regenerate migrations after rebase + "1528395716_add_git_commit_author.down.sql": {_1528395716_add_git_commit_authorDownSql, map[string]*bintree{}}, + "1528395716_add_git_commit_author.up.sql": {_1528395716_add_git_commit_authorUpSql, map[string]*bintree{}}, }} // RestoreAsset restores an asset under the given directory.