src,sqlite: refactor value conversion

Author: geeksilva97

src/node_sqlite.cc

@@ -1997,6 +1997,16 @@ bool StatementSync::BindValue(const Local<Value>& value, const int index) {
  return true;
 }
 
+MaybeLocal<Value> ColumnToValue(Isolate* isolate,
+ sqlite3_stmt* statement,
+ const int column,
+ const bool use_big_ints) {
+ MaybeLocal<Value> js_val = MaybeLocal<Value>();
+ SQLITE_VALUE_TO_JS(
+ column, isolate, use_big_ints, js_val, statement, column);
+ return js_val;
+}
+
 MaybeLocal<Value> StatementSync::ColumnToValue(const int column) {
  Isolate* isolate = env()->isolate();
  MaybeLocal<Value> js_val = MaybeLocal<Value>();
@@ -2017,6 +2027,20 @@ MaybeLocal<Name> StatementSync::ColumnNameToName(const int column) {
 
 void StatementSync::MemoryInfo(MemoryTracker* tracker) const {}
 
+bool ExtractRowValues(LocalVector<Value>& row_values,
+ int num_cols,
+ StatementSync* stmt) {
+ row_values.clear();
+ row_values.reserve(num_cols);
+
+ for (int i = 0; i < num_cols; ++i) {
+ Local<Value> val;
+ if (!stmt->ColumnToValue(i).ToLocal(&val)) return false;
+ row_values.emplace_back(val);
+ }
+ return true;
+}
+
 void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
  StatementSync* stmt;
  ASSIGN_OR_RETURN_UNWRAP(&stmt, args.This());
@@ -2034,24 +2058,16 @@ void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
  auto reset = OnScopeLeave([&]() { sqlite3_reset(stmt->statement_); });
  int num_cols = sqlite3_column_count(stmt->statement_);
  LocalVector<Value> rows(isolate);
+ LocalVector<Value> row_values(isolate);
+ LocalVector<Name> row_keys(isolate);
 
- if (stmt->return_arrays_) {
- while ((r = sqlite3_step(stmt->statement_)) == SQLITE_ROW) {
- LocalVector<Value> array_values(isolate);
- array_values.reserve(num_cols);
- for (int i = 0; i < num_cols; ++i) {
- Local<Value> val;
- if (!stmt->ColumnToValue(i).ToLocal(&val)) return;
- array_values.emplace_back(val);
- }
+ while ((r = sqlite3_step(stmt->statement_)) == SQLITE_ROW) {
+ if (!ExtractRowValues(row_values, num_cols, stmt)) return;
+ if (stmt->return_arrays_) {
  Local<Array> row_array =
- Array::New(isolate, array_values.data(), array_values.size());
+ Array::New(isolate, row_values.data(), row_values.size());
  rows.emplace_back(row_array);
- }
- } else {
- LocalVector<Name> row_keys(isolate);
-
- while ((r = sqlite3_step(stmt->statement_)) == SQLITE_ROW) {
+ } else {
  if (row_keys.size() == 0) {
  row_keys.reserve(num_cols);
  for (int i = 0; i < num_cols; ++i) {
@@ -2061,14 +2077,6 @@ void StatementSync::All(const FunctionCallbackInfo<Value>& args) {
  }
  }
 
- 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;
- row_values.emplace_back(val);
- }
-
  DCHECK_EQ(row_keys.size(), row_values.size());
  Local<Object> row_obj = Object::New(
  isolate, Null(isolate), row_keys.data(), row_values.data(), num_cols);
@@ -2546,28 +2554,18 @@ void StatementSyncIterator::Next(const FunctionCallbackInfo<Value>& args) {
 
  int num_cols = sqlite3_column_count(iter->stmt_->statement_);
  Local<Value> row_value;
+ LocalVector<Name> row_keys(isolate);
+ LocalVector<Value> row_values(isolate);
 
+ if (!ExtractRowValues(row_values, num_cols, iter->stmt_.get())) return;
  if (iter->stmt_->return_arrays_) {
- LocalVector<Value> array_values(isolate);
- array_values.reserve(num_cols);
- for (int i = 0; i < num_cols; ++i) {
- Local<Value> val;
- if (!iter->stmt_->ColumnToValue(i).ToLocal(&val)) return;
- array_values.emplace_back(val);
- }
- row_value = Array::New(isolate, array_values.data(), array_values.size());
+ row_value = Array::New(isolate, row_values.data(), row_values.size());
  } else {
- LocalVector<Name> row_keys(isolate);
- LocalVector<Value> row_values(isolate);
  row_keys.reserve(num_cols);
- row_values.reserve(num_cols);
  for (int i = 0; i < num_cols; ++i) {
  Local<Name> key;
  if (!iter->stmt_->ColumnNameToName(i).ToLocal(&key)) return;
- Local<Value> val;
- if (!iter->stmt_->ColumnToValue(i).ToLocal(&val)) return;
  row_keys.emplace_back(key);
- row_values.emplace_back(val);
  }
 
  DCHECK_EQ(row_keys.size(), row_values.size());

src/node_sqlite.h

@@ -174,6 +174,8 @@ class StatementSync : public BaseObject {
  const v8::FunctionCallbackInfo<v8::Value>& args);
  static void SetReadBigInts(const v8::FunctionCallbackInfo<v8::Value>& args);
  static void SetReturnArrays(const v8::FunctionCallbackInfo<v8::Value>& args);
+ v8::MaybeLocal<v8::Value> ColumnToValue(const int column);
+ v8::MaybeLocal<v8::Name> ColumnNameToName(const int column);
  void Finalize();
  bool IsFinalized();
 
@@ -191,8 +193,6 @@ class StatementSync : public BaseObject {
  std::optional<std::map<std::string, std::string>> bare_named_params_;
  bool BindParams(const v8::FunctionCallbackInfo<v8::Value>& args);
  bool BindValue(const v8::Local<v8::Value>& value, const int index);
- v8::MaybeLocal<v8::Value> ColumnToValue(const int column);
- v8::MaybeLocal<v8::Name> ColumnNameToName(const int column);
 
  friend class StatementSyncIterator;
 };