bump sqlite-loadable==0.0.6-alpha.6

Author: asg017

Cargo.lock

@@ -10,7 +10,7 @@ keywords = ["sqlite", "sqlite-extension"]
 license = "MIT/Apache-2.0"
 
 [dependencies]
-sqlite-loadable = "0.0.6-alpha.2"
+sqlite-loadable = "0.0.6-alpha.6"
 regex = "1"
 
 [lib]

Cargo.toml

@@ -39,10 +39,14 @@ ifdef target
 CARGO_TARGET=--target=$(target)
 BUILT_LOCATION=target/$(target)/debug/$(LIBRARY_PREFIX)sqlite_regex.$(LOADABLE_EXTENSION)
 BUILT_LOCATION_RELEASE=target/$(target)/release/$(LIBRARY_PREFIX)sqlite_regex.$(LOADABLE_EXTENSION)
+BUILT_LOCATION_STATIC=target/$(target)/debug/libsqlite_regex.$(STATIC_EXTENSION)
+BUILT_LOCATION_STATIC_RELEASE=target/$(target)/release/libsqlite_regex.$(STATIC_EXTENSION)
 else
 CARGO_TARGET=
 BUILT_LOCATION=target/debug/$(LIBRARY_PREFIX)sqlite_regex.$(LOADABLE_EXTENSION)
 BUILT_LOCATION_RELEASE=target/release/$(LIBRARY_PREFIX)sqlite_regex.$(LOADABLE_EXTENSION)
+BUILT_LOCATION_STATIC=target/debug/libsqlite_regex.$(STATIC_EXTENSION)
+BUILT_LOCATION_STATIC_RELEASE=target/release/libsqlite_regex.$(STATIC_EXTENSION)
 endif
 
 ifdef python
@@ -75,6 +79,14 @@ $(TARGET_LOADABLE_RELEASE): $(prefix) $(shell find . -type f -name '*.rs')
 	cargo build --release $(CARGO_TARGET)
 	cp $(BUILT_LOCATION_RELEASE) $@
 
+$(TARGET_STATIC): $(prefix) $(shell find . -type f -name '*.rs')
+	cargo build $(CARGO_TARGET) --features=sqlite-loadable/static
+	cp $(BUILT_LOCATION) $@
+
+$(TARGET_STATIC_RELEASE): $(prefix) $(shell find . -type f -name '*.rs')
+	cargo build --release $(CARGO_TARGET) --features=sqlite-loadable/static
+	cp $(BUILT_LOCATION_RELEASE) $@
+
 python: $(TARGET_WHEELS) $(TARGET_LOADABLE) python/sqlite_regex/setup.py python/sqlite_regex/sqlite_regex/__init__.py .github/workflows/rename-wheels.py
 	cp $(TARGET_LOADABLE) $(INTERMEDIATE_PYPACKAGE_EXTENSION)
 	rm $(TARGET_WHEELS)/sqlite_regex* || true

Makefile

@@ -2,12 +2,12 @@ use regex::{Captures, Regex};
 use sqlite_loadable::{
     api,
     scalar::scalar_function_raw,
-    table::{ConstraintOperator, IndexInfo, VTab, VTabArguments, VTabCursor, VTabFind},
+    table::{ConstraintOperator, FindResult, IndexInfo, VTab, VTabArguments, VTabCursor, VTabFind},
     BestIndexError, Result,
 };
 use sqlite_loadable::{prelude::*, Error};
 
-use std::{mem, os::raw::c_int};
+use std::{ffi::c_void, mem, os::raw::c_int};
 
 use crate::utils::{result_regex_captures, value_regex};
 
@@ -92,13 +92,9 @@ impl<'vtab> VTab<'vtab> for RegexCapturesTable {
 }
 
 impl<'vtab> VTabFind<'vtab> for RegexCapturesTable {
-    fn find_function(
-        &mut self,
-        argc: i32,
-        name: &str,
-    ) -> Option<unsafe extern "C" fn(*mut sqlite3_context, i32, *mut *mut sqlite3_value)> {
+    fn find_function(&mut self, argc: i32, name: &str) -> Option<FindResult> {
         if name == "->>" && argc == 2 {
-            return Some(scalar_function_raw(crate::regex_capture2));
+            return Some((scalar_function_raw(crate::regex_capture2), None, None));
         }
         None
     }