Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@athenna/database",
"version": "5.50.0",
"version": "5.51.0",
"description": "The Athenna database handler for SQL/NoSQL.",
"license": "MIT",
"author": "João Lenon <lenon@athenna.io>",
Expand Down
19 changes: 18 additions & 1 deletion src/database/drivers/BaseKnexDriver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -520,9 +520,26 @@ export class BaseKnexDriver extends Driver<Knex, Knex.QueryBuilder> {

/**
* Verify if a value should be serialized before persisting.
*
* Knex `Raw` instances must NEVER be stringified: they hold an internal
* reference to the database client (and its connection pool, which contains
* Node.js `Timeout` objects with circular references), so calling
* `JSON.stringify` on them throws `TypeError: Converting circular structure
* to JSON`. Knex marks every `Raw` instance with `isRawInstance = true` and
* relies on it internally during query compilation, so we trust the same
* marker here. The same precaution applies to Knex `QueryBuilder` instances
* (subqueries) which expose `isQueryBuilder = true`.
*/
private shouldStringifyJsonValue(value: any) {
return !!value && (Is.Array(value) || Is.Object(value))
if (!value) {
return false
}

if (value.isRawInstance || value.isQueryBuilder) {
return false
}

return Is.Array(value) || Is.Object(value)
}

/**
Expand Down
27 changes: 27 additions & 0 deletions tests/unit/drivers/MySqlDriverTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -898,6 +898,33 @@ export default class MySqlDriverTest {
])
}

@Test()
public async shouldBeAbleToUpdateDataUsingARawValueWithoutThrowingCircularStructureError({ assert }: Context) {
await this.driver.table('users').create({ id: '1', name: 'Robert Kiyosaki' })

await assert.doesNotReject(() =>
this.driver
.table('users')
.where('id', '1')
.update({ name: this.driver.raw("'Warren Buffet'") } as any)
)

const result = await this.driver.table('users').where('id', '1').find()

assert.containSubset(result, { id: '1', name: 'Warren Buffet' })
}

@Test()
public async shouldBeAbleToCreateDataUsingARawValueWithoutThrowingCircularStructureError({ assert }: Context) {
await assert.doesNotReject(() =>
this.driver.table('users').create({ id: '1', name: this.driver.raw("'Robert Kiyosaki'") } as any)
)

const result = await this.driver.table('users').where('id', '1').find()

assert.containSubset(result, { id: '1', name: 'Robert Kiyosaki' })
}

@Test()
public async shouldBeAbleToDeleteDataUsingDeleteMethod({ assert }: Context) {
const data = { id: '1', name: 'Robert Kiyosaki' }
Expand Down
27 changes: 27 additions & 0 deletions tests/unit/drivers/PostgresDriverTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -897,6 +897,33 @@ export default class PostgresDriverTest {
])
}

@Test()
public async shouldBeAbleToUpdateDataUsingARawValueWithoutThrowingCircularStructureError({ assert }: Context) {
await this.driver.table('users').create({ id: '1', name: 'Robert Kiyosaki' })

await assert.doesNotReject(() =>
this.driver
.table('users')
.where('id', '1')
.update({ name: this.driver.raw("'Warren Buffet'") } as any)
)

const result = await this.driver.table('users').where('id', '1').find()

assert.containSubset(result, { id: '1', name: 'Warren Buffet' })
}

@Test()
public async shouldBeAbleToCreateDataUsingARawValueWithoutThrowingCircularStructureError({ assert }: Context) {
await assert.doesNotReject(() =>
this.driver.table('users').create({ id: '1', name: this.driver.raw("'Robert Kiyosaki'") } as any)
)

const result = await this.driver.table('users').where('id', '1').find()

assert.containSubset(result, { id: '1', name: 'Robert Kiyosaki' })
}

@Test()
public async shouldBeAbleToDeleteDataUsingDeleteMethod({ assert }: Context) {
const data = { id: '1', name: 'Robert Kiyosaki' }
Expand Down
43 changes: 43 additions & 0 deletions tests/unit/drivers/SqliteDriverTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -899,6 +899,49 @@ export default class SqliteDriverTest {
])
}

@Test()
public async shouldBeAbleToUpdateDataUsingARawValueWithoutThrowingCircularStructureError({ assert }: Context) {
await this.driver.table('users').create({ id: '1', name: 'Robert Kiyosaki' })

await assert.doesNotReject(() =>
this.driver
.table('users')
.where('id', '1')
.update({ name: this.driver.raw("'Warren Buffet'") } as any)
)

const result = await this.driver.table('users').where('id', '1').find()

assert.containSubset(result, { id: '1', name: 'Warren Buffet' })
}

@Test()
public async shouldBeAbleToCreateDataUsingARawValueWithoutThrowingCircularStructureError({ assert }: Context) {
await assert.doesNotReject(() =>
this.driver.table('users').create({ id: '1', name: this.driver.raw("'Robert Kiyosaki'") } as any)
)

const result = await this.driver.table('users').where('id', '1').find()

assert.containSubset(result, { id: '1', name: 'Robert Kiyosaki' })
}

@Test()
public async shouldBeAbleToCreateOrUpdateUsingARawValueWithoutThrowingCircularStructureError({ assert }: Context) {
await this.driver.table('users').create({ id: '1', name: 'Robert Kiyosaki' })

await assert.doesNotReject(() =>
this.driver
.table('users')
.where('id', '1')
.createOrUpdate({ id: '1', name: this.driver.raw("'Warren Buffet'") } as any)
)

const result = await this.driver.table('users').where('id', '1').find()

assert.containSubset(result, { id: '1', name: 'Warren Buffet' })
}

@Test()
public async shouldBeAbleToDeleteDataUsingDeleteMethod({ assert }: Context) {
const data = { id: '1', name: 'Robert Kiyosaki' }
Expand Down
Loading