Fix: Make SQL connection string parsing more sensible

docs/api/sql.md

@@ -604,13 +604,12 @@ const db = new SQL({
   connectionTimeout: 30, // Timeout when establishing new connections
 
   // SSL/TLS options
-  ssl: "prefer", // or "disable", "require", "verify-ca", "verify-full"
-  // tls: {
-  //   rejectUnauthorized: true,
-  //   ca: "path/to/ca.pem",
-  //   key: "path/to/key.pem",
-  //   cert: "path/to/cert.pem",
-  // },
+  tls: {
+    rejectUnauthorized: true,
+    ca: "path/to/ca.pem",
+    key: "path/to/key.pem",
+    cert: "path/to/cert.pem",
+  },
 
   // Callbacks
   onconnect: client => {

packages/bun-types/sql.d.ts

@@ -41,22 +41,22 @@ declare module "bun" {
 
     class PostgresError extends SQLError {
       public readonly code: string;
-      public readonly errno: string | undefined;
-      public readonly detail: string | undefined;
-      public readonly hint: string | undefined;
-      public readonly severity: string | undefined;
-      public readonly position: string | undefined;
-      public readonly internalPosition: string | undefined;
-      public readonly internalQuery: string | undefined;
-      public readonly where: string | undefined;
-      public readonly schema: string | undefined;
-      public readonly table: string | undefined;
-      public readonly column: string | undefined;
-      public readonly dataType: string | undefined;
-      public readonly constraint: string | undefined;
-      public readonly file: string | undefined;
-      public readonly line: string | undefined;
-      public readonly routine: string | undefined;
+      public readonly errno?: string | undefined;
+      public readonly detail?: string | undefined;
+      public readonly hint?: string | undefined;
+      public readonly severity?: string | undefined;
+      public readonly position?: string | undefined;
+      public readonly internalPosition?: string | undefined;
+      public readonly internalQuery?: string | undefined;
+      public readonly where?: string | undefined;
+      public readonly schema?: string | undefined;
+      public readonly table?: string | undefined;
+      public readonly column?: string | undefined;
+      public readonly dataType?: string | undefined;
+      public readonly constraint?: string | undefined;
+      public readonly file?: string | undefined;
+      public readonly line?: string | undefined;
+      public readonly routine?: string | undefined;
 
       constructor(
         message: string,
@@ -84,8 +84,8 @@ declare module "bun" {
 
     class MySQLError extends SQLError {
       public readonly code: string;
-      public readonly errno: number | undefined;
-      public readonly sqlState: string | undefined;
+      public readonly errno?: number | undefined;
+      public readonly sqlState?: string | undefined;
       constructor(message: string, options: { code: string; errno: number | undefined; sqlState: string | undefined });
     }
 
@@ -143,13 +143,13 @@ declare module "bun" {
 
       /**
        * Database server hostname
+       * @deprecated Prefer {@link hostname}
        * @default "localhost"
        */
       host?: string | undefined;
 
       /**
-       * Database server hostname (alias for host)
-       * @deprecated Prefer {@link host}
+       * Database server hostname
        * @default "localhost"
        */
       hostname?: string | undefined;
@@ -264,13 +264,14 @@ declare module "bun" {
        * Whether to use TLS/SSL for the connection
        * @default false
        */
-      tls?: TLSOptions | boolean | undefined;
+      tls?: Bun.BunFile | TLSOptions | boolean | undefined;
 
       /**
        * Whether to use TLS/SSL for the connection (alias for tls)
+       * @deprecated Prefer {@link tls}
        * @default false
        */
-      ssl?: TLSOptions | boolean | undefined;
+      ssl?: Bun.BunFile | TLSOptions | boolean | undefined;
 
       /**
        * Unix domain socket path for connection

src/bun.js/api/bun/socket/Listener.zig

@@ -437,6 +437,7 @@ pub fn stop(this: *Listener, _: *jsc.JSGlobalObject, callframe: *jsc.CallFrame)
 fn doStop(this: *Listener, force_close: bool) void {
     if (this.listener == .none) return;
     const listener = this.listener;
+
     defer switch (listener) {
         .uws => |socket| socket.close(this.ssl),
         .namedPipe => |namedPipe| if (Environment.isWindows) namedPipe.closePipeAndDeinit(),

src/js/bun/sql.ts

@@ -32,6 +32,7 @@ function adapterFromOptions(options: Bun.SQL.__internal.DefinedOptions) {
     case "postgres":
       return new PostgresAdapter(options);
     case "mysql":
+    case "mariadb":
       return new MySQLAdapter(options);
     case "sqlite":
       return new SQLiteAdapter(options);

src/js/internal/sql/errors.ts

@@ -7,7 +7,26 @@ class SQLError extends Error implements Bun.SQL.SQLError {
 
 export interface PostgresErrorOptions {
   code: string;
+  detail?: string | undefined;
+  hint?: string | undefined;
+  severity?: string | undefined;
+  errno?: string | undefined;
+  position?: string | undefined;
+  internalPosition?: string | undefined;
+  internalQuery?: string | undefined;
+  where?: string | undefined;
+  schema?: string | undefined;
+  table?: string | undefined;
+  column?: string | undefined;
+  dataType?: string | undefined;
+  constraint?: string | undefined;
+  file?: string | undefined;
+  line?: string | undefined;
+  routine?: string | undefined;
+}
 
+// oxlint-disable-next-line typescript-eslint(no-unsafe-declaration-merging)
+interface PostgresError {
   detail?: string | undefined;
   hint?: string | undefined;
   severity?: string | undefined;
@@ -28,33 +47,17 @@ export interface PostgresErrorOptions {
 
 class PostgresError extends SQLError implements Bun.SQL.PostgresError {
   public readonly code: string;
-  public readonly detail: string | undefined;
-  public readonly hint: string | undefined;
-  public readonly severity: string | undefined;
-  public readonly errno: string | undefined;
-  public readonly position: string | undefined;
-  public readonly internalPosition: string | undefined;
-  public readonly internalQuery: string | undefined;
-  public readonly where: string | undefined;
-  public readonly schema: string | undefined;
-  public readonly table: string | undefined;
-  public readonly column: string | undefined;
-  public readonly dataType: string | undefined;
-  public readonly constraint: string | undefined;
-  public readonly file: string | undefined;
-  public readonly line: string | undefined;
-  public readonly routine: string | undefined;
 
   constructor(message: string, options: PostgresErrorOptions) {
     super(message);
 
     this.name = "PostgresError";
     this.code = options.code;
 
+    if (options.errno !== undefined) this.errno = options.errno;
     if (options.detail !== undefined) this.detail = options.detail;
     if (options.hint !== undefined) this.hint = options.hint;
     if (options.severity !== undefined) this.severity = options.severity;
-    if (options.errno !== undefined) this.errno = options.errno;
     if (options.position !== undefined) this.position = options.position;
     if (options.internalPosition !== undefined) this.internalPosition = options.internalPosition;
     if (options.internalQuery !== undefined) this.internalQuery = options.internalQuery;
@@ -76,15 +79,20 @@ export interface SQLiteErrorOptions {
   byteOffset?: number | undefined;
 }
 
+// oxlint-disable-next-line typescript-eslint(no-unsafe-declaration-merging)
+interface SQLiteError {
+  byteOffset?: number | undefined;
+}
+
 class SQLiteError extends SQLError implements Bun.SQL.SQLiteError {
   public readonly code: string;
   public readonly errno: number;
-  public readonly byteOffset: number | undefined;
 
   constructor(message: string, options: SQLiteErrorOptions) {
     super(message);
 
     this.name = "SQLiteError";
+
     this.code = options.code;
     this.errno = options.errno;
 
@@ -94,22 +102,28 @@ class SQLiteError extends SQLError implements Bun.SQL.SQLiteError {
 
 export interface MySQLErrorOptions {
   code: string;
-  errno: number | undefined;
-  sqlState: string | undefined;
+  errno?: number | undefined;
+  sqlState?: string | undefined;
+}
+
+// oxlint-disable-next-line typescript-eslint(no-unsafe-declaration-merging)
+interface MySQLError {
+  errno?: number | undefined;
+  sqlState?: string | undefined;
 }
 
 class MySQLError extends SQLError implements Bun.SQL.MySQLError {
   public readonly code: string;
-  public readonly errno: number | undefined;
-  public readonly sqlState: string | undefined;
 
   constructor(message: string, options: MySQLErrorOptions) {
     super(message);
 
     this.name = "MySQLError";
     this.code = options.code;
-    this.errno = options.errno;
-    this.sqlState = options.sqlState;
+
+    if (options.errno !== undefined) this.errno = options.errno;
+    if (options.sqlState !== undefined) this.sqlState = options.sqlState;
   }
 }
+
 export default { PostgresError, SQLError, SQLiteError, MySQLError };

src/js/internal/sql/mysql.ts

@@ -109,7 +109,7 @@ export interface MySQLDotZig {
     password: string,
     databae: string,
     sslmode: SSLMode,
-    tls: Bun.TLSOptions | boolean | null, // boolean true => empty TLSOptions object `{}`, boolean false or null => nothing
+    tls: Bun.TLSOptions | boolean | null | Bun.BunFile, // boolean true => empty TLSOptions object `{}`, boolean false or null => nothing
     query: string,
     path: string,
     onConnected: (err: Error | null, connection: $ZigGeneratedClasses.MySQLConnection) => void,
@@ -126,7 +126,7 @@ export interface MySQLDotZig {
     columns: string[] | undefined,
     bigint: boolean,
     simple: boolean,
-  ) => $ZigGeneratedClasses.MySQLSQLQuery;
+  ) => $ZigGeneratedClasses.MySQLQuery;
 }
 
 const enum SQLCommand {
@@ -276,10 +276,10 @@ function onQueryFinish(this: PooledMySQLConnection, onClose: (err: Error) => voi
 
 class PooledMySQLConnection {
   private static async createConnection(
-    options: Bun.SQL.__internal.DefinedMySQLOptions,
-    onConnected: (err: Error | null, connection: $ZigGeneratedClasses.MySQLSQLConnection) => void,
+    options: Bun.SQL.__internal.DefinedPostgresOrMySQLOptions,
+    onConnected: (err: Error | null, connection: $ZigGeneratedClasses.MySQLConnection) => void,
     onClose: (err: Error | null) => void,
-  ): Promise<$ZigGeneratedClasses.MySQLSQLConnection | null> {
+  ): Promise<$ZigGeneratedClasses.MySQLConnection | null> {
     const {
       hostname,
       port,
@@ -292,8 +292,6 @@ class PooledMySQLConnection {
       connectionTimeout = 30 * 1000,
       maxLifetime = 0,
       prepare = true,
-
-      // @ts-expect-error path is currently removed from the types
       path,
     } = options;
 
@@ -302,10 +300,10 @@ class PooledMySQLConnection {
     try {
       if (typeof password === "function") {
         password = password();
+      }
 
-        if (password && $isPromise(password)) {
-          password = await password;
-        }
+      if (password && $isPromise(password)) {
+        password = await password;
       }
 
       return createMySQLConnection(
@@ -336,12 +334,12 @@ class PooledMySQLConnection {
   }
 
   adapter: MySQLAdapter;
-  connection: $ZigGeneratedClasses.MySQLSQLConnection | null = null;
+  connection: $ZigGeneratedClasses.MySQLConnection | null = null;
   state: PooledConnectionState = PooledConnectionState.pending;
   storedError: Error | null = null;
   queries: Set<(err: Error) => void> = new Set();
   onFinish: ((err: Error | null) => void) | null = null;
-  connectionInfo: Bun.SQL.__internal.DefinedMySQLOptions;
+  connectionInfo: Bun.SQL.__internal.DefinedPostgresOrMySQLOptions;
   flags: number = 0;
   /// queryCount is used to indicate the number of queries using the connection, if a connection is reserved or if its a transaction queryCount will be 1 independently of the number of queries
   queryCount: number = 0;
@@ -488,7 +486,7 @@ export class MySQLAdapter
   implements
     DatabaseAdapter<PooledMySQLConnection, $ZigGeneratedClasses.MySQLConnection, $ZigGeneratedClasses.MySQLQuery>
 {
-  public readonly connectionInfo: Bun.SQL.__internal.DefinedMySQLOptions;
+  public readonly connectionInfo: Bun.SQL.__internal.DefinedPostgresOrMySQLOptions;
 
   public readonly connections: PooledMySQLConnection[];
   public readonly readyConnections: Set<PooledMySQLConnection>;
@@ -501,7 +499,7 @@ export class MySQLAdapter
   public totalQueries: number = 0;
   public onAllQueriesFinished: (() => void) | null = null;
 
-  constructor(connectionInfo: Bun.SQL.__internal.DefinedMySQLOptions) {
+  constructor(connectionInfo: Bun.SQL.__internal.DefinedPostgresOrMySQLOptions) {
     this.connectionInfo = connectionInfo;
     this.connections = new Array(connectionInfo.max);
     this.readyConnections = new Set();
@@ -845,7 +843,7 @@ export class MySQLAdapter
         return;
       }
 
-      const { promise, resolve } = Promise.withResolvers();
+      const { promise, resolve } = Promise.withResolvers<void>();
       const timer = setTimeout(() => {
         // timeout is reached, lets close and probably fail some queries
         this.#close().finally(resolve);
@@ -868,7 +866,7 @@ export class MySQLAdapter
       }
 
       // gracefully close the pool
-      const { promise, resolve } = Promise.withResolvers();
+      const { promise, resolve } = Promise.withResolvers<void>();
 
       this.onAllQueriesFinished = () => {
         // everything is closed, lets close the pool
@@ -1179,7 +1177,7 @@ export class MySQLAdapter
 
 export default {
   MySQLAdapter,
-  SQLCommand,
   commandToString,
   detectCommand,
+  SQLCommand,
 };