Initiated implementation for ODBC-152. Boolean type support for Fireb…

…ird 3
FirebirdSQL · May 14, 2013 · f32b1a0 · f32b1a0
1 parent 31ff22d
commit f32b1a0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/IscDbc/IscDbc.h b/IscDbc/IscDbc.h
@@ -35,7 +35,7 @@
 #include "LoadFbClientDll.h"
 
 #ifndef SQL_BOOLEAN
-#define SQL_BOOLEAN		590
+#define SQL_BOOLEAN		32764
 #endif
 
 #ifndef NULL

diff --git a/IscDbc/JavaType.h b/IscDbc/JavaType.h
@@ -55,7 +55,7 @@
 #define JDBC_SQL_TIME 	  10
 #define JDBC_SQL_TIMESTAMP	  11
 
-#define JDBC_BOOLEAN	  16
+#define JDBC_BOOLEAN	  -7
 
 #define JDBC_DATE 		  91
 #define JDBC_TIME 		  92

diff --git a/IscDbc/Sqlda.h b/IscDbc/Sqlda.h
@@ -44,7 +44,10 @@ class CAttrSqlVar
 
 	void operator = ( XSQLVAR *var )
 	{
-		*(QUAD*)this = *(QUAD*)var;
+		sqltype = var->sqltype;
+		sqlscale = var->sqlscale;
+		sqlsubtype = var->sqlsubtype;
+		sqllen = var->sqllen; 
 		varOrg = var;
 	}
 

diff --git a/OdbcConvert.cpp b/OdbcConvert.cpp
@@ -135,10 +135,6 @@ ADRESS_FUNCTION OdbcConvert::getAdressFunction(DescRecord * from, DescRecord * t
 	switch(from->conciseType)
 	{
 	case SQL_C_BIT:
-		if ( to->isIndicatorSqlDa )
-			return &OdbcConvert::transferStringToAllowedType;
-		break;
-
 	case SQL_C_TINYINT:
 	case SQL_C_UTINYINT:
 	case SQL_C_STINYINT: