Enhance SQLite error handling by throwing std::invalid_argument for invalid statement handles and adding new methods to retrieve database file path and statement count.

Author: alienx5499

include/libp2p/storage/sqlite.hpp

@@ -61,6 +61,7 @@ namespace libp2p::storage {
      * @param st_handle - statement identifier
      * @param args - command arguments
      * @return number of rows affected, -1 in case of error
+     * @throws std::invalid_argument if statement handle is invalid
      */
     template <typename... Args>
     inline int execCommand(StatementHandle st_handle, const Args &...args) {
@@ -69,11 +70,14 @@ namespace libp2p::storage {
         bindArgs(st, args...);
         st.execute();
         return countChanges();
-      } catch (const std::runtime_error &e) {
+      } catch (const std::invalid_argument &e) {
         // getStatement can receive invalid handle
-        log_->error(e.what());
+        log_->error("Invalid statement handle: {}", e.what());
+        throw; // Re-throw invalid_argument as it's a programming error
+      } catch (const std::runtime_error &e) {
+        log_->error("Runtime error during command execution: {}", e.what());
       } catch (...) {
-        log_->error(getErrorMessage());
+        log_->error("Unknown error during command execution: {}", getErrorMessage());
       }
       return -1;
     }
@@ -86,6 +90,7 @@ namespace libp2p::storage {
      * @param sink - query response consumer
      * @param args - query arguments
      * @return true when query was successfully executed, otherwise - false
+     * @throws std::invalid_argument if statement handle is invalid
      */
     template <typename Sink, typename... Args>
     inline bool execQuery(StatementHandle st_handle,
@@ -96,11 +101,14 @@ namespace libp2p::storage {
         bindArgs(st, args...);
         st >> sink;
         return true;
-      } catch (const std::runtime_error &e) {
+      } catch (const std::invalid_argument &e) {
         // getStatement can receive invalid handle
-        log_->error(e.what());
+        log_->error("Invalid statement handle: {}", e.what());
+        throw; // Re-throw invalid_argument as it's a programming error
+      } catch (const std::runtime_error &e) {
+        log_->error("Runtime error during query execution: {}", e.what());
       } catch (...) {
-        log_->error(getErrorMessage());
+        log_->error("Unknown error during query execution: {}", getErrorMessage());
       }
       return false;
     }
@@ -121,6 +129,12 @@ namespace libp2p::storage {
     /// Returns the number of rows modified
     int countChanges() const;
 
+    /// Returns the database file path
+    const std::string &getDatabaseFile() const;
+
+    /// Returns the number of prepared statements
+    size_t getStatementCount() const;
+
     ::sqlite::database db_;
     std::string db_file_;
     log::Logger log_;

src/storage/sqlite.cpp

@@ -42,12 +42,23 @@ namespace libp2p::storage {
   SQLite::database_binder &SQLite::getStatement(
       SQLite::StatementHandle handle) {
     if (handle >= statements_.size()) {
-      throw std::runtime_error("SQLite: statement does not exist");
+      throw std::invalid_argument("SQLite: statement handle " + 
+                                 std::to_string(handle) + 
+                                 " does not exist (max: " + 
+                                 std::to_string(statements_.size() - 1) + ")");
     }
     return statements_[handle];
   }
 
   int SQLite::countChanges() const {
     return sqlite3_changes(db_.connection().get());
   }
+
+  const std::string &SQLite::getDatabaseFile() const {
+    return db_file_;
+  }
+
+  size_t SQLite::getStatementCount() const {
+    return statements_.size();
+  }
 }  // namespace libp2p::storage