@dyrected/db-mysql 2.17.0 → 2.18.1

package/dist/index.cjs

@@ -50,6 +50,24 @@ function parseMysqlDuplicateKey(message) {
   }
   return { field, value };
 }
+function jsonWhereExpr(field) {
+  const path = `JSON_EXTRACT(data, '$.${field}')`;
+  return `IF(JSON_TYPE(${path}) = 'NULL', NULL, IF(JSON_TYPE(${path}) = 'BOOLEAN', IF(${path} = TRUE, 1, 0), JSON_UNQUOTE(${path})))`;
+}
+var DATE_TYPES = /* @__PURE__ */ new Set(["date", "datetime"]);
+var ISO_WITH_TIME = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}(:\d{2}(\.\d+)?)?(Z|[+-]\d{2}:?\d{2})?$/;
+var MYSQL_DATETIME = /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}(\.\d+)?$/;
+function toDatetimeColumn(value) {
+  if (typeof value !== "string" || !ISO_WITH_TIME.test(value)) return value;
+  const date = new Date(value);
+  if (Number.isNaN(date.getTime())) return value;
+  return date.toISOString().replace("T", " ").replace("Z", "");
+}
+function fromDatetimeColumn(value) {
+  if (value instanceof Date) return Number.isNaN(value.getTime()) ? value : value.toISOString();
+  if (typeof value === "string" && MYSQL_DATETIME.test(value)) return `${value.replace(" ", "T")}Z`;
+  return value;
+}
 function isNumericOp(val) {
   return val !== null && typeof val === "object" && !Array.isArray(val) && ("increment" in val || "decrement" in val);
 }
@@ -352,7 +370,15 @@ FIX INSTRUCTIONS:
           console.log(`[dyrected/mysql] Promoting field "${field.name}" to column in ${tableName}`);
           const isUniqueOrIndexed = field.unique || indexedFields.has(field.name);
           let sqlType = isUniqueOrIndexed ? "VARCHAR(191)" : "TEXT";
+          if (!isUniqueOrIndexed) {
+            if ((field.type === "select" || field.type === "radio") && !field.hasMany) sqlType = "VARCHAR(100)";
+            else if (field.type === "relationship" && !field.hasMany) sqlType = "VARCHAR(191)";
+            else if (field.type === "email") sqlType = "VARCHAR(254)";
+          } else if (field.type === "email") {
+            sqlType = "VARCHAR(191)";
+          }
           if (field.type === "number") sqlType = "DECIMAL(19,4)";
+          if (field.type === "money") sqlType = "BIGINT";
           if (field.type === "boolean") sqlType = "TINYINT(1)";
           if (field.type === "date" || field.type === "datetime") sqlType = "DATETIME(3)";
           if (field.type === "textarea" || field.type === "richText" || field.type === "json") sqlType = "LONGTEXT";
@@ -370,6 +396,8 @@ FIX INSTRUCTIONS:
           let castExpr = `JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field.name}'))`;
           if (field.type === "number") {
             castExpr = `IF(JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field.name}')) REGEXP '^-?[0-9]+(\\\\.[0-9]+)?([eE][+-]?[0-9]+)?$', CAST(JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field.name}')) AS DECIMAL(19,4)), NULL)`;
+          } else if (field.type === "money") {
+            castExpr = `IF(JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field.name}')) REGEXP '^-?[0-9]+$', CAST(JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field.name}')) AS SIGNED), NULL)`;
           } else if (field.type === "boolean") {
             castExpr = `IF(JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field.name}')) IN ('true', '1'), 1, 0)`;
           } else if (field.type === "date" || field.type === "datetime") {
@@ -388,7 +416,7 @@ FIX INSTRUCTIONS:
       const existingIndexNames = new Set(existingIndicesRows.map((r) => r?.Key_name).filter(Boolean));
       for (const field of fields) {
         if (field.unique) {
-          const idxName = `uniq_${tableName}_${field.name}`;
+          const idxName = (0, import_core.resolveIndexName)("uniq", tableName, [field.name]);
           if (!existingIndexNames.has(idxName) && !existingIndexNames.has(field.name) && !this.failedIndexes.has(idxName)) {
             try {
               const [colInfoRows] = await this.query(`SHOW COLUMNS FROM \`${tableName}\` WHERE Field = ?`, [field.name]);
@@ -420,7 +448,7 @@ FIX INSTRUCTIONS:
         for (const idx of indexes) {
           if (!Array.isArray(idx.fields) || idx.fields.length === 0) continue;
           const isUnique = Boolean(idx.unique);
-          const idxName = idx.name || `${isUnique ? "uniq" : "idx"}_${tableName}_${idx.fields.join("_")}`;
+          const idxName = idx.name || (0, import_core.resolveIndexName)(isUnique ? "uniq" : "idx", tableName, idx.fields);
           if (!existingIndexNames.has(idxName) && !this.failedIndexes.has(idxName)) {
             for (const fName of idx.fields) {
               try {
@@ -472,7 +500,7 @@ FIX INSTRUCTIONS:
     let whereParams = [];
     if (args.where && Object.keys(args.where).length > 0) {
       const result = (0, import_core.parseSqlWhere)(
-        args.where,
+        this.coerceBooleanWhere(args.collection, args.where),
         (field) => {
           if (field === "id") return "`id`";
           if (field === "createdAt" || field === "created_at") return "`created_at`";
@@ -480,7 +508,7 @@ FIX INSTRUCTIONS:
           if (existingCols.includes(field) && !["id", "data"].includes(field)) {
             return `\`${field}\``;
           }
-          return `JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field}'))`;
+          return jsonWhereExpr(field);
         },
         "?"
       );
@@ -498,12 +526,13 @@ FIX INSTRUCTIONS:
       `SELECT * FROM \`${tableName}\` ${whereSql} ORDER BY ${sort} LIMIT ? OFFSET ?${lock}`,
       [...whereParams, limit, offset]
     );
+    const dateCols = this.dateColumns(args.collection);
     const docs = rows.map((r) => {
       const parsedData = JSON.parse(typeof r.data === "string" ? r.data : JSON.stringify(r.data));
       const promotedOverlay = {};
       for (const col of existingCols) {
         if (!["id", "data", "created_at", "updated_at"].includes(col) && r[col] !== void 0 && r[col] !== null) {
-          promotedOverlay[col] = r[col];
+          promotedOverlay[col] = dateCols.has(col) ? fromDatetimeColumn(r[col]) : r[col];
         }
       }
       return {
@@ -526,6 +555,11 @@ FIX INSTRUCTIONS:
     };
   }
   async findOne(params) {
+    if (params.id === void 0 && params.where) {
+      const found = await this.find({ collection: params.collection, where: params.where, limit: 1, lock: params.lock });
+      return found.docs[0] ?? null;
+    }
+    if (params.id === void 0) throw new Error("findOne requires either id or where");
     if (!this.inTransaction) await this.ensureTable(params.collection);
     const tableName = this.getTableName(params.collection);
     const lock = this.inTransaction || params.lock === "for-update" ? " FOR UPDATE" : "";
@@ -534,10 +568,11 @@ FIX INSTRUCTIONS:
     if (!row) return null;
     const parsedData = JSON.parse(typeof row.data === "string" ? row.data : JSON.stringify(row.data));
     const existingCols = await this.getTableColumns(tableName);
+    const dateCols = this.dateColumns(params.collection);
     const promotedOverlay = {};
     for (const col of existingCols) {
       if (!["id", "data", "created_at", "updated_at"].includes(col) && row[col] !== void 0 && row[col] !== null) {
-        promotedOverlay[col] = row[col];
+        promotedOverlay[col] = dateCols.has(col) ? fromDatetimeColumn(row[col]) : row[col];
       }
     }
     return {
@@ -559,18 +594,19 @@ FIX INSTRUCTIONS:
     delete data.id;
     delete data.createdAt;
     delete data.updatedAt;
+    const dateCols = this.dateColumns(params.collection);
     const promotedValues = {};
     for (const col of existingCols) {
       if (["id", "data", "created_at", "updated_at"].includes(col)) continue;
       if (data[col] !== void 0) {
-        promotedValues[col] = data[col];
+        promotedValues[col] = dateCols.has(col) ? toDatetimeColumn(data[col]) : data[col];
       }
     }
     const colNames = ["id", "data", "created_at", "updated_at", ...Object.keys(promotedValues).map((k) => `\`${k}\``)];
     const placeholders = colNames.map(() => "?").join(", ");
     const values = [id, JSON.stringify(data), now, now, ...Object.values(promotedValues)];
     await this.query(`INSERT INTO \`${tableName}\` (${colNames.join(", ")}) VALUES (${placeholders})`, values);
-    return { id, ...data, ...promotedValues, createdAt: now, updatedAt: now };
+    return { id, ...data, ...promotedValues, ...this.isoDates(dateCols, promotedValues), createdAt: now, updatedAt: now };
   }
   async update(params) {
     if (!this.inTransaction) await this.ensureTable(params.collection);
@@ -584,7 +620,7 @@ FIX INSTRUCTIONS:
       whereParams = [params.id];
       if (params.where && Object.keys(params.where).length > 0) {
         const parsed = (0, import_core.parseSqlWhere)(
-          params.where,
+          this.coerceBooleanWhere(params.collection, params.where),
           (field) => {
             if (field === "id") return "`id`";
             if (field === "createdAt" || field === "created_at") return "`created_at`";
@@ -592,7 +628,7 @@ FIX INSTRUCTIONS:
             if (existingCols.includes(field) && !["id", "data"].includes(field)) {
               return `\`${field}\``;
             }
-            return `JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field}'))`;
+            return jsonWhereExpr(field);
           },
           "?"
         );
@@ -601,7 +637,7 @@ FIX INSTRUCTIONS:
       }
     } else if (params.where && Object.keys(params.where).length > 0) {
       const parsed = (0, import_core.parseSqlWhere)(
-        params.where,
+        this.coerceBooleanWhere(params.collection, params.where),
         (field) => {
           if (field === "id") return "`id`";
           if (field === "createdAt" || field === "created_at") return "`created_at`";
@@ -609,7 +645,7 @@ FIX INSTRUCTIONS:
           if (existingCols.includes(field) && !["id", "data"].includes(field)) {
             return `\`${field}\``;
           }
-          return `JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field}'))`;
+          return jsonWhereExpr(field);
         },
         "?"
       );
@@ -622,6 +658,7 @@ FIX INSTRUCTIONS:
     const setParams = [];
     const jsonPaths = [];
     const jsonParams = [];
+    const dateColsForUpdate = this.dateColumns(params.collection);
     for (const [key, val] of Object.entries(params.data)) {
       if (["id", "createdAt", "updatedAt"].includes(key)) continue;
       const isPromoted = existingCols.includes(key) && !["id", "data", "created_at", "updated_at"].includes(key);
@@ -640,7 +677,7 @@ FIX INSTRUCTIONS:
         if (isPromoted) {
           const escapedCol = escapeMysqlIdentifier(key);
           setClauses.push(`${escapedCol} = ?`);
-          setParams.push(val);
+          setParams.push(dateColsForUpdate.has(key) ? toDatetimeColumn(val) : val);
           jsonPaths.push(`'$.${key}', ${escapedCol}`);
         } else if (val === null) {
           jsonPaths.push(`'$.${key}', CAST('null' AS JSON)`);
@@ -675,6 +712,21 @@ FIX INSTRUCTIONS:
     }
     return { id: targetId, ...params.data, affectedRows: res?.affectedRows ?? 0, updatedAt: now };
   }
+  /** Re-expresses bound date values as ISO strings for the document returned from a write. */
+  isoDates(dateCols, values) {
+    const out = {};
+    for (const col of dateCols) if (col in values) out[col] = fromDatetimeColumn(values[col]);
+    return out;
+  }
+  dateColumns(collection) {
+    return new Set(
+      (this.collectionConfigs.get(collection)?.fields ?? []).filter((f) => DATE_TYPES.has(f.type) && f.name).map((f) => f.name)
+    );
+  }
+  /** Applies {@link coerceBooleanWhere} using the collection's declared field types. */
+  coerceBooleanWhere(collection, where) {
+    return (0, import_core.coerceBooleanWhere)(where, this.collectionConfigs.get(collection)?.fields);
+  }
   async sync(collections) {
     for (const col of collections) {
       this.collectionConfigs.set(col.slug, col);
@@ -739,7 +791,7 @@ FIX INSTRUCTIONS:
       if (existingCols.includes(field) && !["id", "data"].includes(field)) {
         return `\`${field}\``;
       }
-      return `JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field}'))`;
+      return jsonWhereExpr(field);
     };
     const toCastExpr = (rawField, cast) => {
       const base = toFieldExpr(rawField);
@@ -749,13 +801,20 @@ FIX INSTRUCTIONS:
       const sqlType = cast === "integer" ? "SIGNED" : "DECIMAL(20,6)";
       return `IF(${base} REGEXP '^-?[0-9]+(\\\\.[0-9]+)?([eE][+-]?[0-9]+)?$', CAST(${base} AS ${sqlType}), NULL)`;
     };
+    const toDistinctValues = (raw) => {
+      const parsed = Array.isArray(raw) ? raw : typeof raw === "string" ? JSON.parse(raw) : raw ?? [];
+      if (!Array.isArray(parsed)) return [];
+      return Array.from(new Set(parsed.filter((v) => v !== null && v !== void 0)));
+    };
+    const groupFieldType = args.groupBy ? (this.collectionConfigs.get(args.collection)?.fields ?? []).find((f) => f.name === args.groupBy)?.type : void 0;
+    const groupKeyOf = (raw) => (0, import_core.normalizeGroupKey)(raw, groupFieldType);
     const selectParts = [];
     const allParams = [];
     const isDistinctMap = {};
     for (const [name, op] of Object.entries(args.aggregates)) {
       let whereSql = null;
       if (op.where && Object.keys(op.where).length > 0) {
-        const parsed = (0, import_core.parseSqlWhere)(op.where, toFieldExpr, "?");
+        const parsed = (0, import_core.parseSqlWhere)(this.coerceBooleanWhere(args.collection, op.where), toFieldExpr, "?");
         whereSql = parsed.sql;
         allParams.push(...parsed.params);
       }
@@ -766,7 +825,7 @@ FIX INSTRUCTIONS:
       } else if ("distinct" in op && typeof op.distinct === "string") {
         isDistinctMap[name] = true;
         const fieldExpr = toFieldExpr(op.distinct);
-        aggExpr = whereSql ? `COALESCE(JSON_ARRAYAGG(DISTINCT IF(${whereSql}, ${fieldExpr}, NULL)), JSON_ARRAY())` : `COALESCE(JSON_ARRAYAGG(DISTINCT ${fieldExpr}), JSON_ARRAY())`;
+        aggExpr = whereSql ? `COALESCE(JSON_ARRAYAGG(IF(${whereSql}, ${fieldExpr}, NULL)), JSON_ARRAY())` : `COALESCE(JSON_ARRAYAGG(${fieldExpr}), JSON_ARRAY())`;
       } else if ("count" in op) {
         aggExpr = whereSql ? `COUNT(IF(${whereSql}, 1, NULL))` : `COUNT(*)`;
       } else if (op.sum) {
@@ -774,7 +833,7 @@ FIX INSTRUCTIONS:
         aggExpr = whereSql ? `SUM(IF(${whereSql}, ${val}, NULL))` : `SUM(${val})`;
       } else if (op.avg) {
         const val = toCastExpr(op.avg, op.cast);
-        aggExpr = whereSql ? `AVG(IF(${whereSql}, ${val}, NULL))` : `AVG(${val})`;
+        aggExpr = whereSql ? `CAST(AVG(IF(${whereSql}, ${val}, NULL)) AS DOUBLE)` : `CAST(AVG(${val}) AS DOUBLE)`;
       } else if (op.min) {
         const val = toCastExpr(op.min, op.cast);
         aggExpr = whereSql ? `MIN(IF(${whereSql}, ${val}, NULL))` : `MIN(${val})`;
@@ -794,13 +853,12 @@ FIX INSTRUCTIONS:
       const [rows2] = await this.query(query2, allParams);
       const groups = {};
       for (const row2 of rows2 ?? []) {
-        const key = row2.__group_key === null || row2.__group_key === void 0 ? "__unassigned__" : String(row2.__group_key);
+        const key = groupKeyOf(row2.__group_key);
         const groupResult = {};
         for (const name of Object.keys(args.aggregates)) {
           const raw = row2[name];
           if (isDistinctMap[name]) {
-            const parsed = Array.isArray(raw) ? raw : typeof raw === "string" ? JSON.parse(raw) : raw ?? [];
-            groupResult[name] = Array.isArray(parsed) ? parsed.filter((v) => v !== null && v !== void 0) : [];
+            groupResult[name] = toDistinctValues(raw);
           } else {
             groupResult[name] = raw === null || raw === void 0 ? null : Number(raw);
           }
@@ -817,8 +875,7 @@ FIX INSTRUCTIONS:
       const raw = row[name];
       const op = args.aggregates[name];
       if (isDistinctMap[name]) {
-        const parsed = Array.isArray(raw) ? raw : typeof raw === "string" ? JSON.parse(raw) : raw ?? [];
-        result[name] = Array.isArray(parsed) ? parsed.filter((v) => v !== null && v !== void 0) : [];
+        result[name] = toDistinctValues(raw);
       } else if (raw instanceof Date) {
         result[name] = raw.toISOString();
       } else if (op?.cast === "date") {

package/dist/index.d.cts

@@ -44,7 +44,8 @@ declare class MysqlAdapter implements DatabaseAdapter {
     }): Promise<PaginatedResult>;
     findOne(params: {
         collection: string;
-        id: string;
+        id?: string;
+        where?: Record<string, unknown>;
         lock?: "for-update";
     }): Promise<any>;
     create(params: {
@@ -57,6 +58,11 @@ declare class MysqlAdapter implements DatabaseAdapter {
         where?: any;
         data: any;
     }): Promise<any>;
+    /** Re-expresses bound date values as ISO strings for the document returned from a write. */
+    private isoDates;
+    private dateColumns;
+    /** Applies {@link coerceBooleanWhere} using the collection's declared field types. */
+    private coerceBooleanWhere;
     sync(collections: any[]): Promise<void>;
     delete(params: {
         collection: string;

package/dist/index.d.ts

@@ -44,7 +44,8 @@ declare class MysqlAdapter implements DatabaseAdapter {
     }): Promise<PaginatedResult>;
     findOne(params: {
         collection: string;
-        id: string;
+        id?: string;
+        where?: Record<string, unknown>;
         lock?: "for-update";
     }): Promise<any>;
     create(params: {
@@ -57,6 +58,11 @@ declare class MysqlAdapter implements DatabaseAdapter {
         where?: any;
         data: any;
     }): Promise<any>;
+    /** Re-expresses bound date values as ISO strings for the document returned from a write. */
+    private isoDates;
+    private dateColumns;
+    /** Applies {@link coerceBooleanWhere} using the collection's declared field types. */
+    private coerceBooleanWhere;
     sync(collections: any[]): Promise<void>;
     delete(params: {
         collection: string;

package/dist/index.js

@@ -1,5 +1,5 @@
 // src/index.ts
-import { parseSort, parseSqlWhere, DuplicateKeyError, generateDocumentId } from "@dyrected/core";
+import { parseSort, parseSqlWhere, DuplicateKeyError, generateDocumentId, resolveIndexName, coerceBooleanWhere, normalizeGroupKey } from "@dyrected/core";
 import mysql from "mysql2/promise";
 function parseMysqlDuplicateKey(message) {
   const match = message.match(/Duplicate entry '(.*)' for key '(?:[^.]*\.)?(.*)'/);
@@ -14,6 +14,24 @@ function parseMysqlDuplicateKey(message) {
   }
   return { field, value };
 }
+function jsonWhereExpr(field) {
+  const path = `JSON_EXTRACT(data, '$.${field}')`;
+  return `IF(JSON_TYPE(${path}) = 'NULL', NULL, IF(JSON_TYPE(${path}) = 'BOOLEAN', IF(${path} = TRUE, 1, 0), JSON_UNQUOTE(${path})))`;
+}
+var DATE_TYPES = /* @__PURE__ */ new Set(["date", "datetime"]);
+var ISO_WITH_TIME = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}(:\d{2}(\.\d+)?)?(Z|[+-]\d{2}:?\d{2})?$/;
+var MYSQL_DATETIME = /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}(\.\d+)?$/;
+function toDatetimeColumn(value) {
+  if (typeof value !== "string" || !ISO_WITH_TIME.test(value)) return value;
+  const date = new Date(value);
+  if (Number.isNaN(date.getTime())) return value;
+  return date.toISOString().replace("T", " ").replace("Z", "");
+}
+function fromDatetimeColumn(value) {
+  if (value instanceof Date) return Number.isNaN(value.getTime()) ? value : value.toISOString();
+  if (typeof value === "string" && MYSQL_DATETIME.test(value)) return `${value.replace(" ", "T")}Z`;
+  return value;
+}
 function isNumericOp(val) {
   return val !== null && typeof val === "object" && !Array.isArray(val) && ("increment" in val || "decrement" in val);
 }
@@ -316,7 +334,15 @@ FIX INSTRUCTIONS:
           console.log(`[dyrected/mysql] Promoting field "${field.name}" to column in ${tableName}`);
           const isUniqueOrIndexed = field.unique || indexedFields.has(field.name);
           let sqlType = isUniqueOrIndexed ? "VARCHAR(191)" : "TEXT";
+          if (!isUniqueOrIndexed) {
+            if ((field.type === "select" || field.type === "radio") && !field.hasMany) sqlType = "VARCHAR(100)";
+            else if (field.type === "relationship" && !field.hasMany) sqlType = "VARCHAR(191)";
+            else if (field.type === "email") sqlType = "VARCHAR(254)";
+          } else if (field.type === "email") {
+            sqlType = "VARCHAR(191)";
+          }
           if (field.type === "number") sqlType = "DECIMAL(19,4)";
+          if (field.type === "money") sqlType = "BIGINT";
           if (field.type === "boolean") sqlType = "TINYINT(1)";
           if (field.type === "date" || field.type === "datetime") sqlType = "DATETIME(3)";
           if (field.type === "textarea" || field.type === "richText" || field.type === "json") sqlType = "LONGTEXT";
@@ -334,6 +360,8 @@ FIX INSTRUCTIONS:
           let castExpr = `JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field.name}'))`;
           if (field.type === "number") {
             castExpr = `IF(JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field.name}')) REGEXP '^-?[0-9]+(\\\\.[0-9]+)?([eE][+-]?[0-9]+)?$', CAST(JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field.name}')) AS DECIMAL(19,4)), NULL)`;
+          } else if (field.type === "money") {
+            castExpr = `IF(JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field.name}')) REGEXP '^-?[0-9]+$', CAST(JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field.name}')) AS SIGNED), NULL)`;
           } else if (field.type === "boolean") {
             castExpr = `IF(JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field.name}')) IN ('true', '1'), 1, 0)`;
           } else if (field.type === "date" || field.type === "datetime") {
@@ -352,7 +380,7 @@ FIX INSTRUCTIONS:
       const existingIndexNames = new Set(existingIndicesRows.map((r) => r?.Key_name).filter(Boolean));
       for (const field of fields) {
         if (field.unique) {
-          const idxName = `uniq_${tableName}_${field.name}`;
+          const idxName = resolveIndexName("uniq", tableName, [field.name]);
           if (!existingIndexNames.has(idxName) && !existingIndexNames.has(field.name) && !this.failedIndexes.has(idxName)) {
             try {
               const [colInfoRows] = await this.query(`SHOW COLUMNS FROM \`${tableName}\` WHERE Field = ?`, [field.name]);
@@ -384,7 +412,7 @@ FIX INSTRUCTIONS:
         for (const idx of indexes) {
           if (!Array.isArray(idx.fields) || idx.fields.length === 0) continue;
           const isUnique = Boolean(idx.unique);
-          const idxName = idx.name || `${isUnique ? "uniq" : "idx"}_${tableName}_${idx.fields.join("_")}`;
+          const idxName = idx.name || resolveIndexName(isUnique ? "uniq" : "idx", tableName, idx.fields);
           if (!existingIndexNames.has(idxName) && !this.failedIndexes.has(idxName)) {
             for (const fName of idx.fields) {
               try {
@@ -436,7 +464,7 @@ FIX INSTRUCTIONS:
     let whereParams = [];
     if (args.where && Object.keys(args.where).length > 0) {
       const result = parseSqlWhere(
-        args.where,
+        this.coerceBooleanWhere(args.collection, args.where),
         (field) => {
           if (field === "id") return "`id`";
           if (field === "createdAt" || field === "created_at") return "`created_at`";
@@ -444,7 +472,7 @@ FIX INSTRUCTIONS:
           if (existingCols.includes(field) && !["id", "data"].includes(field)) {
             return `\`${field}\``;
           }
-          return `JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field}'))`;
+          return jsonWhereExpr(field);
         },
         "?"
       );
@@ -462,12 +490,13 @@ FIX INSTRUCTIONS:
       `SELECT * FROM \`${tableName}\` ${whereSql} ORDER BY ${sort} LIMIT ? OFFSET ?${lock}`,
       [...whereParams, limit, offset]
     );
+    const dateCols = this.dateColumns(args.collection);
     const docs = rows.map((r) => {
       const parsedData = JSON.parse(typeof r.data === "string" ? r.data : JSON.stringify(r.data));
       const promotedOverlay = {};
       for (const col of existingCols) {
         if (!["id", "data", "created_at", "updated_at"].includes(col) && r[col] !== void 0 && r[col] !== null) {
-          promotedOverlay[col] = r[col];
+          promotedOverlay[col] = dateCols.has(col) ? fromDatetimeColumn(r[col]) : r[col];
         }
       }
       return {
@@ -490,6 +519,11 @@ FIX INSTRUCTIONS:
     };
   }
   async findOne(params) {
+    if (params.id === void 0 && params.where) {
+      const found = await this.find({ collection: params.collection, where: params.where, limit: 1, lock: params.lock });
+      return found.docs[0] ?? null;
+    }
+    if (params.id === void 0) throw new Error("findOne requires either id or where");
     if (!this.inTransaction) await this.ensureTable(params.collection);
     const tableName = this.getTableName(params.collection);
     const lock = this.inTransaction || params.lock === "for-update" ? " FOR UPDATE" : "";
@@ -498,10 +532,11 @@ FIX INSTRUCTIONS:
     if (!row) return null;
     const parsedData = JSON.parse(typeof row.data === "string" ? row.data : JSON.stringify(row.data));
     const existingCols = await this.getTableColumns(tableName);
+    const dateCols = this.dateColumns(params.collection);
     const promotedOverlay = {};
     for (const col of existingCols) {
       if (!["id", "data", "created_at", "updated_at"].includes(col) && row[col] !== void 0 && row[col] !== null) {
-        promotedOverlay[col] = row[col];
+        promotedOverlay[col] = dateCols.has(col) ? fromDatetimeColumn(row[col]) : row[col];
       }
     }
     return {
@@ -523,18 +558,19 @@ FIX INSTRUCTIONS:
     delete data.id;
     delete data.createdAt;
     delete data.updatedAt;
+    const dateCols = this.dateColumns(params.collection);
     const promotedValues = {};
     for (const col of existingCols) {
       if (["id", "data", "created_at", "updated_at"].includes(col)) continue;
       if (data[col] !== void 0) {
-        promotedValues[col] = data[col];
+        promotedValues[col] = dateCols.has(col) ? toDatetimeColumn(data[col]) : data[col];
       }
     }
     const colNames = ["id", "data", "created_at", "updated_at", ...Object.keys(promotedValues).map((k) => `\`${k}\``)];
     const placeholders = colNames.map(() => "?").join(", ");
     const values = [id, JSON.stringify(data), now, now, ...Object.values(promotedValues)];
     await this.query(`INSERT INTO \`${tableName}\` (${colNames.join(", ")}) VALUES (${placeholders})`, values);
-    return { id, ...data, ...promotedValues, createdAt: now, updatedAt: now };
+    return { id, ...data, ...promotedValues, ...this.isoDates(dateCols, promotedValues), createdAt: now, updatedAt: now };
   }
   async update(params) {
     if (!this.inTransaction) await this.ensureTable(params.collection);
@@ -548,7 +584,7 @@ FIX INSTRUCTIONS:
       whereParams = [params.id];
       if (params.where && Object.keys(params.where).length > 0) {
         const parsed = parseSqlWhere(
-          params.where,
+          this.coerceBooleanWhere(params.collection, params.where),
           (field) => {
             if (field === "id") return "`id`";
             if (field === "createdAt" || field === "created_at") return "`created_at`";
@@ -556,7 +592,7 @@ FIX INSTRUCTIONS:
             if (existingCols.includes(field) && !["id", "data"].includes(field)) {
               return `\`${field}\``;
             }
-            return `JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field}'))`;
+            return jsonWhereExpr(field);
           },
           "?"
         );
@@ -565,7 +601,7 @@ FIX INSTRUCTIONS:
       }
     } else if (params.where && Object.keys(params.where).length > 0) {
       const parsed = parseSqlWhere(
-        params.where,
+        this.coerceBooleanWhere(params.collection, params.where),
         (field) => {
           if (field === "id") return "`id`";
           if (field === "createdAt" || field === "created_at") return "`created_at`";
@@ -573,7 +609,7 @@ FIX INSTRUCTIONS:
           if (existingCols.includes(field) && !["id", "data"].includes(field)) {
             return `\`${field}\``;
           }
-          return `JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field}'))`;
+          return jsonWhereExpr(field);
         },
         "?"
       );
@@ -586,6 +622,7 @@ FIX INSTRUCTIONS:
     const setParams = [];
     const jsonPaths = [];
     const jsonParams = [];
+    const dateColsForUpdate = this.dateColumns(params.collection);
     for (const [key, val] of Object.entries(params.data)) {
       if (["id", "createdAt", "updatedAt"].includes(key)) continue;
       const isPromoted = existingCols.includes(key) && !["id", "data", "created_at", "updated_at"].includes(key);
@@ -604,7 +641,7 @@ FIX INSTRUCTIONS:
         if (isPromoted) {
           const escapedCol = escapeMysqlIdentifier(key);
           setClauses.push(`${escapedCol} = ?`);
-          setParams.push(val);
+          setParams.push(dateColsForUpdate.has(key) ? toDatetimeColumn(val) : val);
           jsonPaths.push(`'$.${key}', ${escapedCol}`);
         } else if (val === null) {
           jsonPaths.push(`'$.${key}', CAST('null' AS JSON)`);
@@ -639,6 +676,21 @@ FIX INSTRUCTIONS:
     }
     return { id: targetId, ...params.data, affectedRows: res?.affectedRows ?? 0, updatedAt: now };
   }
+  /** Re-expresses bound date values as ISO strings for the document returned from a write. */
+  isoDates(dateCols, values) {
+    const out = {};
+    for (const col of dateCols) if (col in values) out[col] = fromDatetimeColumn(values[col]);
+    return out;
+  }
+  dateColumns(collection) {
+    return new Set(
+      (this.collectionConfigs.get(collection)?.fields ?? []).filter((f) => DATE_TYPES.has(f.type) && f.name).map((f) => f.name)
+    );
+  }
+  /** Applies {@link coerceBooleanWhere} using the collection's declared field types. */
+  coerceBooleanWhere(collection, where) {
+    return coerceBooleanWhere(where, this.collectionConfigs.get(collection)?.fields);
+  }
   async sync(collections) {
     for (const col of collections) {
       this.collectionConfigs.set(col.slug, col);
@@ -703,7 +755,7 @@ FIX INSTRUCTIONS:
       if (existingCols.includes(field) && !["id", "data"].includes(field)) {
         return `\`${field}\``;
       }
-      return `JSON_UNQUOTE(JSON_EXTRACT(data, '$.${field}'))`;
+      return jsonWhereExpr(field);
     };
     const toCastExpr = (rawField, cast) => {
       const base = toFieldExpr(rawField);
@@ -713,13 +765,20 @@ FIX INSTRUCTIONS:
       const sqlType = cast === "integer" ? "SIGNED" : "DECIMAL(20,6)";
       return `IF(${base} REGEXP '^-?[0-9]+(\\\\.[0-9]+)?([eE][+-]?[0-9]+)?$', CAST(${base} AS ${sqlType}), NULL)`;
     };
+    const toDistinctValues = (raw) => {
+      const parsed = Array.isArray(raw) ? raw : typeof raw === "string" ? JSON.parse(raw) : raw ?? [];
+      if (!Array.isArray(parsed)) return [];
+      return Array.from(new Set(parsed.filter((v) => v !== null && v !== void 0)));
+    };
+    const groupFieldType = args.groupBy ? (this.collectionConfigs.get(args.collection)?.fields ?? []).find((f) => f.name === args.groupBy)?.type : void 0;
+    const groupKeyOf = (raw) => normalizeGroupKey(raw, groupFieldType);
     const selectParts = [];
     const allParams = [];
     const isDistinctMap = {};
     for (const [name, op] of Object.entries(args.aggregates)) {
       let whereSql = null;
       if (op.where && Object.keys(op.where).length > 0) {
-        const parsed = parseSqlWhere(op.where, toFieldExpr, "?");
+        const parsed = parseSqlWhere(this.coerceBooleanWhere(args.collection, op.where), toFieldExpr, "?");
         whereSql = parsed.sql;
         allParams.push(...parsed.params);
       }
@@ -730,7 +789,7 @@ FIX INSTRUCTIONS:
       } else if ("distinct" in op && typeof op.distinct === "string") {
         isDistinctMap[name] = true;
         const fieldExpr = toFieldExpr(op.distinct);
-        aggExpr = whereSql ? `COALESCE(JSON_ARRAYAGG(DISTINCT IF(${whereSql}, ${fieldExpr}, NULL)), JSON_ARRAY())` : `COALESCE(JSON_ARRAYAGG(DISTINCT ${fieldExpr}), JSON_ARRAY())`;
+        aggExpr = whereSql ? `COALESCE(JSON_ARRAYAGG(IF(${whereSql}, ${fieldExpr}, NULL)), JSON_ARRAY())` : `COALESCE(JSON_ARRAYAGG(${fieldExpr}), JSON_ARRAY())`;
       } else if ("count" in op) {
         aggExpr = whereSql ? `COUNT(IF(${whereSql}, 1, NULL))` : `COUNT(*)`;
       } else if (op.sum) {
@@ -738,7 +797,7 @@ FIX INSTRUCTIONS:
         aggExpr = whereSql ? `SUM(IF(${whereSql}, ${val}, NULL))` : `SUM(${val})`;
       } else if (op.avg) {
         const val = toCastExpr(op.avg, op.cast);
-        aggExpr = whereSql ? `AVG(IF(${whereSql}, ${val}, NULL))` : `AVG(${val})`;
+        aggExpr = whereSql ? `CAST(AVG(IF(${whereSql}, ${val}, NULL)) AS DOUBLE)` : `CAST(AVG(${val}) AS DOUBLE)`;
       } else if (op.min) {
         const val = toCastExpr(op.min, op.cast);
         aggExpr = whereSql ? `MIN(IF(${whereSql}, ${val}, NULL))` : `MIN(${val})`;
@@ -758,13 +817,12 @@ FIX INSTRUCTIONS:
       const [rows2] = await this.query(query2, allParams);
       const groups = {};
       for (const row2 of rows2 ?? []) {
-        const key = row2.__group_key === null || row2.__group_key === void 0 ? "__unassigned__" : String(row2.__group_key);
+        const key = groupKeyOf(row2.__group_key);
         const groupResult = {};
         for (const name of Object.keys(args.aggregates)) {
           const raw = row2[name];
           if (isDistinctMap[name]) {
-            const parsed = Array.isArray(raw) ? raw : typeof raw === "string" ? JSON.parse(raw) : raw ?? [];
-            groupResult[name] = Array.isArray(parsed) ? parsed.filter((v) => v !== null && v !== void 0) : [];
+            groupResult[name] = toDistinctValues(raw);
           } else {
             groupResult[name] = raw === null || raw === void 0 ? null : Number(raw);
           }
@@ -781,8 +839,7 @@ FIX INSTRUCTIONS:
       const raw = row[name];
       const op = args.aggregates[name];
       if (isDistinctMap[name]) {
-        const parsed = Array.isArray(raw) ? raw : typeof raw === "string" ? JSON.parse(raw) : raw ?? [];
-        result[name] = Array.isArray(parsed) ? parsed.filter((v) => v !== null && v !== void 0) : [];
+        result[name] = toDistinctValues(raw);
       } else if (raw instanceof Date) {
         result[name] = raw.toISOString();
       } else if (op?.cast === "date") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dyrected/db-mysql",
-  "version": "2.17.0",
+  "version": "2.18.1",
   "description": "MySQL adapter for Dyrected CMS",
   "type": "module",
   "files": [
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "mysql2": "^3.22.3",
-    "@dyrected/core": "^2.17.0"
+    "@dyrected/core": "^2.18.1"
   },
   "devDependencies": {
     "tsup": "^8.0.0",