Skip to content

Commit 223f663

Browse files
committed
stack changes
1 parent f271d9f commit 223f663

File tree

1 file changed

+26
-16
lines changed

1 file changed

+26
-16
lines changed

templates/cli/lib/commands/push.js.twig

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1744,22 +1744,32 @@ const checkAndApplyTablesDBChanges = async () => {
17441744
remote: chalk.red('(does not exist)'),
17451745
local: chalk.green(`${localDB.name} (${localDB.$id})`)
17461746
});
1747-
} else if (remoteDB.name !== localDB.name) {
1748-
toUpdate.push(localDB);
1749-
changes.push({
1750-
id: localDB.$id,
1751-
key: 'Name',
1752-
remote: chalk.red(remoteDB.name),
1753-
local: chalk.green(localDB.name)
1754-
});
1755-
} else if (remoteDB.enabled !== localDB.enabled) {
1756-
toUpdate.push(localDB);
1757-
changes.push({
1758-
id: localDB.$id,
1759-
key: 'Enabled?',
1760-
remote: chalk.red(remoteDB.enabled),
1761-
local: chalk.green(localDB.enabled)
1762-
});
1747+
} else {
1748+
let hasChanges = false;
1749+
1750+
if (remoteDB.name !== localDB.name) {
1751+
hasChanges = true;
1752+
changes.push({
1753+
id: localDB.$id,
1754+
key: 'Name',
1755+
remote: chalk.red(remoteDB.name),
1756+
local: chalk.green(localDB.name)
1757+
});
1758+
}
1759+
1760+
if (remoteDB.enabled !== localDB.enabled) {
1761+
hasChanges = true;
1762+
changes.push({
1763+
id: localDB.$id,
1764+
key: 'Enabled?',
1765+
remote: chalk.red(remoteDB.enabled),
1766+
local: chalk.green(localDB.enabled)
1767+
});
1768+
}
1769+
1770+
if (hasChanges) {
1771+
toUpdate.push(localDB);
1772+
}
17631773
}
17641774
}
17651775

0 commit comments

Comments
 (0)