1 files changed, 252 insertions, 97 deletions

diff --git a/libodbcpp/odbc-column.h b/libodbcpp/odbc-column.h
index 5d7c7d4..4f3c697 100644
--- a/libodbcpp/odbc-column.h
+++ b/libodbcpp/odbc-column.h
@@ -1,130 +1,285 @@
 #ifndef ODBC_COLUMN_H
 #define ODBC_COLUMN_H
 
-#include <column.h>
-#include <typeinfo>
-#include <glibmm/ustring.h>
-#include <algorithm>
 #include "odbc-bind.h"
 #include "odbc-param.h"
+#include <algorithm>
+#include <column.h>
+#include <glibmm/ustring.h>
+#include <typeinfo>
 
 namespace ODBC {
 	class SelectCommand;
 	class Column : public virtual Bind, public virtual DB::Column {
-		public:
-			Column(SelectCommand *, const Glib::ustring & s, unsigned int i);
-			virtual ~Column() = default;
-			void bind();
-			virtual void * rwDataAddress() = 0;
-			virtual bool resize();
+	public:
+		Column(SelectCommand *, const Glib::ustring & s, unsigned int i);
+		virtual ~Column() = default;
+		void bind();
+		virtual void * rwDataAddress() = 0;
+		virtual bool resize();
+
+		virtual operator int() const
+		{
+			throw std::bad_cast();
+		}
+		virtual operator long() const
+		{
+			throw std::bad_cast();
+		}
+		virtual operator long long() const
+		{
+			throw std::bad_cast();
+		}
+		virtual operator unsigned int() const
+		{
+			throw std::bad_cast();
+		}
+		virtual operator unsigned long() const
+		{
+			throw std::bad_cast();
+		}
+		virtual operator unsigned long long() const
+		{
+			throw std::bad_cast();
+		}
 
-			virtual operator int () const { throw std::bad_cast(); }
-			virtual operator long () const { throw std::bad_cast(); }
-			virtual operator long long () const { throw std::bad_cast(); }
-			virtual operator unsigned int () const { throw std::bad_cast(); }
-			virtual operator unsigned long () const { throw std::bad_cast(); }
-			virtual operator unsigned long long () const { throw std::bad_cast(); }
+		virtual operator double() const
+		{
+			throw std::bad_cast();
+		}
+		virtual operator float() const
+		{
+			throw std::bad_cast();
+		}
 
-			virtual operator double () const { throw std::bad_cast(); }
-			virtual operator float () const { throw std::bad_cast(); }
+		virtual operator std::string() const
+		{
+			throw std::bad_cast();
+		}
+		virtual operator Glib::ustring() const
+		{
+			throw std::bad_cast();
+		}
 
-			virtual operator std::string () const { throw std::bad_cast(); }
-			virtual operator Glib::ustring () const { throw std::bad_cast(); }
+		virtual operator struct tm() const
+		{
+			throw std::bad_cast();
+		}
+		virtual operator SQL_TIMESTAMP_STRUCT() const
+		{
+			throw std::bad_cast();
+		}
 
-			virtual operator struct tm () const { throw std::bad_cast(); }
-			virtual operator SQL_TIMESTAMP_STRUCT () const { throw std::bad_cast(); }
+		[[nodiscard]] bool isNull() const override;
+		virtual void apply(DB::HandleField &) const override = 0;
 
-			[[nodiscard]] bool isNull() const override;
-			virtual void apply(DB::HandleField &) const override = 0;
+		const SelectCommand * selectCmd;
 
-			const SelectCommand *	selectCmd;
-		protected:
-			virtual const Param * meAsAParam() const = 0;
+	protected:
+		virtual const Param * meAsAParam() const = 0;
 	};
 	class CharArrayColumn : public Column, public Param {
-		public:
-			typedef std::vector<char> CharArray;
-			CharArrayColumn(SelectCommand * sc, const Glib::ustring & n, unsigned int i, SQLULEN sizeHint) :
-				DB::Column(n, i),
-				Column(sc, n, i)
-			{
-				data.resize(std::max<SQLULEN>(sizeHint, 64) + 1);
-			}
-			virtual SQLSMALLINT ctype() const override { return SQL_C_CHAR; }
-			virtual SQLSMALLINT stype() const override { return SQL_CHAR; }
-			virtual SQLULEN size() const override { return data.size(); }
-			virtual SQLINTEGER dp() const override { return 0; }
-			virtual const void * dataAddress() const override { return &data.front(); }
-			virtual void * rwDataAddress() override { return &data.front(); }
-			void operator=(const Glib::ustring & d);
-			bool resize() override;
-			virtual operator std::string () const override { return std::string(&data.front(), bindLen); }
-			virtual operator Glib::ustring () const override { return std::string(&data.front(), bindLen); }
-			virtual void apply(DB::HandleField &) const override;
-		protected:
-			virtual const Param * meAsAParam() const override { return this; }
-			CharArray data;
+	public:
+		typedef std::vector<char> CharArray;
+		CharArrayColumn(SelectCommand * sc, const Glib::ustring & n, unsigned int i, SQLULEN sizeHint) :
+			DB::Column(n, i), Column(sc, n, i)
+		{
+			data.resize(std::max<SQLULEN>(sizeHint, 64) + 1);
+		}
+		virtual SQLSMALLINT
+		ctype() const override
+		{
+			return SQL_C_CHAR;
+		}
+		virtual SQLSMALLINT
+		stype() const override
+		{
+			return SQL_CHAR;
+		}
+		virtual SQLULEN
+		size() const override
+		{
+			return data.size();
+		}
+		virtual SQLINTEGER
+		dp() const override
+		{
+			return 0;
+		}
+		virtual const void *
+		dataAddress() const override
+		{
+			return &data.front();
+		}
+		virtual void *
+		rwDataAddress() override
+		{
+			return &data.front();
+		}
+		void operator=(const Glib::ustring & d);
+		bool resize() override;
+		virtual operator std::string() const override
+		{
+			return std::string(&data.front(), bindLen);
+		}
+		virtual operator Glib::ustring() const override
+		{
+			return std::string(&data.front(), bindLen);
+		}
+		virtual void apply(DB::HandleField &) const override;
+
+	protected:
+		virtual const Param *
+		meAsAParam() const override
+		{
+			return this;
+		}
+		CharArray data;
 	};
 	class SignedIntegerColumn : public Column, public SignedIntegerParam {
-		public:
-			SignedIntegerColumn(SelectCommand * sc, const Glib::ustring & n, unsigned int i) :
-				DB::Column(n, i),
-				Column(sc, n, i) { }
-			virtual SQLSMALLINT ctype() const override { return SignedIntegerParam::ctype(); }
-			virtual SQLULEN size() const override { return SignedIntegerParam::size(); }
-			virtual void * rwDataAddress() override { return &data; }
-			virtual operator int () const override { return data; }
-			virtual operator long () const override { return data; }
-			virtual operator long long () const override { return data; }
-			virtual const Param * meAsAParam() const override { return this; }
-			virtual void apply(DB::HandleField &) const override;
+	public:
+		SignedIntegerColumn(SelectCommand * sc, const Glib::ustring & n, unsigned int i) :
+			DB::Column(n, i), Column(sc, n, i)
+		{
+		}
+		virtual SQLSMALLINT
+		ctype() const override
+		{
+			return SignedIntegerParam::ctype();
+		}
+		virtual SQLULEN
+		size() const override
+		{
+			return SignedIntegerParam::size();
+		}
+		virtual void *
+		rwDataAddress() override
+		{
+			return &data;
+		}
+		virtual operator int() const override
+		{
+			return data;
+		}
+		virtual operator long() const override
+		{
+			return data;
+		}
+		virtual operator long long() const override
+		{
+			return data;
+		}
+		virtual const Param *
+		meAsAParam() const override
+		{
+			return this;
+		}
+		virtual void apply(DB::HandleField &) const override;
 	};
 #ifdef COMPLETENESS
 	class UnsignedIntegerColumn : public Column, public UnsignedIntegerParam {
-		public:
-			UnsignedIntegerColumn(SelectCommand * sc, const Glib::ustring & n, unsigned int i) :
-				Column(sc, n, i) { }
-			virtual const Param * meAsAParam() const override { return this; }
+	public:
+		UnsignedIntegerColumn(SelectCommand * sc, const Glib::ustring & n, unsigned int i) : Column(sc, n, i) { }
+		virtual const Param *
+		meAsAParam() const override
+		{
+			return this;
+		}
 	};
 #endif
 	class FloatingPointColumn : public Column, public FloatingPointParam {
-		public:
-			FloatingPointColumn(SelectCommand * sc, const Glib::ustring & n, unsigned int i) :
-				DB::Column(n, i),
-				Column(sc, n, i) { }
-			virtual SQLSMALLINT ctype() const override { return FloatingPointParam::ctype(); }
-			virtual SQLULEN size() const override { return FloatingPointParam::size(); }
-			virtual void * rwDataAddress() override { return &data; }
-			virtual operator double () const override { return data; }
-			virtual operator float () const override { return data; }
-			virtual const Param * meAsAParam() const override { return this; }
-			virtual void apply(DB::HandleField &) const override;
+	public:
+		FloatingPointColumn(SelectCommand * sc, const Glib::ustring & n, unsigned int i) :
+			DB::Column(n, i), Column(sc, n, i)
+		{
+		}
+		virtual SQLSMALLINT
+		ctype() const override
+		{
+			return FloatingPointParam::ctype();
+		}
+		virtual SQLULEN
+		size() const override
+		{
+			return FloatingPointParam::size();
+		}
+		virtual void *
+		rwDataAddress() override
+		{
+			return &data;
+		}
+		virtual operator double() const override
+		{
+			return data;
+		}
+		virtual operator float() const override
+		{
+			return data;
+		}
+		virtual const Param *
+		meAsAParam() const override
+		{
+			return this;
+		}
+		virtual void apply(DB::HandleField &) const override;
 	};
 	class IntervalColumn : public Column, public IntervalParam {
-		public:
-			IntervalColumn(SelectCommand * sc, const Glib::ustring & n, unsigned int i) :
-				DB::Column(n, i),
-				Column(sc, n, i) { }
-			virtual SQLSMALLINT ctype() const override { return IntervalParam::ctype(); }
-			virtual SQLULEN size() const override { return IntervalParam::size(); }
-			virtual void * rwDataAddress() override { return &data; }
-			virtual operator boost::posix_time::time_duration () const;
-			virtual const Param * meAsAParam() const override { return this; }
-			virtual void apply(DB::HandleField &) const override;
+	public:
+		IntervalColumn(SelectCommand * sc, const Glib::ustring & n, unsigned int i) : DB::Column(n, i), Column(sc, n, i)
+		{
+		}
+		virtual SQLSMALLINT
+		ctype() const override
+		{
+			return IntervalParam::ctype();
+		}
+		virtual SQLULEN
+		size() const override
+		{
+			return IntervalParam::size();
+		}
+		virtual void *
+		rwDataAddress() override
+		{
+			return &data;
+		}
+		virtual operator boost::posix_time::time_duration() const;
+		virtual const Param *
+		meAsAParam() const override
+		{
+			return this;
+		}
+		virtual void apply(DB::HandleField &) const override;
 	};
 	class TimeStampColumn : public Column, public TimeStampParam {
-		public:
-			TimeStampColumn(SelectCommand * sc, const Glib::ustring & n, unsigned int i) :
-				DB::Column(n, i),
-				Column(sc, n, i) { }
-			virtual SQLSMALLINT ctype() const override { return TimeStampParam::ctype(); }
-			virtual SQLULEN size() const override { return TimeStampParam::size(); }
-			virtual void * rwDataAddress() override { return &data; }
-			virtual operator boost::posix_time::ptime () const;
-			virtual const Param * meAsAParam() const override { return this; }
-			virtual void apply(DB::HandleField &) const override;
+	public:
+		TimeStampColumn(SelectCommand * sc, const Glib::ustring & n, unsigned int i) :
+			DB::Column(n, i), Column(sc, n, i)
+		{
+		}
+		virtual SQLSMALLINT
+		ctype() const override
+		{
+			return TimeStampParam::ctype();
+		}
+		virtual SQLULEN
+		size() const override
+		{
+			return TimeStampParam::size();
+		}
+		virtual void *
+		rwDataAddress() override
+		{
+			return &data;
+		}
+		virtual operator boost::posix_time::ptime() const;
+		virtual const Param *
+		meAsAParam() const override
+		{
+			return this;
+		}
+		virtual void apply(DB::HandleField &) const override;
 	};
 }
 
 #endif
-