Skip to content

Commit 2069bba

Browse files
committed
Refresh branch schema before generating diff
1 parent c2e3aa9 commit 2069bba

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

ps-create-helper-functions.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,22 @@ function create-deploy-request {
6565
if [ -n "$CI" ]; then
6666
echo "::set-output name=DEPLOY_REQUEST_URL::$deploy_request"
6767
echo "::set-output name=DEPLOY_REQUEST_NUMBER::$deploy_request_number"
68-
create-diff-for-ci "$DB_NAME" "$ORG_NAME" "$deploy_request_number"
68+
create-diff-for-ci "$DB_NAME" "$ORG_NAME" "$deploy_request_number" "$BRANCH_NAME"
6969
fi
7070
}
7171

7272
function create-diff-for-ci {
7373
local DB_NAME=$1
7474
local ORG_NAME=$2
7575
local deploy_request_number=$3
76+
local BRANCH_NAME=$4
7677

7778
local deploy_request="https://app.planetscale.com/${ORG_NAME}/${DB_NAME}/deploy-requests/${deploy_request_number}"
7879
local BRANCH_DIFF="Diff could not be generated for deploy request $deploy_request"
7980

81+
# updating schema for branch
82+
pscale branch refresh-schema "$DB_NAME" "$BRANCH_NAME" --org "$ORG_NAME"
83+
8084
local lines=""
8185
# read shell output line by line and assign to variable
8286
while read -r line; do
@@ -123,7 +127,7 @@ function create-deployment {
123127
exit 1
124128
fi
125129
else
126-
create-diff-for-ci "$DB_NAME" "$ORG_NAME" "$deploy_request_number"
130+
create-diff-for-ci "$DB_NAME" "$ORG_NAME" "$deploy_request_number" "$BRANCH_NAME"
127131
fi
128132

129133
pscale deploy-request deploy "$DB_NAME" "$deploy_request_number" --org "$ORG_NAME"

update-db-branch.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ DEPLOY_REQUEST_NUMBER="$3"
1313

1414
. ps-create-helper-functions.sh
1515
create-schema-change "$DB_NAME" "$BRANCH_NAME" "$ORG_NAME" "$DDL_STATEMENTS"
16-
create-diff-for-ci "$DB_NAME" "$ORG_NAME" "$DEPLOY_REQUEST_NUMBER"
16+
create-diff-for-ci "$DB_NAME" "$ORG_NAME" "$DEPLOY_REQUEST_NUMBER" "$BRANCH_NAME"

0 commit comments

Comments
 (0)