@astrojs/db 0.9.1 → 0.9.3

package/dist/core/cli/commands/push/index.js

@@ -19,10 +19,11 @@ async function cmd({
   const appToken = await getManagedAppTokenOrExit(flags.token);
   const productionSnapshot = await getProductionCurrentSnapshot({ appToken: appToken.token });
   const currentSnapshot = createCurrentSnapshot(dbConfig);
-  const isFromScratch = isForceReset || !productionSnapshot;
+  const isFromScratch = !productionSnapshot;
   const { queries: migrationQueries, confirmations } = await getMigrationQueries({
     oldSnapshot: isFromScratch ? createEmptySnapshot() : productionSnapshot,
-    newSnapshot: currentSnapshot
+    newSnapshot: currentSnapshot,
+    reset: isForceReset
   });
   if (migrationQueries.length === 0) {
     console.log("Database schema is up to date.");

package/dist/core/cli/migration-queries.d.ts

@@ -1,7 +1,8 @@
 import { type DBConfig, type DBSnapshot, type DBTable } from '../types.js';
-export declare function getMigrationQueries({ oldSnapshot, newSnapshot, }: {
+export declare function getMigrationQueries({ oldSnapshot, newSnapshot, reset, }: {
     oldSnapshot: DBSnapshot;
     newSnapshot: DBSnapshot;
+    reset?: boolean;
 }): Promise<{
     queries: string[];
     confirmations: string[];

package/dist/core/cli/migration-queries.js

@@ -24,10 +24,16 @@ const sqlite = new SQLiteAsyncDialect();
 const genTempTableName = customAlphabet("abcdefghijklmnopqrstuvwxyz", 10);
 async function getMigrationQueries({
   oldSnapshot,
-  newSnapshot
+  newSnapshot,
+  reset = false
 }) {
   const queries = [];
   const confirmations = [];
+  if (reset) {
+    const currentSnapshot = oldSnapshot;
+    oldSnapshot = createEmptySnapshot();
+    queries.push(...getDropTableQueriesForSnapshot(currentSnapshot));
+  }
   const addedCollections = getAddedCollections(oldSnapshot, newSnapshot);
   const droppedTables = getDroppedCollections(oldSnapshot, newSnapshot);
   const notDeprecatedDroppedTables = Object.fromEntries(
@@ -346,6 +352,14 @@ async function getProductionCurrentSnapshot({
   }
   return result.data;
 }
+function getDropTableQueriesForSnapshot(snapshot) {
+  const queries = [];
+  for (const collectionName of Object.keys(snapshot.schema)) {
+    const dropQuery = `DROP TABLE ${sqlite.escapeName(collectionName)}`;
+    queries.unshift(dropQuery);
+  }
+  return queries;
+}
 function createCurrentSnapshot({ tables = {} }) {
   const schema = JSON.parse(JSON.stringify(tables));
   return { version: MIGRATION_VERSION, schema };

package/dist/core/cli/print-help.js

@@ -27,7 +27,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"0.9.1"}`
+        `v${"0.9.3"}`
       )} ${headline}`
     );
   }

package/dist/core/integration/vite-plugin-db.js

@@ -94,7 +94,10 @@ function getStudioVirtualModContents({
   return `
 import {asDrizzleTable, createRemoteDatabaseClient} from ${RUNTIME_IMPORT};
 
-export const db = await createRemoteDatabaseClient(process.env.ASTRO_STUDIO_APP_TOKEN);
+export const db = await createRemoteDatabaseClient(process.env.ASTRO_STUDIO_APP_TOKEN ?? ${JSON.stringify(
+    appToken
+    // Respect runtime env for user overrides in SSR
+  )}, import.meta.env.ASTRO_STUDIO_REMOTE_DB_URL ?? ${JSON.stringify(getRemoteDatabaseUrl())});
 
 export * from ${RUNTIME_CONFIG_IMPORT};
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/db",
-  "version": "0.9.1",
+  "version": "0.9.3",
   "description": "",
   "license": "MIT",
   "type": "module",
@@ -81,8 +81,8 @@
     "mocha": "^10.2.0",
     "typescript": "^5.2.2",
     "vite": "^5.1.4",
-    "astro": "4.5.8",
-    "astro-scripts": "0.0.14"
+    "astro-scripts": "0.0.14",
+    "astro": "4.5.8"
   },
   "scripts": {
     "types:config": "tsc -p ./tsconfig.config-types.json",