diff options
Diffstat (limited to 'libpqpp/pq-column.cpp')
| -rw-r--r-- | libpqpp/pq-column.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libpqpp/pq-column.cpp b/libpqpp/pq-column.cpp index e495f2a..6c1c4eb 100644 --- a/libpqpp/pq-column.cpp +++ b/libpqpp/pq-column.cpp @@ -11,8 +11,8 @@ #include <libpq-fe.h> #include <server/catalog/pg_type_d.h> -PQ::Column::Column(const SelectBase * s, unsigned int i) : - DB::Column(PQfname(s->execRes.get(), static_cast<int>(i)), i), sc(s), +PQ::Column::Column(const SelectBase * select, unsigned int field) : + DB::Column(PQfname(select->execRes.get(), static_cast<int>(field)), field), sc(select), oid(PQftype(sc->execRes.get(), static_cast<int>(colNo))) { } @@ -37,10 +37,10 @@ PQ::Column::value() const } void -PQ::Column::apply(DB::HandleField & h) const +PQ::Column::apply(DB::HandleField & handler) const { if (isNull()) { - h.null(); + handler.null(); return; } switch (oid) { @@ -49,20 +49,20 @@ PQ::Column::apply(DB::HandleField & h) const case TEXTOID: case XMLOID: default: - h.string({value(), length()}); + handler.string({value(), length()}); break; case BOOLOID: - h.boolean(*value() == 't'); + handler.boolean(*value() == 't'); break; case INT2OID: case INT4OID: case INT8OID: - h.integer(atol(value())); + handler.integer(atol(value())); break; case NUMERICOID: case FLOAT4OID: case FLOAT8OID: - h.floatingpoint(atof(value())); + handler.floatingpoint(atof(value())); break; case TIMEOID: case INTERVALOID: { @@ -72,22 +72,22 @@ PQ::Column::apply(DB::HandleField & h) const if (sscanf(val, "%d %*[days] %d:%d:%d.%n%d%n", &days, &hours, &minutes, &seconds, &flen1, &fractions, &flen2) >= 4) { - h.interval(boost::posix_time::time_duration((24 * days) + hours, minutes, seconds, + handler.interval(boost::posix_time::time_duration((24 * days) + hours, minutes, seconds, fractions * static_cast<long>(pow(10, boost::posix_time::time_res_traits::num_fractional_digits() + flen1 - flen2)))); } else { - h.interval(boost::posix_time::duration_from_string(val)); + handler.interval(boost::posix_time::duration_from_string(val)); } break; } case DATEOID: - h.timestamp(boost::posix_time::ptime(boost::gregorian::from_string(value()))); + handler.timestamp(boost::posix_time::ptime(boost::gregorian::from_string(value()))); break; case TIMESTAMPOID: case TIMESTAMPTZOID: - h.timestamp(boost::posix_time::time_from_string(value())); + handler.timestamp(boost::posix_time::time_from_string(value())); break; case BYTEAOID: if (sc->tuple != buffer.row || !buffer.data) { @@ -95,7 +95,7 @@ PQ::Column::apply(DB::HandleField & h) const PQunescapeBytea(reinterpret_cast<const unsigned char *>(value()), &buffer.length)}; buffer.row = sc->tuple; } - h.blob(DB::Blob(buffer.data.get(), buffer.length)); + handler.blob(DB::Blob(buffer.data.get(), buffer.length)); break; } } |