Skip to content

Fix warning when using mysql or sqlite with knex >= 0.16.4 #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix warning when using mysql or sqlite with knex >= 0.16.4 #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae1622c
only supply the id attribute to knex.insert for drivers that support it
Jan 15, 2020
cc5440f
allow supplying a database password for tests and migrations
Jan 15, 2020
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: 4 additions & 0 deletions mocha.start.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ if (DB_CLIENT === 'sqlite3') {
user: process.env.DB_USER || 'root',
database: process.env.DB_NAME || 'test'
}

if (process.env.DB_PASS) {
connection.password = process.env.DB_PASS
}
}

JSDataAdapterTests.init({
Expand Down
9 changes: 8 additions & 1 deletion src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,13 @@ function loadWithRelations (items, resourceConfig, options) {
Adapter.extend({
constructor: SqlAdapter,

_returning (idAttribute) {
// Some knex client drivers do not support .returning(), so set the
// attribute to null to prevent knex from emitting warnings.

return ['mysql', 'sqlite3'].includes(this.knexOpts.client) ? null : idAttribute
},

_count (mapper, query, opts) {
opts || (opts = {})
query || (query = {})
Expand All @@ -438,7 +445,7 @@ Adapter.extend({

const sqlBuilder = utils.isUndefined(opts.transaction) ? this.knex : opts.transaction
return sqlBuilder(getTable(mapper))
.insert(props, idAttribute)
.insert(props, this._returning(idAttribute))
.then((ids) => {
const id = utils.isUndefined(props[idAttribute]) ? (ids.length ? ids[0] : undefined) : props[idAttribute]
if (utils.isUndefined(id)) {
Expand Down
8 changes: 6 additions & 2 deletions test/knexfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,12 @@ if (DB_CLIENT === 'sqlite3') {
} else {
connection = {
host: process.env.DB_HOST || '127.0.0.1',
user: process.env.DB_USER,
database: process.env.DB_NAME
user: process.env.DB_USER || 'root',
database: process.env.DB_NAME || 'test'
}

if (process.env.DB_PASS) {
connection.password = process.env.DB_PASS
}
}

Expand Down