refactor: propagate structured error fields

Author: kentkwu

c/driver/sqlite/CMakeLists.txt

@@ -32,7 +32,7 @@ if(EXISTS "${SQLite3_INCLUDE_DIRS}/sqlite3.h")
               ADBC_SQLITE_WITH_LOAD_EXTENSION)
 endif()
 
-if(NOT ADBC_SQLITE_WITH_LOAD_EXTENSION)
+if(ADBC_SQLITE_WITH_LOAD_EXTENSION EQUAL -1)
   set(ADBC_SQLITE_COMPILE_DEFINES "-DADBC_SQLITE_WITH_NO_LOAD_EXTENSION")
 endif()
 

ci/scripts/node_build.sh

@@ -31,14 +31,6 @@ OUT_DIR="$1"
 echo "=== Building C++ Drivers ==="
 mkdir -p "${OUT_DIR}"
 
-# On macOS, the system sqlite3.h omits sqlite3_load_extension. The cmake
-# auto-detection has a bug (string(FIND) returns -1 which is truthy in
-# cmake's if(), so the NO_LOAD_EXTENSION guard is never set). Pass it
-# explicitly on macOS to avoid a compilation error.
-if [[ "$(uname)" == "Darwin" ]]; then
-  ADBC_CMAKE_ARGS="${ADBC_CMAKE_ARGS} -DADBC_SQLITE_COMPILE_DEFINES=-DADBC_SQLITE_WITH_NO_LOAD_EXTENSION"
-fi
-
 cmake -S "${REPO_ROOT}/c" -B "${OUT_DIR}" \
   ${ADBC_CMAKE_ARGS} \
   -DCMAKE_INSTALL_PREFIX="${OUT_DIR}" \

javascript/__test__/error_handling.spec.ts

@@ -41,10 +41,9 @@ after(async () => {
 })
 
 test('error: invalid sql syntax', async () => {
-  await stmt.setSqlQuery('SELECT * FROM') // Syntax error
-
   let error: unknown
   try {
+    await stmt.setSqlQuery('SELECT * FROM') // Syntax error
     const reader = await stmt.executeQuery()
     for await (const _ of reader) {
     }
@@ -54,14 +53,17 @@ test('error: invalid sql syntax', async () => {
 
   assert.ok(error instanceof AdbcError)
   assert.match(error.message, /syntax error|incomplete input/i)
-  assert.ok(error.sqlState)
+  assert.strictEqual(error.code, 'InvalidArguments')
+  // SQLite does not expose a numeric vendor code; the ADBC sentinel (INT32_MIN) is filtered to undefined
+  assert.strictEqual(error.vendorCode, undefined)
+  // SQLite does not set a SQLSTATE for this error
+  assert.strictEqual(error.sqlState, undefined)
 })
 
 test('error: table not found', async () => {
-  await stmt.setSqlQuery('SELECT * FROM non_existent_table')
-
   let error: unknown
   try {
+    await stmt.setSqlQuery('SELECT * FROM non_existent_table')
     const reader = await stmt.executeQuery()
     for await (const _ of reader) {
     }
@@ -71,6 +73,9 @@ test('error: table not found', async () => {
 
   assert.ok(error instanceof AdbcError)
   assert.match(error.message, /no such table/i)
+  assert.strictEqual(error.code, 'InvalidArguments')
+  assert.strictEqual(error.vendorCode, undefined)
+  assert.strictEqual(error.sqlState, undefined)
 })
 
 test('error: constraint violation', async () => {
@@ -91,6 +96,8 @@ test('error: constraint violation', async () => {
 
   assert.ok(error instanceof AdbcError)
   assert.match(error.code, /AlreadyExists|Integrity|IO/)
+  assert.strictEqual(error.vendorCode, undefined)
+  assert.strictEqual(error.sqlState, undefined)
 })
 
 test('error: unsupported option', () => {
@@ -104,4 +111,6 @@ test('error: unsupported option', () => {
 
   assert.ok(error instanceof AdbcError)
   assert.strictEqual(error.code, 'NotImplemented')
+  assert.strictEqual(error.vendorCode, undefined)
+  assert.strictEqual(error.sqlState, undefined)
 })

javascript/lib/error.ts

@@ -32,22 +32,14 @@ export class AdbcError extends Error {
   }
 
   /**
-   * Parses a raw error message from the native binding into a structured AdbcError.
-   * Expected format: "[STATUS] Message (Vendor Code: X, SQL State: Y)"
+   * Promotes a raw error thrown by the native binding into a structured AdbcError.
    *
-   * If the error does not match this specific format (e.g. it is a standard JS TypeError),
-   * the original error is returned unmodified.
+   * Non-ADBC errors (e.g. a standard JS TypeError) are returned unmodified.
    */
   static fromError(err: any): any {
-    if (err instanceof Error) {
-      // Regex to match: [Status] Message (Vendor Code: 123, SQL State: XYZ)
-      // Note: Message might contain parentheses, so we match strictly on the suffix.
-      const match = err.message.trim().match(/^\[(.*?)\] (.*) \(Vendor Code: (-?\d+), SQL State: (.*)\)$/s)
-
-      if (match) {
-        const [, status, msg, vendor, sqlState] = match
-        return new AdbcError(msg, status, Number(vendor), sqlState)
-      }
+    if (err instanceof Error && err.name === 'AdbcError') {
+      const e = err as any
+      return new AdbcError(e.message, e.code ?? 'UNKNOWN', e.vendorCode, e.sqlState)
     }
     return err
   }