Commit ec785083 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Make sure db:check-schema can catch corrupted structure.sql

This is done by migrating to the previous major version in
`db:check-schema` and then run migrations, it'll only be basing on
`db/structure.sql` from last major version rather than blindly using the
currently committed `db/structure.sql`.
parent f6ddd1b3
...@@ -345,10 +345,13 @@ db:migrate:reset: ...@@ -345,10 +345,13 @@ db:migrate:reset:
db:check-schema: db:check-schema:
extends: extends:
- .db-job-base - db:migrate-from-previous-major-version
- .rails:rules:ee-mr-and-default-branch-only - .rails:rules:ee-mr-and-default-branch-only
variables:
TAG_TO_CHECKOUT: "v14.4.0"
script: script:
- source scripts/schema_changed.sh - run_timed_command "bundle exec rake db:migrate"
- scripts/schema_changed.sh
- scripts/validate_migration_timestamps - scripts/validate_migration_timestamps
db:check-migrations: db:check-migrations:
...@@ -367,7 +370,8 @@ db:migrate-from-previous-major-version: ...@@ -367,7 +370,8 @@ db:migrate-from-previous-major-version:
SETUP_DB: "false" SETUP_DB: "false"
PROJECT_TO_CHECKOUT: "gitlab-foss" PROJECT_TO_CHECKOUT: "gitlab-foss"
TAG_TO_CHECKOUT: "v13.12.9" TAG_TO_CHECKOUT: "v13.12.9"
script: before_script:
- !reference [.default-before_script, before_script]
- '[[ -d "ee/" ]] || export PROJECT_TO_CHECKOUT="gitlab"' - '[[ -d "ee/" ]] || export PROJECT_TO_CHECKOUT="gitlab"'
- '[[ -d "ee/" ]] || export TAG_TO_CHECKOUT="${TAG_TO_CHECKOUT}-ee"' - '[[ -d "ee/" ]] || export TAG_TO_CHECKOUT="${TAG_TO_CHECKOUT}-ee"'
- retry 'git fetch https://gitlab.com/gitlab-org/$PROJECT_TO_CHECKOUT.git $TAG_TO_CHECKOUT' - retry 'git fetch https://gitlab.com/gitlab-org/$PROJECT_TO_CHECKOUT.git $TAG_TO_CHECKOUT'
...@@ -376,6 +380,7 @@ db:migrate-from-previous-major-version: ...@@ -376,6 +380,7 @@ db:migrate-from-previous-major-version:
- run_timed_command "bundle exec rake db:drop db:create db:structure:load db:migrate db:seed_fu" - run_timed_command "bundle exec rake db:drop db:create db:structure:load db:migrate db:seed_fu"
- git checkout -f $CI_COMMIT_SHA - git checkout -f $CI_COMMIT_SHA
- SETUP_DB=false USE_BUNDLE_INSTALL=true bash scripts/prepare_build.sh - SETUP_DB=false USE_BUNDLE_INSTALL=true bash scripts/prepare_build.sh
script:
- run_timed_command "bundle exec rake db:migrate" - run_timed_command "bundle exec rake db:migrate"
db:rollback: db:rollback:
......
#!/bin/sh #!/bin/sh
schema_changed() { if [ ! -z "$(git diff --name-only -- db/structure.sql)" ]; then
if [ ! -z "$(git diff --name-only -- db/structure.sql)" ]; then printf "Schema changes are not cleanly committed to db/structure.sql\n"
printf "Schema changes are not cleanly committed to db/structure.sql\n" printf "The diff is as follows:\n"
printf "The diff is as follows:\n" diff=$(git diff -p --binary -- db/structure.sql)
diff=$(git diff -p --binary -- db/structure.sql) printf "%s" "$diff"
printf "%s" "$diff" exit 1
exit 1 else
else printf "Schema changes are correctly applied to db/structure.sql\n"
printf "Schema changes are correctly applied to db/structure.sql\n" fi
fi
if [ ! -z "$(git add -A -n db/schema_migrations)" ]; then if [ ! -z "$(git add -A -n db/schema_migrations)" ]; then
printf "Schema version files have not been committed to the repository:\n" printf "Schema version files have not been committed to the repository:\n"
printf "The following files should be committed:\n" printf "The following files should be committed:\n"
diff=$(git add -A -n db/schema_migrations) diff=$(git add -A -n db/schema_migrations)
printf "%s" "$diff" printf "%s" "$diff"
exit 2 exit 2
else else
printf "Schema changes are correctly applied to db/structure.sql and db/schema_migrations/\n" printf "Schema changes are correctly applied to db/structure.sql and db/schema_migrations/\n"
fi fi
}
schema_changed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment