@proteinjs/db-driver-spanner 1.25.0 → 1.26.0

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.26.0](https://github.com/proteinjs/db/compare/@proteinjs/db-driver-spanner@1.25.0...@proteinjs/db-driver-spanner@1.26.0) (2026-08-29)
+
+
+### Features
+
+* grouped-aggregation reads — Db.queryAggregates + QueryBuilder.timeBucket ([f94e564](https://github.com/proteinjs/db/commit/f94e564e6312f4c224d500e3d5fb0d53e3d9b59f))
+* timeBucket hour grain — widen the unit union to day|hour across query + drivers ([153e3d0](https://github.com/proteinjs/db/commit/153e3d09c6c56d7746f9071e1f57ac527b07dc55))
+
+
+
+
+
 # [1.25.0](https://github.com/proteinjs/db/compare/@proteinjs/db-driver-spanner@1.24.0...@proteinjs/db-driver-spanner@1.25.0) (2026-08-29)
 
 

package/dist/src/SpannerDriver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SpannerDriver.d.ts","sourceRoot":"","sources":["../../src/SpannerDriver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SpannerDriver.d.ts","sourceRoot":"","sources":["../../src/SpannerDriver.ts"],"names":[],"mappings":"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"}

package/dist/src/SpannerDriver.js

@@ -287,6 +287,12 @@ var SpannerDriver = /** @class */ (function () {
                             prefixTablesWithDb: false,
                             getDriverColumnType: this.getColumnType.bind(this),
                             handleCaseSensitivity: this.handleCaseSensitivity.bind(this),
+                            // GoogleSQL day/hour truncation for QueryBuilder.timeBucket. UTC deliberately: bucket
+                            // boundaries must be stable regardless of the serving process's TZ (hour-grain callers
+                            // render the UTC buckets in the operator's local time).
+                            dateTruncExpression: function (resolvedColumnName, unit) {
+                                return "TIMESTAMP_TRUNC(".concat(resolvedColumnName, ", ").concat(unit === 'hour' ? 'HOUR' : 'DAY', ", 'UTC')");
+                            },
                         }), sql = _a.sql, namedParams = _a.namedParams;
                         startTime = process.hrtime.bigint();
                         _b.label = 1;

package/dist/src/SpannerDriver.js.map

@@ -1 +1 @@
-{"version":3,"file":"SpannerDriver.js","sourceRoot":"","sources":["../../src/SpannerDriver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SpannerDriver.js","sourceRoot":"","sources":["../../src/SpannerDriver.ts"],"names":[],"mappings":"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"}

package/dist/test/QueryAggregates.test.d.ts

@@ -0,0 +1,2 @@
+import '../generated/test/index';
+//# sourceMappingURL=QueryAggregates.test.d.ts.map

package/dist/test/QueryAggregates.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryAggregates.test.d.ts","sourceRoot":"","sources":["../../test/QueryAggregates.test.ts"],"names":[],"mappings":"AAgBA,OAAO,yBAAyB,CAAC"}

package/dist/test/QueryAggregates.test.js

@@ -0,0 +1,292 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var moment_1 = __importDefault(require("moment"));
+var db_driver_spanner_1 = require("@proteinjs/db-driver-spanner");
+var db_1 = require("@proteinjs/db");
+var test_1 = require("@proteinjs/db/test");
+var db_transaction_context_1 = require("@proteinjs/db-transaction-context");
+var getDropTestTable_1 = require("./util/getDropTestTable");
+var SpannerEmulatorProvisioner_1 = require("./util/SpannerEmulatorProvisioner");
+require("../generated/test/index");
+var UsageShapeTable = /** @class */ (function (_super) {
+    __extends(UsageShapeTable, _super);
+    function UsageShapeTable() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.name = 'db_test_query_aggregates';
+        _this.columns = (0, db_1.withRecordColumns)({
+            model: new db_1.StringColumn('model'),
+            source: new db_1.StringColumn('source'),
+            totalTokens: new db_1.IntegerColumn('total_tokens', undefined, true),
+            costMicroUsd: new db_1.IntegerColumn('cost_micro_usd', undefined, true),
+            priced: new db_1.BooleanColumn('priced'),
+        });
+        return _this;
+    }
+    return UsageShapeTable;
+}(db_1.Table));
+var table = new UsageShapeTable();
+var getTable = function (tableName) {
+    if (tableName === table.name) {
+        return table;
+    }
+    throw new Error("Unexpected table lookup in test: ".concat(tableName));
+};
+var spannerDriver = new db_driver_spanner_1.SpannerDriver({
+    projectId: 'proteinjs-test',
+    instanceName: 'proteinjs-test',
+    databaseName: 'test',
+}, getTable);
+var seedRow = function (over) { return (__assign({ model: 'model-a', source: 'chat_turn', totalTokens: 0, costMicroUsd: 0, priced: true }, over)); };
+/** Bucket values arrive as the driver returns them (Date/ISO string); normalize to YYYY-MM-DD. */
+var dayOf = function (value) { return new Date(String(value)).toISOString().slice(0, 10); };
+describe('Db.queryAggregates (grouped aggregation + UTC day buckets)', function () {
+    var dropTable = (0, getDropTestTable_1.getDropTestTable)(spannerDriver);
+    var db = new db_1.Db(spannerDriver, getTable, new db_transaction_context_1.TransactionContext());
+    beforeAll(function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    // The table declares no auth block → the default admin door; carry that identity.
+                    (0, test_1.registerTestUser)();
+                    return [4 /*yield*/, SpannerEmulatorProvisioner_1.SpannerEmulatorProvisioner.ensureProvisioned({
+                            projectId: 'proteinjs-test',
+                            instanceName: 'proteinjs-test',
+                            databaseName: 'test',
+                        })];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, dropTable(table)];
+                case 2:
+                    _a.sent();
+                    return [4 /*yield*/, spannerDriver.getTableManager().loadTable(table)];
+                case 3:
+                    _a.sent();
+                    // Two models, two sources, three UTC instants — the last two straddle a UTC midnight.
+                    return [4 /*yield*/, db.insert(table, seedRow({
+                            model: 'model-a',
+                            source: 'chat_turn',
+                            totalTokens: 1000,
+                            costMicroUsd: 50000,
+                            created: moment_1.default.utc('2026-08-10T10:00:00Z'),
+                        }))];
+                case 4:
+                    // Two models, two sources, three UTC instants — the last two straddle a UTC midnight.
+                    _a.sent();
+                    return [4 /*yield*/, db.insert(table, seedRow({
+                            model: 'model-a',
+                            source: 'flow_request',
+                            totalTokens: 200,
+                            costMicroUsd: 10000,
+                            created: moment_1.default.utc('2026-08-10T23:30:00Z'),
+                        }))];
+                case 5:
+                    _a.sent();
+                    return [4 /*yield*/, db.insert(table, seedRow({
+                            model: 'model-b',
+                            source: 'chat_turn',
+                            totalTokens: 40,
+                            costMicroUsd: 2000,
+                            priced: false,
+                            created: moment_1.default.utc('2026-08-11T00:30:00Z'),
+                        }))];
+                case 6:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); }, 60000);
+    afterAll(function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    (0, test_1.clearTestUser)();
+                    return [4 /*yield*/, dropTable(table)];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, SpannerEmulatorProvisioner_1.SpannerEmulatorProvisioner.release()];
+                case 2:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); }, 30000);
+    test('grouped SUM/COUNT rows carry group fields + aggregate resultProps', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var qb, rows, byModel;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    qb = new db_1.QueryBuilderFactory()
+                        .createQueryBuilder(table)
+                        .select({ fields: ['model'] })
+                        .groupBy(['model'])
+                        .aggregate({ function: 'SUM', field: 'totalTokens', resultProp: 'totalTokens' })
+                        .aggregate({ function: 'SUM', field: 'costMicroUsd', resultProp: 'costMicroUsd' })
+                        .aggregate({ function: 'COUNT', resultProp: 'requests' });
+                    return [4 /*yield*/, db.queryAggregates(table, qb)];
+                case 1:
+                    rows = _a.sent();
+                    byModel = new Map(rows.map(function (row) { return [row.model, row]; }));
+                    expect(byModel.size).toBe(2);
+                    expect(Number(byModel.get('model-a').totalTokens)).toBe(1200);
+                    expect(Number(byModel.get('model-a').costMicroUsd)).toBe(60000);
+                    expect(Number(byModel.get('model-a').requests)).toBe(2);
+                    expect(Number(byModel.get('model-b').totalTokens)).toBe(40);
+                    expect(Number(byModel.get('model-b').requests)).toBe(1);
+                    return [2 /*return*/];
+            }
+        });
+    }); }, 60000);
+    test('timeBucket buckets by UTC day — rows across a UTC midnight land apart', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var qb, rows, byDay;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    qb = new db_1.QueryBuilderFactory()
+                        .createQueryBuilder(table)
+                        .timeBucket({ field: 'created', unit: 'day', resultProp: 'day' })
+                        .aggregate({ function: 'SUM', field: 'totalTokens', resultProp: 'totalTokens' });
+                    return [4 /*yield*/, db.queryAggregates(table, qb)];
+                case 1:
+                    rows = _a.sent();
+                    byDay = new Map(rows.map(function (row) { return [dayOf(row.day), Number(row.totalTokens)]; }));
+                    expect(byDay.size).toBe(2);
+                    expect(byDay.get('2026-08-10')).toBe(1200); // 10:00Z + 23:30Z
+                    expect(byDay.get('2026-08-11')).toBe(40); // 00:30Z — next UTC day
+                    return [2 /*return*/];
+            }
+        });
+    }); }, 60000);
+    test('group fields, day bucket, aggregates, and conditions compose in one statement', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var qb, rows, key, byKey;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    qb = new db_1.QueryBuilderFactory()
+                        .createQueryBuilder(table)
+                        .condition({ field: 'priced', operator: '=', value: true })
+                        .select({ fields: ['model', 'source'] })
+                        .groupBy(['model', 'source'])
+                        .timeBucket({ field: 'created', unit: 'day', resultProp: 'day' })
+                        .aggregate({ function: 'SUM', field: 'totalTokens', resultProp: 'totalTokens' })
+                        .aggregate({ function: 'COUNT', resultProp: 'requests' });
+                    return [4 /*yield*/, db.queryAggregates(table, qb)];
+                case 1:
+                    rows = _a.sent();
+                    // priced=false row excluded; model-a splits by source, same day for the 10:00Z/23:30Z rows.
+                    expect(rows).toHaveLength(2);
+                    key = function (row) { return "".concat(row.model, "/").concat(row.source, "/").concat(dayOf(row.day)); };
+                    byKey = new Map(rows.map(function (row) { return [key(row), row]; }));
+                    expect(Number(byKey.get('model-a/chat_turn/2026-08-10').totalTokens)).toBe(1000);
+                    expect(Number(byKey.get('model-a/flow_request/2026-08-10').totalTokens)).toBe(200);
+                    expect(Number(byKey.get('model-a/chat_turn/2026-08-10').requests)).toBe(1);
+                    return [2 /*return*/];
+            }
+        });
+    }); }, 60000);
+    // LAST test: it seeds an extra same-hour row; afterAll drops the table so no cleanup needed.
+    test('timeBucket(hour) buckets by UTC hour — cross-hour rows split, same-hour rows merge (V2.3)', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var hourQb, byHour, _a, byHour2, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    hourQb = function () {
+                        return new db_1.QueryBuilderFactory()
+                            .createQueryBuilder(table)
+                            .timeBucket({ field: 'created', unit: 'hour', resultProp: 'hour' })
+                            .aggregate({ function: 'SUM', field: 'totalTokens', resultProp: 'totalTokens' })
+                            .aggregate({ function: 'COUNT', resultProp: 'requests' });
+                    };
+                    _a = Map.bind;
+                    return [4 /*yield*/, db.queryAggregates(table, hourQb())];
+                case 1:
+                    byHour = new (_a.apply(Map, [void 0, (_c.sent()).map(function (row) { return [
+                            new Date(String(row.hour)).toISOString(),
+                            Number(row.totalTokens),
+                        ]; })]))();
+                    expect(byHour.size).toBe(3);
+                    expect(byHour.get('2026-08-10T10:00:00.000Z')).toBe(1000);
+                    expect(byHour.get('2026-08-10T23:00:00.000Z')).toBe(200); // 23:30Z floors to 23:00Z
+                    expect(byHour.get('2026-08-11T00:00:00.000Z')).toBe(40); // 00:30Z → its own hour, not merged with 23:30Z
+                    // A second row INSIDE an existing hour must MERGE, not open a new bucket (30 min apart, same hour).
+                    return [4 /*yield*/, db.insert(table, seedRow({ model: 'model-c', totalTokens: 7, created: moment_1.default.utc('2026-08-10T10:45:00Z') }))];
+                case 2:
+                    // A second row INSIDE an existing hour must MERGE, not open a new bucket (30 min apart, same hour).
+                    _c.sent();
+                    _b = Map.bind;
+                    return [4 /*yield*/, db.queryAggregates(table, hourQb())];
+                case 3:
+                    byHour2 = new (_b.apply(Map, [void 0, (_c.sent()).map(function (row) { return [new Date(String(row.hour)).toISOString(), row]; })]))();
+                    expect(byHour2.size).toBe(3); // still three hours — 10:00Z absorbed the 10:45Z row
+                    expect(Number(byHour2.get('2026-08-10T10:00:00.000Z').totalTokens)).toBe(1007); // 1000 + 7
+                    expect(Number(byHour2.get('2026-08-10T10:00:00.000Z').requests)).toBe(2);
+                    return [2 /*return*/];
+            }
+        });
+    }); }, 60000);
+});
+//# sourceMappingURL=QueryAggregates.test.js.map

package/dist/test/QueryAggregates.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryAggregates.test.js","sourceRoot":"","sources":["../../test/QueryAggregates.test.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@proteinjs/db-driver-spanner",
-  "version": "1.25.0",
+  "version": "1.26.0",
   "main": "./dist/generated/index.js",
   "types": "./dist/generated/index.d.ts",
   "exports": {
@@ -42,10 +42,10 @@
   },
   "dependencies": {
     "@google-cloud/spanner": "7.5.0",
-    "@proteinjs/db": "^1.37.0",
-    "@proteinjs/db-query": "^1.8.0",
-    "@proteinjs/db-spanner-common": "^1.3.21",
-    "@proteinjs/db-transaction-context": "^0.5.21",
+    "@proteinjs/db": "^1.38.0",
+    "@proteinjs/db-query": "^1.9.0",
+    "@proteinjs/db-spanner-common": "^1.3.22",
+    "@proteinjs/db-transaction-context": "^0.5.22",
     "@proteinjs/logger": "^1.0.21",
     "@proteinjs/reflection": "^1.2.0",
     "@proteinjs/util": "^1.6.1"
@@ -63,5 +63,5 @@
     "ts-jest": "29.1.1",
     "typescript": "5.2.2"
   },
-  "gitHead": "cb0fda126d5d2bd5b17d1bc13e87c2373eb61f52"
+  "gitHead": "7c4ebb2ab218d48a276940140161979f0aa31730"
 }

package/src/SpannerDriver.ts

@@ -237,6 +237,11 @@ export class SpannerDriver implements DbDriver {
       prefixTablesWithDb: false,
       getDriverColumnType: this.getColumnType.bind(this),
       handleCaseSensitivity: this.handleCaseSensitivity.bind(this),
+      // GoogleSQL day/hour truncation for QueryBuilder.timeBucket. UTC deliberately: bucket
+      // boundaries must be stable regardless of the serving process's TZ (hour-grain callers
+      // render the UTC buckets in the operator's local time).
+      dateTruncExpression: (resolvedColumnName: string, unit: 'day' | 'hour') =>
+        `TIMESTAMP_TRUNC(${resolvedColumnName}, ${unit === 'hour' ? 'HOUR' : 'DAY'}, 'UTC')`,
     });
 
     const startTime = process.hrtime.bigint();

package/test/QueryAggregates.test.ts

@@ -0,0 +1,215 @@
+import moment from 'moment';
+import { SpannerDriver } from '@proteinjs/db-driver-spanner';
+import {
+  BooleanColumn,
+  Db,
+  IntegerColumn,
+  QueryBuilderFactory,
+  Record,
+  StringColumn,
+  Table,
+  withRecordColumns,
+} from '@proteinjs/db';
+import { registerTestUser, clearTestUser } from '@proteinjs/db/test';
+import { TransactionContext } from '@proteinjs/db-transaction-context';
+import { getDropTestTable } from './util/getDropTestTable';
+import { SpannerEmulatorProvisioner } from './util/SpannerEmulatorProvisioner';
+import '../generated/test/index';
+
+/**
+ * `Db.queryAggregates` against real Spanner semantics: grouped SUM/COUNT rows come back with
+ * the group fields + aggregate resultProps, and `timeBucket('day')` truncates in UTC — two rows
+ * 60 minutes apart across a UTC midnight land in DIFFERENT buckets (a local-TZ truncation, e.g.
+ * America/Los_Angeles, would merge them: both fall on the same LA calendar day).
+ */
+
+interface UsageShape extends Record {
+  model: string;
+  source: string;
+  totalTokens: number;
+  costMicroUsd: number;
+  priced: boolean;
+}
+
+class UsageShapeTable extends Table<UsageShape> {
+  name = 'db_test_query_aggregates';
+  columns = withRecordColumns<UsageShape>({
+    model: new StringColumn('model'),
+    source: new StringColumn('source'),
+    totalTokens: new IntegerColumn('total_tokens', undefined, true),
+    costMicroUsd: new IntegerColumn('cost_micro_usd', undefined, true),
+    priced: new BooleanColumn('priced'),
+  });
+}
+
+const table = new UsageShapeTable();
+const getTable = (tableName: string) => {
+  if (tableName === table.name) {
+    return table;
+  }
+  throw new Error(`Unexpected table lookup in test: ${tableName}`);
+};
+
+const spannerDriver = new SpannerDriver(
+  {
+    projectId: 'proteinjs-test',
+    instanceName: 'proteinjs-test',
+    databaseName: 'test',
+  },
+  getTable
+);
+
+const seedRow = (over: Partial<UsageShape>) => ({
+  model: 'model-a',
+  source: 'chat_turn',
+  totalTokens: 0,
+  costMicroUsd: 0,
+  priced: true,
+  ...over,
+});
+
+/** Bucket values arrive as the driver returns them (Date/ISO string); normalize to YYYY-MM-DD. */
+const dayOf = (value: unknown): string => new Date(String(value)).toISOString().slice(0, 10);
+
+describe('Db.queryAggregates (grouped aggregation + UTC day buckets)', () => {
+  const dropTable = getDropTestTable(spannerDriver);
+  const db = new Db(spannerDriver, getTable, new TransactionContext());
+
+  beforeAll(async () => {
+    // The table declares no auth block → the default admin door; carry that identity.
+    registerTestUser();
+    await SpannerEmulatorProvisioner.ensureProvisioned({
+      projectId: 'proteinjs-test',
+      instanceName: 'proteinjs-test',
+      databaseName: 'test',
+    });
+    await dropTable(table);
+    await spannerDriver.getTableManager().loadTable(table);
+
+    // Two models, two sources, three UTC instants — the last two straddle a UTC midnight.
+    await db.insert(
+      table,
+      seedRow({
+        model: 'model-a',
+        source: 'chat_turn',
+        totalTokens: 1000,
+        costMicroUsd: 50_000,
+        created: moment.utc('2026-08-10T10:00:00Z'),
+      }) as any
+    );
+    await db.insert(
+      table,
+      seedRow({
+        model: 'model-a',
+        source: 'flow_request',
+        totalTokens: 200,
+        costMicroUsd: 10_000,
+        created: moment.utc('2026-08-10T23:30:00Z'),
+      }) as any
+    );
+    await db.insert(
+      table,
+      seedRow({
+        model: 'model-b',
+        source: 'chat_turn',
+        totalTokens: 40,
+        costMicroUsd: 2_000,
+        priced: false,
+        created: moment.utc('2026-08-11T00:30:00Z'),
+      }) as any
+    );
+  }, 60000);
+
+  afterAll(async () => {
+    clearTestUser();
+    await dropTable(table);
+    await SpannerEmulatorProvisioner.release();
+  }, 30000);
+
+  test('grouped SUM/COUNT rows carry group fields + aggregate resultProps', async () => {
+    const qb = new QueryBuilderFactory()
+      .createQueryBuilder<UsageShape>(table)
+      .select({ fields: ['model'] })
+      .groupBy(['model'])
+      .aggregate({ function: 'SUM', field: 'totalTokens', resultProp: 'totalTokens' })
+      .aggregate({ function: 'SUM', field: 'costMicroUsd', resultProp: 'costMicroUsd' })
+      .aggregate({ function: 'COUNT', resultProp: 'requests' });
+    const rows = await db.queryAggregates(table, qb);
+
+    const byModel = new Map(rows.map((row) => [row.model, row]));
+    expect(byModel.size).toBe(2);
+    expect(Number(byModel.get('model-a')!.totalTokens)).toBe(1200);
+    expect(Number(byModel.get('model-a')!.costMicroUsd)).toBe(60_000);
+    expect(Number(byModel.get('model-a')!.requests)).toBe(2);
+    expect(Number(byModel.get('model-b')!.totalTokens)).toBe(40);
+    expect(Number(byModel.get('model-b')!.requests)).toBe(1);
+  }, 60000);
+
+  test('timeBucket buckets by UTC day — rows across a UTC midnight land apart', async () => {
+    const qb = new QueryBuilderFactory()
+      .createQueryBuilder<UsageShape>(table)
+      .timeBucket({ field: 'created', unit: 'day', resultProp: 'day' })
+      .aggregate({ function: 'SUM', field: 'totalTokens', resultProp: 'totalTokens' });
+    const rows = await db.queryAggregates(table, qb);
+
+    const byDay = new Map(rows.map((row) => [dayOf(row.day), Number(row.totalTokens)]));
+    expect(byDay.size).toBe(2);
+    expect(byDay.get('2026-08-10')).toBe(1200); // 10:00Z + 23:30Z
+    expect(byDay.get('2026-08-11')).toBe(40); // 00:30Z — next UTC day
+  }, 60000);
+
+  test('group fields, day bucket, aggregates, and conditions compose in one statement', async () => {
+    const qb = new QueryBuilderFactory()
+      .createQueryBuilder<UsageShape>(table)
+      .condition({ field: 'priced', operator: '=', value: true })
+      .select({ fields: ['model', 'source'] })
+      .groupBy(['model', 'source'])
+      .timeBucket({ field: 'created', unit: 'day', resultProp: 'day' })
+      .aggregate({ function: 'SUM', field: 'totalTokens', resultProp: 'totalTokens' })
+      .aggregate({ function: 'COUNT', resultProp: 'requests' });
+    const rows = await db.queryAggregates(table, qb);
+
+    // priced=false row excluded; model-a splits by source, same day for the 10:00Z/23:30Z rows.
+    expect(rows).toHaveLength(2);
+    const key = (row: { [k: string]: unknown }) => `${row.model}/${row.source}/${dayOf(row.day)}`;
+    const byKey = new Map(rows.map((row) => [key(row), row]));
+    expect(Number(byKey.get('model-a/chat_turn/2026-08-10')!.totalTokens)).toBe(1000);
+    expect(Number(byKey.get('model-a/flow_request/2026-08-10')!.totalTokens)).toBe(200);
+    expect(Number(byKey.get('model-a/chat_turn/2026-08-10')!.requests)).toBe(1);
+  }, 60000);
+
+  // LAST test: it seeds an extra same-hour row; afterAll drops the table so no cleanup needed.
+  test('timeBucket(hour) buckets by UTC hour — cross-hour rows split, same-hour rows merge (V2.3)', async () => {
+    const hourQb = () =>
+      new QueryBuilderFactory()
+        .createQueryBuilder<UsageShape>(table)
+        .timeBucket({ field: 'created', unit: 'hour', resultProp: 'hour' })
+        .aggregate({ function: 'SUM', field: 'totalTokens', resultProp: 'totalTokens' })
+        .aggregate({ function: 'COUNT', resultProp: 'requests' });
+
+    // Seeded UTC instants: 10:00Z (1000), 23:30Z (200), next-day 00:30Z (40) — three DISTINCT
+    // UTC hours. Under DAY grain the first two merged (both 2026-08-10); under HOUR they split.
+    const byHour = new Map(
+      (await db.queryAggregates(table, hourQb())).map((row) => [
+        new Date(String(row.hour)).toISOString(),
+        Number(row.totalTokens),
+      ])
+    );
+    expect(byHour.size).toBe(3);
+    expect(byHour.get('2026-08-10T10:00:00.000Z')).toBe(1000);
+    expect(byHour.get('2026-08-10T23:00:00.000Z')).toBe(200); // 23:30Z floors to 23:00Z
+    expect(byHour.get('2026-08-11T00:00:00.000Z')).toBe(40); // 00:30Z → its own hour, not merged with 23:30Z
+
+    // A second row INSIDE an existing hour must MERGE, not open a new bucket (30 min apart, same hour).
+    await db.insert(
+      table,
+      seedRow({ model: 'model-c', totalTokens: 7, created: moment.utc('2026-08-10T10:45:00Z') }) as any
+    );
+    const byHour2 = new Map(
+      (await db.queryAggregates(table, hourQb())).map((row) => [new Date(String(row.hour)).toISOString(), row])
+    );
+    expect(byHour2.size).toBe(3); // still three hours — 10:00Z absorbed the 10:45Z row
+    expect(Number(byHour2.get('2026-08-10T10:00:00.000Z')!.totalTokens)).toBe(1007); // 1000 + 7
+    expect(Number(byHour2.get('2026-08-10T10:00:00.000Z')!.requests)).toBe(2);
+  }, 60000);
+});