[Moneymanagerex-commits] SF.net SVN: moneymanagerex:[5928] trunk/src/model/Model_Report.cpp

[<vo...@us...>]

Revision: 5928
          http://sourceforge.net/p/moneymanagerex/code/5928
Author:   vomikan
Date:     2014-01-15 17:10:40 +0000 (Wed, 15 Jan 2014)
Log Message:
-----------
fix for % usage and sql errors handler

Modified Paths:
--------------
    trunk/src/model/Model_Report.cpp

Modified: trunk/src/model/Model_Report.cpp
===================================================================
--- trunk/src/model/Model_Report.cpp	2014-01-15 17:09:42 UTC (rev 5927)
+++ trunk/src/model/Model_Report.cpp	2014-01-15 17:10:40 UTC (rev 5928)
@@ -76,21 +76,45 @@
     report("TEMPLATEPATH") = r->TEMPLATEPATH;
 
     loop_t contents;
-
-    wxSQLite3Statement stmt = this->db_->PrepareStatement(r->SQLCONTENT);
-    wxLogDebug(stmt.GetSQL());
     loop_t errors;
     row_t error;
-    if (!stmt.IsReadOnly())
-    {
-        error("ERROR") = r->SQLCONTENT + " will modify database! aborted!";
-        errors += error;
-    }
+
+    //Check if script is read only
+    int rows;
+    wxString sqlScriptException;
+    try
+    {
+        rows = this->db_->ExecuteScalar(wxString::Format("select count (*) from (\n%s\n)", r->SQLCONTENT));
+    }
+    catch (const wxSQLite3Exception& e)
+    {
+        sqlScriptException = e.GetMessage().Lower();
+    }
+
+    if (sqlScriptException.Contains("update") ||
+        sqlScriptException.Contains("delete") ||
+        sqlScriptException.Contains("insert"))
+    {
+        error("ERROR") = r->SQLCONTENT + "\nwill modify database! aborted!";
+        errors += error;
+    }
     else
     {
-        wxSQLite3ResultSet q = stmt.ExecuteQuery();
-        int columnCount = q.GetColumnCount();
+        wxSQLite3ResultSet q;
+        bool ok = true;
+        try
+        {
+            q = this->db_->ExecuteQuery(r->SQLCONTENT);
+        }
+        catch (const wxSQLite3Exception& e)
+        {
+            error("ERROR") = wxString::Format(_("Error: %s"), e.GetMessage());
+            errors += error;
+            ok = false;
+        }
 
+        int columnCount = ok ? q.GetColumnCount() : 0;
+
         loop_t columns;
         for (int i = 0; i < columnCount; ++ i)
         {
@@ -116,7 +140,7 @@
             errors += error;
         }
 
-        while (q.NextRow())
+        while (ok && q.NextRow())
         {
             Record r;
             for (int i = 0; i < columnCount; ++ i)
@@ -151,7 +175,7 @@
             for (const auto& item : r) row(item.first) = item.second;
             contents += row;
         }
-        q.Finalize();
+        if (ok) q.Finalize();
 
         Record result;
         if (lua_status) 

This was sent by MMEX an easy to use, money management application.