Rationalize code in values/row and make find_column public

include/soci/column-info.h

@@ -33,21 +33,22 @@ struct type_conversion<column_info>
     static std::size_t get_numeric_value(const values & v,
         const std::string & field_name)
     {
-        data_type dt = v.get_properties(field_name).get_data_type();
+        std::size_t pos = v.find_column(field_name);
+        data_type dt = v.get_properties(pos).get_data_type();
         switch (dt)
         {
         case dt_double:
             return static_cast<std::size_t>(
-                v.get<double>(field_name, 0.0));
+                v.get<double>(pos, 0.0));
         case dt_integer:
             return static_cast<std::size_t>(
-                v.get<int>(field_name, 0));
+                v.get<int>(pos, 0));
         case dt_long_long:
             return static_cast<std::size_t>(
-                v.get<long long>(field_name, 0ll));
+                v.get<long long>(pos, 0ll));
         case dt_unsigned_long_long:
             return static_cast<std::size_t>(
-                v.get<unsigned long long>(field_name, 0ull));
+                v.get<unsigned long long>(pos, 0ull));
             break;
         default:
             return 0u;

include/soci/row.h

@@ -46,6 +46,8 @@ class SOCI_DECL row
     row(row &&other) = default;
     row &operator=(row &&other) = default;
 
+    std::size_t find_column(std::string const& name) const;
+
     void uppercase_column_names(bool forceToUpper);
     void add_properties(column_properties const& cp);
     std::size_t size() const;
@@ -97,13 +99,7 @@ class SOCI_DECL row
     T get(std::string const &name, T const &nullValue) const
     {
         std::size_t const pos = find_column(name);
-
-        if (i_null == *indicators_[pos])
-        {
-            return nullValue;
-        }
-
-        return get<T>(pos);
+        return get<T>(pos, nullValue);
     }
 
     template <typename T>
@@ -127,8 +123,6 @@ class SOCI_DECL row
 private:
     SOCI_NOT_COPYABLE(row)
 
-    std::size_t find_column(std::string const& name) const;
-
     std::vector<column_properties> columns_;
     std::vector<details::holder*> holders_;
     std::vector<indicator*> indicators_;

include/soci/values.h

@@ -51,8 +51,25 @@ class SOCI_DECL values
 
     values() : row_(NULL), currentPos_(0), uppercaseColumnNames_(false) {}
 
+    std::size_t find_column(std::string const& name) const
+    {
+        if (row_ != NULL)
+            return row_->find_column(name);
+
+        const auto pos = index_.find(name);
+        if (pos != index_.end())
+        {
+            return pos->second;
+        }
+        throw soci_error("Value named " + name + " not found.");
+    }
+
     indicator get_indicator(std::size_t pos) const;
-    indicator get_indicator(std::string const & name) const;
+    indicator get_indicator(std::string const & name) const
+    {
+        std::size_t pos = find_column(name);
+        return get_indicator(pos);
+    }
 
     template <typename T>
     T get(std::size_t pos) const
@@ -82,28 +99,22 @@ class SOCI_DECL values
         {
             return row_->get<T>(pos, nullValue);
         }
-        else if (*indicators_[pos] == i_null)
-        {
-            return nullValue;
-        }
         else
         {
-            return get_from_uses<T>(pos);
+            return get_from_uses<T>(pos, nullValue);
         }
     }
 
     template <typename T>
     T get(std::string const & name) const
     {
-        return row_ != NULL ? row_->get<T>(name) : get_from_uses<T>(name);
+        return get<T>(find_column(name));
     }
 
     template <typename T>
     T get(std::string const & name, T const & nullValue) const
     {
-        return row_ != NULL
-            ? row_->get<T>(name, nullValue)
-            : get_from_uses<T>(name, nullValue);
+        return get<T>(find_column(name), nullValue);
     }
 
     template <typename T>
@@ -254,30 +265,14 @@ class SOCI_DECL values
     // without an underlying row object.  In that case, get_from_uses()
     // returns the underlying field values
     template <typename T>
-    T get_from_uses(std::string const & name, T const & nullValue) const
+    T get_from_uses(std::size_t pos, T const & nullValue) const
     {
-        std::map<std::string, std::size_t>::const_iterator pos = index_.find(name);
-        if (pos != index_.end())
+        if (*indicators_[pos] == i_null)
         {
-            if (*indicators_[pos->second] == i_null)
-            {
-                return nullValue;
-            }
-
-            return get_from_uses<T>(pos->second);
+            return nullValue;
         }
-        throw soci_error("Value named " + name + " not found.");
-    }
 
-    template <typename T>
-    T get_from_uses(std::string const & name) const
-    {
-        std::map<std::string, std::size_t>::const_iterator pos = index_.find(name);
-        if (pos != index_.end())
-        {
-            return get_from_uses<T>(pos->second);
-        }
-        throw soci_error("Value named " + name + " not found.");
+        return get_from_uses<T>(pos);
     }
 
     template <typename T>

src/core/values.cpp

@@ -29,25 +29,6 @@ indicator values::get_indicator(std::size_t pos) const
     }
 }
 
-indicator values::get_indicator(std::string const& name) const
-{
-    if (row_)
-    {
-        return row_->get_indicator(name);
-    }
-    else
-    {
-        std::map<std::string, std::size_t>::const_iterator it = index_.find(name);
-        if (it == index_.end())
-        {
-            std::ostringstream msg;
-            msg << "Column '" << name << "' not found";
-            throw soci_error(msg.str());
-        }
-        return *indicators_[it->second];
-    }
-}
-
 column_properties const& values::get_properties(std::size_t pos) const
 {
     if (row_)