sqlite: add database property on payload

Author: araujogui

src/node_sqlite.cc

@@ -2457,6 +2457,7 @@ int DatabaseSync::TraceCallback(unsigned int type,
 
   Isolate* isolate = env->isolate();
   HandleScope handle_scope(isolate);
+  Local<Context> context = env->context();
 
   char* expanded = sqlite3_expanded_sql(static_cast<sqlite3_stmt*>(p));
   Local<Value> sql_string;
@@ -2475,7 +2476,21 @@ int DatabaseSync::TraceCallback(unsigned int type,
     }
   }
 
-  ch->Publish(env, sql_string);
+  Local<Object> payload = Object::New(isolate);
+  if (payload
+          ->Set(context,
+                FIXED_ONE_BYTE_STRING(isolate, "sql"),
+                sql_string)
+          .IsNothing() ||
+      payload
+          ->Set(context,
+                FIXED_ONE_BYTE_STRING(isolate, "database"),
+                db->object())
+          .IsNothing()) {
+    return 0;
+  }
+
+  ch->Publish(env, payload);
 
   return 0;
 }

test/parallel/test-sqlite-trace.js

@@ -14,24 +14,24 @@ suite('sqlite.db.query diagnostics channel', () => {
     const db = new DatabaseSync(':memory:');
     t.after(() => db.close());
 
-    const handler = (sql) => calls.push(sql);
+    const handler = (msg) => calls.push(msg);
     dc.subscribe('sqlite.db.query', handler);
     t.after(() => dc.unsubscribe('sqlite.db.query', handler));
 
     db.exec('CREATE TABLE t (x INTEGER)');
     db.exec('INSERT INTO t VALUES (1)');
 
     assert.strictEqual(calls.length, 2);
-    assert.strictEqual(calls[0], 'CREATE TABLE t (x INTEGER)');
-    assert.strictEqual(calls[1], 'INSERT INTO t VALUES (1)');
+    assert.strictEqual(calls[0].sql, 'CREATE TABLE t (x INTEGER)');
+    assert.strictEqual(calls[1].sql, 'INSERT INTO t VALUES (1)');
   });
 
   it('subscriber receives SQL string for prepared INSERT statements', (t) => {
     let calls = [];
     const db = new DatabaseSync(':memory:');
     t.after(() => db.close());
 
-    const handler = (sql) => calls.push(sql);
+    const handler = (msg) => calls.push(msg);
     dc.subscribe('sqlite.db.query', handler);
     t.after(() => dc.unsubscribe('sqlite.db.query', handler));
 
@@ -42,15 +42,15 @@ suite('sqlite.db.query diagnostics channel', () => {
     stmt.run(42);
 
     assert.strictEqual(calls.length, 1);
-    assert.strictEqual(calls[0], 'INSERT INTO t VALUES (42.0)');
+    assert.strictEqual(calls[0].sql, 'INSERT INTO t VALUES (42.0)');
   });
 
   it('subscriber receives SQL string for prepared SELECT statements', (t) => {
     let calls = [];
     const db = new DatabaseSync(':memory:');
     t.after(() => db.close());
 
-    const handler = (sql) => calls.push(sql);
+    const handler = (msg) => calls.push(msg);
     dc.subscribe('sqlite.db.query', handler);
     t.after(() => dc.unsubscribe('sqlite.db.query', handler));
 
@@ -62,15 +62,15 @@ suite('sqlite.db.query diagnostics channel', () => {
     stmt.get(1);
 
     assert.strictEqual(calls.length, 1);
-    assert.strictEqual(calls[0], 'SELECT x FROM t WHERE x = 1.0');
+    assert.strictEqual(calls[0].sql, 'SELECT x FROM t WHERE x = 1.0');
   });
 
   it('subscriber receives SQL string for prepared UPDATE statements', (t) => {
     let calls = [];
     const db = new DatabaseSync(':memory:');
     t.after(() => db.close());
 
-    const handler = (sql) => calls.push(sql);
+    const handler = (msg) => calls.push(msg);
     dc.subscribe('sqlite.db.query', handler);
     t.after(() => dc.unsubscribe('sqlite.db.query', handler));
 
@@ -82,15 +82,15 @@ suite('sqlite.db.query diagnostics channel', () => {
     stmt.run(2, 1);
 
     assert.strictEqual(calls.length, 1);
-    assert.strictEqual(calls[0], 'UPDATE t SET x = 2.0 WHERE x = 1.0');
+    assert.strictEqual(calls[0].sql, 'UPDATE t SET x = 2.0 WHERE x = 1.0');
   });
 
   it('subscriber receives SQL string for prepared DELETE statements', (t) => {
     let calls = [];
     const db = new DatabaseSync(':memory:');
     t.after(() => db.close());
 
-    const handler = (sql) => calls.push(sql);
+    const handler = (msg) => calls.push(msg);
     dc.subscribe('sqlite.db.query', handler);
     t.after(() => dc.unsubscribe('sqlite.db.query', handler));
 
@@ -102,15 +102,15 @@ suite('sqlite.db.query diagnostics channel', () => {
     stmt.run(1);
 
     assert.strictEqual(calls.length, 1);
-    assert.strictEqual(calls[0], 'DELETE FROM t WHERE x = 1.0');
+    assert.strictEqual(calls[0].sql, 'DELETE FROM t WHERE x = 1.0');
   });
 
   it('no calls received after unsubscribe', (t) => {
     const calls = [];
     const db = new DatabaseSync(':memory:');
     t.after(() => db.close());
 
-    const handler = (sql) => calls.push(sql);
+    const handler = (msg) => calls.push(msg);
     dc.subscribe('sqlite.db.query', handler);
 
     db.exec('CREATE TABLE t (x INTEGER)');
@@ -126,7 +126,7 @@ suite('sqlite.db.query diagnostics channel', () => {
     const db = new DatabaseSync(':memory:', { limits: { length: 1000 } });
     t.after(() => db.close());
 
-    const handler = (sql) => calls.push(sql);
+    const handler = (msg) => calls.push(msg);
     dc.subscribe('sqlite.db.query', handler);
     t.after(() => dc.unsubscribe('sqlite.db.query', handler));
 
@@ -140,6 +140,27 @@ suite('sqlite.db.query diagnostics channel', () => {
 
     assert.strictEqual(calls.length, 1);
     // Falls back to source SQL with unexpanded '?' placeholder
-    assert.strictEqual(calls[0], 'INSERT INTO t VALUES (?)');
+    assert.strictEqual(calls[0].sql, 'INSERT INTO t VALUES (?)');
+  });
+
+  it('database property identifies the correct database', (t) => {
+    const calls = [];
+    const db1 = new DatabaseSync(':memory:');
+    const db2 = new DatabaseSync(':memory:');
+    t.after(() => {
+      db1.close(); db2.close();
+    });
+
+    const handler = (msg) => calls.push(msg);
+    dc.subscribe('sqlite.db.query', handler);
+    t.after(() => dc.unsubscribe('sqlite.db.query', handler));
+
+    db1.exec('CREATE TABLE t (x INTEGER)');
+    db2.exec('CREATE TABLE t (x INTEGER)');
+
+    assert.strictEqual(calls.length, 2);
+    assert.strictEqual(calls[0].database, db1);
+    assert.strictEqual(calls[1].database, db2);
+    assert.notStrictEqual(calls[0].database, calls[1].database);
   });
 });