@nocobase/database 2.1.0-alpha.14 → 2.1.0-alpha.16

package/lib/query/builder.js

@@ -49,6 +49,7 @@ var import_postgres = require("./formatters/postgres");
 var import_sqlite = require("./formatters/sqlite");
 var import_having = require("./having");
 const ALLOWED_AGG_FUNCS = ["sum", "count", "avg", "min", "max"];
+const ALLOWED_ORDER_DIRECTIONS = ["ASC", "DESC"];
 function createQueryFormatter(database) {
   switch (database.sequelize.getDialect()) {
     case "sqlite":
@@ -165,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);
@@ -183,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) => {
@@ -201,11 +204,14 @@ 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);
-    let sort = (item.order || "ASC").toUpperCase();
+    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";
     }

package/lib/query/formatter.d.ts

@@ -8,7 +8,7 @@ export declare abstract class QueryFormatter {
     abstract formatDate(field: Col, format: string, timezone?: string): 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;
+    protected getTimezoneByOffset(offset?: string): string;
     protected getOffsetExpression(timezone: string): string;
     format(options: {
         type: string;

package/lib/query/formatter.js

@@ -50,9 +50,15 @@ const _QueryFormatter = class _QueryFormatter {
     return format;
   }
   getTimezoneByOffset(offset) {
-    if (!/^[+-]\d{1,2}:\d{2}$/.test(offset)) {
+    if (!offset) {
+      return;
+    }
+    if (import_moment_timezone.default.tz.zone(offset)) {
       return offset;
     }
+    if (!/^[+-]\d{1,2}:\d{2}$/.test(offset)) {
+      return;
+    }
     const offsetMinutes = import_moment_timezone.default.duration(offset).asMinutes();
     return import_moment_timezone.default.tz.names().find((timezone) => {
       return import_moment_timezone.default.tz(timezone).utcOffset() === offsetMinutes;

package/lib/query/formatters/mysql.js

@@ -37,10 +37,11 @@ const _MySQLQueryFormatter = class _MySQLQueryFormatter extends import_formatter
   }
   formatDate(field, format, timezone) {
     const fmt = this.convertFormat(format);
-    if (timezone) {
+    const resolvedTimezone = this.getTimezoneByOffset(timezone);
+    if (resolvedTimezone) {
       return this.sequelize.fn(
         "date_format",
-        this.sequelize.fn("convert_tz", field, process.env.TZ || "UTC", timezone),
+        this.sequelize.fn("convert_tz", field, process.env.TZ || "UTC", resolvedTimezone),
         fmt
       );
     }
@@ -49,11 +50,12 @@ const _MySQLQueryFormatter = class _MySQLQueryFormatter extends import_formatter
   formatUnixTimestamp(field, format, accuracy = "second", timezone) {
     const fmt = this.convertFormat(format);
     const quoted = this.sequelize.getQueryInterface().quoteIdentifiers(field);
+    const resolvedTimezone = this.getTimezoneByOffset(timezone);
     const timestamp = accuracy === "millisecond" ? this.sequelize.fn("from_unixtime", this.sequelize.literal(`ROUND(${quoted} / 1000)`)) : this.sequelize.fn("from_unixtime", this.sequelize.col(field));
-    if (timezone) {
+    if (resolvedTimezone) {
       return this.sequelize.fn(
         "date_format",
-        this.sequelize.fn("convert_tz", timestamp, process.env.TZ || "UTC", timezone),
+        this.sequelize.fn("convert_tz", timestamp, process.env.TZ || "UTC", resolvedTimezone),
         fmt
       );
     }

package/lib/query/formatters/oracle.js

@@ -37,8 +37,8 @@ const _OracleQueryFormatter = class _OracleQueryFormatter extends import_formatt
   }
   formatDate(field, format, timezone) {
     const fmt = this.convertFormat(format);
-    if (timezone) {
-      const resolvedTimezone = this.getTimezoneByOffset(timezone);
+    const resolvedTimezone = this.getTimezoneByOffset(timezone);
+    if (resolvedTimezone) {
       const quoted = this.sequelize.getQueryInterface().quoteIdentifiers(field.col);
       return this.sequelize.fn(
         "to_char",
@@ -51,7 +51,8 @@ const _OracleQueryFormatter = class _OracleQueryFormatter extends import_formatt
   formatUnixTimestamp(field, format, accuracy = "second", timezone) {
     const quoted = this.sequelize.getQueryInterface().quoteIdentifiers(field);
     const timestamp = accuracy === "millisecond" ? `to_timestamp(ROUND(${quoted} / 1000))` : `to_timestamp(${quoted})`;
-    const literal = timezone ? `${timestamp} AT TIME ZONE '${this.getTimezoneByOffset(timezone)}'` : timestamp;
+    const resolvedTimezone = this.getTimezoneByOffset(timezone);
+    const literal = resolvedTimezone ? `${timestamp} AT TIME ZONE '${resolvedTimezone}'` : timestamp;
     return this.sequelize.fn("to_char", this.sequelize.literal(literal), this.convertFormat(format));
   }
 };

package/lib/query/formatters/postgres.js

@@ -37,8 +37,8 @@ const _PostgresQueryFormatter = class _PostgresQueryFormatter extends import_for
   }
   formatDate(field, format, timezone) {
     const fmt = this.convertFormat(format);
-    if (timezone) {
-      const resolvedTimezone = this.getTimezoneByOffset(timezone);
+    const resolvedTimezone = this.getTimezoneByOffset(timezone);
+    if (resolvedTimezone) {
       const quoted = this.sequelize.getQueryInterface().quoteIdentifiers(field.col);
       return this.sequelize.fn(
         "to_char",
@@ -51,7 +51,8 @@ const _PostgresQueryFormatter = class _PostgresQueryFormatter extends import_for
   formatUnixTimestamp(field, format, accuracy = "second", timezone) {
     const quoted = this.sequelize.getQueryInterface().quoteIdentifiers(field);
     const timestamp = accuracy === "millisecond" ? `to_timestamp(ROUND(${quoted} / 1000))` : `to_timestamp(${quoted})`;
-    const literal = timezone ? `${timestamp} AT TIME ZONE '${this.getTimezoneByOffset(timezone)}'` : timestamp;
+    const resolvedTimezone = this.getTimezoneByOffset(timezone);
+    const literal = resolvedTimezone ? `${timestamp} AT TIME ZONE '${resolvedTimezone}'` : timestamp;
     return this.sequelize.fn("to_char", this.sequelize.literal(literal), this.convertFormat(format));
   }
 };

package/lib/query/formatters/sqlite.js

@@ -37,7 +37,7 @@ const _SQLiteQueryFormatter = class _SQLiteQueryFormatter extends import_formatt
   }
   formatDate(field, format, timezone) {
     const fmt = this.convertFormat(format);
-    if (timezone) {
+    if (timezone && /^[+-]\d{1,2}:\d{2}$/.test(timezone)) {
       return this.sequelize.fn("strftime", fmt, field, this.getOffsetExpression(timezone));
     }
     return this.sequelize.fn("strftime", fmt, field);
@@ -46,7 +46,7 @@ const _SQLiteQueryFormatter = class _SQLiteQueryFormatter extends import_formatt
     const quoted = this.sequelize.getQueryInterface().quoteIdentifiers(field);
     const base = accuracy === "millisecond" ? this.sequelize.literal(`ROUND(${quoted} / 1000)`) : this.sequelize.col(field);
     const args = [base, "unixepoch"];
-    if (timezone) {
+    if (timezone && /^[+-]\d{1,2}:\d{2}$/.test(timezone)) {
       args.push(this.getOffsetExpression(timezone));
     }
     return this.sequelize.fn("strftime", this.convertFormat(format), this.sequelize.fn("DATETIME", ...args));

package/lib/view/field-type-map.d.ts

@@ -23,7 +23,7 @@ declare const fieldTypeMap: {
         real: string;
         'double precision': string;
         'timestamp without time zone': string;
-        'timestamp with time zone': string;
+        'timestamp with time zone': string[];
         'time without time zone': string;
         date: string;
         boolean: string;
@@ -63,7 +63,7 @@ declare const fieldTypeMap: {
         decimal: string;
         year: string[];
         datetime: string[];
-        timestamp: string;
+        timestamp: string[];
         json: string[];
         enum: string;
     };
@@ -72,7 +72,7 @@ declare const fieldTypeMap: {
         varchar: string[];
         integer: string;
         real: string;
-        datetime: string;
+        datetime: string[];
         date: string;
         time: string;
         boolean: string;
@@ -105,7 +105,7 @@ declare const fieldTypeMap: {
         decimal: string;
         year: string[];
         datetime: string[];
-        timestamp: string;
+        timestamp: string[];
         json: string[];
         enum: string;
     };

package/lib/view/field-type-map.js

@@ -45,7 +45,7 @@ const postgres = {
   real: "float",
   "double precision": "float",
   "timestamp without time zone": "datetimeNoTz",
-  "timestamp with time zone": "datetimeTz",
+  "timestamp with time zone": ["datetimeTz", "date"],
   "time without time zone": "time",
   date: "dateOnly",
   boolean: "boolean",
@@ -84,8 +84,8 @@ const mysql = {
   boolean: "boolean",
   decimal: "decimal",
   year: ["string", "integer"],
-  datetime: ["datetimeNoTz", "datetimeTz"],
-  timestamp: "datetimeTz",
+  datetime: ["datetimeNoTz", "datetimeTz", "date"],
+  timestamp: ["datetimeTz", "date"],
   json: ["json", "array"],
   enum: "string"
 };
@@ -94,7 +94,7 @@ const sqlite = {
   varchar: ["string", "uuid", "nanoid", "encryption"],
   integer: "integer",
   real: "real",
-  datetime: "datetimeTz",
+  datetime: ["datetimeTz", "date"],
   date: "date",
   time: "time",
   boolean: "boolean",

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "2.1.0-alpha.14",
+  "version": "2.1.0-alpha.16",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "2.1.0-alpha.14",
-    "@nocobase/utils": "2.1.0-alpha.14",
+    "@nocobase/logger": "2.1.0-alpha.16",
+    "@nocobase/utils": "2.1.0-alpha.16",
     "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": "d8735b541de0ff9557bba704de49c799b4962672"
+  "gitHead": "14cf3dbdb9f0a9669602de4ad21a9464fa27c105"
 }