Commit 7c61b08

Browse files
araujoguiaduh95
araujogui
authored and
aduh95
committed
sqlite: add StatementSync.prototype[Symbol.dispose]()
This extends explicit resource management support to prepared statements, allowing a StatementSync to be deterministically finalized via a `using` declaration, mirroring the existing DatabaseSync and Session dispose methods. Signed-off-by: Guilherme Araújo <arauujogui@gmail.com> PR-URL: #64232 Reviewed-By: René <contact.9a5d6388@renegade334.me.uk>
1 parent 7aff78d commit 7c61b08

4 files changed

Lines changed: 66 additions & 4 deletions

File tree

‎doc/api/sqlite.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,6 +1194,15 @@ added: v22.5.0
11941194
The source SQL text of the prepared statement. This property is a
11951195
wrapper around [`sqlite3_sql()`][].
11961196

1197+
### `statement[Symbol.dispose]()`
1198+
1199+
<!-- YAML
1200+
added: REPLACEME
1201+
-->
1202+
1203+
Finalizes the prepared statement. If the prepared statement is already
1204+
finalized, then this is a no-op.
1205+
11971206
## Class: `SQLTagStore`
11981207

11991208
<!-- YAML

‎src/node_sqlite.cc‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,10 +1058,7 @@ void DatabaseSync::FinalizeStatements() {
10581058
}
10591059

10601060
voidDatabaseSync::UntrackStatement(StatementSync* statement) {
1061-
auto it = statements_.find(statement);
1062-
if (it != statements_.end()) {
1063-
statements_.erase(it);
1064-
}
1061+
statements_.erase(statement);
10651062
}
10661063

10671064
inlineboolDatabaseSync::IsOpen() {
@@ -2634,6 +2631,10 @@ StatementSync::StatementSync(Environment* env,
26342631
}
26352632

26362633
StatementSync::~StatementSync() {
2634+
Close();
2635+
}
2636+
2637+
voidStatementSync::Close() {
26372638
if (!IsFinalized()) {
26382639
db_->UntrackStatement(this);
26392640
Finalize();
@@ -2654,6 +2655,12 @@ inline bool StatementSync::IsFinalized() {
26542655
return statement_ == nullptr;
26552656
}
26562657

2658+
voidStatementSync::Close(const FunctionCallbackInfo<Value>& args) {
2659+
StatementSync* stmt;
2660+
ASSIGN_OR_RETURN_UNWRAP(&stmt, args.This());
2661+
stmt->Close();
2662+
}
2663+
26572664
inlineintStatementSync::ResetStatement() {
26582665
reset_generation_++;
26592666
returnsqlite3_reset(statement_);
@@ -3687,6 +3694,7 @@ Local<FunctionTemplate> StatementSync::GetConstructorTemplate(
36873694
isolate, tmpl, "setReadBigInts", StatementSync::SetReadBigInts);
36883695
SetProtoMethod(
36893696
isolate, tmpl, "setReturnArrays", StatementSync::SetReturnArrays);
3697+
SetProtoDispose(isolate, tmpl, StatementSync::Close);
36903698
env->set_sqlite_statement_sync_constructor_template(tmpl);
36913699
}
36923700
return tmpl;

‎src/node_sqlite.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ class StatementSync : public BaseObject {
284284
const v8::FunctionCallbackInfo<v8::Value>& args);
285285
staticvoidSetReadBigInts(const v8::FunctionCallbackInfo<v8::Value>& args);
286286
staticvoidSetReturnArrays(const v8::FunctionCallbackInfo<v8::Value>& args);
287+
staticvoidClose(const v8::FunctionCallbackInfo<v8::Value>& args);
287288
v8::MaybeLocal<v8::Value> ColumnToValue(constint column);
288289
v8::MaybeLocal<v8::Name> ColumnNameToName(constint column);
289290
boolGetCachedColumnNames(v8::LocalVector<v8::Name>* keys);
@@ -295,6 +296,7 @@ class StatementSync : public BaseObject {
295296

296297
private:
297298
~StatementSync() override;
299+
voidClose();
298300
BaseObjectPtr<DatabaseSync> db_;
299301
sqlite3_stmt* statement_;
300302
bool return_arrays_ = false;

‎test/parallel/test-sqlite-statement-sync.js‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -969,3 +969,46 @@ suite('options.allowBareNamedParameters', () => {
969969
);
970970
});
971971
});
972+
973+
974+
suite('StatementSync.prototype[Symbol.dispose]()',()=>{
975+
test('finalizes an open statement',(t)=>{
976+
usingdb=newDatabaseSync(':memory:');
977+
db.exec('CREATE TABLE storage(key TEXT, val TEXT)');
978+
conststmt=db.prepare('SELECT * FROM storage');
979+
stmt[Symbol.dispose]();
980+
t.assert.throws(()=>stmt.get(),{
981+
code: 'ERR_INVALID_STATE',
982+
message: /statementhasbeenfinalized/,
983+
});
984+
});
985+
986+
test('does not throw on an already-finalized statement',()=>{
987+
usingdb=newDatabaseSync(':memory:');
988+
conststmt=db.prepare('CREATE TABLE storage(key TEXT, val TEXT)');
989+
stmt[Symbol.dispose]();
990+
stmt[Symbol.dispose]();
991+
});
992+
993+
test('works with a using declaration',(t)=>{
994+
usingdb=newDatabaseSync(':memory:');
995+
db.exec('CREATE TABLE storage(key TEXT, val TEXT)');
996+
letcaptured;
997+
{
998+
usingstmt=db.prepare('SELECT * FROM storage');
999+
captured=stmt;
1000+
t.assert.deepStrictEqual(stmt.all(),[]);
1001+
}
1002+
t.assert.throws(()=>captured.get(),{
1003+
code: 'ERR_INVALID_STATE',
1004+
message: /statementhasbeenfinalized/,
1005+
});
1006+
});
1007+
1008+
test('closing the database after dispose does not double-finalize',()=>{
1009+
usingdb=newDatabaseSync(':memory:');
1010+
conststmt=db.prepare('CREATE TABLE storage(key TEXT, val TEXT)');
1011+
stmt[Symbol.dispose]();
1012+
db.close();
1013+
});
1014+
});

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Commit 7c61b08
Browse files
araujoguiaduh95
araujogui
authored and
aduh95
committed
sqlite: add StatementSync.prototype[Symbol.dispose]()
This extends explicit resource management support to prepared
statements, allowing a StatementSync to be deterministically
finalized via a `using` declaration, mirroring the existing
DatabaseSync and Session dispose methods.
Signed-off-by: Guilherme Araújo <arauujogui@gmail.com>
PR-URL: #64232
Reviewed-By: René <contact.9a5d6388@renegade334.me.uk>
1 parent 7aff78d commit 7c61b08
4 files changed
Lines changed: 66 additions & 4 deletions
File tree
‎doc/api/sqlite.md‎
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,6 +1194,15 @@ added: v22.5.0
11941194
The source SQL text of the prepared statement. This property is a
11951195
wrapper around [`sqlite3_sql()`][].
11961196

1197+
### `statement[Symbol.dispose]()`
1198+
1199+
<!-- YAML
1200+
added: REPLACEME
1201+
-->
1202+
1203+
Finalizes the prepared statement. If the prepared statement is already
1204+
finalized, then this is a no-op.
1205+
11971206
## Class: `SQLTagStore`
11981207

11991208
<!-- YAML
‎src/node_sqlite.cc‎
Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,10 +1058,7 @@ void DatabaseSync::FinalizeStatements() {
10581058
}
10591059

10601060
voidDatabaseSync::UntrackStatement(StatementSync* statement) {
1061-
auto it = statements_.find(statement);
1062-
if (it != statements_.end()) {
1063-
 statements_.erase(it);
1064-
 }
1061+
 statements_.erase(statement);
10651062
}
10661063

10671064
inlineboolDatabaseSync::IsOpen() {
@@ -2634,6 +2631,10 @@ StatementSync::StatementSync(Environment* env,
26342631
}
26352632

26362633
StatementSync::~StatementSync() {
2634+
Close();
2635+
}
2636+
2637+
voidStatementSync::Close() {
26372638
if (!IsFinalized()) {
26382639
 db_->UntrackStatement(this);
26392640
Finalize();
@@ -2654,6 +2655,12 @@ inline bool StatementSync::IsFinalized() {
26542655
return statement_ == nullptr;
26552656
}
26562657

2658+
voidStatementSync::Close(const FunctionCallbackInfo<Value>& args) {
2659+
 StatementSync* stmt;
2660+
ASSIGN_OR_RETURN_UNWRAP(&stmt, args.This());
2661+
 stmt->Close();
2662+
}
2663+
26572664
inlineintStatementSync::ResetStatement() {
26582665
 reset_generation_++;
26592666
returnsqlite3_reset(statement_);
@@ -3687,6 +3694,7 @@ Local<FunctionTemplate> StatementSync::GetConstructorTemplate(
36873694
 isolate, tmpl, "setReadBigInts", StatementSync::SetReadBigInts);
36883695
SetProtoMethod(
36893696
 isolate, tmpl, "setReturnArrays", StatementSync::SetReturnArrays);
3697+
SetProtoDispose(isolate, tmpl, StatementSync::Close);
36903698
 env->set_sqlite_statement_sync_constructor_template(tmpl);
36913699
 }
36923700
return tmpl;
‎src/node_sqlite.h‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ class StatementSync : public BaseObject {
284284
const v8::FunctionCallbackInfo<v8::Value>& args);
285285
staticvoidSetReadBigInts(const v8::FunctionCallbackInfo<v8::Value>& args);
286286
staticvoidSetReturnArrays(const v8::FunctionCallbackInfo<v8::Value>& args);
287+
staticvoidClose(const v8::FunctionCallbackInfo<v8::Value>& args);
287288
 v8::MaybeLocal<v8::Value> ColumnToValue(constint column);
288289
 v8::MaybeLocal<v8::Name> ColumnNameToName(constint column);
289290
boolGetCachedColumnNames(v8::LocalVector<v8::Name>* keys);
@@ -295,6 +296,7 @@ class StatementSync : public BaseObject {
295296

296297
private:
297298
~StatementSync() override;
299+
voidClose();
298300
 BaseObjectPtr<DatabaseSync> db_;
299301
 sqlite3_stmt* statement_;
300302
bool return_arrays_ = false;
‎test/parallel/test-sqlite-statement-sync.js‎
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -969,3 +969,46 @@ suite('options.allowBareNamedParameters', () => {
969969
);
970970
});
971971
});
972+
973+
974+
suite('StatementSync.prototype[Symbol.dispose]()',()=>{
975+
test('finalizes an open statement',(t)=>{
976+
usingdb=newDatabaseSync(':memory:');
977+
db.exec('CREATE TABLE storage(key TEXT, val TEXT)');
978+
conststmt=db.prepare('SELECT * FROM storage');
979+
stmt[Symbol.dispose]();
980+
t.assert.throws(()=>stmt.get(),{
981+
code: 'ERR_INVALID_STATE',
982+
message: /statementhasbeenfinalized/,
983+
});
984+
});
985+
986+
test('does not throw on an already-finalized statement',()=>{
987+
usingdb=newDatabaseSync(':memory:');
988+
conststmt=db.prepare('CREATE TABLE storage(key TEXT, val TEXT)');
989+
stmt[Symbol.dispose]();
990+
stmt[Symbol.dispose]();
991+
});
992+
993+
test('works with a using declaration',(t)=>{
994+
usingdb=newDatabaseSync(':memory:');
995+
db.exec('CREATE TABLE storage(key TEXT, val TEXT)');
996+
letcaptured;
997+
{
998+
usingstmt=db.prepare('SELECT * FROM storage');
999+
captured=stmt;
1000+
t.assert.deepStrictEqual(stmt.all(),[]);
1001+
}
1002+
t.assert.throws(()=>captured.get(),{
1003+
code: 'ERR_INVALID_STATE',
1004+
message: /statementhasbeenfinalized/,
1005+
});
1006+
});
1007+
1008+
test('closing the database after dispose does not double-finalize',()=>{
1009+
usingdb=newDatabaseSync(':memory:');
1010+
conststmt=db.prepare('CREATE TABLE storage(key TEXT, val TEXT)');
1011+
stmt[Symbol.dispose]();
1012+
db.close();
1013+
});
1014+
});
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 7c61b08
Browse files
araujoguiaduh95
araujogui
authored and
aduh95
committed
sqlite: add StatementSync.prototype[Symbol.dispose]()
This extends explicit resource management support to prepared
statements, allowing a StatementSync to be deterministically
finalized via a `using` declaration, mirroring the existing
DatabaseSync and Session dispose methods.
Signed-off-by: Guilherme Araújo <arauujogui@gmail.com>
PR-URL: #64232
Reviewed-By: René <contact.9a5d6388@renegade334.me.uk>
1 parent 7aff78d commit 7c61b08
4 files changed
Lines changed: 66 additions & 4 deletions
File tree
‎doc/api/sqlite.md‎
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,6 +1194,15 @@ added: v22.5.0
11941194
The source SQL text of the prepared statement. This property is a
11951195
wrapper around [`sqlite3_sql()`][].
11961196

1197+
### `statement[Symbol.dispose]()`
1198+
1199+
<!-- YAML
1200+
added: REPLACEME
1201+
-->
1202+
1203+
Finalizes the prepared statement. If the prepared statement is already
1204+
finalized, then this is a no-op.
1205+
11971206
## Class: `SQLTagStore`
11981207

11991208
<!-- YAML
‎src/node_sqlite.cc‎
Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,10 +1058,7 @@ void DatabaseSync::FinalizeStatements() {
10581058
}
10591059

10601060
voidDatabaseSync::UntrackStatement(StatementSync* statement) {
1061-
auto it = statements_.find(statement);
1062-
if (it != statements_.end()) {
1063-
 statements_.erase(it);
1064-
 }
1061+
 statements_.erase(statement);
10651062
}
10661063

10671064
inlineboolDatabaseSync::IsOpen() {
@@ -2634,6 +2631,10 @@ StatementSync::StatementSync(Environment* env,
26342631
}
26352632

26362633
StatementSync::~StatementSync() {
2634+
Close();
2635+
}
2636+
2637+
voidStatementSync::Close() {
26372638
if (!IsFinalized()) {
26382639
 db_->UntrackStatement(this);
26392640
Finalize();
@@ -2654,6 +2655,12 @@ inline bool StatementSync::IsFinalized() {
26542655
return statement_ == nullptr;
26552656
}
26562657

2658+
voidStatementSync::Close(const FunctionCallbackInfo<Value>& args) {
2659+
 StatementSync* stmt;
2660+
ASSIGN_OR_RETURN_UNWRAP(&stmt, args.This());
2661+
 stmt->Close();
2662+
}
2663+
26572664
inlineintStatementSync::ResetStatement() {
26582665
 reset_generation_++;
26592666
returnsqlite3_reset(statement_);
@@ -3687,6 +3694,7 @@ Local<FunctionTemplate> StatementSync::GetConstructorTemplate(
36873694
 isolate, tmpl, "setReadBigInts", StatementSync::SetReadBigInts);
36883695
SetProtoMethod(
36893696
 isolate, tmpl, "setReturnArrays", StatementSync::SetReturnArrays);
3697+
SetProtoDispose(isolate, tmpl, StatementSync::Close);
36903698
 env->set_sqlite_statement_sync_constructor_template(tmpl);
36913699
 }
36923700
return tmpl;
‎src/node_sqlite.h‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ class StatementSync : public BaseObject {
284284
const v8::FunctionCallbackInfo<v8::Value>& args);
285285
staticvoidSetReadBigInts(const v8::FunctionCallbackInfo<v8::Value>& args);
286286
staticvoidSetReturnArrays(const v8::FunctionCallbackInfo<v8::Value>& args);
287+
staticvoidClose(const v8::FunctionCallbackInfo<v8::Value>& args);
287288
 v8::MaybeLocal<v8::Value> ColumnToValue(constint column);
288289
 v8::MaybeLocal<v8::Name> ColumnNameToName(constint column);
289290
boolGetCachedColumnNames(v8::LocalVector<v8::Name>* keys);
@@ -295,6 +296,7 @@ class StatementSync : public BaseObject {
295296

296297
private:
297298
~StatementSync() override;
299+
voidClose();
298300
 BaseObjectPtr<DatabaseSync> db_;
299301
 sqlite3_stmt* statement_;
300302
bool return_arrays_ = false;
‎test/parallel/test-sqlite-statement-sync.js‎
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -969,3 +969,46 @@ suite('options.allowBareNamedParameters', () => {
969969
);
970970
});
971971
});
972+
973+
974+
suite('StatementSync.prototype[Symbol.dispose]()',()=>{
975+
test('finalizes an open statement',(t)=>{
976+
usingdb=newDatabaseSync(':memory:');
977+
db.exec('CREATE TABLE storage(key TEXT, val TEXT)');
978+
conststmt=db.prepare('SELECT * FROM storage');
979+
stmt[Symbol.dispose]();
980+
t.assert.throws(()=>stmt.get(),{
981+
code: 'ERR_INVALID_STATE',
982+
message: /statementhasbeenfinalized/,
983+
});
984+
});
985+
986+
test('does not throw on an already-finalized statement',()=>{
987+
usingdb=newDatabaseSync(':memory:');
988+
conststmt=db.prepare('CREATE TABLE storage(key TEXT, val TEXT)');
989+
stmt[Symbol.dispose]();
990+
stmt[Symbol.dispose]();
991+
});
992+
993+
test('works with a using declaration',(t)=>{
994+
usingdb=newDatabaseSync(':memory:');
995+
db.exec('CREATE TABLE storage(key TEXT, val TEXT)');
996+
letcaptured;
997+
{
998+
usingstmt=db.prepare('SELECT * FROM storage');
999+
captured=stmt;
1000+
t.assert.deepStrictEqual(stmt.all(),[]);
1001+
}
1002+
t.assert.throws(()=>captured.get(),{
1003+
code: 'ERR_INVALID_STATE',
1004+
message: /statementhasbeenfinalized/,
1005+
});
1006+
});
1007+
1008+
test('closing the database after dispose does not double-finalize',()=>{
1009+
usingdb=newDatabaseSync(':memory:');
1010+
conststmt=db.prepare('CREATE TABLE storage(key TEXT, val TEXT)');
1011+
stmt[Symbol.dispose]();
1012+
db.close();
1013+
});
1014+
});
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 7c61b08
Browse files
araujoguiaduh95
araujogui
authored and
aduh95
committed
sqlite: add StatementSync.prototype[Symbol.dispose]()
This extends explicit resource management support to prepared
statements, allowing a StatementSync to be deterministically
finalized via a `using` declaration, mirroring the existing
DatabaseSync and Session dispose methods.
Signed-off-by: Guilherme Araújo <arauujogui@gmail.com>
PR-URL: #64232
Reviewed-By: René <contact.9a5d6388@renegade334.me.uk>
1 parent 7aff78d commit 7c61b08
4 files changed
Lines changed: 66 additions & 4 deletions
File tree
‎doc/api/sqlite.md‎
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,6 +1194,15 @@ added: v22.5.0
11941194
The source SQL text of the prepared statement. This property is a
11951195
wrapper around [`sqlite3_sql()`][].
11961196

1197+
### `statement[Symbol.dispose]()`
1198+
1199+
<!-- YAML
1200+
added: REPLACEME
1201+
-->
1202+
1203+
Finalizes the prepared statement. If the prepared statement is already
1204+
finalized, then this is a no-op.
1205+
11971206
## Class: `SQLTagStore`
11981207

11991208
<!-- YAML
‎src/node_sqlite.cc‎
Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,10 +1058,7 @@ void DatabaseSync::FinalizeStatements() {
10581058
}
10591059

10601060
voidDatabaseSync::UntrackStatement(StatementSync* statement) {
1061-
auto it = statements_.find(statement);
1062-
if (it != statements_.end()) {
1063-
 statements_.erase(it);
1064-
 }
1061+
 statements_.erase(statement);
10651062
}
10661063

10671064
inlineboolDatabaseSync::IsOpen() {
@@ -2634,6 +2631,10 @@ StatementSync::StatementSync(Environment* env,
26342631
}
26352632

26362633
StatementSync::~StatementSync() {
2634+
Close();
2635+
}
2636+
2637+
voidStatementSync::Close() {
26372638
if (!IsFinalized()) {
26382639
 db_->UntrackStatement(this);
26392640
Finalize();
@@ -2654,6 +2655,12 @@ inline bool StatementSync::IsFinalized() {
26542655
return statement_ == nullptr;
26552656
}
26562657

2658+
voidStatementSync::Close(const FunctionCallbackInfo<Value>& args) {
2659+
 StatementSync* stmt;
2660+
ASSIGN_OR_RETURN_UNWRAP(&stmt, args.This());
2661+
 stmt->Close();
2662+
}
2663+
26572664
inlineintStatementSync::ResetStatement() {
26582665
 reset_generation_++;
26592666
returnsqlite3_reset(statement_);
@@ -3687,6 +3694,7 @@ Local<FunctionTemplate> StatementSync::GetConstructorTemplate(
36873694
 isolate, tmpl, "setReadBigInts", StatementSync::SetReadBigInts);
36883695
SetProtoMethod(
36893696
 isolate, tmpl, "setReturnArrays", StatementSync::SetReturnArrays);
3697+
SetProtoDispose(isolate, tmpl, StatementSync::Close);
36903698
 env->set_sqlite_statement_sync_constructor_template(tmpl);
36913699
 }
36923700
return tmpl;
‎src/node_sqlite.h‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ class StatementSync : public BaseObject {
284284
const v8::FunctionCallbackInfo<v8::Value>& args);
285285
staticvoidSetReadBigInts(const v8::FunctionCallbackInfo<v8::Value>& args);
286286
staticvoidSetReturnArrays(const v8::FunctionCallbackInfo<v8::Value>& args);
287+
staticvoidClose(const v8::FunctionCallbackInfo<v8::Value>& args);
287288
 v8::MaybeLocal<v8::Value> ColumnToValue(constint column);
288289
 v8::MaybeLocal<v8::Name> ColumnNameToName(constint column);
289290
boolGetCachedColumnNames(v8::LocalVector<v8::Name>* keys);
@@ -295,6 +296,7 @@ class StatementSync : public BaseObject {
295296

296297
private:
297298
~StatementSync() override;
299+
voidClose();
298300
 BaseObjectPtr<DatabaseSync> db_;
299301
 sqlite3_stmt* statement_;
300302
bool return_arrays_ = false;
‎test/parallel/test-sqlite-statement-sync.js‎
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -969,3 +969,46 @@ suite('options.allowBareNamedParameters', () => {
969969
);
970970
});
971971
});
972+
973+
974+
suite('StatementSync.prototype[Symbol.dispose]()',()=>{
975+
test('finalizes an open statement',(t)=>{
976+
usingdb=newDatabaseSync(':memory:');
977+
db.exec('CREATE TABLE storage(key TEXT, val TEXT)');
978+
conststmt=db.prepare('SELECT * FROM storage');
979+
stmt[Symbol.dispose]();
980+
t.assert.throws(()=>stmt.get(),{
981+
code: 'ERR_INVALID_STATE',
982+
message: /statementhasbeenfinalized/,
983+
});
984+
});
985+
986+
test('does not throw on an already-finalized statement',()=>{
987+
usingdb=newDatabaseSync(':memory:');
988+
conststmt=db.prepare('CREATE TABLE storage(key TEXT, val TEXT)');
989+
stmt[Symbol.dispose]();
990+
stmt[Symbol.dispose]();
991+
});
992+
993+
test('works with a using declaration',(t)=>{
994+
usingdb=newDatabaseSync(':memory:');
995+
db.exec('CREATE TABLE storage(key TEXT, val TEXT)');
996+
letcaptured;
997+
{
998+
usingstmt=db.prepare('SELECT * FROM storage');
999+
captured=stmt;
1000+
t.assert.deepStrictEqual(stmt.all(),[]);
1001+
}
1002+
t.assert.throws(()=>captured.get(),{
1003+
code: 'ERR_INVALID_STATE',
1004+
message: /statementhasbeenfinalized/,
1005+
});
1006+
});
1007+
1008+
test('closing the database after dispose does not double-finalize',()=>{
1009+
usingdb=newDatabaseSync(':memory:');
1010+
conststmt=db.prepare('CREATE TABLE storage(key TEXT, val TEXT)');
1011+
stmt[Symbol.dispose]();
1012+
db.close();
1013+
});
1014+
});
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Commit 7c61b08
Browse files
araujoguiaduh95
araujogui
authored and
aduh95
committed
sqlite: add StatementSync.prototype[Symbol.dispose]()
This extends explicit resource management support to prepared
statements, allowing a StatementSync to be deterministically
finalized via a `using` declaration, mirroring the existing
DatabaseSync and Session dispose methods.
Signed-off-by: Guilherme Araújo <arauujogui@gmail.com>
PR-URL: #64232
Reviewed-By: René <contact.9a5d6388@renegade334.me.uk>
1 parent 7aff78d commit 7c61b08
4 files changed
Lines changed: 66 additions & 4 deletions
File tree
‎doc/api/sqlite.md‎
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,6 +1194,15 @@ added: v22.5.0
11941194
The source SQL text of the prepared statement. This property is a
11951195
wrapper around [`sqlite3_sql()`][].
11961196

1197+
### `statement[Symbol.dispose]()`
1198+
1199+
<!-- YAML
1200+
added: REPLACEME
1201+
-->
1202+
1203+
Finalizes the prepared statement. If the prepared statement is already
1204+
finalized, then this is a no-op.
1205+
11971206
## Class: `SQLTagStore`
11981207

11991208
<!-- YAML
‎src/node_sqlite.cc‎
Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,10 +1058,7 @@ void DatabaseSync::FinalizeStatements() {
10581058
}
10591059

10601060
voidDatabaseSync::UntrackStatement(StatementSync* statement) {
1061-
auto it = statements_.find(statement);
1062-
if (it != statements_.end()) {
1063-
 statements_.erase(it);
1064-
 }
1061+
 statements_.erase(statement);
10651062
}
10661063

10671064
inlineboolDatabaseSync::IsOpen() {
@@ -2634,6 +2631,10 @@ StatementSync::StatementSync(Environment* env,
26342631
}
26352632

26362633
StatementSync::~StatementSync() {
2634+
Close();
2635+
}
2636+
2637+
voidStatementSync::Close() {
26372638
if (!IsFinalized()) {
26382639
 db_->UntrackStatement(this);
26392640
Finalize();
@@ -2654,6 +2655,12 @@ inline bool StatementSync::IsFinalized() {
26542655
return statement_ == nullptr;
26552656
}
26562657

2658+
voidStatementSync::Close(const FunctionCallbackInfo<Value>& args) {
2659+
 StatementSync* stmt;
2660+
ASSIGN_OR_RETURN_UNWRAP(&stmt, args.This());
2661+
 stmt->Close();
2662+
}
2663+
26572664
inlineintStatementSync::ResetStatement() {
26582665
 reset_generation_++;
26592666
returnsqlite3_reset(statement_);
@@ -3687,6 +3694,7 @@ Local<FunctionTemplate> StatementSync::GetConstructorTemplate(
36873694
 isolate, tmpl, "setReadBigInts", StatementSync::SetReadBigInts);
36883695
SetProtoMethod(
36893696
 isolate, tmpl, "setReturnArrays", StatementSync::SetReturnArrays);
3697+
SetProtoDispose(isolate, tmpl, StatementSync::Close);
36903698
 env->set_sqlite_statement_sync_constructor_template(tmpl);
36913699
 }
36923700
return tmpl;
‎src/node_sqlite.h‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ class StatementSync : public BaseObject {
284284
const v8::FunctionCallbackInfo<v8::Value>& args);
285285
staticvoidSetReadBigInts(const v8::FunctionCallbackInfo<v8::Value>& args);
286286
staticvoidSetReturnArrays(const v8::FunctionCallbackInfo<v8::Value>& args);
287+
staticvoidClose(const v8::FunctionCallbackInfo<v8::Value>& args);
287288
 v8::MaybeLocal<v8::Value> ColumnToValue(constint column);
288289
 v8::MaybeLocal<v8::Name> ColumnNameToName(constint column);
289290
boolGetCachedColumnNames(v8::LocalVector<v8::Name>* keys);
@@ -295,6 +296,7 @@ class StatementSync : public BaseObject {
295296

296297
private:
297298
~StatementSync() override;
299+
voidClose();
298300
 BaseObjectPtr<DatabaseSync> db_;
299301
 sqlite3_stmt* statement_;
300302
bool return_arrays_ = false;
‎test/parallel/test-sqlite-statement-sync.js‎
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -969,3 +969,46 @@ suite('options.allowBareNamedParameters', () => {
969969
);
970970
});
971971
});
972+
973+
974+
suite('StatementSync.prototype[Symbol.dispose]()',()=>{
975+
test('finalizes an open statement',(t)=>{
976+
usingdb=newDatabaseSync(':memory:');
977+
db.exec('CREATE TABLE storage(key TEXT, val TEXT)');
978+
conststmt=db.prepare('SELECT * FROM storage');
979+
stmt[Symbol.dispose]();
980+
t.assert.throws(()=>stmt.get(),{
981+
code: 'ERR_INVALID_STATE',
982+
message: /statementhasbeenfinalized/,
983+
});
984+
});
985+
986+
test('does not throw on an already-finalized statement',()=>{
987+
usingdb=newDatabaseSync(':memory:');
988+
conststmt=db.prepare('CREATE TABLE storage(key TEXT, val TEXT)');
989+
stmt[Symbol.dispose]();
990+
stmt[Symbol.dispose]();
991+
});
992+
993+
test('works with a using declaration',(t)=>{
994+
usingdb=newDatabaseSync(':memory:');
995+
db.exec('CREATE TABLE storage(key TEXT, val TEXT)');
996+
letcaptured;
997+
{
998+
usingstmt=db.prepare('SELECT * FROM storage');
999+
captured=stmt;
1000+
t.assert.deepStrictEqual(stmt.all(),[]);
1001+
}
1002+
t.assert.throws(()=>captured.get(),{
1003+
code: 'ERR_INVALID_STATE',
1004+
message: /statementhasbeenfinalized/,
1005+
});
1006+
});
1007+
1008+
test('closing the database after dispose does not double-finalize',()=>{
1009+
usingdb=newDatabaseSync(':memory:');
1010+
conststmt=db.prepare('CREATE TABLE storage(key TEXT, val TEXT)');
1011+
stmt[Symbol.dispose]();
1012+
db.close();
1013+
});
1014+
});
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 7c61b08
Browse files
araujoguiaduh95
araujogui
authored and
aduh95
committed
sqlite: add StatementSync.prototype[Symbol.dispose]()
This extends explicit resource management support to prepared
statements, allowing a StatementSync to be deterministically
finalized via a `using` declaration, mirroring the existing
DatabaseSync and Session dispose methods.
Signed-off-by: Guilherme Araújo <arauujogui@gmail.com>
PR-URL: #64232
Reviewed-By: René <contact.9a5d6388@renegade334.me.uk>
1 parent 7aff78d commit 7c61b08
4 files changed
Lines changed: 66 additions & 4 deletions
File tree
‎doc/api/sqlite.md‎
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,6 +1194,15 @@ added: v22.5.0
11941194
The source SQL text of the prepared statement. This property is a
11951195
wrapper around [`sqlite3_sql()`][].
11961196

1197+
### `statement[Symbol.dispose]()`
1198+
1199+
<!-- YAML
1200+
added: REPLACEME
1201+
-->
1202+
1203+
Finalizes the prepared statement. If the prepared statement is already
1204+
finalized, then this is a no-op.
1205+
11971206
## Class: `SQLTagStore`
11981207

11991208
<!-- YAML
‎src/node_sqlite.cc‎
Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,10 +1058,7 @@ void DatabaseSync::FinalizeStatements() {
10581058
}
10591059

10601060
voidDatabaseSync::UntrackStatement(StatementSync* statement) {
1061-
auto it = statements_.find(statement);
1062-
if (it != statements_.end()) {
1063-
 statements_.erase(it);
1064-
 }
1061+
 statements_.erase(statement);
10651062
}
10661063

10671064
inlineboolDatabaseSync::IsOpen() {
@@ -2634,6 +2631,10 @@ StatementSync::StatementSync(Environment* env,
26342631
}
26352632

26362633
StatementSync::~StatementSync() {
2634+
Close();
2635+
}
2636+
2637+
voidStatementSync::Close() {
26372638
if (!IsFinalized()) {
26382639
 db_->UntrackStatement(this);
26392640
Finalize();
@@ -2654,6 +2655,12 @@ inline bool StatementSync::IsFinalized() {
26542655
return statement_ == nullptr;
26552656
}
26562657

2658+
voidStatementSync::Close(const FunctionCallbackInfo<Value>& args) {
2659+
 StatementSync* stmt;
2660+
ASSIGN_OR_RETURN_UNWRAP(&stmt, args.This());
2661+
 stmt->Close();
2662+
}
2663+
26572664
inlineintStatementSync::ResetStatement() {
26582665
 reset_generation_++;
26592666
returnsqlite3_reset(statement_);
@@ -3687,6 +3694,7 @@ Local<FunctionTemplate> StatementSync::GetConstructorTemplate(
36873694
 isolate, tmpl, "setReadBigInts", StatementSync::SetReadBigInts);
36883695
SetProtoMethod(
36893696
 isolate, tmpl, "setReturnArrays", StatementSync::SetReturnArrays);
3697+
SetProtoDispose(isolate, tmpl, StatementSync::Close);
36903698
 env->set_sqlite_statement_sync_constructor_template(tmpl);
36913699
 }
36923700
return tmpl;
‎src/node_sqlite.h‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ class StatementSync : public BaseObject {
284284
const v8::FunctionCallbackInfo<v8::Value>& args);
285285
staticvoidSetReadBigInts(const v8::FunctionCallbackInfo<v8::Value>& args);
286286
staticvoidSetReturnArrays(const v8::FunctionCallbackInfo<v8::Value>& args);
287+
staticvoidClose(const v8::FunctionCallbackInfo<v8::Value>& args);
287288
 v8::MaybeLocal<v8::Value> ColumnToValue(constint column);
288289
 v8::MaybeLocal<v8::Name> ColumnNameToName(constint column);
289290
boolGetCachedColumnNames(v8::LocalVector<v8::Name>* keys);
@@ -295,6 +296,7 @@ class StatementSync : public BaseObject {
295296

296297
private:
297298
~StatementSync() override;
299+
voidClose();
298300
 BaseObjectPtr<DatabaseSync> db_;
299301
 sqlite3_stmt* statement_;
300302
bool return_arrays_ = false;
‎test/parallel/test-sqlite-statement-sync.js‎
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -969,3 +969,46 @@ suite('options.allowBareNamedParameters', () => {
969969
);
970970
});
971971
});
972+
973+
974+
suite('StatementSync.prototype[Symbol.dispose]()',()=>{
975+
test('finalizes an open statement',(t)=>{
976+
usingdb=newDatabaseSync(':memory:');
977+
db.exec('CREATE TABLE storage(key TEXT, val TEXT)');
978+
conststmt=db.prepare('SELECT * FROM storage');
979+
stmt[Symbol.dispose]();
980+
t.assert.throws(()=>stmt.get(),{
981+
code: 'ERR_INVALID_STATE',
982+
message: /statementhasbeenfinalized/,
983+
});
984+
});
985+
986+
test('does not throw on an already-finalized statement',()=>{
987+
usingdb=newDatabaseSync(':memory:');
988+
conststmt=db.prepare('CREATE TABLE storage(key TEXT, val TEXT)');
989+
stmt[Symbol.dispose]();
990+
stmt[Symbol.dispose]();
991+
});
992+
993+
test('works with a using declaration',(t)=>{
994+
usingdb=newDatabaseSync(':memory:');
995+
db.exec('CREATE TABLE storage(key TEXT, val TEXT)');
996+
letcaptured;
997+
{
998+
usingstmt=db.prepare('SELECT * FROM storage');
999+
captured=stmt;
1000+
t.assert.deepStrictEqual(stmt.all(),[]);
1001+
}
1002+
t.assert.throws(()=>captured.get(),{
1003+
code: 'ERR_INVALID_STATE',
1004+
message: /statementhasbeenfinalized/,
1005+
});
1006+
});
1007+
1008+
test('closing the database after dispose does not double-finalize',()=>{
1009+
usingdb=newDatabaseSync(':memory:');
1010+
conststmt=db.prepare('CREATE TABLE storage(key TEXT, val TEXT)');
1011+
stmt[Symbol.dispose]();
1012+
db.close();
1013+
});
1014+
});
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 7c61b08
Browse files
araujoguiaduh95
araujogui
authored and
aduh95
committed
sqlite: add StatementSync.prototype[Symbol.dispose]()
This extends explicit resource management support to prepared
statements, allowing a StatementSync to be deterministically
finalized via a `using` declaration, mirroring the existing
DatabaseSync and Session dispose methods.
Signed-off-by: Guilherme Araújo <arauujogui@gmail.com>
PR-URL: #64232
Reviewed-By: René <contact.9a5d6388@renegade334.me.uk>
1 parent 7aff78d commit 7c61b08
4 files changed
Lines changed: 66 additions & 4 deletions
File tree
‎doc/api/sqlite.md‎
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,6 +1194,15 @@ added: v22.5.0
11941194
The source SQL text of the prepared statement. This property is a
11951195
wrapper around [`sqlite3_sql()`][].
11961196

1197+
### `statement[Symbol.dispose]()`
1198+
1199+
<!-- YAML
1200+
added: REPLACEME
1201+
-->
1202+
1203+
Finalizes the prepared statement. If the prepared statement is already
1204+
finalized, then this is a no-op.
1205+
11971206
## Class: `SQLTagStore`
11981207

11991208
<!-- YAML
‎src/node_sqlite.cc‎
Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,10 +1058,7 @@ void DatabaseSync::FinalizeStatements() {
10581058
}
10591059

10601060
voidDatabaseSync::UntrackStatement(StatementSync* statement) {
1061-
auto it = statements_.find(statement);
1062-
if (it != statements_.end()) {
1063-
 statements_.erase(it);
1064-
 }
1061+
 statements_.erase(statement);
10651062
}
10661063

10671064
inlineboolDatabaseSync::IsOpen() {
@@ -2634,6 +2631,10 @@ StatementSync::StatementSync(Environment* env,
26342631
}
26352632

26362633
StatementSync::~StatementSync() {
2634+
Close();
2635+
}
2636+
2637+
voidStatementSync::Close() {
26372638
if (!IsFinalized()) {
26382639
 db_->UntrackStatement(this);
26392640
Finalize();
@@ -2654,6 +2655,12 @@ inline bool StatementSync::IsFinalized() {
26542655
return statement_ == nullptr;
26552656
}
26562657

2658+
voidStatementSync::Close(const FunctionCallbackInfo<Value>& args) {
2659+
 StatementSync* stmt;
2660+
ASSIGN_OR_RETURN_UNWRAP(&stmt, args.This());
2661+
 stmt->Close();
2662+
}
2663+
26572664
inlineintStatementSync::ResetStatement() {
26582665
 reset_generation_++;
26592666
returnsqlite3_reset(statement_);
@@ -3687,6 +3694,7 @@ Local<FunctionTemplate> StatementSync::GetConstructorTemplate(
36873694
 isolate, tmpl, "setReadBigInts", StatementSync::SetReadBigInts);
36883695
SetProtoMethod(
36893696
 isolate, tmpl, "setReturnArrays", StatementSync::SetReturnArrays);
3697+
SetProtoDispose(isolate, tmpl, StatementSync::Close);
36903698
 env->set_sqlite_statement_sync_constructor_template(tmpl);
36913699
 }
36923700
return tmpl;
‎src/node_sqlite.h‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ class StatementSync : public BaseObject {
284284
const v8::FunctionCallbackInfo<v8::Value>& args);
285285
staticvoidSetReadBigInts(const v8::FunctionCallbackInfo<v8::Value>& args);
286286
staticvoidSetReturnArrays(const v8::FunctionCallbackInfo<v8::Value>& args);
287+
staticvoidClose(const v8::FunctionCallbackInfo<v8::Value>& args);
287288
 v8::MaybeLocal<v8::Value> ColumnToValue(constint column);
288289
 v8::MaybeLocal<v8::Name> ColumnNameToName(constint column);
289290
boolGetCachedColumnNames(v8::LocalVector<v8::Name>* keys);
@@ -295,6 +296,7 @@ class StatementSync : public BaseObject {
295296

296297
private:
297298
~StatementSync() override;
299+
voidClose();
298300
 BaseObjectPtr<DatabaseSync> db_;
299301
 sqlite3_stmt* statement_;
300302
bool return_arrays_ = false;
‎test/parallel/test-sqlite-statement-sync.js‎
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -969,3 +969,46 @@ suite('options.allowBareNamedParameters', () => {
969969
);
970970
});
971971
});
972+
973+
974+
suite('StatementSync.prototype[Symbol.dispose]()',()=>{
975+
test('finalizes an open statement',(t)=>{
976+
usingdb=newDatabaseSync(':memory:');
977+
db.exec('CREATE TABLE storage(key TEXT, val TEXT)');
978+
conststmt=db.prepare('SELECT * FROM storage');
979+
stmt[Symbol.dispose]();
980+
t.assert.throws(()=>stmt.get(),{
981+
code: 'ERR_INVALID_STATE',
982+
message: /statementhasbeenfinalized/,
983+
});
984+
});
985+
986+
test('does not throw on an already-finalized statement',()=>{
987+
usingdb=newDatabaseSync(':memory:');
988+
conststmt=db.prepare('CREATE TABLE storage(key TEXT, val TEXT)');
989+
stmt[Symbol.dispose]();
990+
stmt[Symbol.dispose]();
991+
});
992+
993+
test('works with a using declaration',(t)=>{
994+
usingdb=newDatabaseSync(':memory:');
995+
db.exec('CREATE TABLE storage(key TEXT, val TEXT)');
996+
letcaptured;
997+
{
998+
usingstmt=db.prepare('SELECT * FROM storage');
999+
captured=stmt;
1000+
t.assert.deepStrictEqual(stmt.all(),[]);
1001+
}
1002+
t.assert.throws(()=>captured.get(),{
1003+
code: 'ERR_INVALID_STATE',
1004+
message: /statementhasbeenfinalized/,
1005+
});
1006+
});
1007+
1008+
test('closing the database after dispose does not double-finalize',()=>{
1009+
usingdb=newDatabaseSync(':memory:');
1010+
conststmt=db.prepare('CREATE TABLE storage(key TEXT, val TEXT)');
1011+
stmt[Symbol.dispose]();
1012+
db.close();
1013+
});
1014+
});
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Commit 7c61b08
Browse files
araujoguiaduh95
araujogui
authored and
aduh95
committed
sqlite: add StatementSync.prototype[Symbol.dispose]()
This extends explicit resource management support to prepared
statements, allowing a StatementSync to be deterministically
finalized via a `using` declaration, mirroring the existing
DatabaseSync and Session dispose methods.
Signed-off-by: Guilherme Araújo <arauujogui@gmail.com>
PR-URL: #64232
Reviewed-By: René <contact.9a5d6388@renegade334.me.uk>
1 parent 7aff78d commit 7c61b08
4 files changed
Lines changed: 66 additions & 4 deletions
File tree
‎doc/api/sqlite.md‎
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,6 +1194,15 @@ added: v22.5.0
11941194
The source SQL text of the prepared statement. This property is a
11951195
wrapper around [`sqlite3_sql()`][].
11961196

1197+
### `statement[Symbol.dispose]()`
1198+
1199+
<!-- YAML
1200+
added: REPLACEME
1201+
-->
1202+
1203+
Finalizes the prepared statement. If the prepared statement is already
1204+
finalized, then this is a no-op.
1205+
11971206
## Class: `SQLTagStore`
11981207

11991208
<!-- YAML
‎src/node_sqlite.cc‎
Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,10 +1058,7 @@ void DatabaseSync::FinalizeStatements() {
10581058
}
10591059

10601060
voidDatabaseSync::UntrackStatement(StatementSync* statement) {
1061-
auto it = statements_.find(statement);
1062-
if (it != statements_.end()) {
1063-
 statements_.erase(it);
1064-
 }
1061+
 statements_.erase(statement);
10651062
}
10661063

10671064
inlineboolDatabaseSync::IsOpen() {
@@ -2634,6 +2631,10 @@ StatementSync::StatementSync(Environment* env,
26342631
}
26352632

26362633
StatementSync::~StatementSync() {
2634+
Close();
2635+
}
2636+
2637+
voidStatementSync::Close() {
26372638
if (!IsFinalized()) {
26382639
 db_->UntrackStatement(this);
26392640
Finalize();
@@ -2654,6 +2655,12 @@ inline bool StatementSync::IsFinalized() {
26542655
return statement_ == nullptr;
26552656
}
26562657

2658+
voidStatementSync::Close(const FunctionCallbackInfo<Value>& args) {
2659+
 StatementSync* stmt;
2660+
ASSIGN_OR_RETURN_UNWRAP(&stmt, args.This());
2661+
 stmt->Close();
2662+
}
2663+
26572664
inlineintStatementSync::ResetStatement() {
26582665
 reset_generation_++;
26592666
returnsqlite3_reset(statement_);
@@ -3687,6 +3694,7 @@ Local<FunctionTemplate> StatementSync::GetConstructorTemplate(
36873694
 isolate, tmpl, "setReadBigInts", StatementSync::SetReadBigInts);
36883695
SetProtoMethod(
36893696
 isolate, tmpl, "setReturnArrays", StatementSync::SetReturnArrays);
3697+
SetProtoDispose(isolate, tmpl, StatementSync::Close);
36903698
 env->set_sqlite_statement_sync_constructor_template(tmpl);
36913699
 }
36923700
return tmpl;
‎src/node_sqlite.h‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ class StatementSync : public BaseObject {
284284
const v8::FunctionCallbackInfo<v8::Value>& args);
285285
staticvoidSetReadBigInts(const v8::FunctionCallbackInfo<v8::Value>& args);
286286
staticvoidSetReturnArrays(const v8::FunctionCallbackInfo<v8::Value>& args);
287+
staticvoidClose(const v8::FunctionCallbackInfo<v8::Value>& args);
287288
 v8::MaybeLocal<v8::Value> ColumnToValue(constint column);
288289
 v8::MaybeLocal<v8::Name> ColumnNameToName(constint column);
289290
boolGetCachedColumnNames(v8::LocalVector<v8::Name>* keys);
@@ -295,6 +296,7 @@ class StatementSync : public BaseObject {
295296

296297
private:
297298
~StatementSync() override;
299+
voidClose();
298300
 BaseObjectPtr<DatabaseSync> db_;
299301
 sqlite3_stmt* statement_;
300302
bool return_arrays_ = false;
‎test/parallel/test-sqlite-statement-sync.js‎
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -969,3 +969,46 @@ suite('options.allowBareNamedParameters', () => {
969969
);
970970
});
971971
});
972+
973+
974+
suite('StatementSync.prototype[Symbol.dispose]()',()=>{
975+
test('finalizes an open statement',(t)=>{
976+
usingdb=newDatabaseSync(':memory:');
977+
db.exec('CREATE TABLE storage(key TEXT, val TEXT)');
978+
conststmt=db.prepare('SELECT * FROM storage');
979+
stmt[Symbol.dispose]();
980+
t.assert.throws(()=>stmt.get(),{
981+
code: 'ERR_INVALID_STATE',
982+
message: /statementhasbeenfinalized/,
983+
});
984+
});
985+
986+
test('does not throw on an already-finalized statement',()=>{
987+
usingdb=newDatabaseSync(':memory:');
988+
conststmt=db.prepare('CREATE TABLE storage(key TEXT, val TEXT)');
989+
stmt[Symbol.dispose]();
990+
stmt[Symbol.dispose]();
991+
});
992+
993+
test('works with a using declaration',(t)=>{
994+
usingdb=newDatabaseSync(':memory:');
995+
db.exec('CREATE TABLE storage(key TEXT, val TEXT)');
996+
letcaptured;
997+
{
998+
usingstmt=db.prepare('SELECT * FROM storage');
999+
captured=stmt;
1000+
t.assert.deepStrictEqual(stmt.all(),[]);
1001+
}
1002+
t.assert.throws(()=>captured.get(),{
1003+
code: 'ERR_INVALID_STATE',
1004+
message: /statementhasbeenfinalized/,
1005+
});
1006+
});
1007+
1008+
test('closing the database after dispose does not double-finalize',()=>{
1009+
usingdb=newDatabaseSync(':memory:');
1010+
conststmt=db.prepare('CREATE TABLE storage(key TEXT, val TEXT)');
1011+
stmt[Symbol.dispose]();
1012+
db.close();
1013+
});
1014+
});
0 commit comments
Comments
 (0)