summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-22 15:09:49 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-22 15:09:49 +0000
commitf2dfd9ee819afb07bf11bd36a5f9d23009be0d39 (patch)
treeedd9468dc9c6c55f9882175fd83a1aadec22edf0 /scripts
parent058c34839488502fcec48d805b83728f928a318c (diff)
downloadgitlab-ce-f2dfd9ee819afb07bf11bd36a5f9d23009be0d39.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/schema_changed.sh8
-rw-r--r--scripts/utils.sh2
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/schema_changed.sh b/scripts/schema_changed.sh
index b5e510c2367..e8c120e92e1 100755
--- a/scripts/schema_changed.sh
+++ b/scripts/schema_changed.sh
@@ -1,14 +1,14 @@
#!/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"
+ if [ ! -z "$(git diff --name-only -- db/structure.sql)" ]; then
+ printf "db/structure.sql 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)
+ diff=$(git diff -p --binary -- db/structure.sql)
printf "%s" "$diff"
exit 1
else
- printf "db/schema.rb after rake db:migrate:reset matches one in the repository"
+ printf "db/structure.sql after rake db:migrate:reset matches one in the repository"
fi
}
diff --git a/scripts/utils.sh b/scripts/utils.sh
index c32be9c9438..d1f98bb3f62 100644
--- a/scripts/utils.sh
+++ b/scripts/utils.sh
@@ -20,7 +20,7 @@ function setup_db_user_only() {
function setup_db() {
setup_db_user_only
- bundle exec rake db:drop db:create db:schema:load db:migrate
+ bundle exec rake db:drop db:create db:structure:load db:migrate
bundle exec rake gitlab:db:setup_ee
}