fix aux tests

asg017 · Nov 20, 2024 · a8d0a28 · a8d0a28
1 parent 804cea5
commit a8d0a28
Show file tree

Hide file tree

Showing 2 changed files with 579 additions and 61 deletions.
diff --git a/sqlite-vec.c b/sqlite-vec.c
@@ -8162,67 +8162,6 @@ int vec0Update_Insert(sqlite3_vtab *pVTab, int argc, sqlite3_value **argv,
     }
   }
 
-  if(p->numAuxiliaryColumns > 0) {
-    sqlite3_stmt *stmt;
-    sqlite3_str * s = sqlite3_str_new(NULL);
-    sqlite3_str_appendf(s, "INSERT INTO " VEC0_SHADOW_AUXILIARY_NAME "(", p->schemaName, p->tableName);
-    for(int i = 0; i < p->numAuxiliaryColumns; i++) {
-      if(i!=0) {
-        sqlite3_str_appendchar(s, 1, ',');
-      }
-      sqlite3_str_appendf(s, "value%02d", i);
-    }
-    sqlite3_str_appendall(s, ") VALUES (");
-    for(int i = 0; i < p->numAuxiliaryColumns; i++) {
-      if(i!=0) {
-        sqlite3_str_appendchar(s, 1, ',');
-      }
-      sqlite3_str_appendchar(s, 1, '?');
-    }
-    sqlite3_str_appendall(s, ")");
-    char * zSql = sqlite3_str_finish(s);
-    // TODO double check error handling ehre
-    if(!zSql) {
-      rc = SQLITE_NOMEM;
-      goto cleanup;
-    }
-    rc = sqlite3_prepare_v2(p->db, zSql, -1, &stmt, NULL);
-    if(rc != SQLITE_OK) {
-      goto cleanup;
-    }
-
-    for (int i = 0; i < vec0_num_defined_user_columns(p); i++) {
-      if(p->user_column_kinds[i] != SQLITE_VEC0_USER_COLUMN_KIND_AUXILIARY) {
-        continue;
-      }
-      int auxiliary_key_idx = p->user_column_idxs[i];
-      sqlite3_value * v = argv[2+VEC0_COLUMN_USERN_START + i];
-      int v_type = sqlite3_value_type(v);
-      if(v_type != SQLITE_NULL && (v_type != p->auxiliary_columns[auxiliary_key_idx].type)) {
-        sqlite3_finalize(stmt);
-        rc = SQLITE_ERROR;
-        vtab_set_error(
-        pVTab,
-        "Auxiliary column type mismatch: The auxiliary column %.*s has type %s, but %s was provided.",
-        p->auxiliary_columns[auxiliary_key_idx].name_length,
-        p->auxiliary_columns[auxiliary_key_idx].name,
-        type_name(p->auxiliary_columns[auxiliary_key_idx].type),
-        type_name(v_type)
-      );
-        goto cleanup;
-      }
-      sqlite3_bind_value(stmt, 1 + auxiliary_key_idx, v);
-    }
-
-    rc = sqlite3_step(stmt);
-    if(rc != SQLITE_DONE) {
-      sqlite3_finalize(stmt);
-      rc = SQLITE_ERROR;
-      goto cleanup;
-    }
-    sqlite3_finalize(stmt);
-  }
-
   // read all the inserted vectors  into vectorDatas, validate their lengths.
   for (int i = 0; i < vec0_num_defined_user_columns(p); i++) {
     if(p->user_column_kinds[i] != SQLITE_VEC0_USER_COLUMN_KIND_VECTOR) {