Make SQLDA logic more solid

Author: irodushka

IscDbc/IscStatement.cpp

@@ -106,8 +106,8 @@ namespace IscDbcLibrary {
 //////////////////////////////////////////////////////////////////////
 
 IscStatement::IscStatement(IscConnection *connect) :
-	inputSqlda{connect},
-	outputSqlda{connect}
+	inputSqlda{connect, Sqlda::SQLDA_INPUT},
+	outputSqlda{connect, Sqlda::SQLDA_OUTPUT}
 {
 	connection = connect;
 	useCount = 1;

IscDbc/Sqlda.cpp

@@ -313,7 +313,7 @@ class CDataStaticCursor
 // Construction/Destruction Sqlda
 //////////////////////////////////////////////////////////////////////
 
-Sqlda::Sqlda(IscConnection* conn) : connection{ conn }, buffer{}, execBuffer{}, useExecBufferMeta{ false }
+Sqlda::Sqlda(IscConnection* conn, e_sqlda_dir dir) : connection{ conn }, buffer{}, execBuffer{}, useExecBufferMeta{ false }, SqldaDir{ dir }
 {
 	init();
 }
@@ -684,7 +684,7 @@ void Sqlda::print()
 //
 int Sqlda::getColumnDisplaySize(int index)
 {
-	const SqlProperties *var = orgVarSqlProperties(index);
+	const SqlProperties *var = (SqldaDir == SQLDA_INPUT) ? orgVarSqlProperties(index) : Var(index);
 
 	switch (var->sqltype)
 	{

IscDbc/Sqlda.h

@@ -160,10 +160,16 @@ class Sqlda
 public:
 	using buffer_t = std::vector<char>;
 
+	enum e_sqlda_dir {
+		SQLDA_INPUT,
+		SQLDA_OUTPUT,
+	};
+
 protected:
 	buffer_t& initStaticCursor(IscStatement* stmt);
 	buffer_t& addRowSqldaInBufferStaticCursor();
 	void restoreOrgAdressFieldsStaticCursor();
+	e_sqlda_dir SqldaDir;
 
 public:
 	const char* getOwnerName(int index);
@@ -202,7 +208,7 @@ class Sqlda
 	CAttrSqlVar* Var(int index) { return &sqlvar.at(index - 1); }
 	const SqlProperties* orgVarSqlProperties(int index) { return &sqlvar.at(index - 1).orgSqlProperties; }
 
-	Sqlda(IscConnection* conn);
+	Sqlda(IscConnection* conn, e_sqlda_dir dir);
 	~Sqlda();
 
 	int isBlobOrArray(int index);

IscDbc/TypesResultSet.cpp

@@ -136,7 +136,7 @@ static Types types [] =
 
 TypesResultSet::TypesResultSet(int dataType, int appOdbcVersion, int bytesPerCharacter, IscConnection* conn) :
 	IscResultSet{nullptr},
-	outputSqlda {conn}
+	outputSqlda {conn, Sqlda::SQLDA_OUTPUT}
 {	
 	dataTypes = dataType;