src: return undefined if no rows are returned in SQLite

deokjinkim · RafaelGSS · commit 3fdcf7a47d28 · 2024-08-05T11:15:43.000-03:00
For now, { key: null, value: null} is returned even though no rows are returned from database when `statement.get()` is called. So return empty value if return value of `sqlite3_step` is `SQLITE_DONE`. PR-URL: #53981 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
diff --git a/src/node_sqlite.cc b/src/node_sqlite.cc
@@ -480,7 +480,8 @@ void StatementSync::Get(const FunctionCallbackInfo<Value>& args) {
 
   auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt->statement_); });
   r = sqlite3_step(stmt->statement_);
-  if (r != SQLITE_ROW && r != SQLITE_DONE) {
+  if (r == SQLITE_DONE) return;
+  if (r != SQLITE_ROW) {
     THROW_ERR_SQLITE_ERROR(env->isolate(), stmt->db_);
     return;
   }
diff --git a/test/parallel/test-sqlite.js b/test/parallel/test-sqlite.js
@@ -219,7 +219,9 @@ suite('StatementSync() constructor', () => {
 suite('StatementSync.prototype.get()', () => {
   test('executes a query and returns undefined on no results', (t) => {
     const db = new DatabaseSync(nextDb());
-    const stmt = db.prepare('CREATE TABLE storage(key TEXT, val TEXT)');
+    let stmt = db.prepare('CREATE TABLE storage(key TEXT, val TEXT)');
+    t.assert.strictEqual(stmt.get(), undefined);
+    stmt = db.prepare('SELECT * FROM storage');
     t.assert.strictEqual(stmt.get(), undefined);
   });
 

Original file line number	Diff line number	Diff line change
`@@ -480,7 +480,8 @@ void StatementSync::Get(const FunctionCallbackInfo<Value>& args) {`
`480`	`480`
`481`	`481`	`auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt->statement_); });`
`482`	`482`	`r = sqlite3_step(stmt->statement_);`
`483`		`- if (r != SQLITE_ROW && r != SQLITE_DONE) {`
	`483`	`+ if (r == SQLITE_DONE) return;`
	`484`	`+ if (r != SQLITE_ROW) {`
`484`	`485`	`THROW_ERR_SQLITE_ERROR(env->isolate(), stmt->db_);`
`485`	`486`	`return;`
`486`	`487`	`}`