Revert "chore: unconcluent tests with SafeArrayIterator"

This reverts commit 916d489.
nodejs · Aug 14, 2024 · 406165d · 406165d
1 parent 916d489
commit 406165d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 16 deletions.
diff --git a/lib/sqlite.js b/lib/sqlite.js
@@ -1,6 +1,5 @@
 'use strict';
 const {
-  SafeArrayIterator,
   globalThis,
 } = primordials;
 
@@ -9,13 +8,8 @@ const { emitExperimentalWarning } = require('internal/util');
 emitExperimentalWarning('SQLite');
 module.exports = internalBinding('sqlite');
 
-const {Iterator} = globalThis;
+const { Iterator } = globalThis;
 const statementIterate = module.exports.StatementSync.prototype.iterate;
 module.exports.StatementSync.prototype.iterate = function iterate() {
-  return new SafeArrayIterator(statementIterate.apply(this, arguments));
-  return statementIterate.apply(this, arguments);
-  return Iterator.from(
-    statementIterate.apply(this, arguments)
-    // new SafeArrayIterator(statementIterate.apply(this, arguments))
-  );
+  return Iterator.from(statementIterate.apply(this, arguments));
 };
diff --git a/src/node_sqlite.cc b/src/node_sqlite.cc
@@ -474,10 +474,6 @@ struct IterateCaptureContext {
   StatementSync* stmt;
 };
 
-void IteratorFunc(const v8::FunctionCallbackInfo<v8::Value>& info) {
-  info.GetReturnValue().Set(info.Holder());
-}
-
 void StatementSync::IterateReturnCallback(
     const FunctionCallbackInfo<Value>& args) {
   Environment* env = Environment::GetCurrent(args);
@@ -588,15 +584,11 @@ void StatementSync::Iterate(const FunctionCallbackInfo<Value>& args) {
       v8::FunctionTemplate::New(isolate,
                                 StatementSync::IterateReturnCallback,
                                 External::New(isolate, captureContext));
-  v8::Local<v8::FunctionTemplate> iteratorFuncTemplate =
-      v8::FunctionTemplate::New(isolate, IteratorFunc);
 
   iterableIteratorTemplate->Set(String::NewFromUtf8Literal(isolate, "next"),
                                 nextFuncTemplate);
   iterableIteratorTemplate->Set(String::NewFromUtf8Literal(isolate, "return"),
                                 returnFuncTemplate);
-  iterableIteratorTemplate->Set(v8::Symbol::GetIterator(isolate),
-                                iteratorFuncTemplate);
 
   auto iterableIterator =
       iterableIteratorTemplate->NewInstance(context).ToLocalChecked();