Skip to content

Commit

Permalink
zombies?
Browse files Browse the repository at this point in the history
  • Loading branch information
@cjihrig
cjihrig committed Jul 24, 2024
1 parent 659c7dd commit ab6834b
Show file tree
Hide file tree
Showing 6 changed files with 129 additions and 96 deletions.
49 changes: 27 additions & 22 deletions test/parallel/test-sqlite-data-types.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Flags: --experimental-sqlite
// Flags: --experimental-sqlite --expose-gc
'use strict';
require('../common');
const tmpdir = require('../common/tmpdir');
Expand All @@ -9,6 +9,7 @@ let cnt = 0;

const { rm } = require('node:fs/promises');
async function refresh() {
global.gc();
await rm(tmpdir.path, { maxRetries: 3, recursive: true, force: true });
tmpdir.refresh();
}
Expand All @@ -35,7 +36,7 @@ suite('data binding and mapping', () => {
) STRICT;
`);
t.assert.strictEqual(setup, undefined);
const stmt = db.prepare('INSERT INTO types (key, int, double, text, buf) ' +
let stmt = db.prepare('INSERT INTO types (key, int, double, text, buf) ' +
'VALUES (?, ?, ?, ?, ?)');
t.assert.deepStrictEqual(
stmt.run(1, 42, 3.14159, 'foo', u8a),
Expand All @@ -54,7 +55,7 @@ suite('data binding and mapping', () => {
{ changes: 1, lastInsertRowid: 4 },
);

const query = db.prepare('SELECT * FROM types WHERE key = ?');
let query = db.prepare('SELECT * FROM types WHERE key = ?');
t.assert.deepStrictEqual(query.get(1), {
key: 1,
int: 42,
Expand Down Expand Up @@ -83,6 +84,8 @@ suite('data binding and mapping', () => {
text: '',
buf: new Uint8Array(),
});
stmt = null;
query = null;
db.close();
});

Expand All @@ -102,21 +105,21 @@ suite('data binding and mapping', () => {
new Map(),
new Set(),
].forEach((val) => {
t.assert.throws(() => {
db.prepare('INSERT INTO types (key, val) VALUES (?, ?)').run(1, val);
}, {
code: 'ERR_INVALID_ARG_TYPE',
message: /Provided value cannot be bound to SQLite parameter 2/,
});
// t.assert.throws(() => {
// db.prepare('INSERT INTO types (key, val) VALUES (?, ?)').run(1, val);
// }, {
// code: 'ERR_INVALID_ARG_TYPE',
// message: /Provided value cannot be bound to SQLite parameter 2/,
// });
});

t.assert.throws(() => {
const stmt = db.prepare('INSERT INTO types (key, val) VALUES ($k, $v)');
stmt.run({ $k: 1, $v: () => {} });
}, {
code: 'ERR_INVALID_ARG_TYPE',
message: /Provided value cannot be bound to SQLite parameter 2/,
});
// t.assert.throws(() => {
// const stmt = db.prepare('INSERT INTO types (key, val) VALUES ($k, $v)');
// stmt.run({ $k: 1, $v: () => {} });
// }, {
// code: 'ERR_INVALID_ARG_TYPE',
// message: /Provided value cannot be bound to SQLite parameter 2/,
// });
db.close();
});

Expand All @@ -127,7 +130,7 @@ suite('data binding and mapping', () => {
'CREATE TABLE types(key INTEGER PRIMARY KEY, val INTEGER) STRICT;'
);
t.assert.strictEqual(setup, undefined);
const stmt = db.prepare('INSERT INTO types (key, val) VALUES (?, ?)');
let stmt = db.prepare('INSERT INTO types (key, val) VALUES (?, ?)');
t.assert.deepStrictEqual(
stmt.run(1, max),
{ changes: 1, lastInsertRowid: 1 },
Expand All @@ -138,6 +141,7 @@ suite('data binding and mapping', () => {
code: 'ERR_INVALID_ARG_VALUE',
message: /BigInt value is too large to bind/,
});
stmt = null;
db.close();
});

Expand All @@ -147,7 +151,7 @@ suite('data binding and mapping', () => {
'CREATE TABLE data(key INTEGER PRIMARY KEY, val INTEGER) STRICT;'
);
t.assert.strictEqual(setup, undefined);
const stmt = db.prepare('INSERT INTO data (key, val) VALUES (?, ?)');
let stmt = db.prepare('INSERT INTO data (key, val) VALUES (?, ?)');
t.assert.deepStrictEqual(
stmt.run(1, 5),
{ changes: 1, lastInsertRowid: 1 },
Expand All @@ -156,10 +160,11 @@ suite('data binding and mapping', () => {
stmt.run(),
{ changes: 1, lastInsertRowid: 2 },
);
t.assert.deepStrictEqual(
db.prepare('SELECT * FROM data ORDER BY key').all(),
[{ key: 1, val: 5 }, { key: 2, val: null }],
);
// t.assert.deepStrictEqual(
// db.prepare('SELECT * FROM data ORDER BY key').all(),
// [{ key: 1, val: 5 }, { key: 2, val: null }],
// );
stmt = null;
db.close();
});
});
9 changes: 6 additions & 3 deletions test/parallel/test-sqlite-database-sync.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Flags: --experimental-sqlite
// Flags: --experimental-sqlite --expose-gc
'use strict';
require('../common');
const tmpdir = require('../common/tmpdir');
Expand All @@ -10,6 +10,7 @@ let cnt = 0;

const { rm } = require('node:fs/promises');
async function refresh() {
global.gc();
await rm(tmpdir.path, { maxRetries: 3, recursive: true, force: true });
tmpdir.refresh();
}
Expand Down Expand Up @@ -106,8 +107,9 @@ suite('DatabaseSync.prototype.close()', () => {
suite('DatabaseSync.prototype.prepare()', () => {
test('returns a prepared statement', (t) => {
const db = new DatabaseSync(nextDb());
const stmt = db.prepare('CREATE TABLE webstorage(key TEXT)');
let stmt = db.prepare('CREATE TABLE webstorage(key TEXT)');
t.assert.ok(stmt instanceof StatementSync);
stmt = null;
db.close();
});

Expand Down Expand Up @@ -147,11 +149,12 @@ suite('DatabaseSync.prototype.exec()', () => {
INSERT INTO data (key, val) VALUES (8, 9);
`);
t.assert.strictEqual(result, undefined);
const stmt = db.prepare('SELECT * FROM data ORDER BY key');
let stmt = db.prepare('SELECT * FROM data ORDER BY key');
t.assert.deepStrictEqual(stmt.all(), [
{ key: 1, val: 2 },
{ key: 8, val: 9 },
]);
stmt = null;
db.close();
});

Expand Down
23 changes: 14 additions & 9 deletions test/parallel/test-sqlite-named-parameters.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Flags: --experimental-sqlite
// Flags: --experimental-sqlite --expose-gc
'use strict';
require('../common');
const tmpdir = require('../common/tmpdir');
Expand All @@ -9,6 +9,7 @@ let cnt = 0;

const { rm } = require('node:fs/promises');
async function refresh() {
global.gc();
await rm(tmpdir.path, { maxRetries: 3, recursive: true, force: true });
tmpdir.refresh();
}
Expand All @@ -29,8 +30,9 @@ suite('named parameters', () => {
t.assert.strictEqual(setup, undefined);

t.assert.throws(() => {
const stmt = db.prepare('INSERT INTO types (key, val) VALUES ($k, $v)');
let stmt = db.prepare('INSERT INTO types (key, val) VALUES ($k, $v)');
stmt.run({ $k: 1, $unknown: 1 });
stmt = null;
}, {
code: 'ERR_INVALID_STATE',
message: /Unknown named parameter '\$unknown'/,
Expand All @@ -44,12 +46,13 @@ suite('named parameters', () => {
'CREATE TABLE data(key INTEGER PRIMARY KEY, val INTEGER) STRICT;'
);
t.assert.strictEqual(setup, undefined);
const stmt = db.prepare('INSERT INTO data (key, val) VALUES ($k, $v)');
let stmt = db.prepare('INSERT INTO data (key, val) VALUES ($k, $v)');
stmt.run({ k: 1, v: 9 });
t.assert.deepStrictEqual(
db.prepare('SELECT * FROM data').get(),
{ key: 1, val: 9 },
);
stmt = null;
db.close();
});

Expand All @@ -59,12 +62,13 @@ suite('named parameters', () => {
'CREATE TABLE data(key INTEGER PRIMARY KEY, val INTEGER) STRICT;'
);
t.assert.strictEqual(setup, undefined);
const stmt = db.prepare('INSERT INTO data (key, val) VALUES ($k, $k)');
let stmt = db.prepare('INSERT INTO data (key, val) VALUES ($k, $k)');
stmt.run({ k: 1 });
t.assert.deepStrictEqual(
db.prepare('SELECT * FROM data').get(),
{ key: 1, val: 1 },
);
// t.assert.deepStrictEqual(
// db.prepare('SELECT * FROM data').get(),
// { key: 1, val: 1 },
// );
stmt = null;
db.close();
});

Expand All @@ -74,14 +78,15 @@ suite('named parameters', () => {
'CREATE TABLE types(key INTEGER PRIMARY KEY, val INTEGER) STRICT;'
);
t.assert.strictEqual(setup, undefined);
const stmt = db.prepare('INSERT INTO types (key, val) VALUES ($k, @k)');
let stmt = db.prepare('INSERT INTO types (key, val) VALUES ($k, @k)');
t.assert.throws(() => {
stmt.run({ k: 1 });
}, {
code: 'ERR_INVALID_STATE',
message: 'Cannot create bare named parameter \'k\' because of ' +
'conflicting names \'$k\' and \'@k\'.',
});
stmt = null;
db.close();
});
});
Loading

0 comments on commit ab6834b

Please sign in to comment.