@@ -78,7 +78,11 @@ console.log(query.all());
7878<!-- YAML
7979added: v22.5.0
8080changes:
81+ <<<<<<< HEAD
8182 - version: v24.0.0
83+ =======
84+ - version: v22.16.0
85+ >>>>>>> 9774069718 (2025-05-21, Version 22.16.0 'Jod' (LTS))
8286 pr-url: https://github.com/nodejs/node/pull/57752
8387 description: Add `timeout` option.
8488 - version:
@@ -130,7 +134,11 @@ Constructs a new `DatabaseSync` instance.
130134### ` database.aggregate(name, options) `
131135
132136<!-- YAML
137+ <<<<<<< HEAD
133138added: v24.0.0
139+ =======
140+ added: v22.16.0
141+ >>>>>>> 9774069718 (2025-05-21, Version 22.16.0 'Jod' (LTS))
134142-->
135143
136144Registers a new aggregate function with the SQLite database. This method is a wrapper around
@@ -246,7 +254,11 @@ loading extensions for security reasons.
246254### ` database.location([dbName]) `
247255
248256<!-- YAML
257+ <<<<<<< HEAD
249258added: v24.0.0
259+ =======
260+ added: v22.16.0
261+ >>>>>>> 9774069718 (2025-05-21, Version 22.16.0 'Jod' (LTS))
250262-->
251263
252264* ` dbName ` {string} Name of the database. This can be ` 'main' ` (the default primary database) or any other
@@ -311,7 +323,11 @@ added:
311323### ` database.isTransaction `
312324
313325<!-- YAML
326+ <<<<<<< HEAD
314327added: v24.0.0
328+ =======
329+ added: v22.16.0
330+ >>>>>>> 9774069718 (2025-05-21, Version 22.16.0 'Jod' (LTS))
315331-->
316332
317333* {boolean} Whether the database is currently within a transaction. This method
@@ -508,7 +524,11 @@ the values in `namedParameters` and `anonymousParameters`.
508524### ` statement.columns() `
509525
510526<!-- YAML
527+ <<<<<<< HEAD
511528added: v23.11.0
529+ =======
530+ added: v22.16.0
531+ >>>>>>> 9774069718 (2025-05-21, Version 22.16.0 'Jod' (LTS))
512532-->
513533
514534* Returns: {Array} An array of objects. Each object corresponds to a column
@@ -714,11 +734,15 @@ exception.
714734## ` sqlite.backup(sourceDb, path[, options]) `
715735
716736<!-- YAML
737+ <<<<<<< HEAD
717738added: v23.8.0
718739changes:
719740 - version: v23.10.0
720741 pr-url: https://github.com/nodejs/node/pull/56991
721742 description: The `path` argument now supports Buffer and URL objects.
743+ =======
744+ added: v22.16.0
745+ >>>>>>> 9774069718 (2025-05-21, Version 22.16.0 'Jod' (LTS))
722746-->
723747
724748* ` sourceDb ` {DatabaseSync} The database to backup. The source database must be open.
0 commit comments