Skip to content

sqlite: add setReturnArrays method to StatementSync #57542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nodejs-github-bot merged 15 commits into from
Apr 4, 2025
+308 −47
Merged

sqlite: add setReturnArrays method to StatementSync #57542

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0111ab7
sqlite: add setReturnArrays method to StatementSync
gurgunday Mar 19, 2025
e4f5ea3
fix linting
gurgunday Mar 19, 2025
6e5357d
apply feedback
gurgunday Mar 19, 2025
39cb87a
format cpp
gurgunday Mar 19, 2025
acca8b1
format cpp
gurgunday Mar 19, 2025
c733e91
apply feedback
gurgunday Mar 19, 2025
de48b93
use localvector and then create array
gurgunday Mar 19, 2025
5824701
apply feedback
gurgunday Mar 19, 2025
d053ea5
format cpp
gurgunday Mar 19, 2025
4d042f0
rebase
gurgunday Apr 4, 2025
bb18d7c
lint
gurgunday Apr 4, 2025
18f3e3c
simplify
gurgunday Apr 4, 2025
784638c
move if outside the while
gurgunday Apr 4, 2025
7a40860
seperate array tests
gurgunday Apr 4, 2025
5420ed5
fix whitespace and lint js
gurgunday Apr 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
use localvector and then create array
  • Loading branch information
@gurgunday
gurgunday committed Apr 4, 2025
commit de48b9391e39bd2cbfbb59f1a1f005bb7befd154
6 changes: 4 additions & 2 deletions src/node_sqlite.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1571,12 +1571,14 @@ void StatementSync::All(const FunctionCallbackInfo<Value>& args) {

while ((r = sqlite3_step(stmt->statement_)) == SQLITE_ROW) {
if (stmt->return_arrays_) {

@cjihrig cjihrig Apr 4, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It might be worth doing this check outside of the while loop. It would mean duplicating the while loop, but then we'd only be paying the price here once per call instead of once per loop iteration.

Local<Array> row = Array::New(isolate, num_cols);
LocalVector<Value> row_values(isolate);
row_values.reserve(num_cols);
for (int i = 0; i < num_cols; ++i) {
Local<Value> val;
if (!stmt->ColumnToValue(i).ToLocal(&val)) return;
if (row->Set(env->context(), i, val).IsNothing()) return;
row_values.emplace_back(val);
}
Local<Array> row = Array::New(isolate, row_values.data(), row_values.size());
rows.emplace_back(row);
} else {
if (row_keys.size() == 0) {
Expand Down