@op-engineering/op-sqlite 6.0.1 → 6.0.2-beta3

package/cpp/libsql/libsql.h

@@ -0,0 +1,133 @@
+#ifndef LIBSQL_EXPERIMENTAL_H
+#define LIBSQL_EXPERIMENTAL_H
+
+#include <stdint.h>
+
+#define LIBSQL_INT 1
+
+#define LIBSQL_FLOAT 2
+
+#define LIBSQL_TEXT 3
+
+#define LIBSQL_BLOB 4
+
+#define LIBSQL_NULL 5
+
+typedef struct libsql_connection libsql_connection;
+
+typedef struct libsql_database libsql_database;
+
+typedef struct libsql_row libsql_row;
+
+typedef struct libsql_rows libsql_rows;
+
+typedef struct libsql_rows_future libsql_rows_future;
+
+typedef struct libsql_stmt libsql_stmt;
+
+typedef const libsql_database *libsql_database_t;
+
+typedef const libsql_connection *libsql_connection_t;
+
+typedef const libsql_stmt *libsql_stmt_t;
+
+typedef const libsql_rows *libsql_rows_t;
+
+typedef const libsql_rows_future *libsql_rows_future_t;
+
+typedef const libsql_row *libsql_row_t;
+
+typedef struct {
+  const char *ptr;
+  int len;
+} blob;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+int libsql_sync(libsql_database_t db, const char **out_err_msg);
+
+int libsql_open_sync(const char *db_path,
+                     const char *primary_url,
+                     const char *auth_token,
+                     char read_your_writes,
+                     const char *encryption_key,
+                     libsql_database_t *out_db,
+                     const char **out_err_msg);
+
+int libsql_open_ext(const char *url, libsql_database_t *out_db, const char **out_err_msg);
+
+int libsql_open_file(const char *url, libsql_database_t *out_db, const char **out_err_msg);
+
+int libsql_open_remote(const char *url, const char *auth_token, libsql_database_t *out_db, const char **out_err_msg);
+
+void libsql_close(libsql_database_t db);
+
+int libsql_connect(libsql_database_t db, libsql_connection_t *out_conn, const char **out_err_msg);
+
+int libsql_reset(libsql_connection_t conn, const char **out_err_msg);
+
+void libsql_disconnect(libsql_connection_t conn);
+
+int libsql_prepare(libsql_connection_t conn, const char *sql, libsql_stmt_t *out_stmt, const char **out_err_msg);
+
+int libsql_bind_int(libsql_stmt_t stmt, int idx, long long value, const char **out_err_msg);
+
+int libsql_bind_float(libsql_stmt_t stmt, int idx, double value, const char **out_err_msg);
+
+int libsql_bind_null(libsql_stmt_t stmt, int idx, const char **out_err_msg);
+
+int libsql_bind_string(libsql_stmt_t stmt, int idx, const char *value, const char **out_err_msg);
+
+int libsql_bind_blob(libsql_stmt_t stmt, int idx, const unsigned char *value, int value_len, const char **out_err_msg);
+
+int libsql_query_stmt(libsql_stmt_t stmt, libsql_rows_t *out_rows, const char **out_err_msg);
+
+int libsql_execute_stmt(libsql_stmt_t stmt, const char **out_err_msg);
+
+int libsql_reset_stmt(libsql_stmt_t stmt, const char **out_err_msg);
+
+void libsql_free_stmt(libsql_stmt_t stmt);
+
+int libsql_query(libsql_connection_t conn, const char *sql, libsql_rows_t *out_rows, const char **out_err_msg);
+
+int libsql_execute(libsql_connection_t conn, const char *sql, const char **out_err_msg);
+
+void libsql_free_rows(libsql_rows_t res);
+
+void libsql_free_rows_future(libsql_rows_future_t res);
+
+void libsql_wait_result(libsql_rows_future_t res);
+
+int libsql_column_count(libsql_rows_t res);
+
+int libsql_column_name(libsql_rows_t res, int col, const char **out_name, const char **out_err_msg);
+
+int libsql_column_type(libsql_rows_t res, libsql_row_t row, int col, int *out_type, const char **out_err_msg);
+
+uint64_t libsql_changes(libsql_connection_t conn);
+
+int64_t libsql_last_insert_rowid(libsql_connection_t conn);
+
+int libsql_next_row(libsql_rows_t res, libsql_row_t *out_row, const char **out_err_msg);
+
+void libsql_free_row(libsql_row_t res);
+
+int libsql_get_string(libsql_row_t res, int col, const char **out_value, const char **out_err_msg);
+
+void libsql_free_string(const char *ptr);
+
+int libsql_get_int(libsql_row_t res, int col, long long *out_value, const char **out_err_msg);
+
+int libsql_get_float(libsql_row_t res, int col, double *out_value, const char **out_err_msg);
+
+int libsql_get_blob(libsql_row_t res, int col, blob *out_blob, const char **out_err_msg);
+
+void libsql_free_blob(blob b);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
+
+#endif /* LIBSQL_EXPERIMENTAL_H */

package/cpp/sqlite3.h

@@ -11,7 +11,6 @@
 *************************************************************************
 ** This header file defines the interface that the SQLite library
 ** presents to client programs.  If a C-function, structure, datatype,
-** or constant definition does not appear in this file, then it is
 ** not a published API of SQLite, is subject to change without
 ** notice, and should not be referenced by programs that use SQLite.
 **

package/cpp/types.h

@@ -29,4 +29,9 @@ struct ArrayBuffer {
 using JSVariant = std::variant<nullptr_t, bool, int, double, long, long long,
                                std::string, ArrayBuffer>;
 
+struct BatchArguments {
+  std::string sql;
+  std::shared_ptr<std::vector<JSVariant>> params;
+};
+
 #endif /* types_h */

package/cpp/utils.cpp

@@ -1,6 +1,8 @@
 #include "utils.h"
 #include "SmartHostObject.h"
+#ifndef OP_SQLITE_USE_LIBSQL
 #include "bridge.h"
+#endif
 #include <fstream>
 #include <iostream>
 #include <sstream>
@@ -12,7 +14,6 @@ namespace opsqlite {
 namespace jsi = facebook::jsi;
 
 jsi::Value toJSI(jsi::Runtime &rt, JSVariant value) {
-
   if (std::holds_alternative<bool>(value)) {
     return std::get<bool>(value);
   } else if (std::holds_alternative<int>(value)) {
@@ -22,7 +23,8 @@ jsi::Value toJSI(jsi::Runtime &rt, JSVariant value) {
   } else if (std::holds_alternative<double>(value)) {
     return jsi::Value(std::get<double>(value));
   } else if (std::holds_alternative<std::string>(value)) {
-    return jsi::String::createFromUtf8(rt, std::get<std::string>(value));
+    auto str = std::get<std::string>(value);
+    return jsi::String::createFromUtf8(rt, str);
   } else if (std::holds_alternative<ArrayBuffer>(value)) {
     auto jsBuffer = std::get<ArrayBuffer>(value);
     jsi::Function array_buffer_ctor =
@@ -79,15 +81,34 @@ JSVariant toVariant(jsi::Runtime &rt, const jsi::Value &value) {
   }
 }
 
-std::vector<JSVariant> toVariantVec(jsi::Runtime &rt,
-                                    jsi::Value const &params) {
+std::vector<std::string> to_string_vec(jsi::Runtime &rt, jsi::Value const &xs) {
+  jsi::Array values = xs.asObject(rt).asArray(rt);
+  std::vector<std::string> res;
+  for (int ii = 0; ii < values.length(rt); ii++) {
+    std::string value = values.getValueAtIndex(rt, ii).asString(rt).utf8(rt);
+    res.push_back(value);
+  }
+  return res;
+}
+
+std::vector<int> to_int_vec(jsi::Runtime &rt, jsi::Value const &xs) {
+  jsi::Array values = xs.asObject(rt).asArray(rt);
+  std::vector<int> res;
+  for (int ii = 0; ii < values.length(rt); ii++) {
+    int value = static_cast<int>(values.getValueAtIndex(rt, ii).asNumber());
+    res.push_back(value);
+  }
+  return res;
+}
+
+std::vector<JSVariant> to_variant_vec(jsi::Runtime &rt, jsi::Value const &xs) {
   std::vector<JSVariant> res;
 
-  if (params.isNull() || params.isUndefined()) {
+  if (xs.isNull() || xs.isUndefined()) {
     return res;
   }
 
-  jsi::Array values = params.asObject(rt).asArray(rt);
+  jsi::Array values = xs.asObject(rt).asArray(rt);
 
   for (int ii = 0; ii < values.length(rt); ii++) {
     jsi::Value value = values.getValueAtIndex(rt, ii);
@@ -198,6 +219,46 @@ create_raw_result(jsi::Runtime &rt, BridgeResult status,
   return res;
 }
 
+void to_batch_arguments(jsi::Runtime &rt, jsi::Array const &batchParams,
+                        std::vector<BatchArguments> *commands) {
+  for (int i = 0; i < batchParams.length(rt); i++) {
+    const jsi::Array &command =
+        batchParams.getValueAtIndex(rt, i).asObject(rt).asArray(rt);
+    if (command.length(rt) == 0) {
+      continue;
+    }
+
+    const std::string query =
+        command.getValueAtIndex(rt, 0).asString(rt).utf8(rt);
+    const jsi::Value &commandParams = command.length(rt) > 1
+                                          ? command.getValueAtIndex(rt, 1)
+                                          : jsi::Value::undefined();
+    if (!commandParams.isUndefined() &&
+        commandParams.asObject(rt).isArray(rt) &&
+        commandParams.asObject(rt).asArray(rt).length(rt) > 0 &&
+        commandParams.asObject(rt)
+            .asArray(rt)
+            .getValueAtIndex(rt, 0)
+            .isObject()) {
+      // This arguments is an array of arrays, like a batch update of a single
+      // sql command.
+      const jsi::Array &batchUpdateParams =
+          commandParams.asObject(rt).asArray(rt);
+      for (int x = 0; x < batchUpdateParams.length(rt); x++) {
+        const jsi::Value &p = batchUpdateParams.getValueAtIndex(rt, x);
+        auto params =
+            std::make_shared<std::vector<JSVariant>>(to_variant_vec(rt, p));
+        commands->push_back({query, params});
+      }
+    } else {
+      auto params = std::make_shared<std::vector<JSVariant>>(
+          to_variant_vec(rt, commandParams));
+      commands->push_back({query, params});
+    }
+  }
+}
+
+#ifndef OP_SQLITE_USE_LIBSQL
 BatchResult importSQLFile(std::string dbName, std::string fileLocation) {
   std::string line;
   std::ifstream sqFile(fileLocation);
@@ -236,6 +297,7 @@ BatchResult importSQLFile(std::string dbName, std::string fileLocation) {
     return {SQLiteError, "[op-sqlite][loadSQLFile] Could not open file", 0, 0};
   }
 }
+#endif
 
 bool folder_exists(const std::string &foldername) {
   struct stat buffer;

package/cpp/utils.h

@@ -16,18 +16,18 @@ namespace opsqlite {
 namespace jsi = facebook::jsi;
 
 jsi::Value toJSI(jsi::Runtime &rt, JSVariant value);
-
 JSVariant toVariant(jsi::Runtime &rt, jsi::Value const &value);
-
-std::vector<JSVariant> toVariantVec(jsi::Runtime &rt, jsi::Value const &args);
-
+std::vector<std::string> to_string_vec(jsi::Runtime &rt, jsi::Value const &xs);
+std::vector<JSVariant> to_variant_vec(jsi::Runtime &rt, jsi::Value const &xs);
+std::vector<int> to_int_vec(jsi::Runtime &rt, jsi::Value const &xs);
 jsi::Value createResult(jsi::Runtime &rt, BridgeResult status,
                         std::vector<DumbHostObject> *results,
                         std::shared_ptr<std::vector<SmartHostObject>> metadata);
-
 jsi::Value
 create_raw_result(jsi::Runtime &rt, BridgeResult status,
                   const std::vector<std::vector<JSVariant>> *results);
+void to_batch_arguments(jsi::Runtime &rt, jsi::Array const &batchParams,
+                        std::vector<BatchArguments> *commands);
 
 BatchResult importSQLFile(std::string dbName, std::string fileLocation);
 

package/ios/libsql.xcframework/Info.plist

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>AvailableLibraries</key>
+	<array>
+		<dict>
+			<key>BinaryPath</key>
+			<string>libsql_experimental.a</string>
+			<key>HeadersPath</key>
+			<string>Headers</string>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64</string>
+			<key>LibraryPath</key>
+			<string>libsql_experimental.a</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+		</dict>
+		<dict>
+			<key>BinaryPath</key>
+			<string>libsql_experimental.a</string>
+			<key>HeadersPath</key>
+			<string>Headers</string>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64_x86_64-simulator</string>
+			<key>LibraryPath</key>
+			<string>libsql_experimental.a</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
+		</dict>
+	</array>
+	<key>CFBundlePackageType</key>
+	<string>XFWK</string>
+	<key>XCFrameworkFormatVersion</key>
+	<string>1.0</string>
+</dict>
+</plist>

package/ios/libsql.xcframework/ios-arm64/Headers/libsql.h

@@ -0,0 +1,133 @@
+#ifndef LIBSQL_EXPERIMENTAL_H
+#define LIBSQL_EXPERIMENTAL_H
+
+#include <stdint.h>
+
+#define LIBSQL_INT 1
+
+#define LIBSQL_FLOAT 2
+
+#define LIBSQL_TEXT 3
+
+#define LIBSQL_BLOB 4
+
+#define LIBSQL_NULL 5
+
+typedef struct libsql_connection libsql_connection;
+
+typedef struct libsql_database libsql_database;
+
+typedef struct libsql_row libsql_row;
+
+typedef struct libsql_rows libsql_rows;
+
+typedef struct libsql_rows_future libsql_rows_future;
+
+typedef struct libsql_stmt libsql_stmt;
+
+typedef const libsql_database *libsql_database_t;
+
+typedef const libsql_connection *libsql_connection_t;
+
+typedef const libsql_stmt *libsql_stmt_t;
+
+typedef const libsql_rows *libsql_rows_t;
+
+typedef const libsql_rows_future *libsql_rows_future_t;
+
+typedef const libsql_row *libsql_row_t;
+
+typedef struct {
+  const char *ptr;
+  int len;
+} blob;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+int libsql_sync(libsql_database_t db, const char **out_err_msg);
+
+int libsql_open_sync(const char *db_path,
+                     const char *primary_url,
+                     const char *auth_token,
+                     char read_your_writes,
+                     const char *encryption_key,
+                     libsql_database_t *out_db,
+                     const char **out_err_msg);
+
+int libsql_open_ext(const char *url, libsql_database_t *out_db, const char **out_err_msg);
+
+int libsql_open_file(const char *url, libsql_database_t *out_db, const char **out_err_msg);
+
+int libsql_open_remote(const char *url, const char *auth_token, libsql_database_t *out_db, const char **out_err_msg);
+
+void libsql_close(libsql_database_t db);
+
+int libsql_connect(libsql_database_t db, libsql_connection_t *out_conn, const char **out_err_msg);
+
+int libsql_reset(libsql_connection_t conn, const char **out_err_msg);
+
+void libsql_disconnect(libsql_connection_t conn);
+
+int libsql_prepare(libsql_connection_t conn, const char *sql, libsql_stmt_t *out_stmt, const char **out_err_msg);
+
+int libsql_bind_int(libsql_stmt_t stmt, int idx, long long value, const char **out_err_msg);
+
+int libsql_bind_float(libsql_stmt_t stmt, int idx, double value, const char **out_err_msg);
+
+int libsql_bind_null(libsql_stmt_t stmt, int idx, const char **out_err_msg);
+
+int libsql_bind_string(libsql_stmt_t stmt, int idx, const char *value, const char **out_err_msg);
+
+int libsql_bind_blob(libsql_stmt_t stmt, int idx, const unsigned char *value, int value_len, const char **out_err_msg);
+
+int libsql_query_stmt(libsql_stmt_t stmt, libsql_rows_t *out_rows, const char **out_err_msg);
+
+int libsql_execute_stmt(libsql_stmt_t stmt, const char **out_err_msg);
+
+int libsql_reset_stmt(libsql_stmt_t stmt, const char **out_err_msg);
+
+void libsql_free_stmt(libsql_stmt_t stmt);
+
+int libsql_query(libsql_connection_t conn, const char *sql, libsql_rows_t *out_rows, const char **out_err_msg);
+
+int libsql_execute(libsql_connection_t conn, const char *sql, const char **out_err_msg);
+
+void libsql_free_rows(libsql_rows_t res);
+
+void libsql_free_rows_future(libsql_rows_future_t res);
+
+void libsql_wait_result(libsql_rows_future_t res);
+
+int libsql_column_count(libsql_rows_t res);
+
+int libsql_column_name(libsql_rows_t res, int col, const char **out_name, const char **out_err_msg);
+
+int libsql_column_type(libsql_rows_t res, libsql_row_t row, int col, int *out_type, const char **out_err_msg);
+
+uint64_t libsql_changes(libsql_connection_t conn);
+
+int64_t libsql_last_insert_rowid(libsql_connection_t conn);
+
+int libsql_next_row(libsql_rows_t res, libsql_row_t *out_row, const char **out_err_msg);
+
+void libsql_free_row(libsql_row_t res);
+
+int libsql_get_string(libsql_row_t res, int col, const char **out_value, const char **out_err_msg);
+
+void libsql_free_string(const char *ptr);
+
+int libsql_get_int(libsql_row_t res, int col, long long *out_value, const char **out_err_msg);
+
+int libsql_get_float(libsql_row_t res, int col, double *out_value, const char **out_err_msg);
+
+int libsql_get_blob(libsql_row_t res, int col, blob *out_blob, const char **out_err_msg);
+
+void libsql_free_blob(blob b);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
+
+#endif /* LIBSQL_EXPERIMENTAL_H */

package/ios/libsql.xcframework/ios-arm64_x86_64-simulator/Headers/libsql.h

@@ -0,0 +1,133 @@
+#ifndef LIBSQL_EXPERIMENTAL_H
+#define LIBSQL_EXPERIMENTAL_H
+
+#include <stdint.h>
+
+#define LIBSQL_INT 1
+
+#define LIBSQL_FLOAT 2
+
+#define LIBSQL_TEXT 3
+
+#define LIBSQL_BLOB 4
+
+#define LIBSQL_NULL 5
+
+typedef struct libsql_connection libsql_connection;
+
+typedef struct libsql_database libsql_database;
+
+typedef struct libsql_row libsql_row;
+
+typedef struct libsql_rows libsql_rows;
+
+typedef struct libsql_rows_future libsql_rows_future;
+
+typedef struct libsql_stmt libsql_stmt;
+
+typedef const libsql_database *libsql_database_t;
+
+typedef const libsql_connection *libsql_connection_t;
+
+typedef const libsql_stmt *libsql_stmt_t;
+
+typedef const libsql_rows *libsql_rows_t;
+
+typedef const libsql_rows_future *libsql_rows_future_t;
+
+typedef const libsql_row *libsql_row_t;
+
+typedef struct {
+  const char *ptr;
+  int len;
+} blob;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+int libsql_sync(libsql_database_t db, const char **out_err_msg);
+
+int libsql_open_sync(const char *db_path,
+                     const char *primary_url,
+                     const char *auth_token,
+                     char read_your_writes,
+                     const char *encryption_key,
+                     libsql_database_t *out_db,
+                     const char **out_err_msg);
+
+int libsql_open_ext(const char *url, libsql_database_t *out_db, const char **out_err_msg);
+
+int libsql_open_file(const char *url, libsql_database_t *out_db, const char **out_err_msg);
+
+int libsql_open_remote(const char *url, const char *auth_token, libsql_database_t *out_db, const char **out_err_msg);
+
+void libsql_close(libsql_database_t db);
+
+int libsql_connect(libsql_database_t db, libsql_connection_t *out_conn, const char **out_err_msg);
+
+int libsql_reset(libsql_connection_t conn, const char **out_err_msg);
+
+void libsql_disconnect(libsql_connection_t conn);
+
+int libsql_prepare(libsql_connection_t conn, const char *sql, libsql_stmt_t *out_stmt, const char **out_err_msg);
+
+int libsql_bind_int(libsql_stmt_t stmt, int idx, long long value, const char **out_err_msg);
+
+int libsql_bind_float(libsql_stmt_t stmt, int idx, double value, const char **out_err_msg);
+
+int libsql_bind_null(libsql_stmt_t stmt, int idx, const char **out_err_msg);
+
+int libsql_bind_string(libsql_stmt_t stmt, int idx, const char *value, const char **out_err_msg);
+
+int libsql_bind_blob(libsql_stmt_t stmt, int idx, const unsigned char *value, int value_len, const char **out_err_msg);
+
+int libsql_query_stmt(libsql_stmt_t stmt, libsql_rows_t *out_rows, const char **out_err_msg);
+
+int libsql_execute_stmt(libsql_stmt_t stmt, const char **out_err_msg);
+
+int libsql_reset_stmt(libsql_stmt_t stmt, const char **out_err_msg);
+
+void libsql_free_stmt(libsql_stmt_t stmt);
+
+int libsql_query(libsql_connection_t conn, const char *sql, libsql_rows_t *out_rows, const char **out_err_msg);
+
+int libsql_execute(libsql_connection_t conn, const char *sql, const char **out_err_msg);
+
+void libsql_free_rows(libsql_rows_t res);
+
+void libsql_free_rows_future(libsql_rows_future_t res);
+
+void libsql_wait_result(libsql_rows_future_t res);
+
+int libsql_column_count(libsql_rows_t res);
+
+int libsql_column_name(libsql_rows_t res, int col, const char **out_name, const char **out_err_msg);
+
+int libsql_column_type(libsql_rows_t res, libsql_row_t row, int col, int *out_type, const char **out_err_msg);
+
+uint64_t libsql_changes(libsql_connection_t conn);
+
+int64_t libsql_last_insert_rowid(libsql_connection_t conn);
+
+int libsql_next_row(libsql_rows_t res, libsql_row_t *out_row, const char **out_err_msg);
+
+void libsql_free_row(libsql_row_t res);
+
+int libsql_get_string(libsql_row_t res, int col, const char **out_value, const char **out_err_msg);
+
+void libsql_free_string(const char *ptr);
+
+int libsql_get_int(libsql_row_t res, int col, long long *out_value, const char **out_err_msg);
+
+int libsql_get_float(libsql_row_t res, int col, double *out_value, const char **out_err_msg);
+
+int libsql_get_blob(libsql_row_t res, int col, blob *out_blob, const char **out_err_msg);
+
+void libsql_free_blob(blob b);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
+
+#endif /* LIBSQL_EXPERIMENTAL_H */