Do not throw on invalid SQL statement and bump version

Author: Oscar Franco

README.md

@@ -34,6 +34,7 @@ If you are using quick-sqlite in your app, please get in touch or open a PR with
 - Your app will now include C++, you will need to install the NDK on your machine for android. (unless you know how to generate an AAR, feel free to open a PR)
 - If you want to run the example project on android, you will have to change the paths on the android/CMakeLists.txt file, they are already there, just uncomment them.
 - This library supports SQLite BLOBs which are mapped to JS ArrayBuffers, check out the sample project on how to use it
+- Starting with version 2.0.0 the library no longer throws errors when an invalid statement is passed, but rather returns an object with a `status` enum property, where 0 signals a succesful execution and `1` an incorrect execution (this is to keep typeorm from exploding when an incorrect query is executed)
 
 ## Use TypeORM
 
@@ -54,6 +55,8 @@ interface ISQLite {
     query: string,
     params: any[] | undefined
   ) => {
+    status: 0 | 1; // 0 for correct execution
+    message: string; // if status === 1, here you will find error description
     rows: any[];
     insertId?: number;
   };

android/CMakeLists.txt

@@ -3,51 +3,47 @@ cmake_minimum_required(VERSION 3.4.1)
 set (CMAKE_VERBOSE_MAKEFILE ON)
 set (CMAKE_CXX_STANDARD 11)
 
-# This flag is set on the example project build.gradle (in the ext variables)
-# Needed to change the directories when building JUST the example project
-# message ("DEV_CMAKE=${DEV_CMAKE}")
-
-# if(DEV_CMAKE)
-#   include_directories(
-#     ../cpp
-#     ../node_modules/react-native/React
-#     ../node_modules/react-native/React/Base
-#     ../node_modules/react-native/ReactCommon/jsi
-#   )
-  
-#   add_library(sequel
-#     SHARED
-
-#     ../node_modules/react-native/ReactCommon/jsi/jsi/jsi.cpp
-#     ../cpp/sequel.cpp
-#     ../cpp/sequel.h
-#     ../cpp/SequelResult.h
-#     ../cpp/react-native-quick-sqlite.cpp
-#     ../cpp/react-native-quick-sqlite.h
-#     ../cpp/sqlite3.h
-#     ../cpp/sqlite3.c
-#     cpp-adapter.cpp
-#   )
-# else()
-  include_directories(
-    ../cpp
-    ../../react-native/React
-    ../../react-native/React/Base
-    ../../react-native/ReactCommon/jsi
-  )
-  
-  add_library(sequel
-    SHARED
-    ../../react-native/ReactCommon/jsi/jsi/jsi.cpp
-    ../cpp/sequel.cpp
-    ../cpp/sequel.h
-    ../cpp/SequelResult.h
-    ../cpp/react-native-quick-sqlite.cpp
-    ../cpp/react-native-quick-sqlite.h
-    ../cpp/sqlite3.h
-    ../cpp/sqlite3.c
-    cpp-adapter.cpp
-  )
-# endif()
-
-target_link_libraries(sequel android log)
+# Uncomment the following lines to compile the example project
+# include_directories(
+#   ../cpp
+#   ../node_modules/react-native/React
+#   ../node_modules/react-native/React/Base
+#   ../node_modules/react-native/ReactCommon/jsi
+# )
+
+# add_library(sequel
+#   SHARED
+
+#   ../node_modules/react-native/ReactCommon/jsi/jsi/jsi.cpp
+#   ../cpp/sequel.cpp
+#   ../cpp/sequel.h
+#   ../cpp/SequelResult.h
+#   ../cpp/react-native-quick-sqlite.cpp
+#   ../cpp/react-native-quick-sqlite.h
+#   ../cpp/sqlite3.h
+#   ../cpp/sqlite3.c
+#   cpp-adapter.cpp
+# )
+
+include_directories(
+  ../cpp
+  ../../react-native/React
+  ../../react-native/React/Base
+  ../../react-native/ReactCommon/jsi
+)
+
+add_library(sequel
+  SHARED
+  ../../react-native/ReactCommon/jsi/jsi/jsi.cpp
+  ../cpp/sequel.cpp
+  ../cpp/sequel.h
+  ../cpp/SequelResult.h
+  ../cpp/react-native-quick-sqlite.cpp
+  ../cpp/react-native-quick-sqlite.h
+  ../cpp/sqlite3.h
+  ../cpp/sqlite3.c
+  cpp-adapter.cpp
+)
+
+
+target_link_libraries(sequel android log)

cpp/react-native-quick-sqlite.cpp

@@ -62,7 +62,7 @@ void installSequel(jsi::Runtime &rt, const char *docPath)
             jsi::detail::throwJSError(rt, "[react-native-quick-sqlite] database location must be a string");
             return {};
           }
-          
+
           tempDocPath = tempDocPath + "/" + args[1].asString(rt).utf8(rt);
         }
 
@@ -167,8 +167,11 @@ void installSequel(jsi::Runtime &rt, const char *docPath)
 
         if (result.type == SequelResultError)
         {
-          jsi::detail::throwJSError(rt, result.message.c_str());
-          return {};
+          // jsi::detail::throwJSError(rt, result.message.c_str());
+          auto res = jsi::Object(rt);
+          res.setProperty(rt, "status", jsi::Value(1));
+          res.setProperty(rt, "message", jsi::String::createFromUtf8(rt, result.message.c_str()));
+          return move(res);
         }
 
         return move(result.value);

cpp/sequel.cpp

@@ -15,6 +15,9 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <map>
+// #ifdef ANDROID
+// #include "logs.h"
+// #endif // ANDROID
 
 using namespace std;
 using namespace facebook;
@@ -262,14 +265,14 @@ SequelResult sequel_execute(jsi::Runtime &rt, string const dbName, string const
   // Compile and move result into statement memory spot
   int statementStatus = sqlite3_prepare_v2(db, query.c_str(), -1, &statement, NULL);
 
+
   if (statementStatus == SQLITE_OK) // statemnet is correct, bind the passed parameters
   {
     bindStatement(statement, rt, params);
   }
   else
   {
     const char *message = sqlite3_errmsg(db);
-
     return {
         SequelResultError,
         "[react-native-quick-sqlite] SQL execution error: " + string(message),
@@ -377,6 +380,7 @@ SequelResult sequel_execute(jsi::Runtime &rt, string const dbName, string const
   }
 
   jsi::Object rows = jsi::Object(rt);
+  rows.setProperty(rt, "status", jsi::Value(0));
   rows.setProperty(rt, "length", jsi::Value((int)results.size()));
   rows.setProperty(rt, "_array", move(array));
 

example/android/build.gradle

@@ -6,7 +6,6 @@ buildscript {
         minSdkVersion = 16
         compileSdkVersion = 29
         targetSdkVersion = 29
-        useDevCmakeLists = true
     }
     repositories {
         google()

example/ios/Podfile.lock

@@ -185,7 +185,7 @@ PODS:
     - React-cxxreact (= 0.63.4)
     - React-jsi (= 0.63.4)
   - React-jsinspector (0.63.4)
-  - react-native-quick-sqlite (0.1.4):
+  - react-native-quick-sqlite (1.0.5):
     - React-Core
   - React-RCTActionSheet (0.63.4):
     - React-Core/RCTActionSheetHeaders (= 0.63.4)
@@ -357,7 +357,7 @@ SPEC CHECKSUMS:
   React-jsi: a0418934cf48f25b485631deb27c64dc40fb4c31
   React-jsiexecutor: 93bd528844ad21dc07aab1c67cb10abae6df6949
   React-jsinspector: 58aef7155bc9a9683f5b60b35eccea8722a4f53a
-  react-native-quick-sqlite: 4c9ebbb28e83ea60274084117c25b513dcf7b571
+  react-native-quick-sqlite: b86820d88ce8c0ee4b5491a2ba1ebbf807a311b4
   React-RCTActionSheet: 89a0ca9f4a06c1f93c26067af074ccdce0f40336
   React-RCTAnimation: 1bde3ecc0c104c55df246eda516e0deb03c4e49b
   React-RCTBlob: a97d378b527740cc667e03ebfa183a75231ab0f0
@@ -372,4 +372,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 468acaff90c15fab0a38d24ffe8509d22154ad61
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.11.2

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-quick-sqlite",
-  "version": "1.0.5",
+  "version": "2.0.0",
   "description": "Fast sqlite implementation for react-native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",