pr fixes
This commit is contained in:
parent
b5fb267e11
commit
d0715cc8e4
|
@ -334,7 +334,7 @@ Predicate parse(const std::string &query)
|
||||||
return std::move(out_predicate);
|
return std::move(out_predicate);
|
||||||
}
|
}
|
||||||
|
|
||||||
void analyzeGrammar()
|
void analyze_grammar()
|
||||||
{
|
{
|
||||||
analyze<pred>();
|
analyze<pred>();
|
||||||
}
|
}
|
||||||
|
|
|
@ -78,8 +78,8 @@ struct Predicate
|
||||||
|
|
||||||
Predicate parse(const std::string &query);
|
Predicate parse(const std::string &query);
|
||||||
|
|
||||||
void analyzeGrammar();
|
void analyze_grammar();
|
||||||
bool testGrammar();
|
bool test_grammar();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -371,7 +371,7 @@ auto value_of_type_for_query(TableGetter&& tables, Value&& value, Arguments &arg
|
||||||
{
|
{
|
||||||
const bool isColumn = std::is_same<PropertyExpression, typename std::remove_reference<Value>::type>::value;
|
const bool isColumn = std::is_same<PropertyExpression, typename std::remove_reference<Value>::type>::value;
|
||||||
using helper = std::conditional_t<isColumn, ColumnGetter<RetType, TableGetter>, ValueGetter<RetType, TableGetter>>;
|
using helper = std::conditional_t<isColumn, ColumnGetter<RetType, TableGetter>, ValueGetter<RetType, TableGetter>>;
|
||||||
return helper::convert(std::forward<TableGetter>(tables), std::forward<Value>(value), args);
|
return helper::convert(tables, value, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename A, typename B>
|
template <typename A, typename B>
|
||||||
|
|
|
@ -134,7 +134,7 @@ static std::vector<std::string> invalid_queries = {
|
||||||
namespace realm {
|
namespace realm {
|
||||||
namespace parser {
|
namespace parser {
|
||||||
|
|
||||||
bool testGrammar()
|
bool test_grammar()
|
||||||
{
|
{
|
||||||
bool success = true;
|
bool success = true;
|
||||||
for (auto &query : valid_queries) {
|
for (auto &query : valid_queries) {
|
||||||
|
|
Loading…
Reference in New Issue