dolphindb 2.0.1000 → 2.0.1002

package/index.d.ts

@@ -375,11 +375,18 @@ export declare class DdbDatabaseError extends Error {
     options: DdbRpcOptions;
     constructor(message: string, ddb: DDB, type: DdbRpcType, options: DdbRpcOptions);
 }
+/** SQL Standrd 标准类型 */
+export declare enum SqlStandard {
+    DolphinDB = 0,
+    Oracle = 1,
+    MySQL = 2
+}
 export interface DdbOptions {
     autologin?: boolean;
     username?: string;
     password?: string;
     python?: boolean;
+    sql?: SqlStandard;
     streaming?: StreamingParams;
     verbose?: boolean;
 }
@@ -407,6 +414,8 @@ export declare class DDB {
     password: string;
     /** python session flag (2048) */
     python: boolean;
+    /** 表示本次会话执行的 SQL 标准 */
+    sql: SqlStandard;
     /** 是否为流数据连接，非流数据这个字段恒为 null  Whether it is a streaming data connection, this field is always null for non-streaming data */
     streaming: StreamingData;
     /** 是否打印每个 rpc 的信息用于调试 */
@@ -440,6 +449,7 @@ export declare class DDB {
             - python?: 设置 python session flag，默认 `false`  set python session flag, default `false`
             - streaming?: 设置该选项后，该 WebSocket 连接只用于流数据  When this option is set, the WebSocket connection is only used for streaming data
             - verbose?: 是否打印每个 rpc 的信息用于调试
+            - sql?: 设置当前会话执行的 sql 标准, 请使用 SqlStandard 枚举进行传参，默认 `DolphinDB`
         
         @example
         let ddb = new DDB('ws://127.0.0.1:8848')

package/index.js

@@ -1217,10 +1217,12 @@ export class DdbObj {
     }
 }
 /** 整数一定用这个 number formatter, InspectOptions.decimals 不传也用这个 */
-let default_formatter = Intl.NumberFormat('en-US', { maximumFractionDigits: 20 });
+let default_formatter = new Intl.NumberFormat('en-US', { maximumFractionDigits: 20 });
 let _decimals = 20;
 /** 缓存，为了优化性能，通常 options.decimals 都是不变的 */
-let _formatter = Intl.NumberFormat('en-US', { maximumFractionDigits: 20 });
+let _formatter = new Intl.NumberFormat('en-US', { maximumFractionDigits: 20 });
+/** 用来处理时差  To deal with jet lag */
+let _datetime_formatter = new Intl.DateTimeFormat('zh-CN', { dateStyle: 'short', timeStyle: 'medium', timeZone: 'UTC' });
 /** 根据 DdbType 格式化单个元素 (value) 为字符串，空值返回 'null' 字符串  Formats a single element (value) as a string according to DdbType, null returns a 'null' string */
 export function format(type, value, le, options = {}) {
     const { decimals } = options;
@@ -1229,7 +1231,7 @@ export function format(type, value, le, options = {}) {
             return default_formatter;
         if (decimals !== _decimals) {
             _decimals = decimals;
-            _formatter = Intl.NumberFormat('en-US', { maximumFractionDigits: decimals, minimumFractionDigits: decimals });
+            _formatter = new Intl.NumberFormat('en-US', { maximumFractionDigits: decimals, minimumFractionDigits: decimals });
         }
         return _formatter;
     })();
@@ -1922,8 +1924,8 @@ export function second2str(second, format = 'HH:mm:ss') {
 export function datetime2ms(datetime) {
     if (datetime === null || datetime === nulls.int32)
         return null;
-    const ms = 1000 * datetime;
-    return 1000 * 60 * new Date(ms).getTimezoneOffset() + ms;
+    const date = new Date(1000 * datetime);
+    return dayjs(`${_datetime_formatter.format(date)}.${date.getUTCMilliseconds()}`).valueOf();
 }
 export function datetime2str(datetime, format = 'YYYY.MM.DD HH:mm:ss') {
     return (datetime === null || datetime === nulls.int32) ?
@@ -1934,8 +1936,8 @@ export function datetime2str(datetime, format = 'YYYY.MM.DD HH:mm:ss') {
 export function timestamp2ms(timestamp) {
     if (timestamp === null || timestamp === nulls.int64)
         return null;
-    const ms = Number(timestamp);
-    return 1000 * 60 * new Date(ms).getTimezoneOffset() + ms;
+    const date = new Date(Number(timestamp));
+    return dayjs(`${_datetime_formatter.format(date)}.${date.getUTCMilliseconds()}`).valueOf();
 }
 /** format timestamp (bigint) to string
     - timestamp: bigint value
@@ -1998,8 +2000,8 @@ export function nanotime2str(nanotime, format = 'HH:mm:ss.SSSSSSSSS') {
 export function nanotimestamp2ns(nanotimestamp) {
     if (nanotimestamp === null || nanotimestamp === nulls.int64)
         return null;
-    const ms = Number(nanotimestamp / 1000000n);
-    return BigInt(1000 * 60 * new Date(ms).getTimezoneOffset()) * 1000000n + nanotimestamp;
+    const date = new Date(Number(nanotimestamp / 1000000n));
+    return BigInt(dayjs(`${_datetime_formatter.format(date)}.${date.getUTCMilliseconds()}`).valueOf()) * 1000000n + nanotimestamp % 1000000n;
 }
 /** format nanotimestamp value (bigint) to string
     - nanotimestamp: bigint value
@@ -2025,9 +2027,7 @@ export function nanotimestamp2str(nanotimestamp, format = 'YYYY.MM.DD HH:mm:ss.S
     const remainder = nanotimestamp % 1000000000n;
     const borrow = remainder < 0n;
     const ms = Number(nanotimestamp / 1000000n);
-    return (dayjs(1000 * 60 * new Date(ms).getTimezoneOffset() +
-        // 去掉 9 位的纳秒部分，转化为毫秒
-        Number((nanotimestamp - remainder + (borrow ? -1000000000n : 0n)) / 1000000n)).format(format.slice(0, i_second_end)) +
+    return (dayjs(_datetime_formatter.format(new Date(ms))).format(format.slice(0, i_second_end)) +
         format.slice(i_second_end, i_nanosecond_start) +
         String(borrow ?
             (remainder + 1000000000n) % 1000000000n
@@ -2104,6 +2104,13 @@ export class DdbDatabaseError extends Error {
         this.options = options;
     }
 }
+/** SQL Standrd 标准类型 */
+export var SqlStandard;
+(function (SqlStandard) {
+    SqlStandard[SqlStandard["DolphinDB"] = 0] = "DolphinDB";
+    SqlStandard[SqlStandard["Oracle"] = 1] = "Oracle";
+    SqlStandard[SqlStandard["MySQL"] = 2] = "MySQL";
+})(SqlStandard || (SqlStandard = {}));
 export class DDB {
     /** 当前的 session id (http 或 tcp) */
     sid = '0';
@@ -2133,6 +2140,8 @@ export class DDB {
     password = '123456';
     /** python session flag (2048) */
     python = false;
+    /** 表示本次会话执行的 SQL 标准 */
+    sql = SqlStandard.DolphinDB;
     /** 是否为流数据连接，非流数据这个字段恒为 null  Whether it is a streaming data connection, this field is always null for non-streaming data */
     streaming = null;
     /** 是否打印每个 rpc 的信息用于调试 */
@@ -2171,6 +2180,7 @@ export class DDB {
             - python?: 设置 python session flag，默认 `false`  set python session flag, default `false`
             - streaming?: 设置该选项后，该 WebSocket 连接只用于流数据  When this option is set, the WebSocket connection is only used for streaming data
             - verbose?: 是否打印每个 rpc 的信息用于调试
+            - sql?: 设置当前会话执行的 sql 标准, 请使用 SqlStandard 枚举进行传参，默认 `DolphinDB`
         
         @example
         let ddb = new DDB('ws://127.0.0.1:8848')
@@ -2194,6 +2204,8 @@ export class DDB {
             this.password = options.password;
         if (options.python !== undefined)
             this.python = options.python;
+        if (options.sql !== undefined)
+            this.sql = options.sql;
         if (options.streaming !== undefined)
             this.streaming = options.streaming;
     }
@@ -2282,6 +2294,8 @@ export class DDB {
         // python session
         if (this.python)
             flag += 2048;
+        // sql standrd
+        flag += 2 ** 19 * this.sql;
         const options = [
             flag,
             cancellable ? 1 : 0,