fix: SQLite Directory Selection to Prefer Config Directory (#995)

* fix: Prefer config.database.directory for SQLite directory if available - Updated SQLite directory selection to use config.database.directory if provided. * add test and use ternary * changeset --------- Co-authored-by: typedarray <[email protected]>
ponder-sh · Jul 24, 2024 · 44f7bbc · 44f7bbc
1 parent 99b3a20
commit 44f7bbc
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 1 deletion.
diff --git a/.changeset/metal-apes-care.md b/.changeset/metal-apes-care.md
@@ -0,0 +1,5 @@
+---
+"@ponder/core": patch
+---
+
+Fixed a bug where the SQLite `directory` option in `ponder.config.ts` was not respected.
diff --git a/packages/core/src/build/configAndIndexingFunctions.test.ts b/packages/core/src/build/configAndIndexingFunctions.test.ts
@@ -640,6 +640,27 @@ test("buildConfigAndIndexingFunctions() database uses sqlite by default", async
   process.env.DATABASE_URL = prev;
 });
 
+test("buildConfigAndIndexingFunctions() database respects custom sqlite path", async () => {
+  const config = createConfig({
+    database: { kind: "sqlite", directory: "custom-sqlite/directory" },
+    networks: { mainnet: { chainId: 1, transport: http() } },
+    contracts: { a: { network: "mainnet", abi: [event0] } },
+  });
+
+  const { databaseConfig } = await buildConfigAndIndexingFunctions({
+    config,
+    rawIndexingFunctions: [{ name: "a:Event0", fn: () => {} }],
+    options,
+  });
+
+  console.log(databaseConfig);
+
+  expect(databaseConfig).toMatchObject({
+    kind: "sqlite",
+    directory: expect.stringContaining(path.join("custom-sqlite", "directory")),
+  });
+});
+
 test("buildConfigAndIndexingFunctions() database uses sqlite if specified even if DATABASE_URL env var present", async () => {
   const config = createConfig({
     database: { kind: "sqlite" },

diff --git a/packages/core/src/build/configAndIndexingFunctions.ts b/packages/core/src/build/configAndIndexingFunctions.ts
@@ -54,7 +54,12 @@ export async function buildConfigAndIndexingFunctions({
   // Build database.
   let databaseConfig: DatabaseConfig;
 
-  const sqliteDir = path.join(ponderDir, "sqlite");
+  // Determine SQLite directory, preferring config.database.directory if available
+  const sqliteDir =
+    config.database?.kind === "sqlite" && config.database.directory
+      ? path.resolve(config.database.directory)
+      : path.join(ponderDir, "sqlite");
+
   const sqlitePrintPath = path.relative(rootDir, sqliteDir);
 
   if (config.database?.kind) {