wrong field size calculation in ODBC code #1659 and other develop backports

This commit is contained in:
Alex Fabijanic
2017-10-30 13:24:32 -05:00
parent 57bc179db5
commit 1b2bd22d34
11 changed files with 89 additions and 52 deletions

View File

@@ -83,12 +83,15 @@ public:
~RowFilter();
/// Destroys the RowFilter.
void addFilter(const Ptr& pFilter, LogicOperator comparison);
void addFilter(Ptr pFilter, LogicOperator comparison);
/// Appends another filter to this one.
void removeFilter(const Ptr& pFilter);
void removeFilter(Ptr pFilter);
/// Removes filter from this filter.
bool has(Ptr pFilter) const;
/// Returns true if this filter is parent of pFilter;
template <typename T>
void add(const std::string& name, Comparison comparison, const T& value, LogicOperator op = OP_OR)
/// Adds value to the filter.
@@ -183,6 +186,12 @@ private:
///
inline bool RowFilter::has(Ptr pFilter) const
{
return _filterMap.find(pFilter) != _filterMap.end();
}
inline bool RowFilter::isEmpty() const
{
return _comparisonMap.size() == 0;