diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2015-07-17 14:16:53 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2015-07-17 14:16:53 +0200 |
| commit | a0cf6442d57fbf1839f20c952f9880daa6bd2d59 (patch) | |
| tree | c1ec9ef9dcf1ea4546b4590cc6769ea78a2b5d71 | |
| parent | 0c5953ed01ff28f81c866fed126ebcd47f76c0ea (diff) | |
Handle empty query::in_range() case
| -rw-r--r-- | odb/mysql/query-dynamic.cxx | 24 | ||||
| -rw-r--r-- | odb/mysql/query.txx | 25 |
2 files changed, 30 insertions, 19 deletions
diff --git a/odb/mysql/query-dynamic.cxx b/odb/mysql/query-dynamic.cxx index e637b26..5513565 100644 --- a/odb/mysql/query-dynamic.cxx +++ b/odb/mysql/query-dynamic.cxx @@ -94,20 +94,26 @@ namespace odb } case part::op_in: { - size_t b (p - x.data); + if (x.data != 0) + { + size_t b (p - x.data); - translate (q, s, b - 1); // column - q += "IN ("; + translate (q, s, b - 1); // column + q += "IN ("; - for (size_t i (b); i != p; ++i) - { - if (i != b) - q += ","; + for (size_t i (b); i != p; ++i) + { + if (i != b) + q += ","; - translate (q, s, i); + translate (q, s, i); + } + + q += ")"; } + else + q.append (false); - q += ")"; break; } case part::op_like: diff --git a/odb/mysql/query.txx b/odb/mysql/query.txx index 8ddd65e..968ac7e 100644 --- a/odb/mysql/query.txx +++ b/odb/mysql/query.txx @@ -100,19 +100,24 @@ namespace odb query_base query_column<T, ID>:: in_range (I begin, I end) const { - query_base q (table_, column_); - q += "IN ("; - - for (I i (begin); i != end; ++i) + if (begin != end) { - if (i != begin) - q += ","; + query_base q (table_, column_); + q += "IN ("; - q.append<T, ID> (val_bind<T> (*i), conversion_); - } + for (I i (begin); i != end; ++i) + { + if (i != begin) + q += ","; - q += ")"; - return q; + q.append<T, ID> (val_bind<T> (*i), conversion_); + } + + q += ")"; + return q; + } + else + return query_base (false); } // like |