status-im
/
realm-js
mirror of https://github.com/status-im/realm-js.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

more string tests and bugfix

This commit is contained in:
Ari Lazier 2015-11-18 12:40:25 -08:00
parent 7be7d330ac
commit aa3bad1a69
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/object-store/parser/query_builder.cpp
View File

@ -267,6 +267,9 @@ struct ValueGetter<String, TableGetter> {
if (value.type == parser::Expression::Type::Argument) { if (value.type == parser::Expression::Type::Argument) {
return args.string_for_argument(std::stoi(value.s)); return args.string_for_argument(std::stoi(value.s));
} }
if (value.type != parser::Expression::Type::String) {
throw std::runtime_error("Attempting to compare String property to a non-String value");
}
return value.s; return value.s;
} }
}; };

11
tests/QueryTests.js
View File

@ -52,9 +52,10 @@ function runQuerySuite(suite) {
TestCase.assertEqual(test[1], results.length, "Query '" + args[1] + "' on type '" + args[0] + "' expected " + test[1] + " results, got " + results.length); TestCase.assertEqual(test[1], results.length, "Query '" + args[1] + "' on type '" + args[0] + "' expected " + test[1] + " results, got " + results.length);
} }
else if (test[0] == "QueryThrows") { else if (test[0] == "QueryThrows") {
var args = test.slice(1);
TestCase.assertThrows(function() { TestCase.assertThrows(function() {
realm.objects.apply(realm, test.slice(1)); realm.objects.apply(realm, args);
}); }, "Expected exception not thrown for query: " + JSON.stringify(args));
} }
else { else {
throw "Invalid query test '" + test[0] + "'"; throw "Invalid query test '" + test[0] + "'";
@ -253,6 +254,12 @@ var testCases = {
["QueryCount", 1, "StringObject", "stringCol CONTAINS 'b'"], ["QueryCount", 1, "StringObject", "stringCol CONTAINS 'b'"],
["QueryCount", 2, "StringObject", "stringCol contains 'c'"], ["QueryCount", 2, "StringObject", "stringCol contains 'c'"],
["QueryCount", 9, "StringObject", "stringCol CONTAINS ''"], ["QueryCount", 9, "StringObject", "stringCol CONTAINS ''"],
["QueryCount", 2, "StringObject", "stringCol == $0", "a"],
["QueryCount", 2, "StringObject", "stringCol ENDSWITH $0", "c"],
["QueryThrows", "StringObject", "stringCol == true"],
["QueryThrows", "StringObject", "stringCol == 123"],
["QueryThrows", "StringObject", "stringCol CONTAINS $0", 1],
// ["QueryCount", 3, "StringObject", "stringCol ==[c] 'a'"], // ["QueryCount", 3, "StringObject", "stringCol ==[c] 'a'"],
// ["QueryCount", 5, "StringObject", "stringCol BEGINSWITH[c] 'A'"], // ["QueryCount", 5, "StringObject", "stringCol BEGINSWITH[c] 'A'"],