diff options
author | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-08-30 09:28:15 +0300 |
---|---|---|
committer | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-08-30 09:29:08 +0300 |
commit | 8f51727d95a70058e1b7db06a022b6cd6b12198e (patch) | |
tree | 1179eaecbd32120920483fd326bcc2eaea20fc66 | |
parent | f981d4febbbb5103262f4daa858236d9c4ed9d67 (diff) |
Backport schema_changed.sh from EE which prints the diff if the schema is different
-rw-r--r-- | changelogs/unreleased/schema-changed-ee-backport.yml | 5 | ||||
-rw-r--r-- | scripts/schema_changed.sh | 13 |
2 files changed, 14 insertions, 4 deletions
diff --git a/changelogs/unreleased/schema-changed-ee-backport.yml b/changelogs/unreleased/schema-changed-ee-backport.yml new file mode 100644 index 00000000000..f3b16fc0c27 --- /dev/null +++ b/changelogs/unreleased/schema-changed-ee-backport.yml @@ -0,0 +1,5 @@ +--- +title: Backport schema_changed.sh from EE which prints the diff if the schema is different +merge_request: 21422 +author: Jasper Maes +type: other diff --git a/scripts/schema_changed.sh b/scripts/schema_changed.sh index 5de2b35571d..b5e510c2367 100644 --- a/scripts/schema_changed.sh +++ b/scripts/schema_changed.sh @@ -1,9 +1,14 @@ -function schema_changed() { - if [[ ! -z `git diff --name-only -- db/schema.rb` ]]; then - echo "db/schema.rb after rake db:migrate:reset is different from one in the repository" +#!/bin/sh + +schema_changed() { + if [ ! -z "$(git diff --name-only -- db/schema.rb)" ]; then + printf "db/schema.rb after rake db:migrate:reset is different from one in the repository" + printf "The diff is as follows:\n" + diff=$(git diff -p --binary -- db/schema.rb) + printf "%s" "$diff" exit 1 else - echo "db/schema.rb after rake db:migrate:reset matches one in the repository" + printf "db/schema.rb after rake db:migrate:reset matches one in the repository" fi } |