dolphindb 2.0.952 → 2.0.954

package/index.d.ts

@@ -476,6 +476,14 @@ export declare class DdbDatabaseError extends Error {
     options: DdbRpcOptions;
     constructor(message: string, ddb: DDB, type: DdbRpcType, options: DdbRpcOptions);
 }
+export interface DdbOptions {
+    autologin?: boolean;
+    username?: string;
+    password?: string;
+    python?: boolean;
+    streaming?: StreamingParams;
+    verbose?: boolean;
+}
 export declare class DDB {
     /** 当前的 session id (http 或 tcp) */
     sid: string;
@@ -526,7 +534,7 @@ export declare class DDB {
         使用 WebSocket URL 初始化连接到 DolphinDB 的实例（不建立实际的网络连接）
         Initialize an instance of DolphinDB Client using the WebSocket URL (without establishing an actual network connection)
         - url: DolphinDB WebSocket URL. e.g.：`ws://127.0.0.1:8848`
-        - options?:
+        - options?: DdbOptions
             - autologin?: 是否在建立连接后自动登录，默认 `true`  Whether to log in automatically after establishing a connection, default `true`
             - username?: DolphinDB 登录用户名，默认 `'admin'`  DolphinDB username, default `'admin'`
             - password?: DolphinDB 登录密码，默认 `'123456'`  DolphinDB password, default `'123456'`
@@ -543,16 +551,8 @@ export declare class DDB {
             username: 'admin',
             password: '123456',
             python: false
-        })
-    */
-    constructor(url: string, options?: {
-        autologin?: boolean;
-        username?: string;
-        password?: string;
-        python?: boolean;
-        streaming?: StreamingParams;
-        verbose?: boolean;
-    });
+        }) */
+    constructor(url: string, options?: DdbOptions);
     private on_message;
     private on_error;
     /** 调用后会确保和数据库的连接是正常的 (this.connected === true && this.errored === false)，否则抛出错误

package/index.js

@@ -421,6 +421,8 @@ class DdbObj {
             case DdbType.symbol:
             case DdbType.code:
             case DdbType.handle:
+            // sqlDS 函数会返回包含 datasource 的 any vector
+            case DdbType.datasource:
             case DdbType.functiondef:
             // mysql 插件 connect 方法会返回 resource 类型的对象
             case DdbType.resource: {
@@ -655,6 +657,7 @@ class DdbObj {
             case DdbType.string:
             case DdbType.symbol:
             case DdbType.handle:
+            case DdbType.datasource:
             case DdbType.code: {
                 let value = new Array(length);
                 let i_head = 0, i_tail = i_head;
@@ -860,6 +863,7 @@ class DdbObj {
                         case DdbType.symbol:
                         case DdbType.code:
                         case DdbType.handle:
+                        case DdbType.datasource:
                         case DdbType.resource:
                             return [
                                 DdbObj.enc.encode(value),
@@ -996,6 +1000,7 @@ class DdbObj {
             case DdbType.string:
             case DdbType.symbol:
             case DdbType.handle:
+            case DdbType.datasource:
             case DdbType.code: {
                 let bufs = new Array(length * 2);
                 for (let i = 0; i < length; i++) {
@@ -1432,6 +1437,7 @@ export function format(type, value, le, options = {}) {
         case DdbType.functiondef:
             return inspect(value.name, options);
         case DdbType.handle:
+        case DdbType.datasource:
         case DdbType.code:
         case DdbType.resource:
             return inspect(value, options);
@@ -2219,7 +2225,7 @@ class DDB {
         使用 WebSocket URL 初始化连接到 DolphinDB 的实例（不建立实际的网络连接）
         Initialize an instance of DolphinDB Client using the WebSocket URL (without establishing an actual network connection)
         - url: DolphinDB WebSocket URL. e.g.：`ws://127.0.0.1:8848`
-        - options?:
+        - options?: DdbOptions
             - autologin?: 是否在建立连接后自动登录，默认 `true`  Whether to log in automatically after establishing a connection, default `true`
             - username?: DolphinDB 登录用户名，默认 `'admin'`  DolphinDB username, default `'admin'`
             - password?: DolphinDB 登录密码，默认 `'123456'`  DolphinDB password, default `'123456'`
@@ -2236,8 +2242,7 @@ class DDB {
             username: 'admin',
             password: '123456',
             python: false
-        })
-    */
+        }) */
     constructor(url, options = {}) {
         this.url = url;
         if (options.verbose !== undefined)