TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-24 14:43:08 +03:00
Code Issues Projects Releases Wiki Activity

Fixed validating numbers as booleans in schema validator

Browse Source 
refs https://github.com/TryGhost/Toolbox/issues/441

- I'm currently working on cleaning up our uses of `bool` and `boolean`
  in favor of `boolean`, and I've noticed we only handle converting
  numbers into booleans when the type is `bool`, so validation would
  otherwise fail
- given these can be used interchangeably, we should also support
  converting the numbers into booleans when the type is `boolean`
- this is going to get cleaned up again when I remove `bool` but this
  fixes the validation bug for now
This commit is contained in:
Daniel Lockyer 2022-10-13 08:00:32 +07:00
parent f5774fad0c
commit 24670aa555
No known key found for this signature in database
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghost/core/core/server/data/schema/validator.js
View File

@ -63,7 +63,7 @@ function validateSchema(tableName, model, options) {
// validate boolean columns
if (Object.prototype.hasOwnProperty.call(schema[tableName][columnKey], 'type')
&& schema[tableName][columnKey].type === 'bool') {
&& (schema[tableName][columnKey].type === 'bool' || schema[tableName][columnKey].type === 'boolean')) {
if (!(validator.isBoolean(strVal) || validator.isEmpty(strVal))) {
message = tpl(messages.valueMustBeBoolean, {
tableName: tableName,

10
ghost/core/test/unit/server/data/schema/validator.test.js
View File

@ -64,7 +64,7 @@ describe('Validate Schema', function () {
);
});
it('transforms 0 and 1', function () {
it('transforms 0 and 1 (bool)', function () {
const post = models.Post.forge(testUtils.DataGenerator.forKnex.createPost({slug: 'test', featured: 0}));
post.get('featured').should.eql(0);
@ -74,6 +74,14 @@ describe('Validate Schema', function () {
});
});
it('transforms 0 and 1 (boolean)', async function () {
const user = models.User.forge(testUtils.DataGenerator.forKnex.createUser({email: 'test@example.com', comment_notifications: 0}));
user.get('comment_notifications').should.eql(0);
await validateSchema('users', user, {method: 'insert'});
user.get('comment_notifications').should.eql(false);
});
it('keeps true or false', function () {
const post = models.Post.forge(testUtils.DataGenerator.forKnex.createPost({slug: 'test', featured: true}));
post.get('featured').should.eql(true);