Skip to content

test: use ERM to destroy sqlite database handles after tests #63076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Renegade334 wants to merge 1 commit into
base: main
Choose a base branch
from
+46 −86
Open

test: use ERM to destroy sqlite database handles after tests #63076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 0 additions & 33 deletions test/parallel/test-sqlite-database-sync-dispose.js
View file
Open in desktop

This file was deleted.

99 changes: 46 additions & 53 deletions test/parallel/test-sqlite-database-sync.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,19 +89,18 @@ suite('DatabaseSync() constructor', () => {

test('is not read-only by default', (t) => {
const dbPath = nextDb();
const db = new DatabaseSync(dbPath);
using db = new DatabaseSync(dbPath);
db.exec('CREATE TABLE foo (id INTEGER PRIMARY KEY)');
});

test('is read-only if readOnly is set', (t) => {
const dbPath = nextDb();
{
const db = new DatabaseSync(dbPath);
using db = new DatabaseSync(dbPath);
db.exec('CREATE TABLE foo (id INTEGER PRIMARY KEY)');
db.close();
}
{
const db = new DatabaseSync(dbPath, { readOnly: true });
using db = new DatabaseSync(dbPath, { readOnly: true });
t.assert.throws(() => {
db.exec('CREATE TABLE bar (id INTEGER PRIMARY KEY)');
}, {
Expand All @@ -122,12 +121,11 @@ suite('DatabaseSync() constructor', () => {

test('enables foreign key constraints by default', (t) => {
const dbPath = nextDb();
const db = new DatabaseSync(dbPath);
using db = new DatabaseSync(dbPath);
db.exec(`
CREATE TABLE foo (id INTEGER PRIMARY KEY);
CREATE TABLE bar (foo_id INTEGER REFERENCES foo(id));
`);
t.after(() => { db.close(); });
t.assert.throws(() => {
db.exec('INSERT INTO bar (foo_id) VALUES (1)');
}, {
Expand All @@ -138,12 +136,11 @@ suite('DatabaseSync() constructor', () => {

test('allows disabling foreign key constraints', (t) => {
const dbPath = nextDb();
const db = new DatabaseSync(dbPath, { enableForeignKeyConstraints: false });
using db = new DatabaseSync(dbPath, { enableForeignKeyConstraints: false });
db.exec(`
CREATE TABLE foo (id INTEGER PRIMARY KEY);
CREATE TABLE bar (foo_id INTEGER REFERENCES foo(id));
`);
t.after(() => { db.close(); });
db.exec('INSERT INTO bar (foo_id) VALUES (1)');
});

Expand All @@ -158,8 +155,7 @@ suite('DatabaseSync() constructor', () => {

test('disables double-quoted string literals by default', (t) => {
const dbPath = nextDb();
const db = new DatabaseSync(dbPath);
t.after(() => { db.close(); });
using db = new DatabaseSync(dbPath);
t.assert.throws(() => {
db.exec('SELECT "foo";');
}, {
Expand All @@ -170,8 +166,7 @@ suite('DatabaseSync() constructor', () => {

test('allows enabling double-quoted string literals', (t) => {
const dbPath = nextDb();
const db = new DatabaseSync(dbPath, { enableDoubleQuotedStringLiterals: true });
t.after(() => { db.close(); });
using db = new DatabaseSync(dbPath, { enableDoubleQuotedStringLiterals: true });
db.exec('SELECT "foo";');
});

Expand All @@ -186,8 +181,7 @@ suite('DatabaseSync() constructor', () => {

test('allows reading big integers', (t) => {
const dbPath = nextDb();
const db = new DatabaseSync(dbPath, { readBigInts: true });
t.after(() => { db.close(); });
using db = new DatabaseSync(dbPath, { readBigInts: true });

const setup = db.exec(`
CREATE TABLE data(key INTEGER PRIMARY KEY, val INTEGER) STRICT;
Expand Down Expand Up @@ -216,8 +210,7 @@ suite('DatabaseSync() constructor', () => {

test('allows returning arrays', (t) => {
const dbPath = nextDb();
const db = new DatabaseSync(dbPath, { returnArrays: true });
t.after(() => { db.close(); });
using db = new DatabaseSync(dbPath, { returnArrays: true });
const setup = db.exec(`
CREATE TABLE data(key INTEGER PRIMARY KEY, val TEXT) STRICT;
INSERT INTO data (key, val) VALUES (1, 'one');
Expand All @@ -240,8 +233,7 @@ suite('DatabaseSync() constructor', () => {

test('throws if bare named parameters are used when option is false', (t) => {
const dbPath = nextDb();
const db = new DatabaseSync(dbPath, { allowBareNamedParameters: false });
t.after(() => { db.close(); });
using db = new DatabaseSync(dbPath, { allowBareNamedParameters: false });
const setup = db.exec(
'CREATE TABLE data(key INTEGER PRIMARY KEY, val INTEGER) STRICT;'
);
Expand All @@ -267,8 +259,7 @@ suite('DatabaseSync() constructor', () => {

test('allows unknown named parameters', (t) => {
const dbPath = nextDb();
const db = new DatabaseSync(dbPath, { allowUnknownNamedParameters: true });
t.after(() => { db.close(); });
using db = new DatabaseSync(dbPath, { allowUnknownNamedParameters: true });
const setup = db.exec(
'CREATE TABLE data(key INTEGER, val INTEGER) STRICT;'
);
Expand All @@ -284,8 +275,7 @@ suite('DatabaseSync() constructor', () => {

test('has sqlite-type symbol property', (t) => {
const dbPath = nextDb();
const db = new DatabaseSync(dbPath);
t.after(() => { db.close(); });
using db = new DatabaseSync(dbPath);

const sqliteTypeSymbol = Symbol.for('sqlite-type');
t.assert.strictEqual(db[sqliteTypeSymbol], 'node:sqlite');
Expand All @@ -295,8 +285,7 @@ suite('DatabaseSync() constructor', () => {
suite('DatabaseSync.prototype.open()', () => {
test('opens a database connection', (t) => {
const dbPath = nextDb();
const db = new DatabaseSync(dbPath, { open: false });
t.after(() => { db.close(); });
using db = new DatabaseSync(dbPath, { open: false });

t.assert.strictEqual(db.isOpen, false);
t.assert.strictEqual(existsSync(dbPath), false);
Expand All @@ -306,8 +295,7 @@ suite('DatabaseSync.prototype.open()', () => {
});

test('throws if database is already open', (t) => {
const db = new DatabaseSync(nextDb(), { open: false });
t.after(() => { db.close(); });
using db = new DatabaseSync(nextDb(), { open: false });

t.assert.strictEqual(db.isOpen, false);
db.open();
Expand All @@ -324,15 +312,15 @@ suite('DatabaseSync.prototype.open()', () => {

suite('DatabaseSync.prototype.close()', () => {
test('closes an open database connection', (t) => {
const db = new DatabaseSync(nextDb());
using db = new DatabaseSync(nextDb());

t.assert.strictEqual(db.isOpen, true);
t.assert.strictEqual(db.close(), undefined);
t.assert.strictEqual(db.isOpen, false);
});

test('throws if database is not open', (t) => {
const db = new DatabaseSync(nextDb(), { open: false });
using db = new DatabaseSync(nextDb(), { open: false });

t.assert.strictEqual(db.isOpen, false);
t.assert.throws(() => {
Expand All @@ -347,14 +335,13 @@ suite('DatabaseSync.prototype.close()', () => {

suite('DatabaseSync.prototype.prepare()', () => {
test('returns a prepared statement', (t) => {
const db = new DatabaseSync(nextDb());
t.after(() => { db.close(); });
using db = new DatabaseSync(nextDb());
const stmt = db.prepare('CREATE TABLE webstorage(key TEXT)');
t.assert.ok(stmt instanceof StatementSync);
});

test('throws if database is not open', (t) => {
const db = new DatabaseSync(nextDb(), { open: false });
using db = new DatabaseSync(nextDb(), { open: false });

t.assert.throws(() => {
db.prepare();
Expand All @@ -365,8 +352,7 @@ suite('DatabaseSync.prototype.prepare()', () => {
});

test('throws if sql is not a string', (t) => {
const db = new DatabaseSync(nextDb());
t.after(() => { db.close(); });
using db = new DatabaseSync(nextDb());

t.assert.throws(() => {
db.prepare();
Expand All @@ -379,8 +365,7 @@ suite('DatabaseSync.prototype.prepare()', () => {

suite('DatabaseSync.prototype.exec()', () => {
test('executes SQL', (t) => {
const db = new DatabaseSync(nextDb());
t.after(() => { db.close(); });
using db = new DatabaseSync(nextDb());
const result = db.exec(`
CREATE TABLE data(
key INTEGER PRIMARY KEY,
Expand All @@ -398,8 +383,7 @@ suite('DatabaseSync.prototype.exec()', () => {
});

test('reports errors from SQLite', (t) => {
const db = new DatabaseSync(nextDb());
t.after(() => { db.close(); });
using db = new DatabaseSync(nextDb());

t.assert.throws(() => {
db.exec('CREATE TABLEEEE');
Expand All @@ -419,7 +403,7 @@ suite('DatabaseSync.prototype.exec()', () => {
});

test('throws if database is not open', (t) => {
const db = new DatabaseSync(nextDb(), { open: false });
using db = new DatabaseSync(nextDb(), { open: false });

t.assert.throws(() => {
db.exec();
Expand All @@ -430,8 +414,7 @@ suite('DatabaseSync.prototype.exec()', () => {
});

test('throws if sql is not a string', (t) => {
const db = new DatabaseSync(nextDb());
t.after(() => { db.close(); });
using db = new DatabaseSync(nextDb());

t.assert.throws(() => {
db.exec();
Expand All @@ -444,7 +427,7 @@ suite('DatabaseSync.prototype.exec()', () => {

suite('DatabaseSync.prototype.isTransaction', () => {
test('correctly detects a committed transaction', (t) => {
const db = new DatabaseSync(':memory:');
using db = new DatabaseSync(':memory:');

t.assert.strictEqual(db.isTransaction, false);
db.exec('BEGIN');
Expand All @@ -456,7 +439,7 @@ suite('DatabaseSync.prototype.isTransaction', () => {
});

test('correctly detects a rolled back transaction', (t) => {
const db = new DatabaseSync(':memory:');
using db = new DatabaseSync(':memory:');

t.assert.strictEqual(db.isTransaction, false);
db.exec('BEGIN');
Expand All @@ -468,7 +451,7 @@ suite('DatabaseSync.prototype.isTransaction', () => {
});

test('throws if database is not open', (t) => {
const db = new DatabaseSync(nextDb(), { open: false });
using db = new DatabaseSync(nextDb(), { open: false });

t.assert.throws(() => {
return db.isTransaction;
Expand All @@ -481,7 +464,7 @@ suite('DatabaseSync.prototype.isTransaction', () => {

suite('DatabaseSync.prototype.location()', () => {
test('throws if database is not open', (t) => {
const db = new DatabaseSync(nextDb(), { open: false });
using db = new DatabaseSync(nextDb(), { open: false });

t.assert.throws(() => {
db.location();
Expand All @@ -492,8 +475,7 @@ suite('DatabaseSync.prototype.location()', () => {
});

test('throws if provided dbName is not string', (t) => {
const db = new DatabaseSync(nextDb());
t.after(() => { db.close(); });
using db = new DatabaseSync(nextDb());

t.assert.throws(() => {
db.location(null);
Expand All @@ -504,24 +486,20 @@ suite('DatabaseSync.prototype.location()', () => {
});

test('returns null when connected to in-memory database', (t) => {
const db = new DatabaseSync(':memory:');
using db = new DatabaseSync(':memory:');
t.assert.strictEqual(db.location(), null);
});

test('returns db path when connected to a persistent database', (t) => {
const dbPath = nextDb();
const db = new DatabaseSync(dbPath);
t.after(() => { db.close(); });
using db = new DatabaseSync(dbPath);
t.assert.strictEqual(db.location(), dbPath);
});

test('returns that specific db path when attached', (t) => {
const dbPath = nextDb();
const otherPath = nextDb();
const db = new DatabaseSync(dbPath);
t.after(() => { db.close(); });
const other = new DatabaseSync(dbPath);
t.after(() => { other.close(); });
using db = new DatabaseSync(dbPath);

// Adding this escape because the test with unusual chars have a single quote which breaks the query
const escapedPath = otherPath.replace("'", "''");
Expand All @@ -530,3 +508,18 @@ suite('DatabaseSync.prototype.location()', () => {
t.assert.strictEqual(db.location('other'), otherPath);
});
});

suite('DatabaseSync.prototype[Symbol.dispose]', () => {
Copy link
Copy Markdown
Contributor

@louwers louwers May 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overlaps with https://github.com/nodejs/node/pull/62978/changes#diff-b3427a71eaab21cd7b294bf8d58b8ac86b5b1d9cc1083b52e243d5571a3a0c30

Copy link
Copy Markdown
Member Author

@Renegade334 Renegade334 May 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Should be a straightforward conflict to resolve in either direction.

test('closes an open database', (t) => {
const db = new DatabaseSync(nextDb());
t.assert.strictEqual(db.isOpen, true);
db[Symbol.dispose]();
t.assert.strictEqual(db.isOpen, false);
});

test('does not throw on databases that are not open', (t) => {
const db = new DatabaseSync(nextDb(), { open: false });
t.assert.strictEqual(db.isOpen, false);
db[Symbol.dispose]();
});
});
Loading