[sqlite] fix some more misuses

tstack · Oct 25, 2024 · 3d8be48 · 3d8be48
1 parent 321c0c9
commit 3d8be48
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/src/extension-functions.cc b/src/extension-functions.cc
@@ -2672,13 +2672,13 @@ common_extension_functions(struct FuncDef** basic_funcs,
 
     /* Aggregate functions */
     static struct FuncDefAgg aAggs[] = {
-        {"stdev", 1, 0, varianceStep, stdevFinalize},
-        {"stddev", 1, 0, varianceStep, stdevFinalize},
-        {"variance", 1, 0, varianceStep, varianceFinalize},
-        {"mode", 1, 0, modeStep, modeFinalize},
-        {"median", 1, 0, modeStep, medianFinalize},
-        {"lower_quartile", 1, 0, modeStep, lower_quartileFinalize},
-        {"upper_quartile", 1, 0, modeStep, upper_quartileFinalize},
+        {"stdev", 1, SQLITE_UTF8, 0, varianceStep, stdevFinalize},
+        {"stddev", 1, SQLITE_UTF8, 0, varianceStep, stdevFinalize},
+        {"variance", 1, SQLITE_UTF8, 0, varianceStep, varianceFinalize},
+        {"mode", 1, SQLITE_UTF8, 0, modeStep, modeFinalize},
+        {"median", 1, SQLITE_UTF8, 0, modeStep, medianFinalize},
+        {"lower_quartile", 1, SQLITE_UTF8, 0, modeStep, lower_quartileFinalize},
+        {"upper_quartile", 1, SQLITE_UTF8, 0, modeStep, upper_quartileFinalize},
 
         {nullptr},
     };

diff --git a/src/json-extension-functions.cc b/src/json-extension-functions.cc
@@ -860,6 +860,7 @@ json_extension_functions(struct FuncDef** basic_funcs,
         {
             "json_group_object",
             -1,
+            SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_RESULT_SUBTYPE,
             0,
             sql_json_group_object_step,
             sql_json_group_object_final,
@@ -885,6 +886,7 @@ json_extension_functions(struct FuncDef** basic_funcs,
         {
             "json_group_array",
             -1,
+            SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_RESULT_SUBTYPE,
             0,
             sql_json_group_array_step,
             sql_json_group_array_final,

diff --git a/src/sqlite-extension-func.cc b/src/sqlite-extension-func.cc
@@ -190,7 +190,7 @@ register_sqlite_funcs(sqlite3* db, sqlite_registration_func_t* reg_funcs)
             sqlite3_create_function(db,
                                     agg_funcs[i].zName,
                                     agg_funcs[i].nArg,
-                                    SQLITE_UTF8,
+                                    agg_funcs[i].eTextRep,
                                     (void*) &agg_funcs[i],
                                     nullptr,
                                     agg_funcs[i].xStep,

diff --git a/src/sqlite-extension-func.hh b/src/sqlite-extension-func.hh
@@ -68,6 +68,7 @@ struct FuncDef {
 struct FuncDefAgg {
     const char* zName{nullptr};
     signed char nArg{0};
+    int eTextRep{0};
     uint8_t needCollSeq{0};
     void (*xStep)(sqlite3_context*, int, sqlite3_value**){nullptr};
     void (*xFinalize)(sqlite3_context*){nullptr};

diff --git a/src/string-extension-functions.cc b/src/string-extension-functions.cc
@@ -1284,6 +1284,7 @@ string_extension_functions(struct FuncDef** basic_funcs,
         {
             "group_spooky_hash",
             -1,
+            SQLITE_UTF8,
             0,
             sql_spooky_hash_step,
             sql_spooky_hash_final,
@@ -1303,6 +1304,7 @@ string_extension_functions(struct FuncDef** basic_funcs,
         {
             "sparkline",
             -1,
+            SQLITE_UTF8,
             0,
             sparkline_step,
             sparkline_final,