diff --git a/package-lock.json b/package-lock.json index 6216672..95f4bf2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,15 @@ { "name": "@outerbase/sdk", - "version": "2.0.0-rc.5", + "version": "2.0.0-rc.8", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@outerbase/sdk", - "version": "2.0.0-rc.5", + "version": "2.0.0-rc.8", "license": "MIT", "dependencies": { - "@outerbase/sdk-transform": "^1.0.3", + "@outerbase/sdk-transform": "^1.0.7", "handlebars": "^4.7.8" }, "bin": { @@ -2981,9 +2981,9 @@ } }, "node_modules/@outerbase/sdk-transform": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@outerbase/sdk-transform/-/sdk-transform-1.0.3.tgz", - "integrity": "sha512-YsiB9YdiDeJmhuVvXFHjIsOoZBCAEHPf+KRCWGGIPm9XOdFXARdA3CJnDDxBUJUUS6oeH0K41juq/pB8bUwSaA==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@outerbase/sdk-transform/-/sdk-transform-1.0.7.tgz", + "integrity": "sha512-NyXu64pKkl6AcpZwtjg3ooezo9TrJ0hrZCJWoKq/3kF2Yxk/4ohbr9tnoKFNHBkJ5GRtuRijN7szP1Wpx9xxlQ==", "license": "MIT" }, "node_modules/@pkgjs/parseargs": { diff --git a/package.json b/package.json index cc1d582..a484f08 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@outerbase/sdk", - "version": "2.0.0-rc.5", + "version": "2.0.0-rc.8", "description": "", "main": "dist/index.js", "module": "dist/index.js", @@ -34,7 +34,7 @@ "author": "Outerbase", "license": "MIT", "dependencies": { - "@outerbase/sdk-transform": "^1.0.3", + "@outerbase/sdk-transform": "^1.0.7", "handlebars": "^4.7.8" }, "devDependencies": { diff --git a/src/connections/mongodb.ts b/src/connections/mongodb.ts index 917aa3a..462369d 100644 --- a/src/connections/mongodb.ts +++ b/src/connections/mongodb.ts @@ -101,7 +101,10 @@ export class MongoDBConnection implements Connection { await this.connect(); await this.disconnect(); return {}; - } catch { + } catch (e) { + if (e instanceof Error) { + return { error: e.message }; + } return { error: 'Failed to connect to MongoDB' }; } } diff --git a/src/connections/mysql.ts b/src/connections/mysql.ts index f7c47c0..94f85c9 100644 --- a/src/connections/mysql.ts +++ b/src/connections/mysql.ts @@ -1,5 +1,6 @@ import { FieldPacket, + OkPacketParams, QueryError, type Connection, type QueryResult as MySQLQueryResult, @@ -225,7 +226,7 @@ export class MySQLConnection extends SqlConnection { ): Promise> { try { const { fields, rows, error } = await new Promise<{ - rows: MySQLQueryResult; + rows: MySQLQueryResult | OkPacketParams; error: QueryError | null; fields: FieldPacket[]; }>((r) => @@ -236,14 +237,11 @@ export class MySQLConnection extends SqlConnection { }, query.parameters, (error, result, fields) => { - if (Array.isArray(result)) { - r({ - rows: (result as MySQLQueryResult) ?? [], - fields: fields, - error, - }); - } - return r({ rows: [], error, fields: [] }); + return r({ + rows: result, + error, + fields, + }); } ) );