Refactory of importSQLFile

 - Method exported to its own file

Author: EduFrazao

android/CMakeLists.txt

@@ -49,6 +49,8 @@ add_library(
   ../cpp/JSIHelper.cpp
   ../cpp/ThreadPool.h
   ../cpp/ThreadPool.cpp
+  ../cpp/sqlfileloader.h
+  ../cpp/sqlfileloader.cpp
   cpp-adapter.cpp
 )
 

cpp/installer.cpp

@@ -12,6 +12,7 @@
 #include "logs.h"
 #include "JSIHelper.h"
 #include "ThreadPool.h"
+#include "sqlfileloader.h"
 #include <vector>
 #include <iostream>
 #include <fstream>
@@ -23,55 +24,6 @@ using namespace facebook;
 string docPathStr;
 std::shared_ptr<react::CallInvoker> invoker;
 
-/**
- * Local function to handle SQL File Import in order to reuse with Sync and Async operations
- */
-SequelBatchOperationResult importSQLFile(string dbName, string fileLocation)
-{
-  string line;
-  ifstream sqFile(fileLocation);
-  if (sqFile.is_open())
-  {
-    try
-    {
-      int affectedRows = 0;
-      int commands = 0;
-      sequel_execute_literal_update(dbName, "BEGIN EXCLUSIVE TRANSACTION");
-      while (std::getline(sqFile, line, '\n'))
-      {
-        if (!line.empty())
-        {
-          SequelLiteralUpdateResult result = sequel_execute_literal_update(dbName, line);
-          if (result.type == SequelResultError)
-          {
-            sequel_execute_literal_update(dbName, "ROLLBACK");
-            sqFile.close();
-            return {SequelResultError, result.message, 0, commands};
-          }
-          else
-          {
-            affectedRows += result.affectedRows;
-            commands++;
-          }
-        }
-      }
-      sqFile.close();
-      sequel_execute_literal_update(dbName, "COMMIT");
-      return {SequelResultOk, "", affectedRows, commands};
-    }
-    catch (...)
-    {
-      sqFile.close();
-      sequel_execute_literal_update(dbName, "ROLLBACK");
-      return {SequelResultError, "[react-native-quick-sqlite][loadSQLFile] Unexpected error, transaction was rolledback", 0, 0};
-    }
-  }
-  else
-  {
-    return {SequelResultError, "[react-native-quick-sqlite][loadSQLFile] Could not open file", 0, 0};
-  }
-}
-
 jsi::Object createError(jsi::Runtime &rt, string message)
 {
   auto res = jsi::Object(rt);

cpp/sqlfileloader.cpp

@@ -0,0 +1,54 @@
+/**
+ * SQL File Loader implementation
+*/
+#include "sqlfileloader.h"
+#include <iostream>
+#include <fstream>
+
+using namespace std;
+
+SequelBatchOperationResult importSQLFile(string dbName, string fileLocation)
+{
+  string line;
+  ifstream sqFile(fileLocation);
+  if (sqFile.is_open())
+  {
+    try
+    {
+      int affectedRows = 0;
+      int commands = 0;
+      sequel_execute_literal_update(dbName, "BEGIN EXCLUSIVE TRANSACTION");
+      while (std::getline(sqFile, line, '\n'))
+      {
+        if (!line.empty())
+        {
+          SequelLiteralUpdateResult result = sequel_execute_literal_update(dbName, line);
+          if (result.type == SequelResultError)
+          {
+            sequel_execute_literal_update(dbName, "ROLLBACK");
+            sqFile.close();
+            return {SequelResultError, result.message, 0, commands};
+          }
+          else
+          {
+            affectedRows += result.affectedRows;
+            commands++;
+          }
+        }
+      }
+      sqFile.close();
+      sequel_execute_literal_update(dbName, "COMMIT");
+      return {SequelResultOk, "", affectedRows, commands};
+    }
+    catch (...)
+    {
+      sqFile.close();
+      sequel_execute_literal_update(dbName, "ROLLBACK");
+      return {SequelResultError, "[react-native-quick-sqlite][loadSQLFile] Unexpected error, transaction was rolledback", 0, 0};
+    }
+  }
+  else
+  {
+    return {SequelResultError, "[react-native-quick-sqlite][loadSQLFile] Could not open file", 0, 0};
+  }
+}

cpp/sqlfileloader.h

@@ -0,0 +1,10 @@
+
+/**
+ * SQL File Loader
+ * Utilizes the regular sqlite bridge to load an SQLFile inside a transaction
+ *
+*/
+
+#include "JSIHelper.h"
+#include "sqliteBridge.h"
+SequelBatchOperationResult importSQLFile(std::string dbName, std::string fileLocation);