@atscript/db-mysql 0.1.134 → 0.1.136

package/dist/index.cjs

@@ -168,8 +168,29 @@ const mysqlDialect = {
 	},
 	calendarBucket: mysqlCalendarBucket,
 	bucketAliasInHaving: true,
+	jsonExtract: mysqlJsonExtract,
 	createViewPrefix: "CREATE OR REPLACE VIEW"
 };
+/** `JSON_TYPE()` names of JSON numbers (MariaDB reports only INTEGER / DOUBLE). */
+const MYSQL_JSON_NUMBER_TYPES = "'INTEGER', 'UNSIGNED INTEGER', 'DOUBLE', 'DECIMAL'";
+/**
+* Typed read of a JSON leaf (`SqlDialect.jsonExtract`), MySQL and MariaDB:
+* `JSON_TYPE()` guards the declared type, so a missing path, JSON `null` or
+* another JSON type yields NULL (no coercion). Numbers convert with `+ 0`
+* (a double) and booleans come back as 1/0 (the comparison's own result) —
+* the view's boolean formatter converts them. Avoids `CAST(… AS DOUBLE)` (MySQL 8.0.17+) and
+* `CAST(… AS JSON)` (not in MariaDB).
+*/
+function mysqlJsonExtract(quotedCol, path, type) {
+	const e = `JSON_EXTRACT(${quotedCol}, ${(0, _atscript_db_sql_tools.jsonDollarPath)(path)})`;
+	const t = `JSON_TYPE(${e})`;
+	switch (type) {
+		case "string": return `CASE ${t} WHEN 'STRING' THEN JSON_UNQUOTE(${e}) END`;
+		case "number": return `CASE WHEN ${t} IN (${MYSQL_JSON_NUMBER_TYPES}) THEN ${e} + 0 END`;
+		case "boolean": return `CASE ${t} WHEN 'BOOLEAN' THEN JSON_UNQUOTE(${e}) = 'true' END`;
+		default: return type;
+	}
+}
 /**
 * Whether a field is stored as a native MySQL `TIMESTAMP`: a `number` with
 * `@db.default.now`. The adapter writes such values as UTC
@@ -577,6 +598,10 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 	calendarBucketUnits() {
 		return _atscript_db.ALL_BUCKET_UNITS;
 	}
+	/** Every aggregate function, `countDistinct` included. */
+	aggregateFns() {
+		return _atscript_db.ALL_AGGREGATE_FNS;
+	}
 	onBeforeFlatten(_type) {
 		const meta = _type.metadata;
 		const engine = meta.get("db.mysql.engine");

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { BaseDbAdapter, BucketUnit, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbDefaultFn, TDbDeleteResult, TDbFieldMeta, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbUpdateResult, TEnsureTableOptions, TExistingColumn, TExistingTableOption, TFieldOps, TPrimaryKeyChange, TReferencingForeignKey, TSearchIndexInfo, TSyncColumnResult, TTableOptionDiff, TValueFormatterPair } from "@atscript/db";
+import { AggregateFn, BaseDbAdapter, BucketUnit, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbDefaultFn, TDbDeleteResult, TDbFieldMeta, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbUpdateResult, TEnsureTableOptions, TExistingColumn, TExistingTableOption, TFieldOps, TPrimaryKeyChange, TReferencingForeignKey, TSearchIndexInfo, TSyncColumnResult, TTableOptionDiff, TValueFormatterPair } from "@atscript/db";
 import { TMetadataMap } from "@atscript/typescript/utils";
 import { FilterExpr as FilterExpr$1 } from "@uniqu/core";
 import { TSqlFragment, TSqlFragment as TSqlFragment$1 } from "@atscript/db-sql-tools";
@@ -137,6 +137,8 @@ declare class MysqlAdapter extends BaseDbAdapter {
    * server's time zone tables (probed per zone in `aggregate()`).
    */
   calendarBucketUnits(): ReadonlySet<BucketUnit>;
+  /** Every aggregate function, `countDistinct` included. */
+  aggregateFns(): ReadonlySet<AggregateFn>;
   onBeforeFlatten(_type: unknown): void;
   onFieldScanned(field: string, _type: unknown, metadata: TMetadataMap<AtscriptMetadata>): void;
   getDesiredTableOptions(): TExistingTableOption[];

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { BaseDbAdapter, BucketUnit, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbDefaultFn, TDbDeleteResult, TDbFieldMeta, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbUpdateResult, TEnsureTableOptions, TExistingColumn, TExistingTableOption, TFieldOps, TPrimaryKeyChange, TReferencingForeignKey, TSearchIndexInfo, TSyncColumnResult, TTableOptionDiff, TValueFormatterPair } from "@atscript/db";
+import { AggregateFn, BaseDbAdapter, BucketUnit, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbDefaultFn, TDbDeleteResult, TDbFieldMeta, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbUpdateResult, TEnsureTableOptions, TExistingColumn, TExistingTableOption, TFieldOps, TPrimaryKeyChange, TReferencingForeignKey, TSearchIndexInfo, TSyncColumnResult, TTableOptionDiff, TValueFormatterPair } from "@atscript/db";
 import { TSqlFragment, TSqlFragment as TSqlFragment$1 } from "@atscript/db-sql-tools";
 import { FilterExpr as FilterExpr$1 } from "@uniqu/core";
 import { TMetadataMap } from "@atscript/typescript/utils";
@@ -137,6 +137,8 @@ declare class MysqlAdapter extends BaseDbAdapter {
    * server's time zone tables (probed per zone in `aggregate()`).
    */
   calendarBucketUnits(): ReadonlySet<BucketUnit>;
+  /** Every aggregate function, `countDistinct` included. */
+  aggregateFns(): ReadonlySet<AggregateFn>;
   onBeforeFlatten(_type: unknown): void;
   onFieldScanned(field: string, _type: unknown, metadata: TMetadataMap<AtscriptMetadata>): void;
   getDesiredTableOptions(): TExistingTableOption[];

package/dist/index.mjs

@@ -1,6 +1,6 @@
-import { ALL_BUCKET_UNITS, BaseDbAdapter, DbError, DbSpace, bucketTimeZoneUnavailable } from "@atscript/db";
+import { ALL_AGGREGATE_FNS, ALL_BUCKET_UNITS, BaseDbAdapter, DbError, DbSpace, bucketTimeZoneUnavailable } from "@atscript/db";
 import { resolveAggregateSearch } from "@atscript/db/agg";
-import { buildAggregateCount, buildAggregateSelect, buildCreateView, buildDelete, buildGeoSearchCount, buildGeoSearchSelect, buildInsert, buildInsertMany, buildSelect, buildUpdate, buildWhere as buildWhere$1, defaultValueForType, defaultValueToSqlLiteral, fillReplacePayload, geoWindowFromControls, insertManyColumns, normalizeGeoPointValue, parseRegexString, refActionToSql, renameGeoDistance, replaceColumnsFor, sqlTimeZoneLiteral, toSqlValue } from "@atscript/db-sql-tools";
+import { buildAggregateCount, buildAggregateSelect, buildCreateView, buildDelete, buildGeoSearchCount, buildGeoSearchSelect, buildInsert, buildInsertMany, buildSelect, buildUpdate, buildWhere as buildWhere$1, defaultValueForType, defaultValueToSqlLiteral, fillReplacePayload, geoWindowFromControls, insertManyColumns, jsonDollarPath, normalizeGeoPointValue, parseRegexString, refActionToSql, renameGeoDistance, replaceColumnsFor, sqlTimeZoneLiteral, toSqlValue } from "@atscript/db-sql-tools";
 import { BUCKET_MAX_INSTANT, BUCKET_MIN_INSTANT } from "@uniqu/core";
 //#region src/sql-builder.ts
 /** TEXT / BLOB families (`TINYTEXT` … `LONGBLOB`). */
@@ -167,8 +167,29 @@ const mysqlDialect = {
 	},
 	calendarBucket: mysqlCalendarBucket,
 	bucketAliasInHaving: true,
+	jsonExtract: mysqlJsonExtract,
 	createViewPrefix: "CREATE OR REPLACE VIEW"
 };
+/** `JSON_TYPE()` names of JSON numbers (MariaDB reports only INTEGER / DOUBLE). */
+const MYSQL_JSON_NUMBER_TYPES = "'INTEGER', 'UNSIGNED INTEGER', 'DOUBLE', 'DECIMAL'";
+/**
+* Typed read of a JSON leaf (`SqlDialect.jsonExtract`), MySQL and MariaDB:
+* `JSON_TYPE()` guards the declared type, so a missing path, JSON `null` or
+* another JSON type yields NULL (no coercion). Numbers convert with `+ 0`
+* (a double) and booleans come back as 1/0 (the comparison's own result) —
+* the view's boolean formatter converts them. Avoids `CAST(… AS DOUBLE)` (MySQL 8.0.17+) and
+* `CAST(… AS JSON)` (not in MariaDB).
+*/
+function mysqlJsonExtract(quotedCol, path, type) {
+	const e = `JSON_EXTRACT(${quotedCol}, ${jsonDollarPath(path)})`;
+	const t = `JSON_TYPE(${e})`;
+	switch (type) {
+		case "string": return `CASE ${t} WHEN 'STRING' THEN JSON_UNQUOTE(${e}) END`;
+		case "number": return `CASE WHEN ${t} IN (${MYSQL_JSON_NUMBER_TYPES}) THEN ${e} + 0 END`;
+		case "boolean": return `CASE ${t} WHEN 'BOOLEAN' THEN JSON_UNQUOTE(${e}) = 'true' END`;
+		default: return type;
+	}
+}
 /**
 * Whether a field is stored as a native MySQL `TIMESTAMP`: a `number` with
 * `@db.default.now`. The adapter writes such values as UTC
@@ -576,6 +597,10 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 	calendarBucketUnits() {
 		return ALL_BUCKET_UNITS;
 	}
+	/** Every aggregate function, `countDistinct` included. */
+	aggregateFns() {
+		return ALL_AGGREGATE_FNS;
+	}
 	onBeforeFlatten(_type) {
 		const meta = _type.metadata;
 		const engine = meta.get("db.mysql.engine");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db-mysql",
-  "version": "0.1.134",
+  "version": "0.1.136",
   "description": "MySQL adapter for @atscript/db with mysql2 driver support.",
   "keywords": [
     "atscript",
@@ -43,17 +43,17 @@
   "devDependencies": {
     "@atscript/core": "^0.1.92",
     "@atscript/typescript": "^0.1.92",
-    "@uniqu/core": "^0.1.10",
+    "@uniqu/core": "^0.1.11",
     "mysql2": "^3.11.0",
     "unplugin-atscript": "^0.1.92"
   },
   "peerDependencies": {
     "@atscript/core": "^0.1.92",
     "@atscript/typescript": "^0.1.92",
-    "@uniqu/core": "^0.1.10",
+    "@uniqu/core": "^0.1.11",
     "mysql2": ">=3.0.0",
-    "@atscript/db-sql-tools": "^0.1.134",
-    "@atscript/db": "^0.1.134"
+    "@atscript/db": "^0.1.136",
+    "@atscript/db-sql-tools": "^0.1.136"
   },
   "peerDependenciesMeta": {
     "mysql2": {