Skip to content

Commit 7e89f03

Browse files
authored
Merge branch 'nodejs:main' into fix-repl-history-callback-error
2 parents d84d9fb + d0c1024 commit 7e89f03

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

doc/api/sqlite.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -550,8 +550,8 @@ sql.run`INSERT INTO users VALUES (1, 'Alice')`;
550550
sql.run`INSERT INTO users VALUES (2, 'Bob')`;
551551

552552
// Using the 'get' method to retrieve a single row.
553-
const id = 1;
554-
const user = sql.get`SELECT * FROM users WHERE id = ${id}`;
553+
const name = 'Alice';
554+
const user = sql.get`SELECT * FROM users WHERE name = ${name}`;
555555
console.log(user); // { id: 1, name: 'Alice' }
556556

557557
// Using the 'all' method to retrieve all rows.
@@ -577,8 +577,8 @@ sql.run`INSERT INTO users VALUES (1, 'Alice')`;
577577
sql.run`INSERT INTO users VALUES (2, 'Bob')`;
578578

579579
// Using the 'get' method to retrieve a single row.
580-
const id = 1;
581-
const user = sql.get`SELECT * FROM users WHERE id = ${id}`;
580+
const name = 'Alice';
581+
const user = sql.get`SELECT * FROM users WHERE name = ${name}`;
582582
console.log(user); // { id: 1, name: 'Alice' }
583583

584584
// Using the 'all' method to retrieve all rows.

test/parallel/test-max-old-space-size-percentage.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ invalidPercentages.forEach((input) => {
4141
`--max-old-space-size-percentage=${input[0]}`,
4242
], { stdio: ['pipe', 'pipe', 'pipe'] });
4343
assert.notStrictEqual(result.status, 0, `Expected non-zero exit for invalid input ${input[0]}`);
44-
assert(input[1].test(result.stderr.toString()), `Unexpected error message for invalid input ${input[0]}`);
44+
assert.match(result.stderr.toString(), input[1]);
4545
});
4646

4747
// Test NODE_OPTIONS with valid percentages
@@ -61,7 +61,7 @@ invalidPercentages.forEach((input) => {
6161
env: { ...process.env, NODE_OPTIONS: `--max-old-space-size-percentage=${input[0]}` }
6262
});
6363
assert.notStrictEqual(result.status, 0, `NODE_OPTIONS: Expected non-zero exit for invalid input ${input[0]}`);
64-
assert(input[1].test(result.stderr.toString()), `NODE_OPTIONS: Unexpected error message for invalid input ${input[0]}`);
64+
assert.match(result.stderr.toString(), input[1]);
6565
});
6666

6767
// Test percentage calculation validation

test/parallel/test-tls-junk-server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ server.listen(0, common.mustCall(function() {
2828
expectedErrorMessage = new RegExp('packet length too long');
2929
};
3030
req.once('error', common.mustCall(function(err) {
31-
assert(expectedErrorMessage.test(err.message));
31+
assert.match(err.message, expectedErrorMessage);
3232
server.close();
3333
}));
3434
}));

0 commit comments

Comments
 (0)