From 9917fcb8386cf74ef52771f9bae6de2088209466 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Wed, 29 Apr 2015 20:43:50 +0100
Subject: Centralize all the column reference storage logic

---
 libmysqlpp/selectcommand.cpp | 37 -------------------------------------
 libmysqlpp/selectcommand.h   | 19 -------------------
 2 files changed, 56 deletions(-)

(limited to 'libmysqlpp')

diff --git a/libmysqlpp/selectcommand.cpp b/libmysqlpp/selectcommand.cpp
index b361fb1..41b28b6 100644
--- a/libmysqlpp/selectcommand.cpp
+++ b/libmysqlpp/selectcommand.cpp
@@ -92,40 +92,3 @@ MySQL::SelectCommand::fetch()
 	}
 }
 
-const DB::Column&
-MySQL::SelectCommand::operator[](unsigned int n) const
-{
-	if (n < columns.size()) {
-		return **columns.get<0>().find(n);
-	}
-	throw Error();
-}
-
-const DB::Column&
-MySQL::SelectCommand::operator[](const Glib::ustring & n) const
-{
-	typedef Columns::nth_index<1>::type CbyName;
-	CbyName::iterator i = columns.get<1>().find(n);
-	if (i != columns.get<1>().end()) {
-		return **i;
-	}
-	throw Error();
-}
-
-unsigned int
-MySQL::SelectCommand::getOrdinal(const Glib::ustring & n) const
-{
-	typedef Columns::nth_index<1>::type CbyName;
-	CbyName::iterator i = columns.get<1>().find(n);
-	if (i != columns.get<1>().end()) {
-		return (*i)->colNo;
-	}
-	throw Error();
-}
-
-unsigned int
-MySQL::SelectCommand::columnCount() const
-{
-	return fields.size();
-}
-
diff --git a/libmysqlpp/selectcommand.h b/libmysqlpp/selectcommand.h
index a338599..7ffff54 100644
--- a/libmysqlpp/selectcommand.h
+++ b/libmysqlpp/selectcommand.h
@@ -2,15 +2,7 @@
 #define MY_SELECTCOMMAND_H
 
 #include "../libdbpp/selectcommand.h"
-#include "../libdbpp/column.h"
 #include "command.h"
-#include <boost/shared_ptr.hpp>
-#include <boost/multi_index_container.hpp>
-#include <boost/multi_index/indexed_by.hpp>
-#include <boost/multi_index/ordered_index.hpp>
-#include <boost/multi_index/member.hpp>
-#include <vector>
-#include <map>
 
 namespace MySQL {
 	class Connection;
@@ -21,21 +13,10 @@ namespace MySQL {
 
 			bool fetch();
 			void execute();
-			const DB::Column& operator[](unsigned int) const;
-			const DB::Column& operator[](const Glib::ustring&) const;
-			unsigned int columnCount() const;
-			unsigned int getOrdinal(const Glib::ustring&) const;
 
 		private:
 			bool executed;
 			Binds fields;
-			typedef boost::multi_index_container<boost::shared_ptr<ColumnBase>, boost::multi_index::indexed_by<
-				boost::multi_index::ordered_unique<boost::multi_index::member<DB::Column, const unsigned int, &DB::Column::colNo>>,
-				boost::multi_index::ordered_unique<boost::multi_index::member<DB::Column, const Glib::ustring, &DB::Column::name>>
-								>> Columns;
-			Columns columns;
-
-			friend class ColumnBase;
 	};
 }
 
-- 
cgit v1.2.3