@nocobase/database 2.1.0-alpha.15 → 2.1.0-alpha.17

package/lib/database.d.ts

@@ -45,6 +45,7 @@ export interface IDatabaseOptions extends Options {
     migrator?: any;
     usingBigIntForId?: boolean;
     underscored?: boolean;
+    rawTimezone?: string;
     logger?: LoggerOptions | Logger;
     customHooks?: any;
     instanceId?: string;

package/lib/query/builder.js

@@ -53,23 +53,23 @@ const ALLOWED_ORDER_DIRECTIONS = ["ASC", "DESC"];
 function createQueryFormatter(database) {
   switch (database.sequelize.getDialect()) {
     case "sqlite":
-      return new import_sqlite.SQLiteQueryFormatter(database.sequelize);
+      return new import_sqlite.SQLiteQueryFormatter(database.sequelize, database.options.rawTimezone);
     case "postgres":
-      return new import_postgres.PostgresQueryFormatter(database.sequelize);
+      return new import_postgres.PostgresQueryFormatter(database.sequelize, database.options.rawTimezone);
     case "mysql":
     case "mariadb":
-      return new import_mysql.MySQLQueryFormatter(database.sequelize);
+      return new import_mysql.MySQLQueryFormatter(database.sequelize, database.options.rawTimezone);
     case "oracle":
-      return new import_oracle.OracleQueryFormatter(database.sequelize);
+      return new import_oracle.OracleQueryFormatter(database.sequelize, database.options.rawTimezone);
     default:
       return new class extends import_formatter.QueryFormatter {
-        formatDate(field, _format, _timezone) {
+        formatDate(field, _format, _timezone, _preserveLocalTime) {
           return field;
         }
         formatUnixTimestamp(field, _format, _accuracy, _timezone) {
           return this.sequelize.col(field);
         }
-      }(database.sequelize);
+      }(database.sequelize, database.options.rawTimezone);
   }
 }
 __name(createQueryFormatter, "createQueryFormatter");
@@ -166,6 +166,7 @@ function buildQuery(database, collection, options = {}) {
   let hasAgg = false;
   const attributes = [];
   const fieldMap = {};
+  const projectedFieldMap = {};
   measures.forEach((measure) => {
     const { field, aggregation, alias, distinct } = measure;
     const col = sequelize.col(field);
@@ -184,6 +185,7 @@ function buildQuery(database, collection, options = {}) {
     }
     attributes.push(attribute.length > 1 ? attribute : attribute[0]);
     fieldMap[alias || field] = measure;
+    projectedFieldMap[alias || field] = attribute[0];
   });
   const group = [];
   dimensions.forEach((dimension) => {
@@ -202,11 +204,13 @@ function buildQuery(database, collection, options = {}) {
       group.push(attribute[0]);
     }
     fieldMap[alias || field] = dimension;
+    projectedFieldMap[alias || field] = attribute[0];
   });
   const order = orders.map((item) => {
     var _a2;
     const alias = sequelize.getQueryInterface().quoteIdentifier(item.alias);
-    const name = hasAgg ? sequelize.literal(alias) : sequelize.col(item.field);
+    const projectedField = projectedFieldMap[item.alias] || projectedFieldMap[item.name] || projectedFieldMap[item.field];
+    const name = hasAgg ? projectedField || sequelize.literal(alias) : sequelize.col(item.field);
     let sort = ALLOWED_ORDER_DIRECTIONS.includes((_a2 = item.order) == null ? void 0 : _a2.toUpperCase()) ? item.order.toUpperCase() : "ASC";
     if (item.nulls === "first") {
       sort += " NULLS FIRST";
@@ -234,15 +238,23 @@ function buildQuery(database, collection, options = {}) {
 }
 __name(buildQuery, "buildQuery");
 function normalizeQueryResult(data, fieldMap) {
+  const dateTimeTypes = ["date", "datetime", "datetimeTz", "datetimeNoTz"];
   return data.map((record) => {
     Object.entries(record).forEach(([key, value]) => {
-      var _a;
       if (value === null || value === void 0) {
         return;
       }
-      const type = (_a = fieldMap[key]) == null ? void 0 : _a.type;
+      const field = fieldMap[key];
+      const type = field == null ? void 0 : field.type;
       if (["bigInt", "integer", "float", "double", "decimal"].includes(type)) {
         record[key] = Number(value);
+        return;
+      }
+      if (!(field == null ? void 0 : field.format) && dateTimeTypes.includes(type) && !(value instanceof Date)) {
+        const dateValue = new Date(value);
+        if (!Number.isNaN(dateValue.getTime())) {
+          record[key] = dateValue;
+        }
       }
     });
     return record;

package/lib/query/formatter.d.ts

@@ -1,11 +1,20 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
 import { Sequelize } from 'sequelize';
 export type Col = ReturnType<typeof Sequelize.col>;
 export type Literal = ReturnType<typeof Sequelize.literal>;
 export type Fn = ReturnType<typeof Sequelize.fn>;
 export declare abstract class QueryFormatter {
     sequelize: Sequelize;
-    constructor(sequelize: Sequelize);
-    abstract formatDate(field: Col, format: string, timezone?: string): Fn | Col;
+    rawTimezone?: string;
+    constructor(sequelize: Sequelize, rawTimezone?: string);
+    abstract formatDate(field: Col, format: string, timezone?: string, preserveLocalTime?: boolean): Fn | Col;
     abstract formatUnixTimestamp(field: string, format: string, accuracy?: 'second' | 'millisecond', timezone?: string): Fn | Literal | Col;
     convertFormat(format: string): string;
     protected getTimezoneByOffset(offset?: string): string;

package/lib/query/formatter.js

@@ -43,8 +43,10 @@ module.exports = __toCommonJS(formatter_exports);
 var import_moment_timezone = __toESM(require("moment-timezone"));
 const _QueryFormatter = class _QueryFormatter {
   sequelize;
-  constructor(sequelize) {
+  rawTimezone;
+  constructor(sequelize, rawTimezone) {
     this.sequelize = sequelize;
+    this.rawTimezone = rawTimezone;
   }
   convertFormat(format) {
     return format;
@@ -80,6 +82,7 @@ const _QueryFormatter = class _QueryFormatter {
       case "datetimeTz":
         return this.formatDate(col, format, timezone);
       case "datetimeNoTz":
+        return this.formatDate(col, format, void 0, true);
       case "dateOnly":
       case "time":
         return this.formatDate(col, format);

package/lib/query/formatters/mysql.d.ts

@@ -9,6 +9,6 @@
 import { QueryFormatter, Col } from '../formatter';
 export declare class MySQLQueryFormatter extends QueryFormatter {
     convertFormat(format: string): string;
-    formatDate(field: Col, format: string, timezone?: string): import("sequelize/types/utils").Fn;
+    formatDate(field: Col, format: string, timezone?: string, _preserveLocalTime?: boolean): import("sequelize/types/utils").Fn;
     formatUnixTimestamp(field: string, format: string, accuracy?: 'second' | 'millisecond', timezone?: string): import("sequelize/types/utils").Fn;
 }

package/lib/query/formatters/mysql.js

@@ -35,7 +35,7 @@ const _MySQLQueryFormatter = class _MySQLQueryFormatter extends import_formatter
   convertFormat(format) {
     return format.replace(/YYYY/g, "%Y").replace(/MM/g, "%m").replace(/DD/g, "%d").replace(/hh/g, "%H").replace(/mm/g, "%i").replace(/ss/g, "%S");
   }
-  formatDate(field, format, timezone) {
+  formatDate(field, format, timezone, _preserveLocalTime) {
     const fmt = this.convertFormat(format);
     const resolvedTimezone = this.getTimezoneByOffset(timezone);
     if (resolvedTimezone) {

package/lib/query/formatters/oracle.d.ts

@@ -9,6 +9,6 @@
 import { QueryFormatter, Col } from '../formatter';
 export declare class OracleQueryFormatter extends QueryFormatter {
     convertFormat(format: string): string;
-    formatDate(field: Col, format: string, timezone?: string): import("sequelize/types/utils").Fn;
+    formatDate(field: Col, format: string, timezone?: string, _preserveLocalTime?: boolean): import("sequelize/types/utils").Fn;
     formatUnixTimestamp(field: string, format: string, accuracy?: 'second' | 'millisecond', timezone?: string): import("sequelize/types/utils").Fn;
 }

package/lib/query/formatters/oracle.js

@@ -35,7 +35,7 @@ const _OracleQueryFormatter = class _OracleQueryFormatter extends import_formatt
   convertFormat(format) {
     return format.replace(/hh/g, "HH24").replace(/mm/g, "MI").replace(/ss/g, "SS");
   }
-  formatDate(field, format, timezone) {
+  formatDate(field, format, timezone, _preserveLocalTime) {
     const fmt = this.convertFormat(format);
     const resolvedTimezone = this.getTimezoneByOffset(timezone);
     if (resolvedTimezone) {

package/lib/query/formatters/postgres.d.ts

@@ -9,6 +9,6 @@
 import { QueryFormatter, Col } from '../formatter';
 export declare class PostgresQueryFormatter extends QueryFormatter {
     convertFormat(format: string): string;
-    formatDate(field: Col, format: string, timezone?: string): import("sequelize/types/utils").Fn;
+    formatDate(field: Col, format: string, timezone?: string, _preserveLocalTime?: boolean): import("sequelize/types/utils").Fn;
     formatUnixTimestamp(field: string, format: string, accuracy?: 'second' | 'millisecond', timezone?: string): import("sequelize/types/utils").Fn;
 }

package/lib/query/formatters/postgres.js

@@ -35,7 +35,7 @@ const _PostgresQueryFormatter = class _PostgresQueryFormatter extends import_for
   convertFormat(format) {
     return format.replace(/hh/g, "HH24").replace(/mm/g, "MI").replace(/ss/g, "SS");
   }
-  formatDate(field, format, timezone) {
+  formatDate(field, format, timezone, _preserveLocalTime) {
     const fmt = this.convertFormat(format);
     const resolvedTimezone = this.getTimezoneByOffset(timezone);
     if (resolvedTimezone) {

package/lib/query/formatters/sqlite.d.ts

@@ -9,6 +9,6 @@
 import { QueryFormatter, Col } from '../formatter';
 export declare class SQLiteQueryFormatter extends QueryFormatter {
     convertFormat(format: string): string;
-    formatDate(field: Col, format: string, timezone?: string): import("sequelize/types/utils").Fn;
+    formatDate(field: Col, format: string, timezone?: string, preserveLocalTime?: boolean): import("sequelize/types/utils").Fn;
     formatUnixTimestamp(field: string, format: string, accuracy?: 'second' | 'millisecond', timezone?: string): import("sequelize/types/utils").Fn;
 }

package/lib/query/formatters/sqlite.js

@@ -35,11 +35,14 @@ const _SQLiteQueryFormatter = class _SQLiteQueryFormatter extends import_formatt
   convertFormat(format) {
     return format.replace(/YYYY/g, "%Y").replace(/MM/g, "%m").replace(/DD/g, "%d").replace(/hh/g, "%H").replace(/mm/g, "%M").replace(/ss/g, "%S");
   }
-  formatDate(field, format, timezone) {
+  formatDate(field, format, timezone, preserveLocalTime) {
     const fmt = this.convertFormat(format);
     if (timezone && /^[+-]\d{1,2}:\d{2}$/.test(timezone)) {
       return this.sequelize.fn("strftime", fmt, field, this.getOffsetExpression(timezone));
     }
+    if (preserveLocalTime && this.rawTimezone && /^[+-]\d{1,2}:\d{2}$/.test(this.rawTimezone)) {
+      return this.sequelize.fn("strftime", fmt, field, this.getOffsetExpression(this.rawTimezone));
+    }
     return this.sequelize.fn("strftime", fmt, field);
   }
   formatUnixTimestamp(field, format, accuracy = "second", timezone) {

package/lib/repository.js

@@ -152,12 +152,13 @@ const _Repository = class _Repository {
         [import_sequelize.Op.and]: [options["where"] || {}, optionParser.filterByTkToWhereOption()]
       };
     }
+    const hasInclude = Array.isArray(options["include"]) && options["include"].length > 0;
     const queryOptions = {
-      ...options,
-      distinct: Boolean(this.collection.model.primaryKeyAttribute) && !this.collection.isMultiFilterTargetKey()
+      ...options
     };
-    if (Array.isArray(queryOptions.include) && queryOptions.include.length > 0) {
+    if (hasInclude) {
       queryOptions.include = (0, import_utils2.processIncludes)(queryOptions.include, this.collection.model);
+      queryOptions.distinct = Boolean(this.collection.model.primaryKeyAttribute) && !this.collection.isMultiFilterTargetKey();
     } else {
       delete queryOptions.include;
     }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "2.1.0-alpha.15",
+  "version": "2.1.0-alpha.17",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "2.1.0-alpha.15",
-    "@nocobase/utils": "2.1.0-alpha.15",
+    "@nocobase/logger": "2.1.0-alpha.17",
+    "@nocobase/utils": "2.1.0-alpha.17",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -38,5 +38,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "7c86e75b0af4b9f532c8ebf5ef96a7423b0ab60e"
+  "gitHead": "586cb00f56557e66168b9720d0e0193a1b752067"
 }