quiverdb 0.12.3 → 0.12.5

package/README.md

@@ -104,6 +104,8 @@ bun run example.ts
 - `readSetBooleansById(collection, attribute, id)` -- Read INTEGER-backed boolean set
 - `readSetFloatsById(collection, attribute, id)` -- Read float set
 - `readSetStringsById(collection, attribute, id)` -- Read string set
+- `readVectorGroupById(collection, group, id)` -- Read a whole vector group as rows (`null` for a SQL NULL cell)
+- `readSetGroupById(collection, group, id)` -- Read a whole set group as rows (`null` for a SQL NULL cell)
 
 ### Read (IDs)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quiverdb",
-  "version": "0.12.3",
+  "version": "0.12.5",
   "license": "MIT",
   "repository": {
     "type": "git",

package/src/composites.ts

@@ -39,9 +39,9 @@ Database.prototype.readVectorsById = function (
   this: Database,
   collection: string,
   id: number,
-): Record<string, number[] | string[]> {
+): Record<string, (number | null)[] | (string | null)[]> {
   const groups = this.listVectorGroups(collection);
-  const result: Record<string, number[] | string[]> = {};
+  const result: Record<string, (number | null)[] | (string | null)[]> = {};
 
   for (const group of groups) {
     for (const col of group.valueColumns) {
@@ -69,9 +69,9 @@ Database.prototype.readSetsById = function (
   this: Database,
   collection: string,
   id: number,
-): Record<string, number[] | string[]> {
+): Record<string, (number | null)[] | (string | null)[]> {
   const groups = this.listSetGroups(collection);
-  const result: Record<string, number[] | string[]> = {};
+  const result: Record<string, (number | null)[] | (string | null)[]> = {};
 
   for (const group of groups) {
     for (const col of group.valueColumns) {

package/src/create.ts

@@ -29,6 +29,16 @@ function setElementArray(
 
   const first = values[0];
 
+  // A vector/set/time-series read returns a NULL cell as null. The element surface is non-null
+  // (NULL cells go through the group writers), whatever the cell's position or the array's type:
+  // the numeric setters below would store a null as 0 / false, and a string array would store an
+  // `undefined` as the text "undefined". `includes`, not `some`: it also sees a sparse array's holes.
+  if (values.includes(null) || values.includes(undefined)) {
+    throw new QuiverError(
+      `Unsupported null cell in array '${name}': write NULL cells with updateVectorGroup, updateSetGroup or updateTimeSeriesGroup`,
+    );
+  }
+
   if (typeof first === "bigint") {
     const arr = allocNativeInt64(values as bigint[]);
     check(lib.quiver_element_set_array_integer(elemPtr, nameBuf.buf, arr.buf, values.length, null));

package/src/database.ts

@@ -1,11 +1,10 @@
 import type { CsvOptions } from "./csv.ts";
 import { check, QuiverError } from "./errors.ts";
 import { allocPtrOut, makeDefaultOptions, readPtrOut, toCString } from "./ffi-helpers.ts";
-import type { GroupColumns } from "./group-columns.ts";
+import type { GroupColumns, TimeSeriesData } from "./group-columns.ts";
 import type { NativePointer } from "./loader.ts";
 import { getSymbols } from "./loader.ts";
 import type { GroupMetadata, ScalarMetadata } from "./metadata.ts";
-import type { TimeSeriesData } from "./time-series.ts";
 import type { DatabaseOptions, ElementData, QueryParam } from "./types.ts";
 
 export class Database {
@@ -138,22 +137,64 @@ export class Database {
   ) => string | null;
   declare readElementIds: (collection: string) => number[];
   declare numberOfElements: (collection: string) => number;
-  declare readVectorIntegers: (collection: string, attribute: string) => number[][];
-  declare readVectorBooleans: (collection: string, attribute: string) => boolean[][];
-  declare readVectorFloats: (collection: string, attribute: string) => number[][];
-  declare readVectorStrings: (collection: string, attribute: string) => string[][];
-  declare readVectorIntegersById: (collection: string, attribute: string, id: number) => number[];
-  declare readVectorBooleansById: (collection: string, attribute: string, id: number) => boolean[];
-  declare readVectorFloatsById: (collection: string, attribute: string, id: number) => number[];
-  declare readVectorStringsById: (collection: string, attribute: string, id: number) => string[];
-  declare readSetIntegers: (collection: string, attribute: string) => number[][];
-  declare readSetBooleans: (collection: string, attribute: string) => boolean[][];
-  declare readSetFloats: (collection: string, attribute: string) => number[][];
-  declare readSetStrings: (collection: string, attribute: string) => string[][];
-  declare readSetIntegersById: (collection: string, attribute: string, id: number) => number[];
-  declare readSetBooleansById: (collection: string, attribute: string, id: number) => boolean[];
-  declare readSetFloatsById: (collection: string, attribute: string, id: number) => number[];
-  declare readSetStringsById: (collection: string, attribute: string, id: number) => string[];
+  declare readVectorIntegers: (collection: string, attribute: string) => (number | null)[][];
+  declare readVectorBooleans: (collection: string, attribute: string) => (boolean | null)[][];
+  declare readVectorFloats: (collection: string, attribute: string) => (number | null)[][];
+  declare readVectorStrings: (collection: string, attribute: string) => (string | null)[][];
+  declare readVectorIntegersById: (
+    collection: string,
+    attribute: string,
+    id: number,
+  ) => (number | null)[];
+  declare readVectorBooleansById: (
+    collection: string,
+    attribute: string,
+    id: number,
+  ) => (boolean | null)[];
+  declare readVectorFloatsById: (
+    collection: string,
+    attribute: string,
+    id: number,
+  ) => (number | null)[];
+  declare readVectorStringsById: (
+    collection: string,
+    attribute: string,
+    id: number,
+  ) => (string | null)[];
+  declare readSetIntegers: (collection: string, attribute: string) => (number | null)[][];
+  declare readSetBooleans: (collection: string, attribute: string) => (boolean | null)[][];
+  declare readSetFloats: (collection: string, attribute: string) => (number | null)[][];
+  declare readSetStrings: (collection: string, attribute: string) => (string | null)[][];
+  declare readSetIntegersById: (
+    collection: string,
+    attribute: string,
+    id: number,
+  ) => (number | null)[];
+  declare readSetBooleansById: (
+    collection: string,
+    attribute: string,
+    id: number,
+  ) => (boolean | null)[];
+  declare readSetFloatsById: (
+    collection: string,
+    attribute: string,
+    id: number,
+  ) => (number | null)[];
+  declare readSetStringsById: (
+    collection: string,
+    attribute: string,
+    id: number,
+  ) => (string | null)[];
+  declare readVectorGroupById: (
+    collection: string,
+    group: string,
+    id: number,
+  ) => Record<string, number | string | null>[];
+  declare readSetGroupById: (
+    collection: string,
+    group: string,
+    id: number,
+  ) => Record<string, number | string | null>[];
 
   // --- Queries (implemented in query.ts) ---
   declare queryString: (sql: string, parameters?: QueryParam[]) => string | null;
@@ -268,6 +309,12 @@ export class Database {
     collection: string,
     id: number,
   ) => Record<string, number | string | null>;
-  declare readVectorsById: (collection: string, id: number) => Record<string, number[] | string[]>;
-  declare readSetsById: (collection: string, id: number) => Record<string, number[] | string[]>;
+  declare readVectorsById: (
+    collection: string,
+    id: number,
+  ) => Record<string, (number | null)[] | (string | null)[]>;
+  declare readSetsById: (
+    collection: string,
+    id: number,
+  ) => Record<string, (number | null)[] | (string | null)[]>;
 }

package/src/group-columns.ts

@@ -1,18 +1,38 @@
-import { type Pointer, ptr } from "bun:ffi";
+import { CString, type Pointer, ptr, read, toArrayBuffer } from "bun:ffi";
 import { check, QuiverError } from "./errors.ts";
 import {
   allocNativeFloat64,
   allocNativeInt64,
   allocNativePtrTable,
   allocNativeStringArray,
+  allocPtrOut,
+  allocUint64Out,
+  decodeFloat64Array,
+  decodeInt64Array,
+  decodePtrArray,
+  decodeStringArray,
+  readPtrOut,
+  readUint64Out,
   toCString,
 } from "./ffi-helpers.ts";
-import type { NativePointer } from "./loader.ts";
-import { DATA_TYPE_FLOAT, DATA_TYPE_INTEGER, DATA_TYPE_STRING, type Allocation } from "./types.ts";
+import { getSymbols, type NativePointer } from "./loader.ts";
+import {
+  type Allocation,
+  DATA_TYPE_DATE_TIME,
+  DATA_TYPE_FLOAT,
+  DATA_TYPE_INTEGER,
+  DATA_TYPE_STRING,
+} from "./types.ts";
 
 /** Column-oriented group payload: one array of cells per column name, `null` for SQL NULL. */
 export type GroupColumns = Record<string, (number | string | boolean | null)[]>;
 
+/**
+ * Column-oriented group read result: one array of cells per column name, `null` for SQL NULL.
+ * The read-side twin of GroupColumns; no reader produces a boolean, so it admits none.
+ */
+export type TimeSeriesData = Record<string, (number | string | null)[]>;
+
 /**
  * The parallel-array signature every columnar group update C function shares
  * (quiver_database_update_{time_series,vector,set}_group and their _by_label forms). The 4th
@@ -170,3 +190,123 @@ export function updateGroupColumns(
     ),
   );
 }
+
+/**
+ * The out-parameter signature every columnar group read C function shares
+ * (quiver_database_read_time_series_group, quiver_database_read_{vector,set}_group_by_id).
+ */
+type ColumnReadFn = (
+  db: NativePointer,
+  collection: Uint8Array,
+  group: Uint8Array,
+  id: bigint,
+  names: Uint8Array,
+  types: Uint8Array,
+  data: Uint8Array,
+  masks: Uint8Array,
+  columnCount: Uint8Array,
+  rowCount: Uint8Array,
+) => number;
+
+/**
+ * Call one of the columnar group read C functions, decode its typed arrays + per-cell mask into
+ * columns, and free the C result. The read-side twin of updateGroupColumns, shared by
+ * readTimeSeriesGroup (which returns the columns) and readVectorGroupById / readSetGroupById
+ * (which transpose them into rows). A masked cell is `null`; DATE_TIME cells stay ISO 8601 strings.
+ */
+export function readGroupColumns(
+  handle: NativePointer,
+  readGroup: ColumnReadFn,
+  collection: string,
+  group: string,
+  id: number,
+): TimeSeriesData {
+  const collBuf = toCString(collection);
+  const grpBuf = toCString(group);
+  const outNames = allocPtrOut();
+  const outTypes = allocPtrOut();
+  const outData = allocPtrOut();
+  const outHasValue = allocPtrOut();
+  const outColCount = allocUint64Out();
+  const outRowCount = allocUint64Out();
+
+  check(
+    readGroup(
+      handle,
+      collBuf.buf,
+      grpBuf.buf,
+      BigInt(id),
+      outNames.buf,
+      outTypes.buf,
+      outData.buf,
+      outHasValue.buf,
+      outColCount.buf,
+      outRowCount.buf,
+    ),
+  );
+
+  const colCount = readUint64Out(outColCount);
+  const rowCount = readUint64Out(outRowCount);
+  if (colCount === 0) return {};
+
+  const namesPtr = readPtrOut(outNames);
+  const typesPtr = readPtrOut(outTypes);
+  const dataPtr = readPtrOut(outData);
+  const hasValuePtr = readPtrOut(outHasValue);
+
+  try {
+    const colNames = decodeStringArray(namesPtr, colCount);
+    const typesAb = toArrayBuffer(typesPtr as Pointer, 0, colCount * 4);
+    const types = Array.from(new Int32Array(typesAb));
+    const dataPtrs = decodePtrArray(dataPtr, colCount);
+    const maskPtrs = decodePtrArray(hasValuePtr, colCount);
+
+    // Per-cell NULL mask: mask[r] === 0 means SQL NULL, surfaced as JS null. A time series'
+    // dimension column's mask is always all 1, so it stays dense.
+    const result: TimeSeriesData = {};
+    for (let c = 0; c < colCount; c++) {
+      const colName = colNames[c];
+      const maskPtr = maskPtrs[c];
+      const mask = maskPtr ? new Uint8Array(toArrayBuffer(maskPtr as Pointer, 0, rowCount)) : null;
+      switch (types[c]) {
+        case DATA_TYPE_INTEGER: {
+          const vals = decodeInt64Array(dataPtrs[c], rowCount);
+          result[colName] = mask ? vals.map((v, r) => (mask[r] ? v : null)) : vals;
+          break;
+        }
+        case DATA_TYPE_FLOAT: {
+          const vals = decodeFloat64Array(dataPtrs[c], rowCount);
+          result[colName] = mask ? vals.map((v, r) => (mask[r] ? v : null)) : vals;
+          break;
+        }
+        case DATA_TYPE_STRING:
+        case DATA_TYPE_DATE_TIME: {
+          // Read pointer-by-pointer, not with decodeStringArray, which turns a NULL char* into "":
+          // a masked-out or NULL cell must come back as null.
+          const base = dataPtrs[c];
+          const col: (string | null)[] = new Array(rowCount);
+          for (let r = 0; r < rowCount; r++) {
+            if (mask && !mask[r]) {
+              col[r] = null;
+              continue;
+            }
+            const strPtr = base ? read.ptr(base as Pointer, r * 8) : 0;
+            col[r] = strPtr === 0 ? null : new CString(strPtr as Pointer).toString();
+          }
+          result[colName] = col;
+          break;
+        }
+      }
+    }
+    return result;
+  } finally {
+    getSymbols().quiver_database_free_time_series_data(
+      namesPtr,
+      typesPtr,
+      dataPtr,
+      hasValuePtr,
+      BigInt(colCount),
+      BigInt(rowCount),
+    );
+  }
+}

package/src/index.ts

@@ -11,11 +11,10 @@ import "./composites.ts";
 export type { CsvOptions } from "./csv.ts";
 export { Database } from "./database.ts";
 export { QuiverError } from "./errors.ts";
-export type { GroupColumns } from "./group-columns.ts";
+export type { GroupColumns, TimeSeriesData } from "./group-columns.ts";
 export { LUA_DB_API_REFERENCE } from "./lua-api.ts";
 export { LuaRunner } from "./lua-runner.ts";
 export type { GroupMetadata, ScalarMetadata } from "./metadata.ts";
-export type { TimeSeriesData } from "./time-series.ts";
 export type {
   ArrayValue,
   DatabaseOptions,

package/src/loader.ts

@@ -73,29 +73,34 @@ const readSymbols = {
   quiver_database_read_scalar_integer_by_id: { args: [P, BUF, BUF, I64, P, P], returns: I32 },
   quiver_database_read_scalar_float_by_id: { args: [P, BUF, BUF, I64, P, P], returns: I32 },
   quiver_database_read_scalar_string_by_id: { args: [P, BUF, BUF, I64, P, P], returns: I32 },
-  quiver_database_read_vector_integers: { args: [P, BUF, BUF, P, P, P], returns: I32 },
-  quiver_database_read_vector_floats: { args: [P, BUF, BUF, P, P, P], returns: I32 },
+  quiver_database_read_vector_integers: { args: [P, BUF, BUF, P, P, P, P], returns: I32 },
+  quiver_database_read_vector_floats: { args: [P, BUF, BUF, P, P, P, P], returns: I32 },
   quiver_database_read_vector_strings: { args: [P, BUF, BUF, P, P, P], returns: I32 },
-  quiver_database_read_set_integers: { args: [P, BUF, BUF, P, P, P], returns: I32 },
-  quiver_database_read_set_floats: { args: [P, BUF, BUF, P, P, P], returns: I32 },
+  quiver_database_read_set_integers: { args: [P, BUF, BUF, P, P, P, P], returns: I32 },
+  quiver_database_read_set_floats: { args: [P, BUF, BUF, P, P, P, P], returns: I32 },
   quiver_database_read_set_strings: { args: [P, BUF, BUF, P, P, P], returns: I32 },
-  quiver_database_read_vector_integers_by_id: { args: [P, BUF, BUF, I64, P, P], returns: I32 },
-  quiver_database_read_vector_floats_by_id: { args: [P, BUF, BUF, I64, P, P], returns: I32 },
+  quiver_database_read_vector_integers_by_id: { args: [P, BUF, BUF, I64, P, P, P], returns: I32 },
+  quiver_database_read_vector_floats_by_id: { args: [P, BUF, BUF, I64, P, P, P], returns: I32 },
   quiver_database_read_vector_strings_by_id: { args: [P, BUF, BUF, I64, P, P], returns: I32 },
-  quiver_database_read_set_integers_by_id: { args: [P, BUF, BUF, I64, P, P], returns: I32 },
-  quiver_database_read_set_floats_by_id: { args: [P, BUF, BUF, I64, P, P], returns: I32 },
+  quiver_database_read_set_integers_by_id: { args: [P, BUF, BUF, I64, P, P, P], returns: I32 },
+  quiver_database_read_set_floats_by_id: { args: [P, BUF, BUF, I64, P, P, P], returns: I32 },
   quiver_database_read_set_strings_by_id: { args: [P, BUF, BUF, I64, P, P], returns: I32 },
+  quiver_database_read_vector_group_by_id: {
+    args: [P, BUF, BUF, I64, P, P, P, P, P, P],
+    returns: I32,
+  },
+  quiver_database_read_set_group_by_id: {
+    args: [P, BUF, BUF, I64, P, P, P, P, P, P],
+    returns: I32,
+  },
   quiver_database_read_element_ids: { args: [P, BUF, P, P], returns: I32 },
   quiver_database_number_of_elements: { args: [P, BUF, P], returns: I32 },
 } as const;
 
 const querySymbols = {
-  quiver_database_query_string: { args: [P, BUF, P, P], returns: I32 },
-  quiver_database_query_integer: { args: [P, BUF, P, P], returns: I32 },
-  quiver_database_query_float: { args: [P, BUF, P, P], returns: I32 },
-  quiver_database_query_string_params: { args: [P, BUF, P, P, USIZE, P, P], returns: I32 },
-  quiver_database_query_integer_params: { args: [P, BUF, P, P, USIZE, P, P], returns: I32 },
-  quiver_database_query_float_params: { args: [P, BUF, P, P, USIZE, P, P], returns: I32 },
+  quiver_database_query_string: { args: [P, BUF, P, P, USIZE, P, P], returns: I32 },
+  quiver_database_query_integer: { args: [P, BUF, P, P, USIZE, P, P], returns: I32 },
+  quiver_database_query_float: { args: [P, BUF, P, P, USIZE, P, P], returns: I32 },
 } as const;
 
 const transactionSymbols = {
@@ -131,7 +136,7 @@ const timeSeriesSymbols = {
     args: [P, BUF, BUF, I64, P, P, P, P, P, P],
     returns: I32,
   },
-  quiver_database_read_time_series_row: { args: [P, BUF, BUF, BUF, BUF, P, P, P], returns: I32 },
+  quiver_database_read_time_series_row: { args: [P, BUF, BUF, BUF, BUF, P, P, P, P], returns: I32 },
   quiver_database_upsert_time_series_row: {
     args: [P, BUF, BUF, I64, P, P, P, USIZE],
     returns: I32,
@@ -181,6 +186,7 @@ const freeSymbols = {
   quiver_database_free_integer_array: { args: [P], returns: I32 },
   quiver_database_free_float_array: { args: [P], returns: I32 },
   quiver_database_free_mask: { args: [P], returns: I32 },
+  quiver_database_free_masks: { args: [P, USIZE], returns: I32 },
   quiver_database_free_string_array: { args: [P, USIZE], returns: I32 },
   quiver_database_free_string: { args: [P], returns: I32 },
   quiver_database_free_integer_vectors: { args: [P, P, USIZE], returns: I32 },

package/src/lua-api.ts

@@ -127,9 +127,14 @@ midnight.
 
   **A table with holes is an object, not an array.** A bulk read of a nullable column returns
   \`nil\` holes (see Reading), so \`return db:read_scalar_integers(c, a)\` encodes as
-  \`{"1":10,"3":30}\` — not \`[10,null,30]\` — and the keys sort as text (\`"1","11","2"\`). When the host
-  needs positional data, return the ids alongside and fill the holes yourself:
+  \`{"1":10,"3":30}\` — not \`[10,null,30]\` — and the keys sort as text (\`"1","11","2"\`). When the
+  host needs positional scalar data, return the ids alongside and fill the holes yourself:
   \`local v = db:read_scalar_integers(c, a); local out = {}; for i in ipairs(ids) do out[i] = v[i] or false end\`.
+  **Inside** a vector/set read an inner list with an interior NULL cell encodes as an object nested
+  in the outer array (\`[{"1":10,"3":30},[]]\`), but a trailing NULL cell leaves no trace at all:
+  \`[10, NULL]\` encodes as the plain \`[10]\`. The ids count elements, not rows, so they cannot
+  restore inner positions — take the row count from a \`NOT NULL\` column of the group (see
+  *Vector reads*), or do that read in the host binding.
 
   Returning a function, a coroutine, or a userdata (including \`db\` itself) raises
   \`Cannot run: script returned an unsupported Lua type\`; nesting deeper than 32 levels raises
@@ -280,6 +285,10 @@ Notes:
   \`Cannot update_element: ...\`.
 - **Empty arrays are skipped.** An attribute whose value is \`{}\` writes no vector/set (the element
   type can't be inferred from an empty array), so it is silently dropped.
+- **Arrays must be dense.** A vector/set read returns a NULL cell as a \`nil\` hole, but an element
+  array cannot carry one: \`create_element\` / \`update_element\` throw \`array '<name>' has a nil
+  hole ...\` rather than cut the array short at the hole. Write NULL cells with
+  \`update_vector_group\` / \`update_set_group\`, which write a hole as NULL.
 - **No \`nil\` scalar attributes.** In Lua a key set to \`nil\` is dropped from the table, so
   \`{ x = nil }\` is identical to \`{}\`; an update/create table that ends up with no attributes
   **throws** (\`...must have at least one scalar attribute\` on create, \`...at least one attribute
@@ -314,10 +323,13 @@ db:read_scalar_strings(collection, attribute)     -- { "Item 1", "Item 2", ... }
 
 ## Vector reads (bulk)
 
-Each returns an array of arrays — one inner array per element.
+Each returns an array of arrays — one inner array per element, aligned with
+\`db:read_element_ids\`; an element with no rows is \`{}\`. A NULL cell is a \`nil\` hole, so on a
+nullable column \`#\` and \`ipairs\` are unreliable on an inner list, and a trailing NULL is
+invisible (\`[10, NULL]\` reads as \`{10}\`; a NULL-only row reads as \`{}\`).
 
 \`\`\`lua
-db:read_vector_integers(collection, attribute)   -- { {1,2,3}, {2,3,4}, ... }
+db:read_vector_integers(collection, attribute)   -- { {1,2,3}, {10,nil,30}, {}, ... }
 db:read_vector_floats(collection, attribute)
 db:read_vector_strings(collection, attribute)
 \`\`\`
@@ -326,7 +338,7 @@ db:read_vector_strings(collection, attribute)
 
 ## Set reads (bulk)
 
-Same shape as vector reads — an array of arrays.
+Same shape and NULL handling as vector reads — an array of arrays with \`nil\` holes.
 
 \`\`\`lua
 db:read_set_integers(collection, attribute)
@@ -358,7 +370,8 @@ rewriting groups you never named. \`(collection, group)\` names exactly one tabl
 
 Rules:
 - **Row count is the largest index any column reaches.** Shorter or sparse columns write NULL in
-  the gaps, so \`nil\` holes from a read round-trip.
+  the gaps, so interior \`nil\` holes from a read round-trip. A trailing row that is NULL in every
+  column is invisible to a read (see *Vector reads*), so writing a read back drops it.
 - **\`{}\` (no columns) clears the group.** Naming a column whose array is empty is an error, not a
   clear — a typo'd column name must not destroy data.
 - **\`id\` and \`vector_index\` are managed by the group** (the element and the row's position) and
@@ -376,20 +389,20 @@ Rules:
 db:read_element_ids(collection)                  -- { 1, 2, 3, ... }
 
 db:read_scalars_by_id(collection, id)            -- { attr = value, ... } (missing -> nil)
-db:read_vectors_by_id(collection, id)            -- { column = { v1, v2, ... }, ... }
-db:read_sets_by_id(collection, id)               -- { column = { v1, v2, ... }, ... }
+db:read_vectors_by_id(collection, id)            -- { column = { v1, nil, v3, ... }, ... }
+db:read_sets_by_id(collection, id)               -- { column = { v1, nil, v3, ... }, ... }
 db:read_element_by_id(collection, id)            -- scalars + vectors + sets merged into one table
 \`\`\`
 
 \`read_element_by_id\` merges every scalar, vector, and set for the element into a single table.
 Scalar attributes with no value come back as \`nil\`.
 
-**Group columns are returned densely, with NULL cells dropped.** \`read_vectors_by_id\` and
-\`read_sets_by_id\` read each column independently, and a column read skips its NULL cells — so two
-columns of the same group are **not** positionally aligned with each other whenever one is
-nullable (e.g. an \`ON DELETE SET NULL\` relation). Do not zip them into rows. There is no
-row-aligned group read in Lua; if you need per-row alignment across a nullable group, do that read
-in the host binding instead.
+**Group columns keep NULL cells as \`nil\` holes**, so cell *i* of every column of one group is
+the same row. Zipping them needs the row count: \`#\` of a \`NOT NULL\` column of the group.
+There is no row-shaped group read in Lua. The result is keyed by column name, so when two vector
+(or two set) groups share a column name, which a foreign key may, that name appears once and is
+read from the group it resolves to (the one named after it, else the one whose table name sorts
+first) — do not zip it with the other group's columns.
 
 ---
 
@@ -856,6 +869,6 @@ and \`unit\` default to \`""\`; \`labels\`, \`dimensions\`, \`dimension_sizes\`,
 DateTime wrapper helpers (Lua uses ISO 8601 strings), boolean *reader* helpers (a stored flag reads
 back as \`0\`/\`1\` — writing a boolean is supported), \`_by_id\` single-scalar variants (use the
 composite by-id readers or the bulk readers instead), and the row-aligned whole-group readers the
-other bindings have (hence the null-dropping caveat under composite by-id reads). Everything else
+other bindings have (hence the row-count caveat under composite by-id reads). Everything else
 the native binding exposes — CRUD, reads, time series, metadata, query, CSV, and the
 binary/expression subsystems — is documented above and callable.`;

package/src/query.ts

@@ -1,4 +1,3 @@
-import { ptr } from "bun:ffi";
 import { integerToBoolean } from "./boolean.ts";
 import { Database } from "./database.ts";
 import { check, QuiverError } from "./errors.ts";
@@ -22,11 +21,18 @@ import {
   type QueryParam,
 } from "./types.ts";
 
-function marshalParams(parameters: QueryParam[]): {
-  types: Allocation;
-  values: Allocation;
+// Marshals query parameters into the C API's parallel type/value arrays. No parameters (omitted or
+// empty) marshal to NULL pointers with a count of 0: the C API reads neither array then, and a
+// zero-length TypedArray has no pointer in Bun (ptr() of one returns a TypeError).
+function marshalParams(parameters?: QueryParam[]): {
+  types: Uint8Array | null;
+  values: Uint8Array | null;
+  count: bigint;
   _keepalive: Allocation[];
 } {
+  if (!parameters || parameters.length === 0)
+    return { types: null, values: null, count: 0n, _keepalive: [] };
+
   const n = parameters.length;
   const typesBuf = new Uint8Array(n * 4);
   const typesDv = new DataView(typesBuf.buffer);
@@ -66,10 +72,7 @@ function marshalParams(parameters: QueryParam[]): {
     }
   }
 
-  const types: Allocation = { ptr: ptr(typesBuf), buf: typesBuf };
-  const values: Allocation = { ptr: ptr(valuesBuf), buf: valuesBuf };
-  keepalive.push(types, values);
-  return { types, values, _keepalive: keepalive };
+  return { types: typesBuf, values: valuesBuf, count: BigInt(n), _keepalive: keepalive };
 }
 
 Database.prototype.queryString = function (
@@ -81,23 +84,19 @@ Database.prototype.queryString = function (
   const sqlBuf = toCString(sql);
   const outValue = allocPtrOut();
   const outHasValue = new Uint8Array(4);
+  const params = marshalParams(parameters);
 
-  if (parameters && parameters.length > 0) {
-    const m = marshalParams(parameters);
-    check(
-      lib.quiver_database_query_string_params(
-        this._handle,
-        sqlBuf.buf,
-        m.types.buf,
-        m.values.buf,
-        BigInt(parameters.length),
-        outValue.buf,
-        outHasValue,
-      ),
-    );
-  } else {
-    check(lib.quiver_database_query_string(this._handle, sqlBuf.buf, outValue.buf, outHasValue));
-  }
+  check(
+    lib.quiver_database_query_string(
+      this._handle,
+      sqlBuf.buf,
+      params.types,
+      params.values,
+      params.count,
+      outValue.buf,
+      outHasValue,
+    ),
+  );
 
   if (new DataView(outHasValue.buffer).getInt32(0, true) === 0) return null;
   const result = decodeStringFromBuf(outValue);
@@ -114,23 +113,19 @@ Database.prototype.queryInteger = function (
   const sqlBuf = toCString(sql);
   const outValue = new Uint8Array(8);
   const outHasValue = new Uint8Array(4);
+  const params = marshalParams(parameters);
 
-  if (parameters && parameters.length > 0) {
-    const m = marshalParams(parameters);
-    check(
-      lib.quiver_database_query_integer_params(
-        this._handle,
-        sqlBuf.buf,
-        m.types.buf,
-        m.values.buf,
-        BigInt(parameters.length),
-        outValue,
-        outHasValue,
-      ),
-    );
-  } else {
-    check(lib.quiver_database_query_integer(this._handle, sqlBuf.buf, outValue, outHasValue));
-  }
+  check(
+    lib.quiver_database_query_integer(
+      this._handle,
+      sqlBuf.buf,
+      params.types,
+      params.values,
+      params.count,
+      outValue,
+      outHasValue,
+    ),
+  );
 
   if (new DataView(outHasValue.buffer).getInt32(0, true) === 0) return null;
   return Number(new DataView(outValue.buffer).getBigInt64(0, true));
@@ -153,23 +148,19 @@ Database.prototype.queryFloat = function (
   const sqlBuf = toCString(sql);
   const outValue = new Uint8Array(8);
   const outHasValue = new Uint8Array(4);
+  const params = marshalParams(parameters);
 
-  if (parameters && parameters.length > 0) {
-    const m = marshalParams(parameters);
-    check(
-      lib.quiver_database_query_float_params(
-        this._handle,
-        sqlBuf.buf,
-        m.types.buf,
-        m.values.buf,
-        BigInt(parameters.length),
-        outValue,
-        outHasValue,
-      ),
-    );
-  } else {
-    check(lib.quiver_database_query_float(this._handle, sqlBuf.buf, outValue, outHasValue));
-  }
+  check(
+    lib.quiver_database_query_float(
+      this._handle,
+      sqlBuf.buf,
+      params.types,
+      params.values,
+      params.count,
+      outValue,
+      outHasValue,
+    ),
+  );
 
   if (new DataView(outHasValue.buffer).getInt32(0, true) === 0) return null;
   return new DataView(outValue.buffer).getFloat64(0, true);

package/src/read.ts

@@ -8,13 +8,13 @@ import {
   decodeFloat64Array,
   decodeInt64Array,
   decodePtrArray,
-  decodeStringArray,
   decodeStringFromBuf,
   decodeUint64Array,
   readPtrOut,
   readUint64Out,
   toCString,
 } from "./ffi-helpers.ts";
+import { readGroupColumns, type TimeSeriesData } from "./group-columns.ts";
 import { getSymbols, type NativePointer } from "./loader.ts";
 
 // --- Scalar array reads ---
@@ -251,10 +251,11 @@ function readBulkIntegers(
   fn: string,
   collection: string,
   attribute: string,
-): number[][] {
+): (number | null)[][] {
   const collBuf = toCString(collection);
   const attrBuf = toCString(attribute);
   const outVectors = allocPtrOut();
+  const outMasks = allocPtrOut();
   const outSizes = allocPtrOut();
   const outCount = allocUint64Out();
   check(
@@ -263,6 +264,7 @@ function readBulkIntegers(
       collBuf.buf,
       attrBuf.buf,
       outVectors.buf,
+      outMasks.buf,
       outSizes.buf,
       outCount.buf,
     ),
@@ -270,14 +272,23 @@ function readBulkIntegers(
   const count = readUint64Out(outCount);
   if (count === 0) return [];
   const vectorsPtr = readPtrOut(outVectors);
+  const masksPtr = readPtrOut(outMasks);
   const sizesPtr = readPtrOut(outSizes);
   const vectorPtrs = decodePtrArray(vectorsPtr, count);
+  const maskPtrs = decodePtrArray(masksPtr, count);
   const sizes = decodeUint64Array(sizesPtr, count);
-  const result: number[][] = new Array(count);
+  const result: (number | null)[][] = new Array(count);
   for (let i = 0; i < count; i++) {
-    result[i] = sizes[i] === 0 ? [] : decodeInt64Array(vectorPtrs[i], sizes[i]);
+    if (sizes[i] === 0) {
+      result[i] = [];
+      continue;
+    }
+    const values = decodeInt64Array(vectorPtrs[i], sizes[i]);
+    const mask = new Uint8Array(toArrayBuffer(maskPtrs[i] as Pointer, 0, sizes[i]));
+    result[i] = values.map((v, j) => (mask[j] ? v : null));
   }
   lib.quiver_database_free_integer_vectors(vectorsPtr, sizesPtr, BigInt(count));
+  lib.quiver_database_free_masks(masksPtr, BigInt(count));
   return result;
 }
 
@@ -287,10 +298,11 @@ function readBulkFloats(
   fn: string,
   collection: string,
   attribute: string,
-): number[][] {
+): (number | null)[][] {
   const collBuf = toCString(collection);
   const attrBuf = toCString(attribute);
   const outVectors = allocPtrOut();
+  const outMasks = allocPtrOut();
   const outSizes = allocPtrOut();
   const outCount = allocUint64Out();
   check(
@@ -299,6 +311,7 @@ function readBulkFloats(
       collBuf.buf,
       attrBuf.buf,
       outVectors.buf,
+      outMasks.buf,
       outSizes.buf,
       outCount.buf,
     ),
@@ -306,14 +319,23 @@ function readBulkFloats(
   const count = readUint64Out(outCount);
   if (count === 0) return [];
   const vectorsPtr = readPtrOut(outVectors);
+  const masksPtr = readPtrOut(outMasks);
   const sizesPtr = readPtrOut(outSizes);
   const vectorPtrs = decodePtrArray(vectorsPtr, count);
+  const maskPtrs = decodePtrArray(masksPtr, count);
   const sizes = decodeUint64Array(sizesPtr, count);
-  const result: number[][] = new Array(count);
+  const result: (number | null)[][] = new Array(count);
   for (let i = 0; i < count; i++) {
-    result[i] = sizes[i] === 0 ? [] : decodeFloat64Array(vectorPtrs[i], sizes[i]);
+    if (sizes[i] === 0) {
+      result[i] = [];
+      continue;
+    }
+    const values = decodeFloat64Array(vectorPtrs[i], sizes[i]);
+    const mask = new Uint8Array(toArrayBuffer(maskPtrs[i] as Pointer, 0, sizes[i]));
+    result[i] = values.map((v, j) => (mask[j] ? v : null));
   }
   lib.quiver_database_free_float_vectors(vectorsPtr, sizesPtr, BigInt(count));
+  lib.quiver_database_free_masks(masksPtr, BigInt(count));
   return result;
 }
 
@@ -323,7 +345,7 @@ function readBulkStrings(
   fn: string,
   collection: string,
   attribute: string,
-): string[][] {
+): (string | null)[][] {
   const collBuf = toCString(collection);
   const attrBuf = toCString(attribute);
   const outVectors = allocPtrOut();
@@ -345,9 +367,16 @@ function readBulkStrings(
   const sizesPtr = readPtrOut(outSizes);
   const vectorPtrs = decodePtrArray(vectorsPtr, count);
   const sizes = decodeUint64Array(sizesPtr, count);
-  const result: string[][] = new Array(count);
+  const result: (string | null)[][] = new Array(count);
   for (let i = 0; i < count; i++) {
-    result[i] = sizes[i] === 0 ? [] : decodeStringArray(vectorPtrs[i], sizes[i]);
+    // A NULL cell is a NULL char* entry, so decode the pointer array and map NULL -> null
+    // (decodeStringArray would construct "" from a NULL pointer instead).
+    result[i] =
+      sizes[i] === 0
+        ? []
+        : decodePtrArray(vectorPtrs[i], sizes[i]).map((cell) =>
+            cell === null ? null : new CString(cell).toString(),
+          );
   }
   lib.quiver_database_free_string_vectors(vectorsPtr, sizesPtr, BigInt(count));
   return result;
@@ -357,7 +386,7 @@ Database.prototype.readVectorIntegers = function (
   this: Database,
   collection: string,
   attribute: string,
-): number[][] {
+): (number | null)[][] {
   return readBulkIntegers(
     getSymbols(),
     this._handle,
@@ -366,15 +395,12 @@ Database.prototype.readVectorIntegers = function (
     attribute,
   );
 };
-/**
- * NULL cells are dropped and only elements that own rows are returned, so the result is not
- * positionally aligned with `readElementIds` (unlike `readScalarBooleans`).
- */
+/** One entry per element; within an entry a SQL NULL cell is `null`. */
 Database.prototype.readVectorBooleans = function (
   this: Database,
   collection: string,
   attribute: string,
-): boolean[][] {
+): (boolean | null)[][] {
   return this.readVectorIntegers(collection, attribute).map((values) =>
     values.map((value) => integerToBoolean(value, collection, attribute)),
   );
@@ -383,7 +409,7 @@ Database.prototype.readVectorFloats = function (
   this: Database,
   collection: string,
   attribute: string,
-): number[][] {
+): (number | null)[][] {
   return readBulkFloats(
     getSymbols(),
     this._handle,
@@ -396,7 +422,7 @@ Database.prototype.readVectorStrings = function (
   this: Database,
   collection: string,
   attribute: string,
-): string[][] {
+): (string | null)[][] {
   return readBulkStrings(
     getSymbols(),
     this._handle,
@@ -409,7 +435,7 @@ Database.prototype.readSetIntegers = function (
   this: Database,
   collection: string,
   attribute: string,
-): number[][] {
+): (number | null)[][] {
   return readBulkIntegers(
     getSymbols(),
     this._handle,
@@ -418,12 +444,12 @@ Database.prototype.readSetIntegers = function (
     attribute,
   );
 };
-/** Same alignment caveat as `readVectorBooleans`: NULL cells dropped, only ids that own rows. */
+/** Same contract as `readVectorBooleans`: one entry per element, and a NULL cell is `null`. */
 Database.prototype.readSetBooleans = function (
   this: Database,
   collection: string,
   attribute: string,
-): boolean[][] {
+): (boolean | null)[][] {
   return this.readSetIntegers(collection, attribute).map((values) =>
     values.map((value) => integerToBoolean(value, collection, attribute)),
   );
@@ -432,7 +458,7 @@ Database.prototype.readSetFloats = function (
   this: Database,
   collection: string,
   attribute: string,
-): number[][] {
+): (number | null)[][] {
   return readBulkFloats(
     getSymbols(),
     this._handle,
@@ -445,7 +471,7 @@ Database.prototype.readSetStrings = function (
   this: Database,
   collection: string,
   attribute: string,
-): string[][] {
+): (string | null)[][] {
   return readBulkStrings(
     getSymbols(),
     this._handle,
@@ -464,10 +490,11 @@ function readByIdIntegers(
   collection: string,
   attribute: string,
   id: number,
-): number[] {
+): (number | null)[] {
   const collBuf = toCString(collection);
   const attrBuf = toCString(attribute);
   const outValues = allocPtrOut();
+  const outMask = allocPtrOut();
   const outCount = allocUint64Out();
   check(
     (lib as Record<string, Function>)[fn](
@@ -476,14 +503,19 @@ function readByIdIntegers(
       attrBuf.buf,
       BigInt(id),
       outValues.buf,
+      outMask.buf,
       outCount.buf,
     ),
   );
   const count = readUint64Out(outCount);
   if (count === 0) return [];
   const arrPtr = readPtrOut(outValues);
-  const result = decodeInt64Array(arrPtr, count);
+  const maskPtr = readPtrOut(outMask);
+  const values = decodeInt64Array(arrPtr, count);
+  const mask = new Uint8Array(toArrayBuffer(maskPtr as Pointer, 0, count));
+  const result = values.map((v, i) => (mask[i] ? v : null));
   lib.quiver_database_free_integer_array(arrPtr);
+  lib.quiver_database_free_mask(maskPtr);
   return result;
 }
 
@@ -494,10 +526,11 @@ function readByIdFloats(
   collection: string,
   attribute: string,
   id: number,
-): number[] {
+): (number | null)[] {
   const collBuf = toCString(collection);
   const attrBuf = toCString(attribute);
   const outValues = allocPtrOut();
+  const outMask = allocPtrOut();
   const outCount = allocUint64Out();
   check(
     (lib as Record<string, Function>)[fn](
@@ -506,14 +539,19 @@ function readByIdFloats(
       attrBuf.buf,
       BigInt(id),
       outValues.buf,
+      outMask.buf,
       outCount.buf,
     ),
   );
   const count = readUint64Out(outCount);
   if (count === 0) return [];
   const arrPtr = readPtrOut(outValues);
-  const result = decodeFloat64Array(arrPtr, count);
+  const maskPtr = readPtrOut(outMask);
+  const values = decodeFloat64Array(arrPtr, count);
+  const mask = new Uint8Array(toArrayBuffer(maskPtr as Pointer, 0, count));
+  const result = values.map((v, i) => (mask[i] ? v : null));
   lib.quiver_database_free_float_array(arrPtr);
+  lib.quiver_database_free_mask(maskPtr);
   return result;
 }
 
@@ -524,7 +562,7 @@ function readByIdStrings(
   collection: string,
   attribute: string,
   id: number,
-): string[] {
+): (string | null)[] {
   const collBuf = toCString(collection);
   const attrBuf = toCString(attribute);
   const outValues = allocPtrOut();
@@ -542,7 +580,11 @@ function readByIdStrings(
   const count = readUint64Out(outCount);
   if (count === 0) return [];
   const arrPtr = readPtrOut(outValues);
-  const result = decodeStringArray(arrPtr, count);
+  // A NULL cell is a NULL char* entry, so decode the pointer array and map NULL -> null
+  // (decodeStringArray would construct "" from a NULL pointer instead).
+  const result = decodePtrArray(arrPtr, count).map((cell) =>
+    cell === null ? null : new CString(cell).toString(),
+  );
   lib.quiver_database_free_string_array(arrPtr, BigInt(count));
   return result;
 }
@@ -552,7 +594,7 @@ Database.prototype.readVectorIntegersById = function (
   collection: string,
   attribute: string,
   id: number,
-): number[] {
+): (number | null)[] {
   return readByIdIntegers(
     getSymbols(),
     this._handle,
@@ -567,7 +609,7 @@ Database.prototype.readVectorBooleansById = function (
   collection: string,
   attribute: string,
   id: number,
-): boolean[] {
+): (boolean | null)[] {
   return this.readVectorIntegersById(collection, attribute, id).map((value) =>
     integerToBoolean(value, collection, attribute),
   );
@@ -577,7 +619,7 @@ Database.prototype.readVectorFloatsById = function (
   collection: string,
   attribute: string,
   id: number,
-): number[] {
+): (number | null)[] {
   return readByIdFloats(
     getSymbols(),
     this._handle,
@@ -592,7 +634,7 @@ Database.prototype.readVectorStringsById = function (
   collection: string,
   attribute: string,
   id: number,
-): string[] {
+): (string | null)[] {
   return readByIdStrings(
     getSymbols(),
     this._handle,
@@ -607,7 +649,7 @@ Database.prototype.readSetIntegersById = function (
   collection: string,
   attribute: string,
   id: number,
-): number[] {
+): (number | null)[] {
   return readByIdIntegers(
     getSymbols(),
     this._handle,
@@ -622,7 +664,7 @@ Database.prototype.readSetBooleansById = function (
   collection: string,
   attribute: string,
   id: number,
-): boolean[] {
+): (boolean | null)[] {
   return this.readSetIntegersById(collection, attribute, id).map((value) =>
     integerToBoolean(value, collection, attribute),
   );
@@ -632,7 +674,7 @@ Database.prototype.readSetFloatsById = function (
   collection: string,
   attribute: string,
   id: number,
-): number[] {
+): (number | null)[] {
   return readByIdFloats(
     getSymbols(),
     this._handle,
@@ -647,7 +689,7 @@ Database.prototype.readSetStringsById = function (
   collection: string,
   attribute: string,
   id: number,
-): string[] {
+): (string | null)[] {
   return readByIdStrings(
     getSymbols(),
     this._handle,
@@ -657,3 +699,58 @@ Database.prototype.readSetStringsById = function (
     id,
   );
 };
+
+// --- Whole-group reads ---
+
+/** One record per row, from decoded columns that all share one length. */
+function columnsToRows(columns: TimeSeriesData): Record<string, number | string | null>[] {
+  const names = Object.keys(columns);
+  if (names.length === 0) return [];
+  return columns[names[0]].map((_, r) =>
+    Object.fromEntries(names.map((name) => [name, columns[name][r]])),
+  );
+}
+
+/**
+ * Read an element's vector group as one record per row, in vector_index order. One native read of
+ * the named group's own table: a SQL NULL cell is `null` in its row, and a column name another
+ * group shares still reads this group (a per-column reader resolves the name). DATE_TIME cells
+ * stay ISO 8601 strings.
+ */
+Database.prototype.readVectorGroupById = function (
+  this: Database,
+  collection: string,
+  group: string,
+  id: number,
+): Record<string, number | string | null>[] {
+  return columnsToRows(
+    readGroupColumns(
+      this._handle,
+      getSymbols().quiver_database_read_vector_group_by_id,
+      collection,
+      group,
+      id,
+    ),
+  );
+};
+
+/**
+ * Set-group counterpart of readVectorGroupById. Row order is consistent across every reader of
+ * the group, otherwise unspecified.
+ */
+Database.prototype.readSetGroupById = function (
+  this: Database,
+  collection: string,
+  group: string,
+  id: number,
+): Record<string, number | string | null>[] {
+  return columnsToRows(
+    readGroupColumns(
+      this._handle,
+      getSymbols().quiver_database_read_set_group_by_id,
+      collection,
+      group,
+      id,
+    ),
+  );
+};

package/src/time-series.ts

@@ -11,23 +11,19 @@ import {
   allocUint64Out,
   decodeFloat64Array,
   decodeInt64Array,
-  decodePtrArray,
   decodeStringArray,
   readPtrOut,
   readUint64Out,
   toCString,
 } from "./ffi-helpers.ts";
-import { type GroupColumns, updateGroupColumns } from "./group-columns.ts";
-import { getSymbols, type NativePointer } from "./loader.ts";
 import {
-  type Allocation,
-  DATA_TYPE_DATE_TIME,
-  DATA_TYPE_FLOAT,
-  DATA_TYPE_INTEGER,
-  DATA_TYPE_STRING,
-} from "./types.ts";
-
-export type TimeSeriesData = Record<string, (number | string | null)[]>;
+  type GroupColumns,
+  readGroupColumns,
+  type TimeSeriesData,
+  updateGroupColumns,
+} from "./group-columns.ts";
+import { getSymbols, type NativePointer } from "./loader.ts";
+import { type Allocation, DATA_TYPE_FLOAT, DATA_TYPE_INTEGER, DATA_TYPE_STRING } from "./types.ts";
 
 Database.prototype.readTimeSeriesGroup = function (
   this: Database,
@@ -35,93 +31,13 @@ Database.prototype.readTimeSeriesGroup = function (
   group: string,
   id: number,
 ): TimeSeriesData {
-  const lib = getSymbols();
-  const collBuf = toCString(collection);
-  const grpBuf = toCString(group);
-  const outNames = allocPtrOut();
-  const outTypes = allocPtrOut();
-  const outData = allocPtrOut();
-  const outHasValue = allocPtrOut();
-  const outColCount = allocUint64Out();
-  const outRowCount = allocUint64Out();
-
-  check(
-    lib.quiver_database_read_time_series_group(
-      this._handle,
-      collBuf.buf,
-      grpBuf.buf,
-      BigInt(id),
-      outNames.buf,
-      outTypes.buf,
-      outData.buf,
-      outHasValue.buf,
-      outColCount.buf,
-      outRowCount.buf,
-    ),
-  );
-
-  const colCount = readUint64Out(outColCount);
-  const rowCount = readUint64Out(outRowCount);
-  if (colCount === 0) return {};
-
-  const namesPtr = readPtrOut(outNames);
-  const typesPtr = readPtrOut(outTypes);
-  const dataPtr = readPtrOut(outData);
-  const hasValuePtr = readPtrOut(outHasValue);
-
-  const colNames = decodeStringArray(namesPtr, colCount);
-  const typesAb = toArrayBuffer(typesPtr as Pointer, 0, colCount * 4);
-  const types = Array.from(new Int32Array(typesAb));
-  const dataPtrs = decodePtrArray(dataPtr, colCount);
-  const maskPtrs = decodePtrArray(hasValuePtr, colCount);
-
-  // Per-cell NULL mask: mask[r] === 0 means SQL NULL, surfaced as JS null. The
-  // dimension column's mask is always all 1, so it stays dense.
-  const result: TimeSeriesData = {};
-  for (let c = 0; c < colCount; c++) {
-    const colName = colNames[c];
-    const maskPtr = maskPtrs[c];
-    const mask = maskPtr ? new Uint8Array(toArrayBuffer(maskPtr as Pointer, 0, rowCount)) : null;
-    switch (types[c]) {
-      case DATA_TYPE_INTEGER: {
-        const vals = decodeInt64Array(dataPtrs[c], rowCount);
-        result[colName] = mask ? vals.map((v, r) => (mask[r] ? v : null)) : vals;
-        break;
-      }
-      case DATA_TYPE_FLOAT: {
-        const vals = decodeFloat64Array(dataPtrs[c], rowCount);
-        result[colName] = mask ? vals.map((v, r) => (mask[r] ? v : null)) : vals;
-        break;
-      }
-      case DATA_TYPE_STRING:
-      case DATA_TYPE_DATE_TIME: {
-        // Read pointer-by-pointer (not decodeStringArray): a masked-out cell is a
-        // NULL char* that CString cannot construct from.
-        const base = dataPtrs[c];
-        const col: (string | null)[] = new Array(rowCount);
-        for (let r = 0; r < rowCount; r++) {
-          if (mask && !mask[r]) {
-            col[r] = null;
-            continue;
-          }
-          const strPtr = base ? read.ptr(base as Pointer, r * 8) : 0;
-          col[r] = strPtr === 0 ? null : new CString(strPtr as Pointer).toString();
-        }
-        result[colName] = col;
-        break;
-      }
-    }
-  }
-
-  lib.quiver_database_free_time_series_data(
-    namesPtr,
-    typesPtr,
-    dataPtr,
-    hasValuePtr,
-    BigInt(colCount),
-    BigInt(rowCount),
+  return readGroupColumns(
+    this._handle,
+    getSymbols().quiver_database_read_time_series_group,
+    collection,
+    group,
+    id,
   );
-  return result;
 };
 
 Database.prototype.readTimeSeriesRow = function (
@@ -138,6 +54,7 @@ Database.prototype.readTimeSeriesRow = function (
   const dtBuf = toCString(dateTime);
   const outDataType = new Uint8Array(4);
   const outValues = allocPtrOut();
+  const outMask = allocPtrOut();
   const outCount = allocUint64Out();
 
   check(
@@ -149,6 +66,7 @@ Database.prototype.readTimeSeriesRow = function (
       dtBuf.buf,
       outDataType,
       outValues.buf,
+      outMask.buf,
       outCount.buf,
     ),
   );
@@ -157,26 +75,33 @@ Database.prototype.readTimeSeriesRow = function (
   const valuesPtr = readPtrOut(outValues);
   if (count === 0 || !valuesPtr) return [];
 
+  // mask[i] === 0: no data at or before dateTime; the data slot is a placeholder, never read.
+  const maskPtr = readPtrOut(outMask);
+  const mask = new Uint8Array(toArrayBuffer(maskPtr as Pointer, 0, count));
   const dataType = new DataView(outDataType.buffer).getInt32(0, true);
   switch (dataType) {
     case DATA_TYPE_INTEGER: {
-      const result = decodeInt64Array(valuesPtr, count);
+      const result = decodeInt64Array(valuesPtr, count).map((v, i) => (mask[i] ? v : null));
       lib.quiver_database_free_integer_array(valuesPtr);
+      lib.quiver_database_free_mask(maskPtr);
       return result;
     }
     case DATA_TYPE_FLOAT: {
-      const result = decodeFloat64Array(valuesPtr, count);
+      const result = decodeFloat64Array(valuesPtr, count).map((v, i) => (mask[i] ? v : null));
       lib.quiver_database_free_float_array(valuesPtr);
+      lib.quiver_database_free_mask(maskPtr);
       return result;
     }
     default: {
-      // STRING or DATE_TIME; NULL entries mark elements with no data
+      // STRING or DATE_TIME; never build a CString from a masked-out (NULL) pointer
       const result: (string | null)[] = new Array(count);
       for (let i = 0; i < count; i++) {
-        const strPtr = read.ptr(valuesPtr as Pointer, i * 8);
-        result[i] = strPtr === 0 ? null : new CString(strPtr as Pointer).toString();
+        result[i] = mask[i]
+          ? new CString(read.ptr(valuesPtr as Pointer, i * 8) as Pointer).toString()
+          : null;
       }
       lib.quiver_database_free_string_array(valuesPtr, BigInt(count));
+      lib.quiver_database_free_mask(maskPtr);
       return result;
     }
   }
@@ -426,7 +351,12 @@ Database.prototype.updateTimeSeriesFiles = function (
   const lib = getSymbols();
   const collBuf = toCString(collection);
   const entries = Object.entries(data);
-  if (entries.length === 0) return;
+  // An empty map still reaches the core, which validates the collection and its files table
+  // before the no-op. null tables, never zero-length buffers (same as updateGroupColumns).
+  if (entries.length === 0) {
+    check(lib.quiver_database_update_time_series_files(this._handle, collBuf.buf, null, null, 0n));
+    return;
+  }
   const keepalive: Allocation[] = [];
 
   const colNames = entries.map(([name]) => name);