@nocobase/database 2.1.0-alpha.23 → 2.1.0-alpha.25

package/lib/query/formatter.js

@@ -58,13 +58,10 @@ const _QueryFormatter = class _QueryFormatter {
     if (import_moment_timezone.default.tz.zone(offset)) {
       return offset;
     }
-    if (!/^[+-]\d{1,2}:\d{2}$/.test(offset)) {
-      return;
+    if (/^[+-]\d{1,2}:\d{2}$/.test(offset)) {
+      return offset;
     }
-    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;
-    });
+    return;
   }
   getOffsetExpression(timezone) {
     const sign = timezone.charAt(0);

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

@@ -9,6 +9,7 @@
 import { QueryFormatter, Col } from '../formatter';
 export declare class PostgresQueryFormatter extends QueryFormatter {
     convertFormat(format: string): string;
+    private buildTimezoneLiteral;
     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,6 +35,12 @@ const _PostgresQueryFormatter = class _PostgresQueryFormatter extends import_for
   convertFormat(format) {
     return format.replace(/hh/g, "HH24").replace(/mm/g, "MI").replace(/ss/g, "SS");
   }
+  buildTimezoneLiteral(target) {
+    if (/^[+-]\d{1,2}:\d{2}$/.test(target)) {
+      return `INTERVAL '${target}'`;
+    }
+    return `'${target}'`;
+  }
   formatDate(field, format, timezone, _preserveLocalTime) {
     const fmt = this.convertFormat(format);
     const resolvedTimezone = this.getTimezoneByOffset(timezone);
@@ -42,7 +48,7 @@ const _PostgresQueryFormatter = class _PostgresQueryFormatter extends import_for
       const quoted = this.sequelize.getQueryInterface().quoteIdentifiers(field.col);
       return this.sequelize.fn(
         "to_char",
-        this.sequelize.literal(`(${quoted} AT TIME ZONE '${resolvedTimezone}')`),
+        this.sequelize.literal(`timezone(${this.buildTimezoneLiteral(resolvedTimezone)}, ${quoted})`),
         fmt
       );
     }
@@ -52,7 +58,7 @@ const _PostgresQueryFormatter = class _PostgresQueryFormatter extends import_for
     const quoted = this.sequelize.getQueryInterface().quoteIdentifiers(field);
     const timestamp = accuracy === "millisecond" ? `to_timestamp(ROUND(${quoted} / 1000))` : `to_timestamp(${quoted})`;
     const resolvedTimezone = this.getTimezoneByOffset(timezone);
-    const literal = resolvedTimezone ? `${timestamp} AT TIME ZONE '${resolvedTimezone}'` : timestamp;
+    const literal = resolvedTimezone ? `timezone(${this.buildTimezoneLiteral(resolvedTimezone)}, ${timestamp})` : timestamp;
     return this.sequelize.fn("to_char", this.sequelize.literal(literal), this.convertFormat(format));
   }
 };

package/package.json

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