From 67fc0baaed632155d0115bfc9f907ebb87c29130 Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Fri, 21 Jun 2024 17:41:59 +0800 Subject: [PATCH 1/9] fix: lint migration github action failed for pull request from contributor --- .github/workflows/lint-migrations.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint-migrations.yml b/.github/workflows/lint-migrations.yml index c1587f696..5770af018 100644 --- a/.github/workflows/lint-migrations.yml +++ b/.github/workflows/lint-migrations.yml @@ -10,9 +10,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 + - name: Fetch main branch + run: git fetch origin main:main - name: Find modified migrations run: | - modified_migrations=$(git diff --diff-filter=d --name-only origin/$GITHUB_BASE_REF...origin/$GITHUB_HEAD_REF 'packages/db/migrations/*.do.*.sql') + modified_migrations=$(git diff --diff-filter=d --name-only main 'packages/db/migrations/*.do.*.sql') echo "$modified_migrations" echo "::set-output name=file_names::$modified_migrations" id: modified-migrations From f64e85be5bc713d4664d6b746f249584c16f7bd3 Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Fri, 21 Jun 2024 17:44:19 +0800 Subject: [PATCH 2/9] create a test migration sql --- packages/db/migrations/0183.do.test.sql | 14 ++++++++++++++ packages/db/migrations/0183.undo.test.sql | 7 +++++++ 2 files changed, 21 insertions(+) create mode 100755 packages/db/migrations/0183.do.test.sql create mode 100755 packages/db/migrations/0183.undo.test.sql diff --git a/packages/db/migrations/0183.do.test.sql b/packages/db/migrations/0183.do.test.sql new file mode 100755 index 000000000..5ac85ac63 --- /dev/null +++ b/packages/db/migrations/0183.do.test.sql @@ -0,0 +1,14 @@ +-- Type: DO +-- Name: test +-- Description: test + +BEGIN; + +CREATE TABLE omnivore.test ( + id UUID PRIMARY KEY DEFAULT uuid_generate_v1mc(), + name TEXT NOT NULL, + created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP +); + +COMMIT; diff --git a/packages/db/migrations/0183.undo.test.sql b/packages/db/migrations/0183.undo.test.sql new file mode 100755 index 000000000..811a356c3 --- /dev/null +++ b/packages/db/migrations/0183.undo.test.sql @@ -0,0 +1,7 @@ +-- Type: UNDO +-- Name: test +-- Description: test + +BEGIN; + +COMMIT; From 38f7317cf8eb0cedf5c6c9da5fea58c183e1b950 Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Fri, 21 Jun 2024 17:50:12 +0800 Subject: [PATCH 3/9] replace set-output command with github env var --- .github/workflows/lint-migrations.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/lint-migrations.yml b/.github/workflows/lint-migrations.yml index 5770af018..24df2ad47 100644 --- a/.github/workflows/lint-migrations.yml +++ b/.github/workflows/lint-migrations.yml @@ -16,8 +16,7 @@ jobs: run: | modified_migrations=$(git diff --diff-filter=d --name-only main 'packages/db/migrations/*.do.*.sql') echo "$modified_migrations" - echo "::set-output name=file_names::$modified_migrations" - id: modified-migrations + echo "{FILE_NAMES}={$modified_migrations}" >> $GITHUB_OUTPUT - uses: sbdchd/squawk-action@v1 with: - pattern: ${{ steps.modified-migrations.outputs.file_names }} + pattern: $FILE_NAMES From 81da0eee4f60520eb55fa0dd6acfba8eca5b8f16 Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Fri, 21 Jun 2024 17:52:06 +0800 Subject: [PATCH 4/9] more testing --- packages/db/migrations/0183.do.test.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/db/migrations/0183.do.test.sql b/packages/db/migrations/0183.do.test.sql index 5ac85ac63..872c82fbe 100755 --- a/packages/db/migrations/0183.do.test.sql +++ b/packages/db/migrations/0183.do.test.sql @@ -11,4 +11,6 @@ CREATE TABLE omnivore.test ( updated_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP ); +CREATE TRIGGER update_test_modtime BEFORE UPDATE ON omnivore.test FOR EACH ROW EXECUTE PROCEDURE update_updated_at_column(); + COMMIT; From 96d6fb965366ca77dce65b2483d9cfb7ab6deb58 Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Fri, 21 Jun 2024 17:59:25 +0800 Subject: [PATCH 5/9] use github env var correctly --- .github/workflows/lint-migrations.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-migrations.yml b/.github/workflows/lint-migrations.yml index 24df2ad47..3105ff9ed 100644 --- a/.github/workflows/lint-migrations.yml +++ b/.github/workflows/lint-migrations.yml @@ -19,4 +19,4 @@ jobs: echo "{FILE_NAMES}={$modified_migrations}" >> $GITHUB_OUTPUT - uses: sbdchd/squawk-action@v1 with: - pattern: $FILE_NAMES + pattern: "$FILE_NAMES" From a15c6793117f8fbe76d96bb8634c96864a535705 Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Fri, 21 Jun 2024 18:03:26 +0800 Subject: [PATCH 6/9] fix typo --- .github/workflows/lint-migrations.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint-migrations.yml b/.github/workflows/lint-migrations.yml index 3105ff9ed..00350abcd 100644 --- a/.github/workflows/lint-migrations.yml +++ b/.github/workflows/lint-migrations.yml @@ -16,7 +16,8 @@ jobs: run: | modified_migrations=$(git diff --diff-filter=d --name-only main 'packages/db/migrations/*.do.*.sql') echo "$modified_migrations" - echo "{FILE_NAMES}={$modified_migrations}" >> $GITHUB_OUTPUT + echo "file_names=$modified_migrations" >> $GITHUB_OUTPUT + id: modified-migrations - uses: sbdchd/squawk-action@v1 with: - pattern: "$FILE_NAMES" + pattern: ${{ steps.modified-migrations.outputs.file_names }} From 538eb382175ce024e0432aa587cbaf7b4e11432a Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Fri, 21 Jun 2024 18:06:12 +0800 Subject: [PATCH 7/9] more testing --- packages/db/migrations/0183.do.test.sql | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/db/migrations/0183.do.test.sql b/packages/db/migrations/0183.do.test.sql index 872c82fbe..5ac85ac63 100755 --- a/packages/db/migrations/0183.do.test.sql +++ b/packages/db/migrations/0183.do.test.sql @@ -11,6 +11,4 @@ CREATE TABLE omnivore.test ( updated_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP ); -CREATE TRIGGER update_test_modtime BEFORE UPDATE ON omnivore.test FOR EACH ROW EXECUTE PROCEDURE update_updated_at_column(); - COMMIT; From d0b790f48b5b04972b927ad0c7d48888cf2c3e45 Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Fri, 21 Jun 2024 18:09:30 +0800 Subject: [PATCH 8/9] more testing --- packages/db/migrations/0183.do.test.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/db/migrations/0183.do.test.sql b/packages/db/migrations/0183.do.test.sql index 5ac85ac63..b0ab4eeea 100755 --- a/packages/db/migrations/0183.do.test.sql +++ b/packages/db/migrations/0183.do.test.sql @@ -11,4 +11,6 @@ CREATE TABLE omnivore.test ( updated_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP ); +CREATE INDEX test_name_idx ON omnivore.test (name); + COMMIT; From 95f3725dfa4b35f21aa0067dfadb767a36fc2add Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Fri, 21 Jun 2024 18:11:07 +0800 Subject: [PATCH 9/9] remove testing sql --- packages/db/migrations/0183.do.test.sql | 16 ---------------- packages/db/migrations/0183.undo.test.sql | 7 ------- 2 files changed, 23 deletions(-) delete mode 100755 packages/db/migrations/0183.do.test.sql delete mode 100755 packages/db/migrations/0183.undo.test.sql diff --git a/packages/db/migrations/0183.do.test.sql b/packages/db/migrations/0183.do.test.sql deleted file mode 100755 index b0ab4eeea..000000000 --- a/packages/db/migrations/0183.do.test.sql +++ /dev/null @@ -1,16 +0,0 @@ --- Type: DO --- Name: test --- Description: test - -BEGIN; - -CREATE TABLE omnivore.test ( - id UUID PRIMARY KEY DEFAULT uuid_generate_v1mc(), - name TEXT NOT NULL, - created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP, - updated_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP -); - -CREATE INDEX test_name_idx ON omnivore.test (name); - -COMMIT; diff --git a/packages/db/migrations/0183.undo.test.sql b/packages/db/migrations/0183.undo.test.sql deleted file mode 100755 index 811a356c3..000000000 --- a/packages/db/migrations/0183.undo.test.sql +++ /dev/null @@ -1,7 +0,0 @@ --- Type: UNDO --- Name: test --- Description: test - -BEGIN; - -COMMIT;