CBL-6626: SQL++ query not return expected results (#2209)

couchbase · Jan 31, 2025 · 868b2b6 · 868b2b6
1 parent 95cb359
commit 868b2b6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/LiteCore/Query/SQLiteFleeceFunctions.cc b/LiteCore/Query/SQLiteFleeceFunctions.cc
@@ -260,8 +260,10 @@ namespace litecore {
                     {
                         switch ( sqlite3_value_subtype(arg) ) {
                             case 0:
-                                // Untagged blob is already Fleece data
-                                break;
+                                if ( sqlite3_value_bytes(arg) > 0 ) {
+                                    // Untagged blob with size is already Fleece data
+                                    break;
+                                }  // Untagged blob with 0 size is null, so fall through into the Null case.
                             case kFleeceNullSubtype:
                                 {
                                     // A tagged Fleece/JSON null:

diff --git a/LiteCore/Query/SQLiteN1QLFunctions.cc b/LiteCore/Query/SQLiteN1QLFunctions.cc
@@ -282,7 +282,9 @@ namespace litecore {
 
     // Test for N1QL NULL value (which is an empty blob tagged with kFleeceNullSubtype)
     static inline bool isNull(sqlite3_value* arg) {
-        return sqlite3_value_type(arg) == SQLITE_BLOB && sqlite3_value_subtype(arg) == kFleeceNullSubtype;
+        if ( sqlite3_value_type(arg) != SQLITE_BLOB ) return false;
+        auto subtype = sqlite3_value_subtype(arg);
+        return subtype == kFleeceNullSubtype || (subtype == 0 && sqlite3_value_bytes(arg) == 0);
     }
 
     static sqlite3_value* passMissingOrNull(int argc, sqlite3_value** argv) {