Skip to content

Commit bf2e50b

Browse files
author
gitlab
committed
Merge branch 'simplify-baseline' into 'master'
simplify the creation of an empty baseline See merge request zstackio/zstack!6094
2 parents e29b07e + 4eb0bd2 commit bf2e50b

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

conf/deploydb.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,8 @@ url="jdbc:mysql://$host:$port/zstack"
4848
bash $flyway -user=$user -password=$password -url=$url clean
4949

5050
# create baseline and clean its contents for 'beforeValidate.sql'
51-
mysql_run -se "SELECT table_name FROM information_schema.tables WHERE table_name = 'schema_version'" | \
52-
grep -wq schema_version || \
53-
( bash $flyway -user=$user -password=$password -url=$url baseline; mysql_run zstack -e "DELETE FROM schema_version" )
51+
bash $flyway -user=$user -password=$password -url=$url baseline
52+
mysql_run zstack -e "DELETE FROM schema_version"
5453

5554
bash $flyway -user=$user -password=$password -url=$url migrate
5655

0 commit comments

Comments
 (0)