Separate calls in sql channel

This commit is contained in:
Fedor Indutny 2024-08-12 12:54:24 -07:00 committed by GitHub
parent 85b130a12d
commit 9a98ae0a4e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 90 additions and 45 deletions

View file

@ -11,7 +11,7 @@ import type {
WrappedWorkerLogEntry,
} from './main';
import type { WritableDB } from './Interface';
import { initialize, DataReader, DataWriter } from './Server';
import { initialize, DataReader, DataWriter, removeDB } from './Server';
import { SqliteErrorKind, parseSqliteError } from './errors';
if (!parentPort) {
@ -102,6 +102,31 @@ port.on('message', ({ seq, request }: WrappedWorkerRequest) => {
return;
}
// Removing database does not require active connection.
if (request.type === 'removeDB') {
try {
if (db) {
if (isPrimary) {
DataWriter.close(db);
} else {
DataReader.close(db);
}
db = undefined;
}
} catch (error) {
logger.error('Failed to close database before removal');
}
if (isPrimary) {
removeDB();
}
isRemoved = true;
respond(seq, undefined, undefined);
return;
}
if (!db) {
throw new Error('Not initialized');
}
@ -119,20 +144,6 @@ port.on('message', ({ seq, request }: WrappedWorkerRequest) => {
return;
}
if (request.type === 'removeDB') {
if (isPrimary) {
DataWriter.removeDB(db);
} else {
DataReader.close(db);
}
isRemoved = true;
db = undefined;
respond(seq, undefined, undefined);
return;
}
if (request.type === 'sqlCall:read' || request.type === 'sqlCall:write') {
const DataInterface =
request.type === 'sqlCall:read' ? DataReader : DataWriter;