@carllee1983/dbcli 1.53.0 → 1.54.1

package/dist/core.d.ts

@@ -37,6 +37,12 @@ export interface ConnectionOptions {
 	srv?: boolean;
 	/** Connection timeout in milliseconds (default: 5000) */
 	timeout?: number;
+	/**
+	 * Statement timeout in milliseconds. Falls back to `timeout` when unset, and
+	 * to the server default when neither is given — an unset statement timeout
+	 * means the server decides, not that 5000ms applies. 0 removes the limit.
+	 */
+	statementTimeout?: number;
 	/** Elasticsearch protocol (http or https) */
 	protocol?: "http" | "https";
 	/** Elasticsearch nodes for round-robin (optional) */
@@ -123,21 +129,31 @@ export interface TableSchema {
 	/** Type of table (table or view) */
 	tableType?: "table" | "view";
 }
-/**
- * Connection error with categorized error code and troubleshooting hints
- */
+type ConnectionErrorCode = "ECONNREFUSED" | "ETIMEDOUT" | "AUTH_FAILED" | "ENOTFOUND" | "EHOSTUNREACH" | "CONNECTION_LOST" | "TOO_MANY_CONNECTIONS" | "TLS_ERROR" | "SERVER_NOT_READY" | "CONNECTION_REJECTED" | "SQL_SYNTAX_ERROR" | "STATEMENT_TIMEOUT" | "TABLE_NOT_FOUND" | "COLUMN_NOT_FOUND" | "UNKNOWN";
 export declare class ConnectionError extends Error {
 	/** Error category code */
-	code: "ECONNREFUSED" | "ETIMEDOUT" | "AUTH_FAILED" | "ENOTFOUND" | "SQL_SYNTAX_ERROR" | "TABLE_NOT_FOUND" | "COLUMN_NOT_FOUND" | "UNKNOWN";
+	code: ConnectionErrorCode;
 	/** Array of actionable troubleshooting hints */
 	hints: string[];
+	/**
+	 * The ceiling that was in force, in milliseconds. Set on STATEMENT_TIMEOUT so
+	 * consumers can state it without parsing `message`; the recovery envelope needs
+	 * it to tell an agent what `--statement-timeout <ms>` it was already up against.
+	 */
+	limitMs?: number | undefined;
 	constructor(
 	/** Error category code */
-	code: "ECONNREFUSED" | "ETIMEDOUT" | "AUTH_FAILED" | "ENOTFOUND" | "SQL_SYNTAX_ERROR" | "TABLE_NOT_FOUND" | "COLUMN_NOT_FOUND" | "UNKNOWN", 
+	code: ConnectionErrorCode, 
 	/** User-friendly error message */
 	message: string, 
 	/** Array of actionable troubleshooting hints */
-	hints: string[]);
+	hints: string[], 
+	/**
+	 * The ceiling that was in force, in milliseconds. Set on STATEMENT_TIMEOUT so
+	 * consumers can state it without parsing `message`; the recovery envelope needs
+	 * it to tell an agent what `--statement-timeout <ms>` it was already up against.
+	 */
+	limitMs?: number | undefined);
 }
 /**
  * Result of a database query or command execution
@@ -170,6 +186,17 @@ type RedisWarning = {
 	code: "REDIS_BLACKLIST_FILTERED";
 	count: number;
 };
+interface TableSchemaOptions {
+	/** MongoDB: 取樣文件數 */
+	sampleSize?: number;
+	/** MongoDB: 取樣方式 */
+	sampleMethod?: "random" | "natural";
+	/**
+	 * 精確列數要掃全表。掃描整個資料庫時設為 false，改用引擎的估計值——
+	 * 一百張表的資料庫做不起一百次全表 COUNT。預設 true。
+	 */
+	exactRowCount?: boolean;
+}
 /**
  * Database adapter interface - contract for all database implementations
  * Defines methods that all database adapters must implement
@@ -213,10 +240,7 @@ export interface DatabaseAdapter {
 	 * @returns Complete table schema including all column details
 	 * @throws {ConnectionError} If query fails
 	 */
-	getTableSchema(tableName: string, options?: {
-		sampleSize?: number;
-		sampleMethod?: "random" | "natural";
-	}): Promise<TableSchema>;
+	getTableSchema(tableName: string, options?: TableSchemaOptions): Promise<TableSchema>;
 	/**
 	 * Test connection with lightweight probe query
 	 * Executes SELECT 1 or equivalent to verify connection is alive
@@ -267,10 +291,23 @@ interface QueryableAdapter {
 	 */
 	listCollections(options?: {
 		includeSystem?: boolean;
+		/** Redis: 取樣上限。列 key 沒有 catalog 可查，只能掃，所以上限是必要的。 */
+		limit?: number;
 	}): Promise<{
 		name: string;
 		documentCount?: number;
 	}[]>;
+	/**
+	 * Redis-only: 取樣 key 名稱並回報是否觸及取樣上限。
+	 *
+	 * 宣告在介面上而不是讓呼叫端 double-cast：`dbcli list` 與 shell 補全都需要
+	 * `truncated` 才能誠實顯示「只看了前 N 個」，而那個資訊 listCollections
+	 * 的形狀裝不下。其他引擎有 catalog 可查，不需要取樣。
+	 */
+	sampleKeyNames?(limit: number): Promise<{
+		names: string[];
+		truncated: boolean;
+	}>;
 	/**
 	 * SQL-compatible collection listing for shared command surfaces.
 	 * @param options Optional filter for system indices
@@ -749,6 +786,7 @@ declare const DbcliConfigSchema: z.ZodObject<{
 	connection: z.ZodUnion<[
 		z.ZodObject<{
 			timeout: z.ZodOptional<z.ZodNumber>;
+			statementTimeout: z.ZodOptional<z.ZodNumber>;
 			system: z.ZodEnum<[
 				"postgresql",
 				"mysql",
@@ -805,27 +843,25 @@ declare const DbcliConfigSchema: z.ZodObject<{
 				}>
 			]>;
 		}, "strip", z.ZodTypeAny, {
-			password: string | {
+			system: "postgresql" | "mysql" | "mariadb";
+			host: string | {
 				$env: string;
 			};
-			user: string | {
+			port: number | {
 				$env: string;
 			};
-			system: "postgresql" | "mysql" | "mariadb";
-			host: string | {
+			user: string | {
 				$env: string;
 			};
-			port: number | {
+			password: string | {
 				$env: string;
 			};
 			database: string | {
 				$env: string;
 			};
 			timeout?: number | undefined;
+			statementTimeout?: number | undefined;
 		}, {
-			user: string | {
-				$env: string;
-			};
 			system: "postgresql" | "mysql" | "mariadb";
 			host: string | {
 				$env: string;
@@ -833,16 +869,21 @@ declare const DbcliConfigSchema: z.ZodObject<{
 			port: number | {
 				$env: string;
 			};
+			user: string | {
+				$env: string;
+			};
 			database: string | {
 				$env: string;
 			};
-			timeout?: number | undefined;
 			password?: string | {
 				$env: string;
 			} | undefined;
+			timeout?: number | undefined;
+			statementTimeout?: number | undefined;
 		}>,
 		z.ZodObject<{
 			timeout: z.ZodOptional<z.ZodNumber>;
+			statementTimeout: z.ZodOptional<z.ZodNumber>;
 			system: z.ZodLiteral<"mongodb">;
 			uri: z.ZodOptional<z.ZodUnion<[
 				z.ZodString,
@@ -927,24 +968,26 @@ declare const DbcliConfigSchema: z.ZodObject<{
 			tls: z.ZodOptional<z.ZodBoolean>;
 			srv: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
 		}, "strip", z.ZodTypeAny, {
-			password: string | {
+			system: "mongodb";
+			host: string | {
 				$env: string;
 			};
-			user: string | {
+			port: number | {
 				$env: string;
 			};
-			system: "mongodb";
-			host: string | {
+			user: string | {
 				$env: string;
 			};
-			port: number | {
+			password: string | {
 				$env: string;
 			};
 			database: string | {
 				$env: string;
 			};
 			srv: boolean;
-			timeout?: number | undefined;
+			uri?: string | {
+				$env: string;
+			} | undefined;
 			authSource?: string | {
 				$env: string;
 			} | undefined;
@@ -952,27 +995,28 @@ declare const DbcliConfigSchema: z.ZodObject<{
 				$env: string;
 			} | undefined;
 			tls?: boolean | undefined;
-			uri?: string | {
-				$env: string;
-			} | undefined;
+			timeout?: number | undefined;
+			statementTimeout?: number | undefined;
 		}, {
 			system: "mongodb";
-			timeout?: number | undefined;
-			password?: string | {
+			host?: string | {
 				$env: string;
 			} | undefined;
-			user?: string | {
+			port?: number | {
 				$env: string;
 			} | undefined;
-			host?: string | {
+			user?: string | {
 				$env: string;
 			} | undefined;
-			port?: number | {
+			password?: string | {
 				$env: string;
 			} | undefined;
 			database?: string | {
 				$env: string;
 			} | undefined;
+			uri?: string | {
+				$env: string;
+			} | undefined;
 			authSource?: string | {
 				$env: string;
 			} | undefined;
@@ -981,12 +1025,12 @@ declare const DbcliConfigSchema: z.ZodObject<{
 			} | undefined;
 			tls?: boolean | undefined;
 			srv?: boolean | undefined;
-			uri?: string | {
-				$env: string;
-			} | undefined;
+			timeout?: number | undefined;
+			statementTimeout?: number | undefined;
 		}>,
 		z.ZodObject<{
 			timeout: z.ZodOptional<z.ZodNumber>;
+			statementTimeout: z.ZodOptional<z.ZodNumber>;
 			system: z.ZodLiteral<"redis">;
 			host: z.ZodUnion<[
 				z.ZodString,
@@ -1039,23 +1083,24 @@ declare const DbcliConfigSchema: z.ZodObject<{
 				}>
 			]>>>;
 		}, "strip", z.ZodTypeAny, {
-			password: string | {
+			system: "redis";
+			host: string | {
 				$env: string;
 			};
-			user: string | {
+			port: number | {
 				$env: string;
 			};
-			system: "redis";
-			host: string | {
+			user: string | {
 				$env: string;
 			};
-			port: number | {
+			password: string | {
 				$env: string;
 			};
 			database: string | {
 				$env: string;
 			};
 			timeout?: number | undefined;
+			statementTimeout?: number | undefined;
 		}, {
 			system: "redis";
 			host: string | {
@@ -1064,19 +1109,21 @@ declare const DbcliConfigSchema: z.ZodObject<{
 			port: number | {
 				$env: string;
 			};
-			timeout?: number | undefined;
-			password?: string | {
+			user?: string | {
 				$env: string;
 			} | undefined;
-			user?: string | {
+			password?: string | {
 				$env: string;
 			} | undefined;
 			database?: string | {
 				$env: string;
 			} | undefined;
+			timeout?: number | undefined;
+			statementTimeout?: number | undefined;
 		}>,
 		z.ZodObject<{
 			timeout: z.ZodOptional<z.ZodNumber>;
+			statementTimeout: z.ZodOptional<z.ZodNumber>;
 			system: z.ZodLiteral<"elasticsearch">;
 			protocol: z.ZodDefault<z.ZodOptional<z.ZodEnum<[
 				"http",
@@ -1156,17 +1203,17 @@ declare const DbcliConfigSchema: z.ZodObject<{
 			caPath: z.ZodOptional<z.ZodString>;
 			rejectUnauthorized: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
 		}, "strip", z.ZodTypeAny, {
-			password: string | {
+			system: "elasticsearch";
+			host: string | {
 				$env: string;
 			};
-			user: string | {
+			port: number | {
 				$env: string;
 			};
-			system: "elasticsearch";
-			host: string | {
+			user: string | {
 				$env: string;
 			};
-			port: number | {
+			password: string | {
 				$env: string;
 			};
 			database: string | {
@@ -1175,6 +1222,7 @@ declare const DbcliConfigSchema: z.ZodObject<{
 			rejectUnauthorized: boolean;
 			protocol: "http" | "https";
 			timeout?: number | undefined;
+			statementTimeout?: number | undefined;
 			nodes?: string[] | undefined;
 			cloudId?: string | {
 				$env: string;
@@ -1185,23 +1233,24 @@ declare const DbcliConfigSchema: z.ZodObject<{
 			caPath?: string | undefined;
 		}, {
 			system: "elasticsearch";
-			timeout?: number | undefined;
-			password?: string | {
+			host?: string | {
 				$env: string;
 			} | undefined;
-			user?: string | {
+			port?: number | {
 				$env: string;
 			} | undefined;
-			host?: string | {
+			user?: string | {
 				$env: string;
 			} | undefined;
-			port?: number | {
+			password?: string | {
 				$env: string;
 			} | undefined;
 			database?: string | {
 				$env: string;
 			} | undefined;
 			rejectUnauthorized?: boolean | undefined;
+			timeout?: number | undefined;
+			statementTimeout?: number | undefined;
 			protocol?: "http" | "https" | undefined;
 			nodes?: string[] | undefined;
 			cloudId?: string | {
@@ -1306,31 +1355,27 @@ declare const DbcliConfigSchema: z.ZodObject<{
 			max_entries: number;
 		};
 	};
-	metadata: {
-		version: string;
-		createdAt?: string | undefined;
-		schemaLastUpdated?: string | undefined;
-		schemaTableCount?: number | undefined;
-	};
 	connection: {
-		password: string | {
+		system: "mongodb";
+		host: string | {
 			$env: string;
 		};
-		user: string | {
+		port: number | {
 			$env: string;
 		};
-		system: "mongodb";
-		host: string | {
+		user: string | {
 			$env: string;
 		};
-		port: number | {
+		password: string | {
 			$env: string;
 		};
 		database: string | {
 			$env: string;
 		};
 		srv: boolean;
-		timeout?: number | undefined;
+		uri?: string | {
+			$env: string;
+		} | undefined;
 		authSource?: string | {
 			$env: string;
 		} | undefined;
@@ -1338,16 +1383,9 @@ declare const DbcliConfigSchema: z.ZodObject<{
 			$env: string;
 		} | undefined;
 		tls?: boolean | undefined;
-		uri?: string | {
-			$env: string;
-		} | undefined;
+		timeout?: number | undefined;
+		statementTimeout?: number | undefined;
 	} | {
-		password: string | {
-			$env: string;
-		};
-		user: string | {
-			$env: string;
-		};
 		system: "postgresql" | "mysql" | "mariadb";
 		host: string | {
 			$env: string;
@@ -1355,17 +1393,18 @@ declare const DbcliConfigSchema: z.ZodObject<{
 		port: number | {
 			$env: string;
 		};
-		database: string | {
+		user: string | {
 			$env: string;
 		};
-		timeout?: number | undefined;
-	} | {
 		password: string | {
 			$env: string;
 		};
-		user: string | {
+		database: string | {
 			$env: string;
 		};
+		timeout?: number | undefined;
+		statementTimeout?: number | undefined;
+	} | {
 		system: "redis";
 		host: string | {
 			$env: string;
@@ -1373,17 +1412,18 @@ declare const DbcliConfigSchema: z.ZodObject<{
 		port: number | {
 			$env: string;
 		};
-		database: string | {
+		user: string | {
 			$env: string;
 		};
-		timeout?: number | undefined;
-	} | {
 		password: string | {
 			$env: string;
 		};
-		user: string | {
+		database: string | {
 			$env: string;
 		};
+		timeout?: number | undefined;
+		statementTimeout?: number | undefined;
+	} | {
 		system: "elasticsearch";
 		host: string | {
 			$env: string;
@@ -1391,12 +1431,19 @@ declare const DbcliConfigSchema: z.ZodObject<{
 		port: number | {
 			$env: string;
 		};
+		user: string | {
+			$env: string;
+		};
+		password: string | {
+			$env: string;
+		};
 		database: string | {
 			$env: string;
 		};
 		rejectUnauthorized: boolean;
 		protocol: "http" | "https";
 		timeout?: number | undefined;
+		statementTimeout?: number | undefined;
 		nodes?: string[] | undefined;
 		cloudId?: string | {
 			$env: string;
@@ -1407,6 +1454,12 @@ declare const DbcliConfigSchema: z.ZodObject<{
 		caPath?: string | undefined;
 	};
 	permission: "admin" | "query-only" | "read-write" | "data-admin";
+	metadata: {
+		version: string;
+		createdAt?: string | undefined;
+		schemaLastUpdated?: string | undefined;
+		schemaTableCount?: number | undefined;
+	};
 	redis?: {
 		mask: {
 			keyPattern: string;
@@ -1416,22 +1469,24 @@ declare const DbcliConfigSchema: z.ZodObject<{
 }, {
 	connection: {
 		system: "mongodb";
-		timeout?: number | undefined;
-		password?: string | {
+		host?: string | {
 			$env: string;
 		} | undefined;
-		user?: string | {
+		port?: number | {
 			$env: string;
 		} | undefined;
-		host?: string | {
+		user?: string | {
 			$env: string;
 		} | undefined;
-		port?: number | {
+		password?: string | {
 			$env: string;
 		} | undefined;
 		database?: string | {
 			$env: string;
 		} | undefined;
+		uri?: string | {
+			$env: string;
+		} | undefined;
 		authSource?: string | {
 			$env: string;
 		} | undefined;
@@ -1440,13 +1495,9 @@ declare const DbcliConfigSchema: z.ZodObject<{
 		} | undefined;
 		tls?: boolean | undefined;
 		srv?: boolean | undefined;
-		uri?: string | {
-			$env: string;
-		} | undefined;
+		timeout?: number | undefined;
+		statementTimeout?: number | undefined;
 	} | {
-		user: string | {
-			$env: string;
-		};
 		system: "postgresql" | "mysql" | "mariadb";
 		host: string | {
 			$env: string;
@@ -1454,13 +1505,17 @@ declare const DbcliConfigSchema: z.ZodObject<{
 		port: number | {
 			$env: string;
 		};
+		user: string | {
+			$env: string;
+		};
 		database: string | {
 			$env: string;
 		};
-		timeout?: number | undefined;
 		password?: string | {
 			$env: string;
 		} | undefined;
+		timeout?: number | undefined;
+		statementTimeout?: number | undefined;
 	} | {
 		system: "redis";
 		host: string | {
@@ -1469,35 +1524,37 @@ declare const DbcliConfigSchema: z.ZodObject<{
 		port: number | {
 			$env: string;
 		};
-		timeout?: number | undefined;
-		password?: string | {
+		user?: string | {
 			$env: string;
 		} | undefined;
-		user?: string | {
+		password?: string | {
 			$env: string;
 		} | undefined;
 		database?: string | {
 			$env: string;
 		} | undefined;
+		timeout?: number | undefined;
+		statementTimeout?: number | undefined;
 	} | {
 		system: "elasticsearch";
-		timeout?: number | undefined;
-		password?: string | {
+		host?: string | {
 			$env: string;
 		} | undefined;
-		user?: string | {
+		port?: number | {
 			$env: string;
 		} | undefined;
-		host?: string | {
+		user?: string | {
 			$env: string;
 		} | undefined;
-		port?: number | {
+		password?: string | {
 			$env: string;
 		} | undefined;
 		database?: string | {
 			$env: string;
 		} | undefined;
 		rejectUnauthorized?: boolean | undefined;
+		timeout?: number | undefined;
+		statementTimeout?: number | undefined;
 		protocol?: "http" | "https" | undefined;
 		nodes?: string[] | undefined;
 		cloudId?: string | {
@@ -1526,13 +1583,13 @@ declare const DbcliConfigSchema: z.ZodObject<{
 			max_entries?: number | undefined;
 		} | undefined;
 	} | undefined;
+	permission?: "admin" | "query-only" | "read-write" | "data-admin" | undefined;
 	metadata?: {
 		version?: string | undefined;
 		createdAt?: string | undefined;
 		schemaLastUpdated?: string | undefined;
 		schemaTableCount?: number | undefined;
 	} | undefined;
-	permission?: "admin" | "query-only" | "read-write" | "data-admin" | undefined;
 }>;
 /**
  * Types inferred from Zod schemas
@@ -1544,6 +1601,7 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 	connections: z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodUnion<[
 		z.ZodObject<{
 			timeout: z.ZodOptional<z.ZodNumber>;
+			statementTimeout: z.ZodOptional<z.ZodNumber>;
 			system: z.ZodEnum<[
 				"postgresql",
 				"mysql",
@@ -1609,17 +1667,17 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 			envFile: z.ZodOptional<z.ZodString>;
 			environment: z.ZodOptional<z.ZodEffects<z.ZodString, string | undefined, string>>;
 		}, "strip", z.ZodTypeAny, {
-			password: string | {
+			system: "postgresql" | "mysql" | "mariadb";
+			host: string | {
 				$env: string;
 			};
-			user: string | {
+			port: number | {
 				$env: string;
 			};
-			system: "postgresql" | "mysql" | "mariadb";
-			host: string | {
+			user: string | {
 				$env: string;
 			};
-			port: number | {
+			password: string | {
 				$env: string;
 			};
 			database: string | {
@@ -1627,12 +1685,10 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 			};
 			permission: "admin" | "query-only" | "read-write" | "data-admin";
 			timeout?: number | undefined;
+			statementTimeout?: number | undefined;
 			envFile?: string | undefined;
 			environment?: string | undefined;
 		}, {
-			user: string | {
-				$env: string;
-			};
 			system: "postgresql" | "mysql" | "mariadb";
 			host: string | {
 				$env: string;
@@ -1640,19 +1696,24 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 			port: number | {
 				$env: string;
 			};
+			user: string | {
+				$env: string;
+			};
 			database: string | {
 				$env: string;
 			};
-			timeout?: number | undefined;
 			password?: string | {
 				$env: string;
 			} | undefined;
+			timeout?: number | undefined;
+			statementTimeout?: number | undefined;
 			permission?: "admin" | "query-only" | "read-write" | "data-admin" | undefined;
 			envFile?: string | undefined;
 			environment?: string | undefined;
 		}>,
 		z.ZodObject<{
 			timeout: z.ZodOptional<z.ZodNumber>;
+			statementTimeout: z.ZodOptional<z.ZodNumber>;
 			system: z.ZodLiteral<"mongodb">;
 			uri: z.ZodOptional<z.ZodUnion<[
 				z.ZodString,
@@ -1746,17 +1807,17 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 			envFile: z.ZodOptional<z.ZodString>;
 			environment: z.ZodOptional<z.ZodEffects<z.ZodString, string | undefined, string>>;
 		}, "strip", z.ZodTypeAny, {
-			password: string | {
+			system: "mongodb";
+			host: string | {
 				$env: string;
 			};
-			user: string | {
+			port: number | {
 				$env: string;
 			};
-			system: "mongodb";
-			host: string | {
+			user: string | {
 				$env: string;
 			};
-			port: number | {
+			password: string | {
 				$env: string;
 			};
 			database: string | {
@@ -1764,7 +1825,9 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 			};
 			srv: boolean;
 			permission: "admin" | "query-only" | "read-write" | "data-admin";
-			timeout?: number | undefined;
+			uri?: string | {
+				$env: string;
+			} | undefined;
 			authSource?: string | {
 				$env: string;
 			} | undefined;
@@ -1772,29 +1835,30 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 				$env: string;
 			} | undefined;
 			tls?: boolean | undefined;
-			uri?: string | {
-				$env: string;
-			} | undefined;
+			timeout?: number | undefined;
+			statementTimeout?: number | undefined;
 			envFile?: string | undefined;
 			environment?: string | undefined;
 		}, {
 			system: "mongodb";
-			timeout?: number | undefined;
-			password?: string | {
+			host?: string | {
 				$env: string;
 			} | undefined;
-			user?: string | {
+			port?: number | {
 				$env: string;
 			} | undefined;
-			host?: string | {
+			user?: string | {
 				$env: string;
 			} | undefined;
-			port?: number | {
+			password?: string | {
 				$env: string;
 			} | undefined;
 			database?: string | {
 				$env: string;
 			} | undefined;
+			uri?: string | {
+				$env: string;
+			} | undefined;
 			authSource?: string | {
 				$env: string;
 			} | undefined;
@@ -1803,15 +1867,15 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 			} | undefined;
 			tls?: boolean | undefined;
 			srv?: boolean | undefined;
-			uri?: string | {
-				$env: string;
-			} | undefined;
+			timeout?: number | undefined;
+			statementTimeout?: number | undefined;
 			permission?: "admin" | "query-only" | "read-write" | "data-admin" | undefined;
 			envFile?: string | undefined;
 			environment?: string | undefined;
 		}>,
 		z.ZodObject<{
 			timeout: z.ZodOptional<z.ZodNumber>;
+			statementTimeout: z.ZodOptional<z.ZodNumber>;
 			system: z.ZodLiteral<"redis">;
 			host: z.ZodUnion<[
 				z.ZodString,
@@ -1873,17 +1937,17 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 			envFile: z.ZodOptional<z.ZodString>;
 			environment: z.ZodOptional<z.ZodEffects<z.ZodString, string | undefined, string>>;
 		}, "strip", z.ZodTypeAny, {
-			password: string | {
+			system: "redis";
+			host: string | {
 				$env: string;
 			};
-			user: string | {
+			port: number | {
 				$env: string;
 			};
-			system: "redis";
-			host: string | {
+			user: string | {
 				$env: string;
 			};
-			port: number | {
+			password: string | {
 				$env: string;
 			};
 			database: string | {
@@ -1891,6 +1955,7 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 			};
 			permission: "admin" | "query-only" | "read-write" | "data-admin";
 			timeout?: number | undefined;
+			statementTimeout?: number | undefined;
 			envFile?: string | undefined;
 			environment?: string | undefined;
 		}, {
@@ -1901,22 +1966,24 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 			port: number | {
 				$env: string;
 			};
-			timeout?: number | undefined;
-			password?: string | {
+			user?: string | {
 				$env: string;
 			} | undefined;
-			user?: string | {
+			password?: string | {
 				$env: string;
 			} | undefined;
 			database?: string | {
 				$env: string;
 			} | undefined;
+			timeout?: number | undefined;
+			statementTimeout?: number | undefined;
 			permission?: "admin" | "query-only" | "read-write" | "data-admin" | undefined;
 			envFile?: string | undefined;
 			environment?: string | undefined;
 		}>,
 		z.ZodObject<{
 			timeout: z.ZodOptional<z.ZodNumber>;
+			statementTimeout: z.ZodOptional<z.ZodNumber>;
 			system: z.ZodLiteral<"elasticsearch">;
 			protocol: z.ZodDefault<z.ZodOptional<z.ZodEnum<[
 				"http",
@@ -2005,17 +2072,17 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 			envFile: z.ZodOptional<z.ZodString>;
 			environment: z.ZodOptional<z.ZodEffects<z.ZodString, string | undefined, string>>;
 		}, "strip", z.ZodTypeAny, {
-			password: string | {
+			system: "elasticsearch";
+			host: string | {
 				$env: string;
 			};
-			user: string | {
+			port: number | {
 				$env: string;
 			};
-			system: "elasticsearch";
-			host: string | {
+			user: string | {
 				$env: string;
 			};
-			port: number | {
+			password: string | {
 				$env: string;
 			};
 			database: string | {
@@ -2025,6 +2092,7 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 			protocol: "http" | "https";
 			permission: "admin" | "query-only" | "read-write" | "data-admin";
 			timeout?: number | undefined;
+			statementTimeout?: number | undefined;
 			nodes?: string[] | undefined;
 			cloudId?: string | {
 				$env: string;
@@ -2037,23 +2105,24 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 			environment?: string | undefined;
 		}, {
 			system: "elasticsearch";
-			timeout?: number | undefined;
-			password?: string | {
+			host?: string | {
 				$env: string;
 			} | undefined;
-			user?: string | {
+			port?: number | {
 				$env: string;
 			} | undefined;
-			host?: string | {
+			user?: string | {
 				$env: string;
 			} | undefined;
-			port?: number | {
+			password?: string | {
 				$env: string;
 			} | undefined;
 			database?: string | {
 				$env: string;
 			} | undefined;
 			rejectUnauthorized?: boolean | undefined;
+			timeout?: number | undefined;
+			statementTimeout?: number | undefined;
 			protocol?: "http" | "https" | undefined;
 			nodes?: string[] | undefined;
 			cloudId?: string | {
@@ -2068,17 +2137,17 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 			environment?: string | undefined;
 		}>
 	]>>, Record<string, {
-		password: string | {
+		system: "postgresql" | "mysql" | "mariadb";
+		host: string | {
 			$env: string;
 		};
-		user: string | {
+		port: number | {
 			$env: string;
 		};
-		system: "postgresql" | "mysql" | "mariadb";
-		host: string | {
+		user: string | {
 			$env: string;
 		};
-		port: number | {
+		password: string | {
 			$env: string;
 		};
 		database: string | {
@@ -2086,20 +2155,21 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 		};
 		permission: "admin" | "query-only" | "read-write" | "data-admin";
 		timeout?: number | undefined;
+		statementTimeout?: number | undefined;
 		envFile?: string | undefined;
 		environment?: string | undefined;
 	} | {
-		password: string | {
+		system: "mongodb";
+		host: string | {
 			$env: string;
 		};
-		user: string | {
+		port: number | {
 			$env: string;
 		};
-		system: "mongodb";
-		host: string | {
+		user: string | {
 			$env: string;
 		};
-		port: number | {
+		password: string | {
 			$env: string;
 		};
 		database: string | {
@@ -2107,7 +2177,9 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 		};
 		srv: boolean;
 		permission: "admin" | "query-only" | "read-write" | "data-admin";
-		timeout?: number | undefined;
+		uri?: string | {
+			$env: string;
+		} | undefined;
 		authSource?: string | {
 			$env: string;
 		} | undefined;
@@ -2115,23 +2187,22 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 			$env: string;
 		} | undefined;
 		tls?: boolean | undefined;
-		uri?: string | {
-			$env: string;
-		} | undefined;
+		timeout?: number | undefined;
+		statementTimeout?: number | undefined;
 		envFile?: string | undefined;
 		environment?: string | undefined;
 	} | {
-		password: string | {
+		system: "redis";
+		host: string | {
 			$env: string;
 		};
-		user: string | {
+		port: number | {
 			$env: string;
 		};
-		system: "redis";
-		host: string | {
+		user: string | {
 			$env: string;
 		};
-		port: number | {
+		password: string | {
 			$env: string;
 		};
 		database: string | {
@@ -2139,20 +2210,21 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 		};
 		permission: "admin" | "query-only" | "read-write" | "data-admin";
 		timeout?: number | undefined;
+		statementTimeout?: number | undefined;
 		envFile?: string | undefined;
 		environment?: string | undefined;
 	} | {
-		password: string | {
+		system: "elasticsearch";
+		host: string | {
 			$env: string;
 		};
-		user: string | {
+		port: number | {
 			$env: string;
 		};
-		system: "elasticsearch";
-		host: string | {
+		user: string | {
 			$env: string;
 		};
-		port: number | {
+		password: string | {
 			$env: string;
 		};
 		database: string | {
@@ -2162,6 +2234,7 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 		protocol: "http" | "https";
 		permission: "admin" | "query-only" | "read-write" | "data-admin";
 		timeout?: number | undefined;
+		statementTimeout?: number | undefined;
 		nodes?: string[] | undefined;
 		cloudId?: string | {
 			$env: string;
@@ -2173,9 +2246,6 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 		envFile?: string | undefined;
 		environment?: string | undefined;
 	}>, Record<string, {
-		user: string | {
-			$env: string;
-		};
 		system: "postgresql" | "mysql" | "mariadb";
 		host: string | {
 			$env: string;
@@ -2183,34 +2253,40 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 		port: number | {
 			$env: string;
 		};
+		user: string | {
+			$env: string;
+		};
 		database: string | {
 			$env: string;
 		};
-		timeout?: number | undefined;
 		password?: string | {
 			$env: string;
 		} | undefined;
+		timeout?: number | undefined;
+		statementTimeout?: number | undefined;
 		permission?: "admin" | "query-only" | "read-write" | "data-admin" | undefined;
 		envFile?: string | undefined;
 		environment?: string | undefined;
 	} | {
 		system: "mongodb";
-		timeout?: number | undefined;
-		password?: string | {
+		host?: string | {
 			$env: string;
 		} | undefined;
-		user?: string | {
+		port?: number | {
 			$env: string;
 		} | undefined;
-		host?: string | {
+		user?: string | {
 			$env: string;
 		} | undefined;
-		port?: number | {
+		password?: string | {
 			$env: string;
 		} | undefined;
 		database?: string | {
 			$env: string;
 		} | undefined;
+		uri?: string | {
+			$env: string;
+		} | undefined;
 		authSource?: string | {
 			$env: string;
 		} | undefined;
@@ -2219,9 +2295,8 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 		} | undefined;
 		tls?: boolean | undefined;
 		srv?: boolean | undefined;
-		uri?: string | {
-			$env: string;
-		} | undefined;
+		timeout?: number | undefined;
+		statementTimeout?: number | undefined;
 		permission?: "admin" | "query-only" | "read-write" | "data-admin" | undefined;
 		envFile?: string | undefined;
 		environment?: string | undefined;
@@ -2233,38 +2308,40 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 		port: number | {
 			$env: string;
 		};
-		timeout?: number | undefined;
-		password?: string | {
+		user?: string | {
 			$env: string;
 		} | undefined;
-		user?: string | {
+		password?: string | {
 			$env: string;
 		} | undefined;
 		database?: string | {
 			$env: string;
 		} | undefined;
+		timeout?: number | undefined;
+		statementTimeout?: number | undefined;
 		permission?: "admin" | "query-only" | "read-write" | "data-admin" | undefined;
 		envFile?: string | undefined;
 		environment?: string | undefined;
 	} | {
 		system: "elasticsearch";
-		timeout?: number | undefined;
-		password?: string | {
+		host?: string | {
 			$env: string;
 		} | undefined;
-		user?: string | {
+		port?: number | {
 			$env: string;
 		} | undefined;
-		host?: string | {
+		user?: string | {
 			$env: string;
 		} | undefined;
-		port?: number | {
+		password?: string | {
 			$env: string;
 		} | undefined;
 		database?: string | {
 			$env: string;
 		} | undefined;
 		rejectUnauthorized?: boolean | undefined;
+		timeout?: number | undefined;
+		statementTimeout?: number | undefined;
 		protocol?: "http" | "https" | undefined;
 		nodes?: string[] | undefined;
 		cloudId?: string | {
@@ -2375,17 +2452,17 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 		schemaTableCount?: number | undefined;
 	};
 	connections: Record<string, {
-		password: string | {
+		system: "postgresql" | "mysql" | "mariadb";
+		host: string | {
 			$env: string;
 		};
-		user: string | {
+		port: number | {
 			$env: string;
 		};
-		system: "postgresql" | "mysql" | "mariadb";
-		host: string | {
+		user: string | {
 			$env: string;
 		};
-		port: number | {
+		password: string | {
 			$env: string;
 		};
 		database: string | {
@@ -2393,20 +2470,21 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 		};
 		permission: "admin" | "query-only" | "read-write" | "data-admin";
 		timeout?: number | undefined;
+		statementTimeout?: number | undefined;
 		envFile?: string | undefined;
 		environment?: string | undefined;
 	} | {
-		password: string | {
+		system: "mongodb";
+		host: string | {
 			$env: string;
 		};
-		user: string | {
+		port: number | {
 			$env: string;
 		};
-		system: "mongodb";
-		host: string | {
+		user: string | {
 			$env: string;
 		};
-		port: number | {
+		password: string | {
 			$env: string;
 		};
 		database: string | {
@@ -2414,7 +2492,9 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 		};
 		srv: boolean;
 		permission: "admin" | "query-only" | "read-write" | "data-admin";
-		timeout?: number | undefined;
+		uri?: string | {
+			$env: string;
+		} | undefined;
 		authSource?: string | {
 			$env: string;
 		} | undefined;
@@ -2422,23 +2502,22 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 			$env: string;
 		} | undefined;
 		tls?: boolean | undefined;
-		uri?: string | {
-			$env: string;
-		} | undefined;
+		timeout?: number | undefined;
+		statementTimeout?: number | undefined;
 		envFile?: string | undefined;
 		environment?: string | undefined;
 	} | {
-		password: string | {
+		system: "redis";
+		host: string | {
 			$env: string;
 		};
-		user: string | {
+		port: number | {
 			$env: string;
 		};
-		system: "redis";
-		host: string | {
+		user: string | {
 			$env: string;
 		};
-		port: number | {
+		password: string | {
 			$env: string;
 		};
 		database: string | {
@@ -2446,20 +2525,21 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 		};
 		permission: "admin" | "query-only" | "read-write" | "data-admin";
 		timeout?: number | undefined;
+		statementTimeout?: number | undefined;
 		envFile?: string | undefined;
 		environment?: string | undefined;
 	} | {
-		password: string | {
+		system: "elasticsearch";
+		host: string | {
 			$env: string;
 		};
-		user: string | {
+		port: number | {
 			$env: string;
 		};
-		system: "elasticsearch";
-		host: string | {
+		user: string | {
 			$env: string;
 		};
-		port: number | {
+		password: string | {
 			$env: string;
 		};
 		database: string | {
@@ -2469,6 +2549,7 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 		protocol: "http" | "https";
 		permission: "admin" | "query-only" | "read-write" | "data-admin";
 		timeout?: number | undefined;
+		statementTimeout?: number | undefined;
 		nodes?: string[] | undefined;
 		cloudId?: string | {
 			$env: string;
@@ -2491,9 +2572,6 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 	version: 2;
 	default: string;
 	connections: Record<string, {
-		user: string | {
-			$env: string;
-		};
 		system: "postgresql" | "mysql" | "mariadb";
 		host: string | {
 			$env: string;
@@ -2501,34 +2579,40 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 		port: number | {
 			$env: string;
 		};
+		user: string | {
+			$env: string;
+		};
 		database: string | {
 			$env: string;
 		};
-		timeout?: number | undefined;
 		password?: string | {
 			$env: string;
 		} | undefined;
+		timeout?: number | undefined;
+		statementTimeout?: number | undefined;
 		permission?: "admin" | "query-only" | "read-write" | "data-admin" | undefined;
 		envFile?: string | undefined;
 		environment?: string | undefined;
 	} | {
 		system: "mongodb";
-		timeout?: number | undefined;
-		password?: string | {
+		host?: string | {
 			$env: string;
 		} | undefined;
-		user?: string | {
+		port?: number | {
 			$env: string;
 		} | undefined;
-		host?: string | {
+		user?: string | {
 			$env: string;
 		} | undefined;
-		port?: number | {
+		password?: string | {
 			$env: string;
 		} | undefined;
 		database?: string | {
 			$env: string;
 		} | undefined;
+		uri?: string | {
+			$env: string;
+		} | undefined;
 		authSource?: string | {
 			$env: string;
 		} | undefined;
@@ -2537,9 +2621,8 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 		} | undefined;
 		tls?: boolean | undefined;
 		srv?: boolean | undefined;
-		uri?: string | {
-			$env: string;
-		} | undefined;
+		timeout?: number | undefined;
+		statementTimeout?: number | undefined;
 		permission?: "admin" | "query-only" | "read-write" | "data-admin" | undefined;
 		envFile?: string | undefined;
 		environment?: string | undefined;
@@ -2551,38 +2634,40 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 		port: number | {
 			$env: string;
 		};
-		timeout?: number | undefined;
-		password?: string | {
+		user?: string | {
 			$env: string;
 		} | undefined;
-		user?: string | {
+		password?: string | {
 			$env: string;
 		} | undefined;
 		database?: string | {
 			$env: string;
 		} | undefined;
+		timeout?: number | undefined;
+		statementTimeout?: number | undefined;
 		permission?: "admin" | "query-only" | "read-write" | "data-admin" | undefined;
 		envFile?: string | undefined;
 		environment?: string | undefined;
 	} | {
 		system: "elasticsearch";
-		timeout?: number | undefined;
-		password?: string | {
+		host?: string | {
 			$env: string;
 		} | undefined;
-		user?: string | {
+		port?: number | {
 			$env: string;
 		} | undefined;
-		host?: string | {
+		user?: string | {
 			$env: string;
 		} | undefined;
-		port?: number | {
+		password?: string | {
 			$env: string;
 		} | undefined;
 		database?: string | {
 			$env: string;
 		} | undefined;
 		rejectUnauthorized?: boolean | undefined;
+		timeout?: number | undefined;
+		statementTimeout?: number | undefined;
 		protocol?: "http" | "https" | undefined;
 		nodes?: string[] | undefined;
 		cloudId?: string | {
@@ -2643,17 +2728,17 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 		schemaTableCount?: number | undefined;
 	};
 	connections: Record<string, {
-		password: string | {
+		system: "postgresql" | "mysql" | "mariadb";
+		host: string | {
 			$env: string;
 		};
-		user: string | {
+		port: number | {
 			$env: string;
 		};
-		system: "postgresql" | "mysql" | "mariadb";
-		host: string | {
+		user: string | {
 			$env: string;
 		};
-		port: number | {
+		password: string | {
 			$env: string;
 		};
 		database: string | {
@@ -2661,20 +2746,21 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 		};
 		permission: "admin" | "query-only" | "read-write" | "data-admin";
 		timeout?: number | undefined;
+		statementTimeout?: number | undefined;
 		envFile?: string | undefined;
 		environment?: string | undefined;
 	} | {
-		password: string | {
+		system: "mongodb";
+		host: string | {
 			$env: string;
 		};
-		user: string | {
+		port: number | {
 			$env: string;
 		};
-		system: "mongodb";
-		host: string | {
+		user: string | {
 			$env: string;
 		};
-		port: number | {
+		password: string | {
 			$env: string;
 		};
 		database: string | {
@@ -2682,7 +2768,9 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 		};
 		srv: boolean;
 		permission: "admin" | "query-only" | "read-write" | "data-admin";
-		timeout?: number | undefined;
+		uri?: string | {
+			$env: string;
+		} | undefined;
 		authSource?: string | {
 			$env: string;
 		} | undefined;
@@ -2690,23 +2778,22 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 			$env: string;
 		} | undefined;
 		tls?: boolean | undefined;
-		uri?: string | {
-			$env: string;
-		} | undefined;
+		timeout?: number | undefined;
+		statementTimeout?: number | undefined;
 		envFile?: string | undefined;
 		environment?: string | undefined;
 	} | {
-		password: string | {
+		system: "redis";
+		host: string | {
 			$env: string;
 		};
-		user: string | {
+		port: number | {
 			$env: string;
 		};
-		system: "redis";
-		host: string | {
+		user: string | {
 			$env: string;
 		};
-		port: number | {
+		password: string | {
 			$env: string;
 		};
 		database: string | {
@@ -2714,20 +2801,21 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 		};
 		permission: "admin" | "query-only" | "read-write" | "data-admin";
 		timeout?: number | undefined;
+		statementTimeout?: number | undefined;
 		envFile?: string | undefined;
 		environment?: string | undefined;
 	} | {
-		password: string | {
+		system: "elasticsearch";
+		host: string | {
 			$env: string;
 		};
-		user: string | {
+		port: number | {
 			$env: string;
 		};
-		system: "elasticsearch";
-		host: string | {
+		user: string | {
 			$env: string;
 		};
-		port: number | {
+		password: string | {
 			$env: string;
 		};
 		database: string | {
@@ -2737,6 +2825,7 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 		protocol: "http" | "https";
 		permission: "admin" | "query-only" | "read-write" | "data-admin";
 		timeout?: number | undefined;
+		statementTimeout?: number | undefined;
 		nodes?: string[] | undefined;
 		cloudId?: string | {
 			$env: string;
@@ -2759,9 +2848,6 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 	version: 2;
 	default: string;
 	connections: Record<string, {
-		user: string | {
-			$env: string;
-		};
 		system: "postgresql" | "mysql" | "mariadb";
 		host: string | {
 			$env: string;
@@ -2769,34 +2855,40 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 		port: number | {
 			$env: string;
 		};
+		user: string | {
+			$env: string;
+		};
 		database: string | {
 			$env: string;
 		};
-		timeout?: number | undefined;
 		password?: string | {
 			$env: string;
 		} | undefined;
+		timeout?: number | undefined;
+		statementTimeout?: number | undefined;
 		permission?: "admin" | "query-only" | "read-write" | "data-admin" | undefined;
 		envFile?: string | undefined;
 		environment?: string | undefined;
 	} | {
 		system: "mongodb";
-		timeout?: number | undefined;
-		password?: string | {
+		host?: string | {
 			$env: string;
 		} | undefined;
-		user?: string | {
+		port?: number | {
 			$env: string;
 		} | undefined;
-		host?: string | {
+		user?: string | {
 			$env: string;
 		} | undefined;
-		port?: number | {
+		password?: string | {
 			$env: string;
 		} | undefined;
 		database?: string | {
 			$env: string;
 		} | undefined;
+		uri?: string | {
+			$env: string;
+		} | undefined;
 		authSource?: string | {
 			$env: string;
 		} | undefined;
@@ -2805,9 +2897,8 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 		} | undefined;
 		tls?: boolean | undefined;
 		srv?: boolean | undefined;
-		uri?: string | {
-			$env: string;
-		} | undefined;
+		timeout?: number | undefined;
+		statementTimeout?: number | undefined;
 		permission?: "admin" | "query-only" | "read-write" | "data-admin" | undefined;
 		envFile?: string | undefined;
 		environment?: string | undefined;
@@ -2819,38 +2910,40 @@ declare const DbcliConfigV2Schema: z.ZodEffects<z.ZodObject<{
 		port: number | {
 			$env: string;
 		};
-		timeout?: number | undefined;
-		password?: string | {
+		user?: string | {
 			$env: string;
 		} | undefined;
-		user?: string | {
+		password?: string | {
 			$env: string;
 		} | undefined;
 		database?: string | {
 			$env: string;
 		} | undefined;
+		timeout?: number | undefined;
+		statementTimeout?: number | undefined;
 		permission?: "admin" | "query-only" | "read-write" | "data-admin" | undefined;
 		envFile?: string | undefined;
 		environment?: string | undefined;
 	} | {
 		system: "elasticsearch";
-		timeout?: number | undefined;
-		password?: string | {
+		host?: string | {
 			$env: string;
 		} | undefined;
-		user?: string | {
+		port?: number | {
 			$env: string;
 		} | undefined;
-		host?: string | {
+		user?: string | {
 			$env: string;
 		} | undefined;
-		port?: number | {
+		password?: string | {
 			$env: string;
 		} | undefined;
 		database?: string | {
 			$env: string;
 		} | undefined;
 		rejectUnauthorized?: boolean | undefined;
+		timeout?: number | undefined;
+		statementTimeout?: number | undefined;
 		protocol?: "http" | "https" | undefined;
 		nodes?: string[] | undefined;
 		cloudId?: string | {