fixes and tests

tests/__snapshots__/test-metadata.ambr

@@ -363,6 +363,24 @@
     ]),
   })
 # ---
+# name: test_errors
+  OrderedDict({
+    'sql': 'select * from v',
+    'rows': list([
+      OrderedDict({
+        'rowid': 1,
+        'vector': b'\x00\x00\x80?',
+        't': 'aaaaaaaaaaaax',
+      }),
+    ]),
+  })
+# ---
+# name: test_errors.1
+  dict({
+    'error': 'OperationalError',
+    'message': 'Could not extract metadata value for column t at rowid 1',
+  })
+# ---
 # name: test_idxstr
   OrderedDict({
     'sql': "select * from vec_movies where synopsis_embedding match '' and k = 0 and is_favorited = true",

tests/afbd/test-afbd.py

@@ -132,29 +132,45 @@ def tests_command(file_path):
         conditions = test["conditions"]
         expected_closest_ids = test["closest_ids"]
         expected_closest_scores = test["closest_scores"]
-        if "or" in conditions:
-            num_or_skips += 1
-            continue
 
         sql = "select rowid, 1 - distance as similarity from v where vector match ? and k = ?"
         params = [serialize_float32(query), len(expected_closest_ids)]
 
-        for condition in conditions["and"]:
-            assert len(condition.keys()) == 1
-            column = list(condition.keys())[0]
-            assert len(list(condition[column].keys())) == 1
-            condition_type = list(condition[column].keys())[0]
-            if condition_type == "match":
-                value = condition[column]["match"]["value"]
-                sql += f" and {column} = ?"
-                params.append(value)
-            elif condition_type == "range":
-                sql += f" and {column} between ? and ?"
-                params.append(condition[column]["range"]["gt"])
-                params.append(condition[column]["range"]["lt"])
-            else:
-                raise Exception(f"Unknown condition type: {condition_type}")
+        if "and" in conditions:
+            for condition in conditions["and"]:
+                assert len(condition.keys()) == 1
+                column = list(condition.keys())[0]
+                assert len(list(condition[column].keys())) == 1
+                condition_type = list(condition[column].keys())[0]
+                if condition_type == "match":
+                    value = condition[column]["match"]["value"]
+                    sql += f" and {column} = ?"
+                    params.append(value)
+                elif condition_type == "range":
+                    sql += f" and {column} between ? and ?"
+                    params.append(condition[column]["range"]["gt"])
+                    params.append(condition[column]["range"]["lt"])
+                else:
+                    raise Exception(f"Unknown condition type: {condition_type}")
+        elif "or" in conditions:
+            column = list(conditions["or"][0].keys())[0]
+            condition_type = list(conditions["or"][0][column].keys())[0]
+            assert condition_type == "match"
+            sql += f" and {column} in ("
+            for idx, condition in enumerate(conditions["or"]):
+                if condition_type == "match":
+                    value = condition[column]["match"]["value"]
+                    if idx != 0:
+                        sql += ","
+                    sql += "?"
+                    params.append(value)
+                elif condition_type == "range":
+                    breakpoint()
+                else:
+                    raise Exception(f"Unknown condition type: {condition_type}")
+            sql += ")"
 
+        # print(sql, params[1:])
         rows = db.execute(sql, params).fetchall()
         actual_closest_ids = [row["rowid"] for row in rows]
         matches = expected_closest_ids == actual_closest_ids

tests/test-metadata.py

@@ -309,6 +309,8 @@ def test_vtab_in(db, snapshot):
             (8, "[8]", 555, "zzzz", 0, 1.1),
         ],
     )
+
+    # EVIDENCE-OF: V15248_32086
     assert exec(
         db, "select *  from v where vector match '[0]' and k = 8 and b in (1, 0)"
     ) == snapshot(name="block-bool")
@@ -570,6 +572,28 @@ def test_stress(db, snapshot):
     ) == snapshot(name="bool-other-op")
 
 
+def test_errors(db, snapshot):
+    db.execute("create virtual table v using vec0(vector float[1], t text)")
+    db.execute("insert into v(vector, t) values ('[1]', 'aaaaaaaaaaaax')")
+
+    assert exec(db, "select * from v") == snapshot()
+
+    # EVIDENCE-OF: V15466_32305
+    db.set_authorizer(
+        authorizer_deny_on(sqlite3.SQLITE_READ, "v_metadata_text_data_00", "data")
+    )
+    assert exec(db, "select * from v") == snapshot()
+
+
+def authorizer_deny_on(operation, x1, x2=None):
+    def _auth(op, p1, p2, p3, p4):
+        if op == operation and p1 == x1 and p2 == x2:
+            return sqlite3.SQLITE_DENY
+        return sqlite3.SQLITE_OK
+
+    return _auth
+
+
 def exec(db, sql, parameters=[]):
     try:
         rows = db.execute(sql, parameters).fetchall()