for

Author: e1arikawa

packages/duckdb-wasm/src/bindings/runtime_browser.ts

@@ -142,22 +142,27 @@ export const BROWSER_RUNTIME: DuckDBRuntime & {
                         dirHandle = await dirHandle.getDirectoryHandle(folder, { create: isReadWrite });
                     }
                 }
-                const fileHandle = await dirHandle.getFileHandle(fileName, { create: false }).catch(e => {
+                let fileHandle:FileSystemFileHandle;
+                try {
+                    fileHandle = await dirHandle.getFileHandle(fileName, { create: false });
+                } catch (e:any) {
                     if (e?.name === 'NotFoundError') {
                         if (isReadWrite) {
-                            console.debug(`File ${path} does not exists yet, creating...`);
-                            return dirHandle.getFileHandle(fileName, { create: true });
+                            console.debug(`File ${ path } does not exists yet, creating...`);
+                            fileHandle = await dirHandle.getFileHandle(fileName, { create: true });
+                        } else {
+                            console.debug(`File ${ path } does not exists, aborting as we are in read-only mode`);
+                            throw e;
                         }
-                        console.debug(`File ${path} does not exists, aborting as we are in read-only mode`);
+                    } else {
+                        throw e;
                     }
-                    throw e;
-                });
+                }
                 try {
-                    let createSyncAccessMode:'read-only' | 'readwrite' | 'readwrite-unsafe' = "read-only";
-                    if( isReadWrite ){
-                        createSyncAccessMode = isReadWrite ? "readwrite" : "readwrite-unsafe";
-                    }
-                    const handle = await fileHandle.createSyncAccessHandle(createSyncAccessMode);
+                    let syncAccessHandleMode:FileSystemSyncAccessHandleMode = isReadWrite ? "readwrite" : "readwrite-unsafe";
+                    const handle = await fileHandle.createSyncAccessHandle({
+                         mode : syncAccessHandleMode
+                    });
                     BROWSER_RUNTIME._preparedHandles[path] = handle;
                     return {
                         path,
@@ -178,10 +183,10 @@ export const BROWSER_RUNTIME: DuckDBRuntime & {
         throw new Error(`Unsupported protocol ${protocol} for paths ${filePaths} with protocol ${protocol}`);
     },
     /** Prepare a file handle that could only be acquired asynchronously */
-    async prepareDBFileHandle(dbPath: string, protocol: DuckDBDataProtocol, accessMode: DuckDBAccessMode): Promise<PreparedDBFileHandle[]> {
+    async prepareDBFileHandle(dbPath: string, protocol: DuckDBDataProtocol, accessMode: DuckDBAccessMode, multiWindowMode:boolean): Promise<PreparedDBFileHandle[]> {
         if (protocol === DuckDBDataProtocol.BROWSER_FSACCESS && this.prepareFileHandles) {
             const filePaths = [dbPath, `${dbPath}.wal`];
-            return this.prepareFileHandles(filePaths, protocol, accessMode);
+            return this.prepareFileHandles(filePaths, protocol, accessMode, multiWindowMode);
         }
         throw new Error(`Unsupported protocol ${protocol} for path ${dbPath} with protocol ${protocol}`);
     },

packages/duckdb-wasm/test/filesystem.test.ts

@@ -237,6 +237,8 @@ export function testFilesystem(
             //);
             //expect(schema_script.trim()).toEqual(`CREATE TABLE foo(v BIGINT);`);
             //expect(csv_buffer.trim()).toEqual(`1\n2\n3\n4\n5`);
+
+            await conn.query('DROP TABLE foo');
         });
 
         it('Generate Series as Parquet', async () => {
@@ -264,6 +266,8 @@ export function testFilesystem(
             expect(content.nullCount).toEqual(0);
             expect(content.numRows).toEqual(5);
             expect(content.getChildAt(0)?.toArray()).toEqual(new Int32Array([1, 2, 3, 4, 5]));
+            
+            await conn.query('DROP TABLE foo');
         });
     });