nodejs
diff --git a/‎doc/api/sqlite.md
Copy file name to clipboardExpand all lines: doc/api/sqlite.md
+3-3Lines changed: 3 additions & 3 deletions b/‎doc/api/sqlite.md
Copy file name to clipboardExpand all lines: doc/api/sqlite.md
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎src/node_sqlite.cc
Copy file name to clipboardExpand all lines: src/node_sqlite.cc
+15-8Lines changed: 15 additions & 8 deletions b/‎src/node_sqlite.cc
Copy file name to clipboardExpand all lines: src/node_sqlite.cc
+15-8Lines changed: 15 additions & 8 deletions
diff --git a/‎test/parallel/test-sqlite-database-sync.js
Copy file name to clipboardExpand all lines: test/parallel/test-sqlite-database-sync.js
+5-4Lines changed: 5 additions & 4 deletions b/‎test/parallel/test-sqlite-database-sync.js
Copy file name to clipboardExpand all lines: test/parallel/test-sqlite-database-sync.js
+5-4Lines changed: 5 additions & 4 deletions
@@ -248,9 +248,9 @@ added: REPLACEME
 -->
 
 * `dbName` {string} Name of the database. This can be `'main'` (the default primary database) or any other
-  database that have been added with [`ATTACH DATABASE`][] **Default:** `'main'`.
-* Returns: {string} The location of the database file. When using an `in-memory` database,
-  this method returns an empty string.
+  database that has been added with [`ATTACH DATABASE`][] **Default:** `'main'`.
+* Returns: {string | null} The location of the database file. When using an in-memory database,
+  this method returns null.
 
 This method is a wrapper around [`sqlite3_db_filename()`][]
 
 
@@ -1181,23 +1181,29 @@ void DatabaseSync::Location(const FunctionCallbackInfo<Value>& args) {
   Environment* env = Environment::GetCurrent(args);
   THROW_AND_RETURN_ON_BAD_STATE(env, !db->IsOpen(), "database is not open");
 
-  std::string db_name = "main";
+  std::string_view db_name = "main";
   if (!args[0]->IsUndefined()) {
     if (!args[0]->IsString()) {
       THROW_ERR_INVALID_ARG_TYPE(env->isolate(),
                                  "The \"dbName\" argument must be a string.");
       return;
     }
 
-    db_name = Utf8Value(env->isolate(), args[0].As<String>()).ToString();
+    Utf8Value db_name_utf8(env->isolate(), args[0].As<String>());
+    db_name = *db_name_utf8 ? *db_name_utf8 : "";
   }
 
   const char* db_filename =
-      sqlite3_db_filename(db->connection_, db_name.c_str());
+      sqlite3_db_filename(db->connection_, std::string(db_name).c_str());
+  if (!db_filename || db_filename[0] == '\0') {
+    args.GetReturnValue().Set(Null(env->isolate()));
+    return;
+  }
 
-  args.GetReturnValue().Set(
-      String::NewFromUtf8(env->isolate(), db_filename, NewStringType::kNormal)
-          .ToLocalChecked());
+  Local<String> ret;
+  if (String::NewFromUtf8(env->isolate(), db_filename).ToLocal(&ret)) {
+    args.GetReturnValue().Set(ret);
+  }
 }
 
 void DatabaseSync::AggregateFunction(const FunctionCallbackInfo<Value>& args) {
@@ -1320,7 +1326,7 @@ void DatabaseSync::AggregateFunction(const FunctionCallbackInfo<Value>& args) {
       return;
     }
 
-    // Subract 1 because the first argument is the aggregate value.
+    // Sutract 1 because the first argument is the aggregate value.
     argc = js_len.As<Int32>()->Value() - 1;
     if (!inverseFunc.IsEmpty() &&
         !inverseFunc->Get(env->context(), env->length_string())
@@ -2632,7 +2638,8 @@ static void Initialize(Local<Object> target,
   SetProtoMethod(isolate, db_tmpl, "prepare", DatabaseSync::Prepare);
   SetProtoMethod(isolate, db_tmpl, "exec", DatabaseSync::Exec);
   SetProtoMethod(isolate, db_tmpl, "function", DatabaseSync::CustomFunction);
-  SetProtoMethod(isolate, db_tmpl, "location", DatabaseSync::Location);
+  SetProtoMethodNoSideEffect(
+      isolate, db_tmpl, "location", DatabaseSync::Location);
   SetProtoMethod(
       isolate, db_tmpl, "aggregate", DatabaseSync::AggregateFunction);
   SetProtoMethod(
 
@@ -339,6 +339,7 @@ suite('DatabaseSync.prototype.location()', () => {
 
   test('throws if provided dbName is not string', (t) => {
     const db = new DatabaseSync(nextDb());
+    t.after(() => { db.close(); });
 
     t.assert.throws(() => {
       db.location(null);
@@ -348,16 +349,16 @@ suite('DatabaseSync.prototype.location()', () => {
     });
   });
 
-  test('returns empty string when connected to in-memory database', (t) => {
+  test('returns null when connected to in-memory database', (t) => {
     const db = new DatabaseSync(':memory:');
-    t.assert.equal(db.location(), '');
+    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(); });
-    t.assert.equal(db.location(), dbPath);
+    t.assert.strictEqual(db.location(), dbPath);
   });
 
   test('returns that specific db path when attached', (t) => {
@@ -372,6 +373,6 @@ suite('DatabaseSync.prototype.location()', () => {
     const escapedPath = otherPath.replace("'", "''");
     db.exec(`ATTACH DATABASE '${escapedPath}' AS other`);
 
-    t.assert.equal(db.location('other'), otherPath);
+    t.assert.strictEqual(db.location('other'), otherPath);
   });
 });