[Tora-cvs] SF.net SVN: tora:[4009] branches/tora-trotl/src/tooracleconnection_trotl. cpp

[<ibr...@us...>]

Revision: 4009
          http://tora.svn.sourceforge.net/tora/?rev=4009&view=rev
Author:   ibre5041
Date:     2011-08-05 20:37:07 +0000 (Fri, 05 Aug 2011)

Log Message:
-----------
some internal fields in trotl library renamed

Modified Paths:
--------------
    branches/tora-trotl/src/tooracleconnection_trotl.cpp

Modified: branches/tora-trotl/src/tooracleconnection_trotl.cpp
===================================================================
--- branches/tora-trotl/src/tooracleconnection_trotl.cpp	2011-08-05 20:17:05 UTC (rev 4008)
+++ branches/tora-trotl/src/tooracleconnection_trotl.cpp	2011-08-05 20:37:07 UTC (rev 4009)
@@ -640,9 +640,9 @@
 			};
 			void readValue(toQValue &value)
 			{
-				super::BindPar const &BP(get_stmt_type() == STMT_SELECT ?
-							   get_next_column() :
-							   get_next_out_bindpar());
+				trotl::BindPar const &BP(get_stmt_type() == STMT_SELECT ?
+							 get_next_column() :
+							 get_next_out_bindpar());
 
 				if((_state & EXECUTED) == 0)
 					execute_internal(::trotl::g_OCIPL_BULK_ROWS, OCI_DEFAULT);
@@ -911,17 +911,17 @@
 
 			// TODO trotl should return const iterator
 
-			const std::vector<trotl::ColumnType> &col = Query->get_columns();
+			const std::vector<trotl::DescribeColumn*> &col = Query->get_columns();
 			if(col.empty()) return ret;
-			std::vector<trotl::ColumnType>::const_iterator it = col.begin(); ++it; // starts with 1st
+			std::vector<trotl::DescribeColumn*>::const_iterator it = col.begin(); ++it; // starts with 1st
 			//TLOG(0,toDecorator,__HERE__) << "Columns: " << q1.get_column_count() << std::endl;
 			for(; it != col.end(); ++it)
 			{
-				TLOG(0,toDecorator,__HERE__) << "Var: " << (*it).get_type_str(true) << std::endl;
+				TLOG(0,toDecorator,__HERE__) << "Var: " << (*it)->typeName() << std::endl;
 				toQDescribe desc;
  				desc.AlignRight = false;
- 				desc.Name = QString::fromUtf8( (*it)._column_name.c_str() );
-				desc.Datatype = QString::fromUtf8( (*it).get_type_str(true).c_str() );
+ 				desc.Name = QString::fromUtf8( (*it)->_name.c_str() );
+				desc.Datatype = QString::fromUtf8( (*it)->typeName().c_str() );
 
 				//datatypearg1 = description[i].char_size;
 				desc.Datatype.sprintf(desc.Datatype.toUtf8().constData(), datatypearg1, datatypearg2);
@@ -1550,42 +1550,42 @@
 	{
 		for (toQList::iterator i = query()->params().begin();i != query()->params().end();i++)
 		{
- 			const trotlQuery::BindPar& bp = (*Query).get_curr_in_bindpar();
+ 			const ::trotl::BindPar& bp = (*Query).get_curr_in_bindpar();
 			
-			if( (bp._bind_type & ( trotlQuery::BindPar::BIND_IN | trotlQuery::BindPar::BIND_OUT )) == 0)
+			if( (bp._bind_type & ( ::trotl::BindPar::BIND_IN | ::trotl::BindPar::BIND_OUT )) == 0)
 				throw toConnection::exception(QString::fromLatin1("Fatal pruser error - invalid BindPar"));
 			
-			if( bp.bind_typename == "int" /*&& (*i).isInt()*/ ) {
+			if( bp._bind_typename == "int" /*&& (*i).isInt()*/ ) {
 				(*Query) << (*i).toInt();
 				TLOG(0,toDecorator,__HERE__)
 					<< "<<(conn=" << conn->_conn << ", this=" << Query << ")"
-					<< "::operator<<(" << bp.type_name << " ftype=" << bp.dty
-					<< ", placeholder=" << bp.bind_name
+					<< "::operator<<(" << bp._type_name << " ftype=" << bp.dty
+					<< ", placeholder=" << bp._bind_name
 					<< ", value=" << (*i).toInt() << ");"
 					<< "\t of:" << query()->params().size() << std::endl;
-			} else if( (bp.bind_typename == "char" || bp.bind_typename == "varchar")
+			} else if( (bp._bind_typename == "char" || bp._bind_typename == "varchar")
 				   && ((*i).isString() || (*i).isNumber() || (*i).isNull() ))
 			{
 			  std::string param((const char*)(((QString)*i).toUtf8().constData()));				
 			  (*Query) << param;
 				TLOG(0,toDecorator,__HERE__)
 					<< "<<(conn=" << conn->_conn << ", this=" << Query << ")"
-					<< "::operator<<(" << bp.type_name << " ftype=" << bp.dty
-					<< ", placeholder=" << bp.bind_name
+					<< "::operator<<(" << bp._type_name << " ftype=" << bp.dty
+					<< ", placeholder=" << bp._bind_name
 					<< ", value=" << ::std::string((const char*)(((QString)*i).toUtf8().constData())) << ");" 
 					<< "\t of:" << query()->params().size() << std::endl;
 			} else {
 				TLOG(0,toDecorator,__HERE__)
-					<< "Fatal pruser error - unsupported BindPar: " << bp.bind_typename << std::endl
+					<< "Fatal pruser error - unsupported BindPar: " << bp._bind_typename << std::endl
 					<< " For SQL: \n" << query()->sql() << std::endl
 					<< "<<(conn=" << conn->_conn << ", this=" << Query << ")"
-					<< "::operator<<(" << bp.type_name << " ftype=" << bp.dty
-					<< ", placeholder=" << bp.bind_name
+					<< "::operator<<(" << bp._type_name << " ftype=" << bp.dty
+					<< ", placeholder=" << bp._bind_name
 					<< ", value=" << ::std::string((const char*)(((QString)*i).toUtf8().constData())) << ");"
 					<< "\t of:" << query()->params().size() << std::endl;
 				throw toConnection::exception(
 					QString::fromLatin1("Fatal pruser error - unsupported BindPar:%1\nFor SQL:\n%2\n")
-					.arg(bp.bind_typename.c_str())
+					.arg(bp._bind_typename.c_str())
 					.arg(query()->sql()));
 				exit(-1);
 			}			


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.