Infrastructure/astro
0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2024-12-16 21:46:22 -05:00
Code Issues Activity

handle undefined snapshot from API (#10378)

Browse source
This commit is contained in:
Fred K. Schott 2024-03-10 23:56:01 -07:00 committed by GitHub
parent dfdf6b3a0b
commit 41dca1e413
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/rotten-snakes-sip.md Normal file
View file

@ -0,0 +1,5 @@
---
"@astrojs/db": patch
---
Handle new schema API response format

2
packages/db/src/core/cli/commands/push/index.ts
View file

@ -25,7 +25,7 @@ export async function cmd({
const appToken = await getManagedAppTokenOrExit(flags.token); const appToken = await getManagedAppTokenOrExit(flags.token);
const productionSnapshot = await getProductionCurrentSnapshot({ appToken: appToken.token }); const productionSnapshot = await getProductionCurrentSnapshot({ appToken: appToken.token });
const currentSnapshot = createCurrentSnapshot(dbConfig); const currentSnapshot = createCurrentSnapshot(dbConfig);
const isFromScratch = isForceReset || JSON.stringify(productionSnapshot) === '{}'; const isFromScratch = isForceReset || !productionSnapshot;
const { queries: migrationQueries, confirmations } = await getMigrationQueries({ const { queries: migrationQueries, confirmations } = await getMigrationQueries({
oldSnapshot: isFromScratch ? createEmptySnapshot() : productionSnapshot, oldSnapshot: isFromScratch ? createEmptySnapshot() : productionSnapshot,
newSnapshot: currentSnapshot, newSnapshot: currentSnapshot,

3
packages/db/src/core/cli/commands/verify/index.ts
View file

@ -23,8 +23,7 @@ export async function cmd({
const productionSnapshot = await getProductionCurrentSnapshot({ appToken: appToken.token }); const productionSnapshot = await getProductionCurrentSnapshot({ appToken: appToken.token });
const currentSnapshot = createCurrentSnapshot(dbConfig); const currentSnapshot = createCurrentSnapshot(dbConfig);
const { queries: migrationQueries, confirmations } = await getMigrationQueries({ const { queries: migrationQueries, confirmations } = await getMigrationQueries({
oldSnapshot: oldSnapshot: productionSnapshot || createEmptySnapshot(),
JSON.stringify(productionSnapshot) !== '{}' ? productionSnapshot : createEmptySnapshot(),
newSnapshot: currentSnapshot, newSnapshot: currentSnapshot,
}); });

2
packages/db/src/core/cli/migration-queries.ts
View file

@ -423,7 +423,7 @@ export async function getProductionCurrentSnapshot({
appToken, appToken,
}: { }: {
appToken: string; appToken: string;
}): Promise<DBSnapshot> { }): Promise<DBSnapshot | undefined> {
const url = new URL('/db/schema', getRemoteDatabaseUrl()); const url = new URL('/db/schema', getRemoteDatabaseUrl());
const response = await fetch(url, { const response = await fetch(url, {