Skip to content

Added support for 'boolean' type. #87

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

Merged
mistic100 merged 1 commit into from
Feb 13, 2015
Merged

Added support for 'boolean' type. #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 12 additions & 3 deletions src/plugins/mongodb-support/plugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
}

rule.value.forEach(function(v, i) {
values.push(changeType(v, rule.type));
values.push(changeType(v, rule.type, 'mongo'));
});
}

Expand All @@ -102,15 +102,24 @@
// UTILITIES
// ===============================
/**
* Change type of a value to int or float
* Change type of a value to int, float or boolean
* @param value {mixed}
* @param type {string}
* @return {mixed}
*/
function changeType(value, type) {
function changeType(value, type, db) {
switch (type) {
case 'integer': return parseInt(value);
case 'double': return parseFloat(value);
case 'boolean':
var bool = value.trim().toLowerCase() === "true" || value.trim() === '1' || value === 1;
if (db === 'sql') {
return bool ? 1 : 0;
}
else if (db === 'mongo') {
return bool;
}
break;
default: return value;
}
}
Expand Down
17 changes: 13 additions & 4 deletions src/plugins/sql-support/plugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@
value+= sql.sep;
}

if (rule.type=='integer' || rule.type=='double') {
v = changeType(v, rule.type);
if (rule.type=='integer' || rule.type=='double' || rule.type=='boolean') {
v = changeType(v, rule.type, 'sql');
}
else if (!stmt) {
v = escapeString(v);
Expand Down Expand Up @@ -174,15 +174,24 @@
// UTILITIES
// ===============================
/**
* Change type of a value to int or float
* Change type of a value to int, float or boolean
* @param value {mixed}
* @param type {string}
* @return {mixed}
*/
function changeType(value, type) {
function changeType(value, type, db) {
switch (type) {
case 'integer': return parseInt(value);
case 'double': return parseFloat(value);
case 'boolean':
var bool = value.trim().toLowerCase() === "true" || value.trim() === '1' || value === 1;
if (db === 'sql') {
return bool ? 1 : 0;
}
else if (db === 'mongo') {
return bool;
}
break;
default: return value;
}
}
Expand Down
27 changes: 20 additions & 7 deletions src/query-builder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@
'double',
'date',
'time',
'datetime'
'datetime',
'boolean'
],
internalTypes = [
'string',
'number',
'datetime'
'datetime',
'boolean'
],
inputs = [
'text',
Expand Down Expand Up @@ -124,13 +126,14 @@
"number_wrong_step": "Must be a multiple of {0}",
"datetime_invalid": "Invalid date format ({0})",
"datetime_exceed_min": "Must be after {0}",
"datetime_exceed_max": "Must be before {0}"
"datetime_exceed_max": "Must be before {0}",
"boolean_not_valid": "Not a boolean"
}
},

operators: [
{type: 'equal', accept_values: 1, apply_to: ['string', 'number', 'datetime']},
{type: 'not_equal', accept_values: 1, apply_to: ['string', 'number', 'datetime']},
{type: 'equal', accept_values: 1, apply_to: ['string', 'number', 'datetime', 'boolean']},
{type: 'not_equal', accept_values: 1, apply_to: ['string', 'number', 'datetime', 'boolean']},
{type: 'in', accept_values: 1, apply_to: ['string', 'number', 'datetime']},
{type: 'not_in', accept_values: 1, apply_to: ['string', 'number', 'datetime']},
{type: 'less', accept_values: 1, apply_to: ['number', 'datetime']},
Expand All @@ -146,8 +149,8 @@
{type: 'not_ends_with', accept_values: 1, apply_to: ['string']},
{type: 'is_empty', accept_values: 0, apply_to: ['string']},
{type: 'is_not_empty', accept_values: 0, apply_to: ['string']},
{type: 'is_null', accept_values: 0, apply_to: ['string', 'number', 'datetime']},
{type: 'is_not_null', accept_values: 0, apply_to: ['string', 'number', 'datetime']}
{type: 'is_null', accept_values: 0, apply_to: ['string', 'number', 'datetime', 'boolean']},
{type: 'is_not_null', accept_values: 0, apply_to: ['string', 'number', 'datetime', 'boolean']}
],

icons: {
Expand Down Expand Up @@ -532,6 +535,9 @@
case 'date': case 'time': case 'datetime':
filter.internalType = 'datetime';
break;
case 'boolean':
filter.internalType = 'boolean';
break;
}

switch (filter.input) {
Expand Down Expand Up @@ -1052,6 +1058,13 @@
}
}
break;

case 'boolean':
if (value[i].trim().toLowerCase() !== 'true' && value[i].trim().toLowerCase() !== 'false' &&
value[i].trim() !== '1' && value[i].trim() !== '0' && value[i] !== 1 && value[i] !== 0) {
result = ['boolean_not_valid'];
break;
}
}
}

Expand Down