List:Commits« Previous MessageNext Message »
From:andrey.hristov Date:November 19 2008 1:23pm
Subject:bzr commit into connector-cpp-bzr branch (andrey.hristov:270)
View as plain text  
#At bzr+ssh://ahristov@stripped/bzrroot/public/connector-cpp-bzr/trunk/

  270 andrey.hristov@stripped	2008-11-19
      Remove const from ResultSetMetaData. Later will add means of protection, that the
client doesn't delete the object by accident
modified:
  cppconn/resultset.h
  cppconn/resultset_metadata.h
  driver/mysql_constructed_resultset.cpp
  driver/mysql_constructed_resultset.h
  driver/mysql_cset_metadata.cpp
  driver/mysql_cset_metadata.h
  driver/mysql_metadata.cpp
  driver/mysql_ps_resultset.cpp
  driver/mysql_ps_resultset.h
  driver/mysql_ps_resultset_metadata.cpp
  driver/mysql_ps_resultset_metadata.h
  driver/mysql_resultset.cpp
  driver/mysql_resultset.h
  driver/mysql_resultset_metadata.cpp
  driver/mysql_resultset_metadata.h
  examples/connection_meta_schemaobj.cpp
  examples/resultset_meta.cpp
  test/CJUnitTestsPort/compliance/DatabaseMetaDataTest.cpp
  test/test_common.cpp

=== modified file 'cppconn/resultset.h'
--- a/cppconn/resultset.h	2008-10-17 16:54:41 +0000
+++ b/cppconn/resultset.h	2008-11-19 12:23:01 +0000
@@ -104,7 +104,7 @@ public:
 	virtual long long getLong(unsigned int columnIndex) const = 0;
 	virtual long long getLong(const std::string& columnLabel) const = 0;
 
-	virtual const ResultSetMetaData * getMetaData() const = 0;
+	virtual ResultSetMetaData * getMetaData() const = 0;
 
 	virtual size_t getRow() const = 0;
 

=== modified file 'cppconn/resultset_metadata.h'
--- a/cppconn/resultset_metadata.h	2008-10-17 16:54:41 +0000
+++ b/cppconn/resultset_metadata.h	2008-11-19 12:23:01 +0000
@@ -37,45 +37,45 @@ public:
 		columnNullableUnknown
 	};
 
-	virtual std::string getCatalogName(unsigned int column) const = 0;
+	virtual std::string getCatalogName(unsigned int column) = 0;
 
-	virtual unsigned int getColumnCount() const = 0;
+	virtual unsigned int getColumnCount() = 0;
 
-	virtual int getColumnDisplaySize(unsigned int column) const = 0;
+	virtual int getColumnDisplaySize(unsigned int column) = 0;
 
-	virtual std::string getColumnLabel(unsigned int column) const = 0;
+	virtual std::string getColumnLabel(unsigned int column) = 0;
 
-	virtual std::string getColumnName(unsigned int column) const = 0;
+	virtual std::string getColumnName(unsigned int column) = 0;
 
-	virtual int getColumnType(unsigned int column) const = 0;
+	virtual int getColumnType(unsigned int column) = 0;
 
-	virtual std::string getColumnTypeName(unsigned int column) const = 0;
+	virtual std::string getColumnTypeName(unsigned int column) = 0;
 
-	virtual int getPrecision(unsigned int column) const = 0;
+	virtual int getPrecision(unsigned int column) = 0;
 
-	virtual int getScale(unsigned int column) const = 0;
+	virtual int getScale(unsigned int column) = 0;
 
-	virtual std::string getSchemaName(unsigned int column) const = 0;
+	virtual std::string getSchemaName(unsigned int column) = 0;
 
-	virtual std::string getTableName(unsigned int column) const = 0;
+	virtual std::string getTableName(unsigned int column) = 0;
 
-	virtual bool isAutoIncrement(unsigned int column) const = 0;
+	virtual bool isAutoIncrement(unsigned int column) = 0;
 
-	virtual bool isCaseSensitive(unsigned int column) const = 0;
+	virtual bool isCaseSensitive(unsigned int column) = 0;
 
-	virtual bool isCurrency(unsigned int column) const = 0;
+	virtual bool isCurrency(unsigned int column) = 0;
 
-	virtual bool isDefinitelyWritable(unsigned int column) const = 0;
+	virtual bool isDefinitelyWritable(unsigned int column) = 0;
 
-	virtual int isNullable(unsigned int column) const = 0;
+	virtual int isNullable(unsigned int column) = 0;
 
-	virtual bool isReadOnly(unsigned int column) const = 0;
+	virtual bool isReadOnly(unsigned int column) = 0;
 
-	virtual bool isSearchable(unsigned int column) const = 0;
+	virtual bool isSearchable(unsigned int column) = 0;
 
-	virtual bool isSigned(unsigned int column) const = 0;
+	virtual bool isSigned(unsigned int column) = 0;
 
-	virtual bool isWritable(unsigned int column) const = 0;
+	virtual bool isWritable(unsigned int column) = 0;
 
 	virtual ~ResultSetMetaData() {}
 };

=== modified file 'driver/mysql_constructed_resultset.cpp'
--- a/driver/mysql_constructed_resultset.cpp	2008-11-19 11:24:56 +0000
+++ b/driver/mysql_constructed_resultset.cpp	2008-11-19 12:23:01 +0000
@@ -453,7 +453,7 @@ MySQL_ConstructedResultSet::getLong(cons
 
 
 /* {{{ MySQL_ConstructedResultSet::getMetaData() -I- */
-const sql::ResultSetMetaData *
+sql::ResultSetMetaData *
 MySQL_ConstructedResultSet::getMetaData() const
 {
 	CPP_ENTER("MySQL_ConstructedResultSet::getMetaData");

=== modified file 'driver/mysql_constructed_resultset.h'
--- a/driver/mysql_constructed_resultset.h	2008-11-03 17:38:56 +0000
+++ b/driver/mysql_constructed_resultset.h	2008-11-19 12:23:01 +0000
@@ -87,7 +87,7 @@ public:
 
 	long long getLong(const std::string& columnLabel) const;
 
-	const sql::ResultSetMetaData * getMetaData() const;
+	sql::ResultSetMetaData * getMetaData() const;
 
 	size_t getRow() const;
 

=== modified file 'driver/mysql_cset_metadata.cpp'
--- a/driver/mysql_cset_metadata.cpp	2008-11-11 17:21:57 +0000
+++ b/driver/mysql_cset_metadata.cpp	2008-11-19 12:23:01 +0000
@@ -58,7 +58,7 @@ MySQL_ConstructedResultSetMetaData::~MyS
 
 /* {{{ MySQL_ConstructedResultSetMetaData::getCatalogName() -I- */
 std::string
-MySQL_ConstructedResultSetMetaData::getCatalogName(unsigned int columnIndex) const
+MySQL_ConstructedResultSetMetaData::getCatalogName(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ConstructedResultSetMetaData::getCatalogName");
 	CPP_INFO_FMT("this=%p", this);
@@ -72,7 +72,7 @@ MySQL_ConstructedResultSetMetaData::getC
 
 /* {{{ MySQL_ConstructedResultSetMetaData::getColumnCount() -I- */
 unsigned int
-MySQL_ConstructedResultSetMetaData::getColumnCount() const
+MySQL_ConstructedResultSetMetaData::getColumnCount()
 {
 	CPP_ENTER("MySQL_ConstructedResultSetMetaData::getColumnCount");
 	CPP_INFO_FMT("this=%p", this);
@@ -84,7 +84,7 @@ MySQL_ConstructedResultSetMetaData::getC
 
 /* {{{ MySQL_ConstructedResultSetMetaData::getColumnDisplaySize() -U- */
 int
-MySQL_ConstructedResultSetMetaData::getColumnDisplaySize(unsigned int columnIndex) const
+MySQL_ConstructedResultSetMetaData::getColumnDisplaySize(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ConstructedResultSetMetaData::getColumnDisplaySize");
 	CPP_INFO_FMT("this=%p", this);
@@ -98,7 +98,7 @@ MySQL_ConstructedResultSetMetaData::getC
 
 /* {{{ MySQL_ConstructedResultSetMetaData::getColumnLabel() -I- */
 std::string
-MySQL_ConstructedResultSetMetaData::getColumnLabel(unsigned int columnIndex) const
+MySQL_ConstructedResultSetMetaData::getColumnLabel(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ConstructedResultSetMetaData::getColumnLabel");
 	CPP_INFO_FMT("this=%p", this);
@@ -112,7 +112,7 @@ MySQL_ConstructedResultSetMetaData::getC
 
 /* {{{ MySQL_ConstructedResultSetMetaData::getColumnName() -I- */
 std::string
-MySQL_ConstructedResultSetMetaData::getColumnName(unsigned int columnIndex) const
+MySQL_ConstructedResultSetMetaData::getColumnName(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ConstructedResultSetMetaData::getColumnName");
 	CPP_INFO_FMT("this=%p", this);
@@ -126,7 +126,7 @@ MySQL_ConstructedResultSetMetaData::getC
 
 /* {{{ MySQL_ConstructedResultSetMetaData::getColumnType() -I- */
 int
-MySQL_ConstructedResultSetMetaData::getColumnType(unsigned int columnIndex) const
+MySQL_ConstructedResultSetMetaData::getColumnType(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ConstructedResultSetMetaData::getColumnType");
 	CPP_INFO_FMT("this=%p", this);
@@ -141,7 +141,7 @@ MySQL_ConstructedResultSetMetaData::getC
 
 /* {{{ MySQL_ConstructedResultSetMetaData::getColumnTypeName() -I- */
 std::string
-MySQL_ConstructedResultSetMetaData::getColumnTypeName(unsigned int columnIndex) const
+MySQL_ConstructedResultSetMetaData::getColumnTypeName(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ConstructedResultSetMetaData::getColumnTypeName");
 	CPP_INFO_FMT("this=%p", this);
@@ -155,7 +155,7 @@ MySQL_ConstructedResultSetMetaData::getC
 
 /* {{{ MySQL_ConstructedResultSetMetaData::getPrecision() -U- */
 int
-MySQL_ConstructedResultSetMetaData::getPrecision(unsigned int columnIndex) const
+MySQL_ConstructedResultSetMetaData::getPrecision(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ConstructedResultSetMetaData::getPrecision");
 	CPP_INFO_FMT("this=%p", this);
@@ -169,7 +169,7 @@ MySQL_ConstructedResultSetMetaData::getP
 
 /* {{{ MySQL_ConstructedResultSetMetaData::getScale() -U- */
 int
-MySQL_ConstructedResultSetMetaData::getScale(unsigned int columnIndex) const
+MySQL_ConstructedResultSetMetaData::getScale(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ConstructedResultSetMetaData::getScale");
 	CPP_INFO_FMT("this=%p", this);
@@ -183,7 +183,7 @@ MySQL_ConstructedResultSetMetaData::getS
 
 /* {{{ MySQL_ConstructedResultSetMetaData::getSchemaName() -I- */
 std::string
-MySQL_ConstructedResultSetMetaData::getSchemaName(unsigned int columnIndex) const
+MySQL_ConstructedResultSetMetaData::getSchemaName(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ConstructedResultSetMetaData::getSchemaName");
 	CPP_INFO_FMT("this=%p", this);
@@ -197,7 +197,7 @@ MySQL_ConstructedResultSetMetaData::getS
 
 /* {{{ MySQL_ConstructedResultSetMetaData::getTableName() -I- */
 std::string
-MySQL_ConstructedResultSetMetaData::getTableName(unsigned int columnIndex) const
+MySQL_ConstructedResultSetMetaData::getTableName(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ConstructedResultSetMetaData::getTableName");
 	CPP_INFO_FMT("this=%p", this);
@@ -211,7 +211,7 @@ MySQL_ConstructedResultSetMetaData::getT
 
 /* {{{ MySQL_ConstructedResultSetMetaData::isAutoIncrement() -I- */
 bool
-MySQL_ConstructedResultSetMetaData::isAutoIncrement(unsigned int columnIndex) const
+MySQL_ConstructedResultSetMetaData::isAutoIncrement(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ConstructedResultSetMetaData::isAutoIncrement");
 	CPP_INFO_FMT("this=%p", this);
@@ -225,7 +225,7 @@ MySQL_ConstructedResultSetMetaData::isAu
 
 /* {{{ MySQL_ConstructedResultSetMetaData::isCaseSensitive() -I- */
 bool
-MySQL_ConstructedResultSetMetaData::isCaseSensitive(unsigned int columnIndex) const
+MySQL_ConstructedResultSetMetaData::isCaseSensitive(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ConstructedResultSetMetaData::isCaseSensitive");
 	CPP_INFO_FMT("this=%p", this);
@@ -239,7 +239,7 @@ MySQL_ConstructedResultSetMetaData::isCa
 
 /* {{{ MySQL_ConstructedResultSetMetaData::isCurrency() -I- */
 bool
-MySQL_ConstructedResultSetMetaData::isCurrency(unsigned int columnIndex) const
+MySQL_ConstructedResultSetMetaData::isCurrency(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ConstructedResultSetMetaData::isCurrency");
 	CPP_INFO_FMT("this=%p", this);
@@ -253,7 +253,7 @@ MySQL_ConstructedResultSetMetaData::isCu
 
 /* {{{ MySQL_ConstructedResultSetMetaData::isDefinitelyWritable() -I- */
 bool
-MySQL_ConstructedResultSetMetaData::isDefinitelyWritable(unsigned int columnIndex) const
+MySQL_ConstructedResultSetMetaData::isDefinitelyWritable(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ConstructedResultSetMetaData::isDefinitelyWritable");
 	CPP_INFO_FMT("this=%p", this);
@@ -267,7 +267,7 @@ MySQL_ConstructedResultSetMetaData::isDe
 
 /* {{{ MySQL_ConstructedResultSetMetaData::isNullable() -I- */
 int
-MySQL_ConstructedResultSetMetaData::isNullable(unsigned int columnIndex) const
+MySQL_ConstructedResultSetMetaData::isNullable(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ConstructedResultSetMetaData::isNullable");
 	CPP_INFO_FMT("this=%p", this);
@@ -281,7 +281,7 @@ MySQL_ConstructedResultSetMetaData::isNu
 
 /* {{{ MySQL_ConstructedResultSetMetaData::isReadOnly() -I- */
 bool
-MySQL_ConstructedResultSetMetaData::isReadOnly(unsigned int columnIndex) const
+MySQL_ConstructedResultSetMetaData::isReadOnly(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ConstructedResultSetMetaData::isReadOnly");
 	CPP_INFO_FMT("this=%p", this);
@@ -296,7 +296,7 @@ MySQL_ConstructedResultSetMetaData::isRe
 
 /* {{{ MySQL_ConstructedResultSetMetaData::isSearchable() -I- */
 bool
-MySQL_ConstructedResultSetMetaData::isSearchable(unsigned int columnIndex) const
+MySQL_ConstructedResultSetMetaData::isSearchable(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ConstructedResultSetMetaData::isSearchable");
 	CPP_INFO_FMT("this=%p", this);
@@ -310,7 +310,7 @@ MySQL_ConstructedResultSetMetaData::isSe
 
 /* {{{ MySQL_ConstructedResultSetMetaData::isSigned() -I- */
 bool
-MySQL_ConstructedResultSetMetaData::isSigned(unsigned int columnIndex) const
+MySQL_ConstructedResultSetMetaData::isSigned(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ConstructedResultSetMetaData::isSigned");
 	CPP_INFO_FMT("this=%p", this);
@@ -324,7 +324,7 @@ MySQL_ConstructedResultSetMetaData::isSi
 
 /* {{{ MySQL_ConstructedResultSetMetaData::isWritable() -I- */
 bool
-MySQL_ConstructedResultSetMetaData::isWritable(unsigned int columnIndex) const
+MySQL_ConstructedResultSetMetaData::isWritable(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ConstructedResultSetMetaData::isWritable");
 	CPP_INFO_FMT("this=%p", this);

=== modified file 'driver/mysql_cset_metadata.h'
--- a/driver/mysql_cset_metadata.h	2008-11-03 17:38:56 +0000
+++ b/driver/mysql_cset_metadata.h	2008-11-19 12:23:01 +0000
@@ -41,45 +41,45 @@ public:
 	MySQL_ConstructedResultSetMetaData(const MySQL_ConstructedResultSet * p,
sql::mysql::util::my_shared_ptr< MySQL_DebugLogger > * l);
 	virtual ~MySQL_ConstructedResultSetMetaData();
 
-	std::string getCatalogName(unsigned int columnIndex) const;
+	std::string getCatalogName(unsigned int columnIndex);
 
-	unsigned int getColumnCount() const;
+	unsigned int getColumnCount();
 
-	int getColumnDisplaySize(unsigned int columnIndex) const;
+	int getColumnDisplaySize(unsigned int columnIndex);
 
-	std::string getColumnLabel(unsigned int columnIndex) const;
+	std::string getColumnLabel(unsigned int columnIndex);
 
-	std::string getColumnName(unsigned int columnIndex) const;
+	std::string getColumnName(unsigned int columnIndex);
 
-	int getColumnType(unsigned int columnIndex) const;
+	int getColumnType(unsigned int columnIndex);
 
-	std::string getColumnTypeName(unsigned int columnIndex) const;
+	std::string getColumnTypeName(unsigned int columnIndex);
 
-	int getPrecision(unsigned int columnIndex) const;
+	int getPrecision(unsigned int columnIndex);
 
-	int getScale(unsigned int columnIndex) const;
+	int getScale(unsigned int columnIndex);
 
-	std::string getSchemaName(unsigned int columnIndex) const;
+	std::string getSchemaName(unsigned int columnIndex);
 
-	std::string getTableName(unsigned int columnIndex) const;
+	std::string getTableName(unsigned int columnIndex);
 
-	bool isAutoIncrement(unsigned int columnIndex) const;
+	bool isAutoIncrement(unsigned int columnIndex);
 
-	bool isCaseSensitive(unsigned int columnIndex) const;
+	bool isCaseSensitive(unsigned int columnIndex);
 
-	bool isCurrency(unsigned int columnIndex) const;
+	bool isCurrency(unsigned int columnIndex);
 
-	bool isDefinitelyWritable(unsigned int columnIndex) const;
+	bool isDefinitelyWritable(unsigned int columnIndex);
 
-	int isNullable(unsigned int columnIndex) const;
+	int isNullable(unsigned int columnIndex);
 
-	bool isReadOnly(unsigned int columnIndex) const;
+	bool isReadOnly(unsigned int columnIndex);
 
-	bool isSearchable(unsigned int columnIndex) const;
+	bool isSearchable(unsigned int columnIndex);
 
-	bool isSigned(unsigned int columnIndex) const;
+	bool isSigned(unsigned int columnIndex);
 
-	bool isWritable(unsigned int columnIndex) const;
+	bool isWritable(unsigned int columnIndex);
 
 private:
 	/* Prevent use of these */

=== modified file 'driver/mysql_metadata.cpp'
--- a/driver/mysql_metadata.cpp	2008-11-19 11:58:55 +0000
+++ b/driver/mysql_metadata.cpp	2008-11-19 12:23:01 +0000
@@ -1382,7 +1382,7 @@ MySQL_ConnectionMetaData::getColumns(con
 
 				std::auto_ptr<sql::Statement> stmt3(connection->createStatement());
 				std::auto_ptr<sql::ResultSet> rs3(stmt1->executeQuery(query3));
-				const sql::ResultSetMetaData * rs3_meta = rs3->getMetaData();
+				sql::ResultSetMetaData * rs3_meta = rs3->getMetaData();
 
 				std::string query4("SHOW FULL COLUMNS FROM `");
 				query4.append(current_schema).append("`.`").append(current_table).append("` LIKE
'").append(columnNamePattern).append("'");

=== modified file 'driver/mysql_ps_resultset.cpp'
--- a/driver/mysql_ps_resultset.cpp	2008-11-18 14:12:44 +0000
+++ b/driver/mysql_ps_resultset.cpp	2008-11-19 12:23:01 +0000
@@ -437,7 +437,7 @@ MySQL_Prepared_ResultSet::getLong(const 
 /* }}} */
 
 /* {{{ MySQL_Prepared_ResultSet::getMetaData() -U- */
-const sql::ResultSetMetaData *
+sql::ResultSetMetaData *
 MySQL_Prepared_ResultSet::getMetaData() const
 {
 	CPP_ENTER("MySQL_Prepared_ResultSet::getMetaData");

=== modified file 'driver/mysql_ps_resultset.h'
--- a/driver/mysql_ps_resultset.h	2008-11-11 16:43:00 +0000
+++ b/driver/mysql_ps_resultset.h	2008-11-19 12:23:01 +0000
@@ -106,7 +106,7 @@ public:
 	long long getLong(unsigned int columnIndex) const;
 	long long getLong(const std::string& columnLabel) const;
 
-	const sql::ResultSetMetaData * getMetaData() const;
+	sql::ResultSetMetaData * getMetaData() const;
 
 	size_t getRow() const;
 

=== modified file 'driver/mysql_ps_resultset_metadata.cpp'
--- a/driver/mysql_ps_resultset_metadata.cpp	2008-11-14 12:22:06 +0000
+++ b/driver/mysql_ps_resultset_metadata.cpp	2008-11-19 12:23:01 +0000
@@ -62,7 +62,7 @@ MySQL_Prepared_ResultSetMetaData::~MySQL
 
 /* {{{ MySQL_Prepared_ResultSetMetaData::getCatalogName -I- */
 std::string
-MySQL_Prepared_ResultSetMetaData::getCatalogName(unsigned int columnIndex) const
+MySQL_Prepared_ResultSetMetaData::getCatalogName(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_Prepared_ResultSetMetaData::getCatalogName");
 	CPP_INFO_FMT("this=%p", this);
@@ -76,7 +76,7 @@ MySQL_Prepared_ResultSetMetaData::getCat
 
 /* {{{ MySQL_Prepared_ResultSetMetaData::getColumnCount -I- */
 unsigned int
-MySQL_Prepared_ResultSetMetaData::getColumnCount() const
+MySQL_Prepared_ResultSetMetaData::getColumnCount()
 {
 	CPP_ENTER("MySQL_Prepared_ResultSetMetaData::getColumnCount");
 	CPP_INFO_FMT("this=%p", this);
@@ -87,7 +87,7 @@ MySQL_Prepared_ResultSetMetaData::getCol
 
 /* {{{ MySQL_Prepared_ResultSetMetaData::getColumnDisplaySize -U- */
 int
-MySQL_Prepared_ResultSetMetaData::getColumnDisplaySize(unsigned int columnIndex) const
+MySQL_Prepared_ResultSetMetaData::getColumnDisplaySize(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_Prepared_ResultSetMetaData::getColumnDisplaySize");
 	CPP_INFO_FMT("this=%p", this);
@@ -101,7 +101,7 @@ MySQL_Prepared_ResultSetMetaData::getCol
 
 /* {{{ MySQL_Prepared_ResultSetMetaData::getColumnLabel -I- */
 std::string
-MySQL_Prepared_ResultSetMetaData::getColumnLabel(unsigned int columnIndex) const
+MySQL_Prepared_ResultSetMetaData::getColumnLabel(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_Prepared_ResultSetMetaData::getColumnLabel");
 	CPP_INFO_FMT("this=%p", this);
@@ -116,7 +116,7 @@ MySQL_Prepared_ResultSetMetaData::getCol
 
 /* {{{ MySQL_Prepared_ResultSetMetaData::getColumnName -I- */
 std::string
-MySQL_Prepared_ResultSetMetaData::getColumnName(unsigned int columnIndex) const
+MySQL_Prepared_ResultSetMetaData::getColumnName(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_Prepared_ResultSetMetaData::getColumnName");
 	CPP_INFO_FMT("this=%p", this);
@@ -131,7 +131,7 @@ MySQL_Prepared_ResultSetMetaData::getCol
 
 /* {{{ MySQL_Prepared_ResultSetMetaData::getColumnType -I- */
 int
-MySQL_Prepared_ResultSetMetaData::getColumnType(unsigned int columnIndex) const
+MySQL_Prepared_ResultSetMetaData::getColumnType(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_Prepared_ResultSetMetaData::getColumnType");
 	CPP_INFO_FMT("this=%p", this);
@@ -146,7 +146,7 @@ MySQL_Prepared_ResultSetMetaData::getCol
 
 /* {{{ MySQL_Prepared_ResultSetMetaData::getColumnTypeName -I- */
 std::string
-MySQL_Prepared_ResultSetMetaData::getColumnTypeName(unsigned int columnIndex) const
+MySQL_Prepared_ResultSetMetaData::getColumnTypeName(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_Prepared_ResultSetMetaData::getColumnTypeName");
 	CPP_INFO_FMT("this=%p", this);
@@ -226,7 +226,7 @@ MySQL_Prepared_ResultSetMetaData::getCol
 
 /* {{{ MySQL_Prepared_ResultSetMetaData::getPrecision -U- */
 int
-MySQL_Prepared_ResultSetMetaData::getPrecision(unsigned int columnIndex) const
+MySQL_Prepared_ResultSetMetaData::getPrecision(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_Prepared_ResultSetMetaData::getPrecision");
 	CPP_INFO_FMT("this=%p", this);
@@ -240,7 +240,7 @@ MySQL_Prepared_ResultSetMetaData::getPre
 
 /* {{{ MySQL_Prepared_ResultSetMetaData::getScale -U- */
 int
-MySQL_Prepared_ResultSetMetaData::getScale(unsigned int columnIndex) const
+MySQL_Prepared_ResultSetMetaData::getScale(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_Prepared_ResultSetMetaData::getScale");
 	CPP_INFO_FMT("this=%p", this);
@@ -254,7 +254,7 @@ MySQL_Prepared_ResultSetMetaData::getSca
 
 /* {{{ MySQL_Prepared_ResultSetMetaData::getSchemaName -I- */
 std::string
-MySQL_Prepared_ResultSetMetaData::getSchemaName(unsigned int columnIndex) const
+MySQL_Prepared_ResultSetMetaData::getSchemaName(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_Prepared_ResultSetMetaData::getSchemaName");
 	CPP_INFO_FMT("this=%p", this);
@@ -269,7 +269,7 @@ MySQL_Prepared_ResultSetMetaData::getSch
 
 /* {{{ MySQL_Prepared_ResultSetMetaData::getTableName -I- */
 std::string
-MySQL_Prepared_ResultSetMetaData::getTableName(unsigned int columnIndex) const
+MySQL_Prepared_ResultSetMetaData::getTableName(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_Prepared_ResultSetMetaData::getTableName");
 	CPP_INFO_FMT("this=%p", this);
@@ -284,7 +284,7 @@ MySQL_Prepared_ResultSetMetaData::getTab
 
 /* {{{ MySQL_Prepared_ResultSetMetaData::isAutoIncrement -I- */
 bool
-MySQL_Prepared_ResultSetMetaData::isAutoIncrement(unsigned int columnIndex) const
+MySQL_Prepared_ResultSetMetaData::isAutoIncrement(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_Prepared_ResultSetMetaData::isAutoIncrement");
 	CPP_INFO_FMT("this=%p", this);
@@ -299,7 +299,7 @@ MySQL_Prepared_ResultSetMetaData::isAuto
 
 /* {{{ MySQL_Prepared_ResultSetMetaData::isCaseSensitive -I- */
 bool
-MySQL_Prepared_ResultSetMetaData::isCaseSensitive(unsigned int columnIndex) const
+MySQL_Prepared_ResultSetMetaData::isCaseSensitive(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_Prepared_ResultSetMetaData::isCaseSensitive");
 	CPP_INFO_FMT("this=%p", this);
@@ -314,7 +314,7 @@ MySQL_Prepared_ResultSetMetaData::isCase
 
 /* {{{ MySQL_Prepared_ResultSetMetaData::isCurrency -I- */
 bool
-MySQL_Prepared_ResultSetMetaData::isCurrency(unsigned int columnIndex) const
+MySQL_Prepared_ResultSetMetaData::isCurrency(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_Prepared_ResultSetMetaData::isCurrency");
 	CPP_INFO_FMT("this=%p", this);
@@ -329,7 +329,7 @@ MySQL_Prepared_ResultSetMetaData::isCurr
 
 /* {{{ MySQL_Prepared_ResultSetMetaData::isDefinitelyWritable -I- */
 bool
-MySQL_Prepared_ResultSetMetaData::isDefinitelyWritable(unsigned int columnIndex) const
+MySQL_Prepared_ResultSetMetaData::isDefinitelyWritable(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_Prepared_ResultSetMetaData::isDefinitelyWritable");
 	CPP_INFO_FMT("this=%p", this);
@@ -344,7 +344,7 @@ MySQL_Prepared_ResultSetMetaData::isDefi
 
 /* {{{ MySQL_Prepared_ResultSetMetaData::isNullable -I- */
 int
-MySQL_Prepared_ResultSetMetaData::isNullable(unsigned int columnIndex) const
+MySQL_Prepared_ResultSetMetaData::isNullable(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_Prepared_ResultSetMetaData::isNullable");
 	CPP_INFO_FMT("this=%p", this);
@@ -359,7 +359,7 @@ MySQL_Prepared_ResultSetMetaData::isNull
 
 /* {{{ MySQL_Prepared_ResultSetMetaData::isReadOnly -I- */
 bool
-MySQL_Prepared_ResultSetMetaData::isReadOnly(unsigned int columnIndex) const
+MySQL_Prepared_ResultSetMetaData::isReadOnly(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_Prepared_ResultSetMetaData::isReadOnly");
 	CPP_INFO_FMT("this=%p", this);
@@ -380,7 +380,7 @@ MySQL_Prepared_ResultSetMetaData::isRead
 
 /* {{{ MySQL_Prepared_ResultSetMetaData::isSearchable -I- */
 bool
-MySQL_Prepared_ResultSetMetaData::isSearchable(unsigned int columnIndex) const
+MySQL_Prepared_ResultSetMetaData::isSearchable(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_Prepared_ResultSetMetaData::isSearchable");
 	CPP_INFO_FMT("this=%p", this);
@@ -395,7 +395,7 @@ MySQL_Prepared_ResultSetMetaData::isSear
 
 /* {{{ MySQL_Prepared_ResultSetMetaData::isSigned -I- */
 bool
-MySQL_Prepared_ResultSetMetaData::isSigned(unsigned int columnIndex) const
+MySQL_Prepared_ResultSetMetaData::isSigned(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_Prepared_ResultSetMetaData::isSigned");
 	CPP_INFO_FMT("this=%p", this);
@@ -410,7 +410,7 @@ MySQL_Prepared_ResultSetMetaData::isSign
 
 /* {{{ MySQL_Prepared_ResultSetMetaData::isWritable -I- */
 bool
-MySQL_Prepared_ResultSetMetaData::isWritable(unsigned int columnIndex) const
+MySQL_Prepared_ResultSetMetaData::isWritable(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_Prepared_ResultSetMetaData::isWritable");
 	CPP_INFO_FMT("this=%p", this);

=== modified file 'driver/mysql_ps_resultset_metadata.h'
--- a/driver/mysql_ps_resultset_metadata.h	2008-11-03 17:38:56 +0000
+++ b/driver/mysql_ps_resultset_metadata.h	2008-11-19 12:23:01 +0000
@@ -43,45 +43,45 @@ public:
 	MySQL_Prepared_ResultSetMetaData(MYSQL_STMT * s, sql::mysql::util::my_shared_ptr<
MySQL_DebugLogger> * l);
 	virtual ~MySQL_Prepared_ResultSetMetaData();
 
-	std::string getCatalogName(unsigned int columnIndex) const;
+	std::string getCatalogName(unsigned int columnIndex);
 
-	unsigned int getColumnCount() const;
+	unsigned int getColumnCount();
 
-	int getColumnDisplaySize(unsigned int columnIndex) const;
+	int getColumnDisplaySize(unsigned int columnIndex);
 
-	std::string getColumnLabel(unsigned int columnIndex) const;
+	std::string getColumnLabel(unsigned int columnIndex);
 
-	std::string getColumnName(unsigned int columnIndex) const;
+	std::string getColumnName(unsigned int columnIndex);
 
-	int getColumnType(unsigned int columnIndex) const;
+	int getColumnType(unsigned int columnIndex);
 
-	std::string getColumnTypeName(unsigned int columnIndex) const;
+	std::string getColumnTypeName(unsigned int columnIndex);
 
-	int getPrecision(unsigned int columnIndex) const;
+	int getPrecision(unsigned int columnIndex);
 
-	int getScale(unsigned int columnIndex) const;
+	int getScale(unsigned int columnIndex);
 
-	std::string getSchemaName(unsigned int columnIndex) const;
+	std::string getSchemaName(unsigned int columnIndex);
 
-	std::string getTableName(unsigned int columnIndex) const;
+	std::string getTableName(unsigned int columnIndex);
 
-	bool isAutoIncrement(unsigned int columnIndex) const;
+	bool isAutoIncrement(unsigned int columnIndex);
 
-	bool isCaseSensitive(unsigned int columnIndex) const;
+	bool isCaseSensitive(unsigned int columnIndex);
 
-	bool isCurrency(unsigned int columnIndex) const;
+	bool isCurrency(unsigned int columnIndex);
 
-	bool isDefinitelyWritable(unsigned int columnIndex) const;
+	bool isDefinitelyWritable(unsigned int columnIndex);
 
-	int isNullable(unsigned int columnIndex) const;
+	int isNullable(unsigned int columnIndex);
 
-	bool isReadOnly(unsigned int columnIndex) const;
+	bool isReadOnly(unsigned int columnIndex);
 
-	bool isSearchable(unsigned int columnIndex) const;
+	bool isSearchable(unsigned int columnIndex);
 
-	bool isSigned(unsigned int columnIndex) const;
+	bool isSigned(unsigned int columnIndex);
 
-	bool isWritable(unsigned int columnIndex) const;
+	bool isWritable(unsigned int columnIndex);
 
 private:
 	/* Prevent use of these */

=== modified file 'driver/mysql_resultset.cpp'
--- a/driver/mysql_resultset.cpp	2008-11-19 08:51:10 +0000
+++ b/driver/mysql_resultset.cpp	2008-11-19 12:23:01 +0000
@@ -429,7 +429,7 @@ MySQL_ResultSet::getLong(const std::stri
 
 
 /* {{{ MySQL_ResultSet::getMetaData() -I- */
-const sql::ResultSetMetaData *
+sql::ResultSetMetaData *
 MySQL_ResultSet::getMetaData() const
 {
 	CPP_ENTER("MySQL_ResultSet::getMetaData");

=== modified file 'driver/mysql_resultset.h'
--- a/driver/mysql_resultset.h	2008-11-03 17:38:56 +0000
+++ b/driver/mysql_resultset.h	2008-11-19 12:23:01 +0000
@@ -53,7 +53,7 @@ class MySQL_ResultSet : public sql::Resu
 
 	const MySQL_Statement * parent;
 
-	const MySQL_ResultSetMetaData *metadata;
+	MySQL_ResultSetMetaData *metadata;
 
 	sql::mysql::util::my_shared_ptr< MySQL_DebugLogger > * logger;
 protected:
@@ -103,7 +103,7 @@ public:
 	long long getLong(unsigned int columnIndex) const;
 	long long getLong(const std::string& columnLabel) const;
 
-	const sql::ResultSetMetaData * getMetaData() const;
+	sql::ResultSetMetaData * getMetaData() const;
 
 	size_t getRow() const;
 

=== modified file 'driver/mysql_resultset_metadata.cpp'
--- a/driver/mysql_resultset_metadata.cpp	2008-11-14 12:22:06 +0000
+++ b/driver/mysql_resultset_metadata.cpp	2008-11-19 12:23:01 +0000
@@ -59,7 +59,7 @@ MySQL_ResultSetMetaData::~MySQL_ResultSe
 
 /* {{{ MySQL_ResultSetMetaData::getCatalogName -I- */
 std::string
-MySQL_ResultSetMetaData::getCatalogName(unsigned int columnIndex) const
+MySQL_ResultSetMetaData::getCatalogName(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ResultSetMetaData::getCatalogName");
 	if (result->isValid()) {
@@ -75,7 +75,7 @@ MySQL_ResultSetMetaData::getCatalogName(
 
 /* {{{ MySQL_ResultSetMetaData::getColumnCount -I- */
 unsigned int
-MySQL_ResultSetMetaData::getColumnCount() const
+MySQL_ResultSetMetaData::getColumnCount()
 {
 	CPP_ENTER("MySQL_ResultSetMetaData::getColumnCount");
 	if (result->isValid()) {
@@ -88,7 +88,7 @@ MySQL_ResultSetMetaData::getColumnCount(
 
 /* {{{ MySQL_ResultSetMetaData::getColumnDisplaySize -U- */
 int
-MySQL_ResultSetMetaData::getColumnDisplaySize(unsigned int columnIndex) const
+MySQL_ResultSetMetaData::getColumnDisplaySize(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ResultSetMetaData::getColumnDisplaySize");
 	if (result->isValid()) {
@@ -105,7 +105,7 @@ MySQL_ResultSetMetaData::getColumnDispla
 
 /* {{{ MySQL_ResultSetMetaData::getColumnLabel -I- */
 std::string
-MySQL_ResultSetMetaData::getColumnLabel(unsigned int columnIndex) const
+MySQL_ResultSetMetaData::getColumnLabel(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ResultSetMetaData::getColumnLabel");
 	if (result->isValid()) {
@@ -121,7 +121,7 @@ MySQL_ResultSetMetaData::getColumnLabel(
 
 /* {{{ MySQL_ResultSetMetaData::getColumnName -I- */
 std::string
-MySQL_ResultSetMetaData::getColumnName(unsigned int columnIndex) const
+MySQL_ResultSetMetaData::getColumnName(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ResultSetMetaData::getColumnName");
 	if (result->isValid()) {
@@ -137,7 +137,7 @@ MySQL_ResultSetMetaData::getColumnName(u
 
 /* {{{ MySQL_ResultSetMetaData::getColumnType -I- */
 int
-MySQL_ResultSetMetaData::getColumnType(unsigned int columnIndex) const
+MySQL_ResultSetMetaData::getColumnType(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ResultSetMetaData::getColumnType");
 	if (result->isValid()) {
@@ -153,7 +153,7 @@ MySQL_ResultSetMetaData::getColumnType(u
 
 /* {{{ MySQL_ResultSetMetaData::getColumnTypeName -I- */
 std::string
-MySQL_ResultSetMetaData::getColumnTypeName(unsigned int columnIndex) const
+MySQL_ResultSetMetaData::getColumnTypeName(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ResultSetMetaData::getColumnTypeName");
 	if (result->isValid()) {
@@ -235,7 +235,7 @@ MySQL_ResultSetMetaData::getColumnTypeNa
 
 /* {{{ MySQL_ResultSetMetaData::getPrecision -U- */
 int
-MySQL_ResultSetMetaData::getPrecision(unsigned int columnIndex) const
+MySQL_ResultSetMetaData::getPrecision(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ResultSetMetaData::getPrecision");
 	if (result->isValid()) {
@@ -251,7 +251,7 @@ MySQL_ResultSetMetaData::getPrecision(un
 
 /* {{{ MySQL_ResultSetMetaData::getScale -U- */
 int
-MySQL_ResultSetMetaData::getScale(unsigned int columnIndex) const
+MySQL_ResultSetMetaData::getScale(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ResultSetMetaData::getScale");
 	if (result->isValid()) {
@@ -268,7 +268,7 @@ MySQL_ResultSetMetaData::getScale(unsign
 
 /* {{{ MySQL_ResultSetMetaData::getSchemaName -I- */
 std::string
-MySQL_ResultSetMetaData::getSchemaName(unsigned int columnIndex) const
+MySQL_ResultSetMetaData::getSchemaName(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ResultSetMetaData::getSchemaName");
 	if (result->isValid()) {
@@ -285,7 +285,7 @@ MySQL_ResultSetMetaData::getSchemaName(u
 
 /* {{{ MySQL_ResultSetMetaData::getTableName -I- */
 std::string
-MySQL_ResultSetMetaData::getTableName(unsigned int columnIndex) const
+MySQL_ResultSetMetaData::getTableName(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ResultSetMetaData::getTableName");
 	if (result->isValid()) {
@@ -301,7 +301,7 @@ MySQL_ResultSetMetaData::getTableName(un
 
 /* {{{ MySQL_ResultSetMetaData::isAutoIncrement -I- */
 bool
-MySQL_ResultSetMetaData::isAutoIncrement(unsigned int columnIndex) const
+MySQL_ResultSetMetaData::isAutoIncrement(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ResultSetMetaData::isAutoIncrement");
 	if (result->isValid()) {
@@ -318,7 +318,7 @@ MySQL_ResultSetMetaData::isAutoIncrement
 
 /* {{{ MySQL_ResultSetMetaData::isCaseSensitive -I- */
 bool
-MySQL_ResultSetMetaData::isCaseSensitive(unsigned int columnIndex) const
+MySQL_ResultSetMetaData::isCaseSensitive(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ResultSetMetaData::isCaseSensitive");
 	if (result->isValid()) {
@@ -334,7 +334,7 @@ MySQL_ResultSetMetaData::isCaseSensitive
 
 /* {{{ MySQL_ResultSetMetaData::isCurrency -I- */
 bool
-MySQL_ResultSetMetaData::isCurrency(unsigned int columnIndex) const
+MySQL_ResultSetMetaData::isCurrency(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ResultSetMetaData::isCurrency");
 	if (result->isValid()) {
@@ -350,7 +350,7 @@ MySQL_ResultSetMetaData::isCurrency(unsi
 
 /* {{{ MySQL_ResultSetMetaData::isDefinitelyWritable -I- */
 bool
-MySQL_ResultSetMetaData::isDefinitelyWritable(unsigned int columnIndex) const
+MySQL_ResultSetMetaData::isDefinitelyWritable(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ResultSetMetaData::isDefinitelyWritable");
 	if (result->isValid()) {
@@ -366,7 +366,7 @@ MySQL_ResultSetMetaData::isDefinitelyWri
 
 /* {{{ MySQL_ResultSetMetaData::isNullable -I- */
 int
-MySQL_ResultSetMetaData::isNullable(unsigned int columnIndex) const
+MySQL_ResultSetMetaData::isNullable(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ResultSetMetaData::isNullable");
 	if (result->isValid()) {
@@ -382,7 +382,7 @@ MySQL_ResultSetMetaData::isNullable(unsi
 
 /* {{{ MySQL_ResultSetMetaData::isReadOnly -I- */
 bool
-MySQL_ResultSetMetaData::isReadOnly(unsigned int columnIndex) const
+MySQL_ResultSetMetaData::isReadOnly(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ResultSetMetaData::isReadOnly");
 	if (result->isValid()) {
@@ -404,7 +404,7 @@ MySQL_ResultSetMetaData::isReadOnly(unsi
 
 /* {{{ MySQL_ResultSetMetaData::isSearchable -I- */
 bool
-MySQL_ResultSetMetaData::isSearchable(unsigned int columnIndex) const
+MySQL_ResultSetMetaData::isSearchable(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ResultSetMetaData::isSearchable");
 	if (result->isValid()) {
@@ -420,7 +420,7 @@ MySQL_ResultSetMetaData::isSearchable(un
 
 /* {{{ MySQL_ResultSetMetaData::isSigned -I- */
 bool
-MySQL_ResultSetMetaData::isSigned(unsigned int columnIndex) const
+MySQL_ResultSetMetaData::isSigned(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ResultSetMetaData::isSigned");
 	if (result->isValid()) {
@@ -436,7 +436,7 @@ MySQL_ResultSetMetaData::isSigned(unsign
 
 /* {{{ MySQL_ResultSetMetaData::isWritable -I- */
 bool
-MySQL_ResultSetMetaData::isWritable(unsigned int columnIndex) const
+MySQL_ResultSetMetaData::isWritable(unsigned int columnIndex)
 {
 	CPP_ENTER("MySQL_ResultSetMetaData::isWritable");
 	if (result->isValid()) {

=== modified file 'driver/mysql_resultset_metadata.h'
--- a/driver/mysql_resultset_metadata.h	2008-11-03 17:38:56 +0000
+++ b/driver/mysql_resultset_metadata.h	2008-11-19 12:23:01 +0000
@@ -40,45 +40,45 @@ public:
 	MySQL_ResultSetMetaData(MYSQL_RES_Wrapper * res, sql::mysql::util::my_shared_ptr<
MySQL_DebugLogger > * l);
 	virtual ~MySQL_ResultSetMetaData();
 
-	std::string getCatalogName(unsigned int columnIndex) const;
+	std::string getCatalogName(unsigned int columnIndex);
 
-	unsigned int getColumnCount() const;
+	unsigned int getColumnCount();
 
-	int getColumnDisplaySize(unsigned int columnIndex) const;
+	int getColumnDisplaySize(unsigned int columnIndex);
 
-	std::string getColumnLabel(unsigned int columnIndex) const;
+	std::string getColumnLabel(unsigned int columnIndex);
 
-	std::string getColumnName(unsigned int columnIndex) const;
+	std::string getColumnName(unsigned int columnIndex);
 
-	int getColumnType(unsigned int columnIndex) const;
+	int getColumnType(unsigned int columnIndex);
 
-	std::string getColumnTypeName(unsigned int columnIndex) const;
+	std::string getColumnTypeName(unsigned int columnIndex);
 
-	int getPrecision(unsigned int columnIndex) const;
+	int getPrecision(unsigned int columnIndex);
 
-	int getScale(unsigned int columnIndex) const;
+	int getScale(unsigned int columnIndex);
 
-	std::string getSchemaName(unsigned int columnIndex) const;
+	std::string getSchemaName(unsigned int columnIndex);
 
-	std::string getTableName(unsigned int columnIndex) const;
+	std::string getTableName(unsigned int columnIndex);
 
-	bool isAutoIncrement(unsigned int columnIndex) const;
+	bool isAutoIncrement(unsigned int columnIndex);
 
-	bool isCaseSensitive(unsigned int columnIndex) const;
+	bool isCaseSensitive(unsigned int columnIndex);
 
-	bool isCurrency(unsigned int columnIndex) const;
+	bool isCurrency(unsigned int columnIndex);
 
-	bool isDefinitelyWritable(unsigned int columnIndex) const;
+	bool isDefinitelyWritable(unsigned int columnIndex);
 
-	int isNullable(unsigned int columnIndex) const;
+	int isNullable(unsigned int columnIndex);
 
-	bool isReadOnly(unsigned int columnIndex) const;
+	bool isReadOnly(unsigned int columnIndex);
 
-	bool isSearchable(unsigned int columnIndex) const;
+	bool isSearchable(unsigned int columnIndex);
 
-	bool isSigned(unsigned int columnIndex) const;
+	bool isSigned(unsigned int columnIndex);
 
-	bool isWritable(unsigned int columnIndex) const;
+	bool isWritable(unsigned int columnIndex);
 
 private:
 	/* Prevent use of these */

=== modified file 'examples/connection_meta_schemaobj.cpp'
--- a/examples/connection_meta_schemaobj.cpp	2008-11-19 11:58:55 +0000
+++ b/examples/connection_meta_schemaobj.cpp	2008-11-19 12:23:01 +0000
@@ -50,7 +50,7 @@ int main(int argc, const char **argv)
 	const string pass(argc >= 4 ? argv[3] : EXAMPLE_PASS);
 	const string database(argc >= 5 ? argv[4] : EXAMPLE_DB);
 
-	sql::ResultSetMetaData const * res_meta, * res_meta_tables;
+	sql::ResultSetMetaData * res_meta, * res_meta_tables;
 
 	static std::list<std::string> table_types;
 	table_types.push_back("TABLE");

=== modified file 'examples/resultset_meta.cpp'
--- a/examples/resultset_meta.cpp	2008-11-17 16:36:59 +0000
+++ b/examples/resultset_meta.cpp	2008-11-19 12:23:01 +0000
@@ -156,8 +156,8 @@ int main(int argc, const char **argv)
 static void printResultSetMetaData(std::auto_ptr< sql::ResultSet > &res,
std::auto_ptr< sql::ResultSet > &ps_res)
 {
 	/* ResultSetMetaData object */
-	sql::ResultSetMetaData const * meta;
-	sql::ResultSetMetaData const * ps_meta;
+	sql::ResultSetMetaData * meta;
+	sql::ResultSetMetaData * ps_meta;
 	unsigned int column;
 
 	if (res->rowsCount() == 0) {

=== modified file 'test/CJUnitTestsPort/compliance/DatabaseMetaDataTest.cpp'
--- a/test/CJUnitTestsPort/compliance/DatabaseMetaDataTest.cpp	2008-11-18 15:48:27 +0000
+++ b/test/CJUnitTestsPort/compliance/DatabaseMetaDataTest.cpp	2008-11-19 12:23:01 +0000
@@ -2725,7 +2725,7 @@ String tmp("%"); 
             String sRetStr;
 
             sRetStr = "";
-            const sql::ResultSetMetaData * rsmd = oRet_ResultSet->getMetaData();
+            sql::ResultSetMetaData * rsmd = oRet_ResultSet->getMetaData();
 
             int iCount = rsmd->getColumnCount();
             TestsListener::theInstance().messagesLog()
@@ -3284,7 +3284,7 @@ std::list< String > tmp2;
 
             ResultSet oRet_ResultSet(dbmd->getTypeInfo());
 
-            const sql::ResultSetMetaData * rsmd = oRet_ResultSet->getMetaData();
+            sql::ResultSetMetaData * rsmd = oRet_ResultSet->getMetaData();
 
             int iCount = rsmd->getColumnCount();
             TestsListener::theInstance().messagesLog()
@@ -3420,7 +3420,7 @@ std::list< String > tmp2;
       String tmp("%");
       std::list<int> tmp2;
             ResultSet oRet_ResultSet(dbmd->getUDTs(sCatalogName, sSchemaName, tmp,
tmp2));
-            const sql::ResultSetMetaData * rsmd = oRet_ResultSet->getMetaData();
+            sql::ResultSetMetaData * rsmd = oRet_ResultSet->getMetaData();
 
             int iCount = rsmd->getColumnCount();
 
@@ -9229,7 +9229,7 @@ std::list< String > tmp2;
     bool statusColumnCount = true;
     bool statusColumnMatch = true;
     int iColumnNamesLength = sColumnNames.size();
-    const sql::ResultSetMetaData * rsmd = rset->getMetaData();
+    sql::ResultSetMetaData * rsmd = rset->getMetaData();
 
     int iCount = rsmd->getColumnCount();
 

=== modified file 'test/test_common.cpp'
--- a/test/test_common.cpp	2008-11-19 11:58:55 +0000
+++ b/test/test_common.cpp	2008-11-19 12:23:01 +0000
@@ -1363,7 +1363,7 @@ static void test_result_set_11(sql::Conn
 		ensure("res1 is NULL", rset1.get() != NULL);
 		ensure("res1 is empty", rset1->next() != false);
 
-		const sql::ResultSetMetaData * meta1(rset1->getMetaData());
+		sql::ResultSetMetaData * meta1(rset1->getMetaData());
 		ensure("column name differs", !meta1->getColumnName(1).compare("a"));
 		ensure("column name differs", !meta1->getColumnName(2).compare("b"));
 		ensure("column name differs", !meta1->getColumnName(3).compare("c"));
@@ -2562,7 +2562,7 @@ static void test_not_implemented_rs_meta
 	std::string bar("foo");
 	std::auto_ptr<sql::Statement> stmt(conn->createStatement());	
 	std::auto_ptr<sql::ResultSet> res(stmt->executeQuery("SELECT 1 AS 'a'"));
-	const sql::ResultSetMetaData * meta(res->getMetaData());
+	sql::ResultSetMetaData * meta(res->getMetaData());
 
 	try {
 		// getPrecision(unsigned int columnIndex) 
@@ -2593,7 +2593,7 @@ static void test_not_implemented_ps_rs_m
 	std::string bar("foo");
 	std::auto_ptr<sql::PreparedStatement> stmt(conn->prepareStatement("SELECT 1 AS
'a'"));
 	std::auto_ptr<sql::ResultSet> res(stmt->executeQuery());
-	const sql::ResultSetMetaData * meta(res->getMetaData());
+	sql::ResultSetMetaData * meta(res->getMetaData());
 
 	try {
 		// getColumnDisplaySize(unsigned int columnIndex) 
@@ -2640,7 +2640,7 @@ static void test_not_implemented_cs_rs_m
 	std::string bar("foo");
 	sql::DatabaseMetaData *conn_meta(conn->getMetaData());
 	std::auto_ptr<sql::ResultSet> res(conn_meta->getSchemaObjectTypes());
-	const sql::ResultSetMetaData * meta(res->getMetaData());
+	sql::ResultSetMetaData * meta(res->getMetaData());
 
 	try {
 		// getColumnDisplaySize(unsigned int columnIndex)
Thread
• bzr commit into connector-cpp-bzr branch (andrey.hristov:270) andrey.hristov19 Nov