updates v0.1.0

trvon · trvon · commit b024e806d7d7 · 2025-10-14T16:23:18.000-04:00
diff --git a/include/sqlite-vec-cpp/distances/cosine.hpp b/include/sqlite-vec-cpp/distances/cosine.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cassert>
 #include <cmath>
 #include <span>
 #include <type_traits>
diff --git a/include/sqlite-vec-cpp/distances/hamming.hpp b/include/sqlite-vec-cpp/distances/hamming.hpp
@@ -2,6 +2,7 @@
 
 #include <array>
 #include <bit>
+#include <cassert>
 #include <climits>
 #include <cstdint>
 #include <span>
diff --git a/include/sqlite-vec-cpp/distances/l1.hpp b/include/sqlite-vec-cpp/distances/l1.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cassert>
 #include <cmath>
 #include <cstdlib>
 #include <span>
diff --git a/include/sqlite-vec-cpp/distances/l2.hpp b/include/sqlite-vec-cpp/distances/l2.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cassert>
 #include <cmath>
 #include <span>
 #include <type_traits>
diff --git a/include/sqlite-vec-cpp/sqlite/context.hpp b/include/sqlite-vec-cpp/sqlite/context.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <sqlite3.h>
+
 #include <cstring>
 #include <span>
 #include <string>
diff --git a/include/sqlite-vec-cpp/sqlite/registration.hpp b/include/sqlite-vec-cpp/sqlite/registration.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <sqlite3.h>
+
 #include "../utils/error.hpp"
 #include "enhanced_functions.hpp"
 #include "functions.hpp"
diff --git a/include/sqlite-vec-cpp/sqlite/value.hpp b/include/sqlite-vec-cpp/sqlite/value.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <sqlite3.h>
+
 #include <cstdint>
 #include <optional>
 #include <span>
diff --git a/include/sqlite-vec-cpp/sqlite/vtab.hpp b/include/sqlite-vec-cpp/sqlite/vtab.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <sqlite3.h>
+
 #include <cstdarg>
 #include <memory>
 #include <string>
diff --git a/src/sqlite_vec_c_api.cpp b/src/sqlite_vec_c_api.cpp
@@ -2,12 +2,10 @@
 // Maintains backward compatibility with original sqlite-vec C API
 // while leveraging modern C++20/23 implementation internally
 
-#include <sqlite3ext.h>
+#include <sqlite3.h>
 #include <sqlite-vec-cpp/sqlite/registration.hpp>
 #include <sqlite-vec-cpp/sqlite_vec.hpp>
 
-SQLITE_EXTENSION_INIT1
-
 // External C API entry point (maintains compatibility)
 extern "C" {
 
@@ -19,7 +17,7 @@ int sqlite3_vec_init(
     char **pzErrMsg,
     const sqlite3_api_routines *pApi
 ) {
-    SQLITE_EXTENSION_INIT2(pApi);
+    (void)pApi; // not using extension API; direct sqlite3.h
 
     try {
         // Register all vector functions from C++ implementation
diff --git a/tests/meson.build b/tests/meson.build
@@ -25,7 +25,7 @@ test_sqlite_functions = executable(
   'test_sqlite_functions',
   'test_sqlite_functions.cpp',
   include_directories: inc_dirs,
-  dependencies: [sqlite3_dep],
+  dependencies: [sqlite3_dep, dependency('sqlite-vec-cpp')],
 )
 
 test('Concepts and VectorView', test_concepts)
diff --git a/tests/test_sqlite_functions.cpp b/tests/test_sqlite_functions.cpp
@@ -1,4 +1,6 @@
 #include <sqlite3.h>
+#include <sqlite-vec-cpp/sqlite_vec.hpp>
+
 #include <cassert>
 #include <cmath>
 #include <iostream>
@@ -141,6 +143,7 @@ void test_vec_f32_json() {
     std::cout << "Testing vec_f32 with JSON input..." << std::endl;
 
     SQLiteDB db;
+    sqlite3_vec_init(db.get(), nullptr, nullptr);
     register_all_functions(db);
 
     // Create from JSON array
@@ -162,6 +165,7 @@ void test_vec_f32_blob() {
     std::cout << "Testing vec_f32 with blob input..." << std::endl;
 
     SQLiteDB db;
+    sqlite3_vec_init(db.get(), nullptr, nullptr);
     register_all_functions(db);
 
     // Create table with blob
@@ -186,6 +190,7 @@ void test_vec_int8() {
     std::cout << "Testing vec_int8..." << std::endl;
 
     SQLiteDB db;
+    sqlite3_vec_init(db.get(), nullptr, nullptr);
     register_all_functions(db);
 
     std::string length = db.exec_scalar("SELECT vec_length(vec_int8('[1, 2, 3, 4, 5]'))");
@@ -201,6 +206,7 @@ void test_vec_length() {
     std::cout << "Testing vec_length..." << std::endl;
 
     SQLiteDB db;
+    sqlite3_vec_init(db.get(), nullptr, nullptr);
     register_all_functions(db);
 
     assert(db.exec_scalar("SELECT vec_length(vec_f32('[1]'))") == "1");
@@ -214,6 +220,7 @@ void test_vec_to_json() {
     std::cout << "Testing vec_to_json..." << std::endl;
 
     SQLiteDB db;
+    sqlite3_vec_init(db.get(), nullptr, nullptr);
     register_all_functions(db);
 
     std::string json = db.exec_scalar("SELECT vec_to_json(vec_f32('[1.0, 2.5, 3.14]'))");
@@ -235,6 +242,7 @@ void test_distance_l2() {
     std::cout << "Testing vec_distance_l2..." << std::endl;
 
     SQLiteDB db;
+    sqlite3_vec_init(db.get(), nullptr, nullptr);
     register_all_functions(db);
 
     // Distance between [0,0] and [3,4] should be 5.0 (Euclidean distance, not squared)
@@ -254,6 +262,7 @@ void test_distance_l1() {
     std::cout << "Testing vec_distance_l1..." << std::endl;
 
     SQLiteDB db;
+    sqlite3_vec_init(db.get(), nullptr, nullptr);
     register_all_functions(db);
 
     // Manhattan distance between [0,0] and [3,4] should be 7
@@ -273,6 +282,7 @@ void test_distance_cosine() {
     std::cout << "Testing vec_distance_cosine..." << std::endl;
 
     SQLiteDB db;
+    sqlite3_vec_init(db.get(), nullptr, nullptr);
     register_all_functions(db);
 
     // Cosine distance between identical vectors should be 0
@@ -297,6 +307,7 @@ void test_vec_add() {
     std::cout << "Testing vec_add..." << std::endl;
 
     SQLiteDB db;
+    sqlite3_vec_init(db.get(), nullptr, nullptr);
     register_all_functions(db);
 
     std::string result =
@@ -314,6 +325,7 @@ void test_vec_sub() {
     std::cout << "Testing vec_sub..." << std::endl;
 
     SQLiteDB db;
+    sqlite3_vec_init(db.get(), nullptr, nullptr);
     register_all_functions(db);
 
     std::string result =
@@ -331,6 +343,7 @@ void test_vec_normalize() {
     std::cout << "Testing vec_normalize..." << std::endl;
 
     SQLiteDB db;
+    sqlite3_vec_init(db.get(), nullptr, nullptr);
     register_all_functions(db);
 
     // Normalize [3, 4] -> [0.6, 0.8]
@@ -351,6 +364,7 @@ void test_vec_slice() {
     std::cout << "Testing vec_slice..." << std::endl;
 
     SQLiteDB db;
+    sqlite3_vec_init(db.get(), nullptr, nullptr);
     register_all_functions(db);
 
     // Slice [1,2,3,4,5] from index 1 to 4 -> [2,3,4]
@@ -376,6 +390,7 @@ void test_vec_dot() {
     std::cout << "Testing vec_dot..." << std::endl;
 
     SQLiteDB db;
+    sqlite3_vec_init(db.get(), nullptr, nullptr);
     register_all_functions(db);
 
     // Dot product of [1,2,3] and [4,5,6] = 1*4 + 2*5 + 3*6 = 32
@@ -395,6 +410,7 @@ void test_vec_magnitude() {
     std::cout << "Testing vec_magnitude..." << std::endl;
 
     SQLiteDB db;
+    sqlite3_vec_init(db.get(), nullptr, nullptr);
     register_all_functions(db);
 
     // Magnitude of [3,4] should be 5
@@ -414,6 +430,7 @@ void test_vec_scale() {
     std::cout << "Testing vec_scale..." << std::endl;
 
     SQLiteDB db;
+    sqlite3_vec_init(db.get(), nullptr, nullptr);
     register_all_functions(db);
 
     // Scale [1,2,3] by 2 -> [2,4,6]
@@ -430,6 +447,7 @@ void test_vec_mean() {
     std::cout << "Testing vec_mean..." << std::endl;
 
     SQLiteDB db;
+    sqlite3_vec_init(db.get(), nullptr, nullptr);
     register_all_functions(db);
 
     // Mean of [1,2,3,4,5] should be 3
@@ -449,6 +467,7 @@ void test_vec_std() {
     std::cout << "Testing vec_std..." << std::endl;
 
     SQLiteDB db;
+    sqlite3_vec_init(db.get(), nullptr, nullptr);
     register_all_functions(db);
 
     // Standard deviation should be > 0 for varying data
@@ -464,6 +483,7 @@ void test_vec_min_max() {
     std::cout << "Testing vec_min and vec_max..." << std::endl;
 
     SQLiteDB db;
+    sqlite3_vec_init(db.get(), nullptr, nullptr);
     register_all_functions(db);
 
     std::string min_val = db.exec_scalar("SELECT vec_min(vec_f32('[3,1,4,1,5,9,2,6]'))");
@@ -481,6 +501,7 @@ void test_vec_clamp() {
     std::cout << "Testing vec_clamp..." << std::endl;
 
     SQLiteDB db;
+    sqlite3_vec_init(db.get(), nullptr, nullptr);
     register_all_functions(db);
 
     // Clamp [1,5,10] to [2,8] -> [2,5,8]
@@ -511,6 +532,7 @@ void test_error_handling() {
     std::cout << "Testing error handling..." << std::endl;
 
     SQLiteDB db;
+    sqlite3_vec_init(db.get(), nullptr, nullptr);
     register_all_functions(db);
 
     // Dimension mismatch
@@ -551,6 +573,7 @@ void test_integration_similarity_search() {
     std::cout << "Testing integration: similarity search..." << std::endl;
 
     SQLiteDB db;
+    sqlite3_vec_init(db.get(), nullptr, nullptr);
     register_all_functions(db);
 
     // Create table with vectors
@@ -578,6 +601,7 @@ void test_integration_vector_operations() {
     std::cout << "Testing integration: vector operations pipeline..." << std::endl;
 
     SQLiteDB db;
+    sqlite3_vec_init(db.get(), nullptr, nullptr);
     register_all_functions(db);
 
     // Complex pipeline: create, normalize, scale, and compute distance
diff --git a/tests/test_utils.cpp b/tests/test_utils.cpp
@@ -1,5 +1,6 @@
 #include <cassert>
 #include <iostream>
+#include <numeric>
 #include <sqlite-vec-cpp/utils/array.hpp>
 
 using namespace sqlite_vec_cpp;

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ test_sqlite_functions = executable(`
`25`	`25`	`'test_sqlite_functions',`
`26`	`26`	`'test_sqlite_functions.cpp',`
`27`	`27`	`include_directories: inc_dirs,`
`28`		`- dependencies: [sqlite3_dep],`
	`28`	`+ dependencies: [sqlite3_dep, dependency('sqlite-vec-cpp')],`
`29`	`29`	`)`
`30`	`30`
`31`	`31`	`test('Concepts and VectorView', test_concepts)`