chore: fix sqlite_step function

Author: codekeyz

Cargo.lock

@@ -14,3 +14,4 @@ serde = { version = "1.0.216", features = ["derive"] }
 serde_json = "1.0.134"
 tokio = { version = "1.42.0", features = ["rt-multi-thread"] }
 reqwest = { version = "0.12.9", features = ["json", "blocking", "gzip"] }
+num_cpus = "1.17.0"

Cargo.toml

@@ -5,23 +5,18 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab"
+      sha256: da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f
       url: "https://pub.dev"
     source: hosted
-    version: "76.0.0"
-  _macros:
-    dependency: transitive
-    description: dart
-    source: sdk
-    version: "0.3.3"
+    version: "85.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e"
+      sha256: "974859dc0ff5f37bc4313244b3218c791810d03ab3470a579580279ba971a48d"
       url: "https://pub.dev"
     source: hosted
-    version: "6.11.0"
+    version: "7.7.1"
   args:
     dependency: transitive
     description:
@@ -86,14 +81,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.6"
-  dotenv:
-    dependency: "direct main"
-    description:
-      name: dotenv
-      sha256: "379e64b6fc82d3df29461d349a1796ecd2c436c480d4653f3af6872eccbc90e1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.2.0"
   ffi:
     dependency: transitive
     description:
@@ -174,14 +161,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.0"
-  macros:
-    dependency: transitive
-    description:
-      name: macros
-      sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.3-main.0"
   matcher:
     dependency: transitive
     description:
@@ -314,18 +293,18 @@ packages:
     dependency: transitive
     description:
       name: sqlite3
-      sha256: dd806fff004a0aeb01e208b858dbc649bc72104670d425a81a6dd17698535f6e
+      sha256: f393d92c71bdcc118d6203d07c991b9be0f84b1a6f89dd4f7eed348131329924
       url: "https://pub.dev"
     source: hosted
-    version: "2.8.0"
+    version: "2.9.0"
   sqlite3_web:
     dependency: transitive
     description:
       name: sqlite3_web
-      sha256: "967e076442f7e1233bd7241ca61f3efe4c7fc168dac0f38411bdb3bdf471eb3c"
+      sha256: "0f6ebcb4992d1892ac5c8b5ecd22a458ab9c5eb6428b11ae5ecb5d63545844da"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.1"
+    version: "0.3.2"
   sqlite_async:
     dependency: "direct main"
     description:
@@ -370,26 +349,26 @@ packages:
     dependency: "direct dev"
     description:
       name: test
-      sha256: "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f"
+      sha256: "75906bf273541b676716d1ca7627a17e4c4070a3a16272b7a3dc7da3b9f3f6b7"
       url: "https://pub.dev"
     source: hosted
-    version: "1.25.8"
+    version: "1.26.3"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
+      sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.3"
+    version: "0.7.7"
   test_core:
     dependency: transitive
     description:
       name: test_core
-      sha256: "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d"
+      sha256: "0cc24b5ff94b38d2ae73e1eb43cc302b77964fbf67abad1e296025b78deb53d0"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.5"
+    version: "0.6.12"
   typed_data:
     dependency: transitive
     description:

pubspec.lock

@@ -7,7 +7,6 @@ environment:
   sdk: ^3.3.1
 
 dependencies:
-  dotenv: ^4.2.0
   path: ^1.9.1
   sqlite_async: ^0.11.8
 

pubspec.yaml

@@ -22,7 +22,8 @@ impl DbAuthStrategy for GlobeStrategy {
         Box::pin(async move {
             let globe_auth_api = std::env::var("GLOBE_DS_API")?;
 
-            let request_body = serde_json::json!({ "db_name": db_name });
+            let clean_db_name = db_name.split('.').next().unwrap_or(db_name);
+            let request_body = serde_json::json!({ "db_name": clean_db_name });
 
             let response = client
                 .post(format!("{}/db/auth", globe_auth_api))

src/auth.rs

@@ -8,16 +8,15 @@ use std::{
 };
 
 use sqlite::{
-    push_error, reset_txn_on_db, ExecutionState, SQLite3, SQLite3PreparedStmt, Value, SQLITE_BUSY,
-    SQLITE_CANTOPEN, SQLITE_DONE, SQLITE_ERROR, SQLITE_FLOAT, SQLITE_INTEGER, SQLITE_MISUSE,
-    SQLITE_NULL, SQLITE_OK, SQLITE_RANGE, SQLITE_TEXT,
+    push_error, reset_txn_on_db, ExecutionState, SQLite3, SQLite3ExecCallback, SQLite3PreparedStmt,
+    Value, SQLITE_BUSY, SQLITE_CANTOPEN, SQLITE_DONE, SQLITE_ERROR, SQLITE_FLOAT, SQLITE_INTEGER,
+    SQLITE_MISUSE, SQLITE_NULL, SQLITE_OK, SQLITE_RANGE, SQLITE_TEXT,
 };
-use utils::execute_async_task;
 
 use crate::{
     auth::{DbAuthStrategy, GlobeStrategy},
     utils::{
-        count_parameters, extract_column_names, get_tokio, is_aligned, sql_is_begin_transaction,
+        count_parameters, execute_async_task, get_tokio, is_aligned, sql_is_begin_transaction,
         sql_is_commit, sql_is_pragma, sql_is_rollback,
     },
 };
@@ -139,7 +138,6 @@ pub unsafe extern "C" fn sqlite3_prepare_v3(
     };
 
     let param_count = count_parameters(&sql);
-    let column_names = extract_column_names(&sql);
 
     // Mock unparsed portion of SQL
     if !pz_tail.is_null() {
@@ -156,7 +154,7 @@ pub unsafe extern "C" fn sqlite3_prepare_v3(
         execution_state: Mutex::new(ExecutionState::Prepared), // Start in the "Prepared" state
         result_rows: Mutex::new(vec![]), // Initialize an empty result set
         current_row: Mutex::new(None), // No current row initially
-        column_names,
+        column_names: Vec::new(),
     });
     *pp_stmt = Box::into_raw(stmt);
 
@@ -277,21 +275,36 @@ pub unsafe extern "C" fn sqlite3_step(stmt_ptr: *mut SQLite3PreparedStmt) -> c_i
     }
     drop(exec_state);
 
-    let sql = stmt.sql.to_uppercase();
-    if sql.starts_with("SELECT") {
-        return execute_async_task(stmt.db, sqlite::handle_select(stmt));
-    } else if sql_is_begin_transaction(&sql) {
-        return execute_async_task(stmt.db, sqlite::begin_tnx_on_db(stmt.db));
-    } else if sql_is_commit(&sql) {
-        return execute_async_task(stmt.db, sqlite::commit_tnx_on_db(stmt.db));
+    let needs_execution = stmt.result_rows.lock().unwrap().is_empty();
+    if needs_execution {
+        let sql = stmt.sql.to_uppercase();
+        let sql_result_code = {
+            if sql_is_begin_transaction(&sql) {
+                execute_async_task(stmt.db, sqlite::begin_tnx_on_db(stmt.db, &sql))
+            } else if sql_is_commit(&sql) {
+                execute_async_task(stmt.db, sqlite::commit_tnx_on_db(stmt.db, &sql))
+            } else {
+                execute_async_task(stmt.db, sqlite::execute_stmt(stmt))
+            }
+        };
+
+        if sql_result_code != SQLITE_OK {
+            return sql_result_code;
+        }
     }
 
-    execute_async_task(stmt.db, sqlite::execute_statement(stmt))
+    let sql_result_code = sqlite::iterate_rows(stmt);
+    if let Err(error) = sql_result_code {
+        push_error(stmt.db, (error.to_string(), SQLITE_ERROR));
+        return SQLITE_ERROR;
+    }
+
+    sql_result_code.unwrap()
 }
 
 #[no_mangle]
 pub extern "C" fn sqlite3_column_count(stmt: *mut SQLite3PreparedStmt) -> i32 {
-    if stmt.is_null() {
+    if !is_aligned(stmt) {
         return 0;
     }
 
@@ -595,9 +608,9 @@ pub extern "C" fn sqlite3_errstr(errcode: c_int) -> *const c_char {
 pub unsafe extern "C" fn sqlite3_exec(
     db: *mut SQLite3,
     sql: *const c_char,
-    _: Option<extern "C" fn(*mut std::ffi::c_void, i32, *const *const i8, *const *const i8) -> i32>,
-    _: *mut std::ffi::c_void,
-    _: *mut *mut i8,
+    callback: SQLite3ExecCallback, // Callback function
+    arg: *mut c_void,
+    errmsg: *mut *mut c_char,
 ) -> c_int {
     if !is_aligned(db) {
         return SQLITE_CANTOPEN;
@@ -610,11 +623,11 @@ pub unsafe extern "C" fn sqlite3_exec(
     if sql_is_pragma(&sql) {
         return SQLITE_OK;
     } else if sql_is_begin_transaction(&sql) {
-        return execute_async_task(db, sqlite::begin_tnx_on_db(db));
+        return execute_async_task(db, sqlite::begin_tnx_on_db(db, &sql));
     } else if sql_is_rollback(&sql) {
         return reset_txn_on_db(db);
     } else if sql_is_commit(&sql) {
-        return execute_async_task(db, sqlite::commit_tnx_on_db(db));
+        return execute_async_task(db, sqlite::commit_tnx_on_db(db, &sql));
     }
 
     execute_async_task(db, sqlite::handle_execute(db, &sql))