Add files for Unicode support.

src/interfaces/odbc/connection.h

@@ -266,6 +266,7 @@ struct ConnectionClass_
 	Int2		pg_version_major;
 	Int2		pg_version_minor;
 	char		ms_jet;
+	char		unicode;
 #ifdef	MULTIBYTE
 	char	   *client_encoding;
 	char	   *server_encoding;

src/interfaces/odbc/odbcapi25w.c

+/*-------
+ * Module:			odbcapi25w.c
+ *
+ * Description:		This module contains UNICODE routines
+ *
+ * Classes:			n/a
+ *
+ * API functions:	SQLColAttributesW, SQLErrorW, SQLGetConnectOptionW,
+			SQLSetConnectOptionW
+ *-------
+ */
+
+#include "psqlodbc.h"
+#include <stdio.h>
+#include <string.h>
+
+#include "pgapifunc.h"
+#include "connection.h"
+#include "statement.h"
+
+RETCODE  SQL_API SQLErrorW(HENV EnvironmentHandle,
+           HDBC ConnectionHandle, HSTMT StatementHandle,
+           SQLWCHAR *Sqlstate, SQLINTEGER *NativeError,
+           SQLWCHAR *MessageText, SQLSMALLINT BufferLength,
+           SQLSMALLINT *TextLength)
+{
+	RETCODE	ret;
+	SWORD	tlen;
+	char	*qst = NULL, *mtxt = NULL;
+
+	mylog("[SQLErrorW]");
+	if (Sqlstate)
+		qst = malloc(8);
+	if (MessageText)
+		mtxt = malloc(BufferLength);	
+	ret = PGAPI_Error(EnvironmentHandle, ConnectionHandle, StatementHandle,
+           	qst, NativeError, mtxt, BufferLength, &tlen);
+	if (qst)
+		utf8_to_ucs2(qst, strlen(qst), Sqlstate, 5);
+	if (TextLength)
+		*TextLength = utf8_to_ucs2(mtxt, tlen, MessageText, BufferLength);
+	free(qst);
+	free(mtxt);
+	return ret;
+}
+
+RETCODE  SQL_API SQLGetConnectOptionW(HDBC ConnectionHandle,
+           SQLUSMALLINT Option, PTR Value)
+{
+	mylog("[SQLGetConnectOptionW]");
+	((ConnectionClass *) ConnectionHandle)->unicode = 1;
+	return PGAPI_GetConnectOption(ConnectionHandle, Option, Value);
+} 
+
+RETCODE  SQL_API SQLSetConnectOptionW(HDBC ConnectionHandle,
+           SQLUSMALLINT Option, SQLUINTEGER Value)
+{
+	mylog("[SQLSetConnectionOptionW]");
+	((ConnectionClass *) ConnectionHandle)->unicode = 1;
+	return PGAPI_SetConnectOption(ConnectionHandle, Option, Value);
+}
+
+RETCODE SQL_API SQLColAttributesW(
+    HSTMT           hstmt,
+    SQLUSMALLINT       icol,
+    SQLUSMALLINT       fDescType,
+    PTR         rgbDesc,
+    SQLSMALLINT        cbDescMax,
+    SQLSMALLINT 	  *pcbDesc,
+    SQLINTEGER 		  *pfDesc)
+{
+	mylog("[SQLColAttributesW]");
+	return PGAPI_ColAttributes(hstmt, icol, fDescType, rgbDesc,
+		cbDescMax, pcbDesc, pfDesc);
+}

src/interfaces/odbc/odbcapi30w.c

+/*-------
+ * Module:			odbcapi30w.c
+ *
+ * Description:		This module contains UNICODE routines
+ *
+ * Classes:			n/a
+ *
+ * API functions:	SQLColAttributeW, SQLGetStmtW, SQLSetStmtW,
+ 			SQLSetConnectAttrW, SQLGetConnectAttrW,
+			SQLGetDescFieldW, SQLGetDescRecW, SQLGetDiagFieldW,
+			SQLGetDiagRecW,
+ *-------
+ */
+
+#include "psqlodbc.h"
+#include <stdio.h>
+#include <string.h>
+
+#include "pgapifunc.h"
+#include "connection.h"
+#include "statement.h"
+
+
+RETCODE	SQL_API	SQLGetStmtAttrW(SQLHSTMT hstmt,
+		SQLINTEGER	fAttribute,
+		PTR		rgbValue,
+		SQLINTEGER	cbValueMax,
+		SQLINTEGER	*pcbValue)
+{
+	RETCODE	ret;
+
+	mylog("[SQLGetStmtAttrW]");
+	ret = PGAPI_GetStmtAttr(hstmt, fAttribute, rgbValue,
+		cbValueMax, pcbValue);
+	return ret;
+}
+
+RETCODE SQL_API	SQLSetStmtAttrW(SQLHSTMT hstmt,
+		SQLINTEGER	fAttribute,
+		PTR		rgbValue,
+		SQLINTEGER	cbValueMax)
+{
+	RETCODE	ret;
+
+	mylog("[SQLSetStmtAttrW]");
+	ret = PGAPI_SetStmtAttr(hstmt, fAttribute, rgbValue,
+		cbValueMax);
+	return ret;
+}
+
+RETCODE SQL_API	SQLGetConnectAttrW(HDBC hdbc,
+		SQLINTEGER	fAttribute,
+		PTR		rgbValue,
+		SQLINTEGER	cbValueMax,
+		SQLINTEGER	*pcbValue)
+{
+	RETCODE	ret;
+
+	mylog("[SQLGetConnectAttrW]");
+	ret = PGAPI_GetConnectAttr(hdbc, fAttribute, rgbValue,
+		cbValueMax, pcbValue);
+	return ret;
+}
+
+RETCODE SQL_API	SQLSetConnectAttrW(HDBC hdbc,
+		SQLINTEGER	fAttribute,
+		PTR		rgbValue,
+		SQLINTEGER	cbValue)
+{
+	RETCODE	ret;
+
+	mylog("[SQLSetConnectAttrW]");
+	ret = PGAPI_SetConnectAttr(hdbc, fAttribute, rgbValue,
+		cbValue);
+	return ret;
+}
+
+RETCODE SQL_API	SQLGetDiagRecW(SWORD fHandleType,
+		SQLHANDLE	handle,
+		SQLSMALLINT	iRecord,
+		SQLWCHAR	*szSqlState,
+		SQLINTEGER	*pfNativeError,
+		SQLWCHAR	*szErrorMsg,
+		SQLSMALLINT	cbErrorMsgMax,
+		SQLSMALLINT	*pcbErrorMsg)
+{
+	RETCODE	ret;
+        SWORD   tlen;
+        char    *qst = NULL, *mtxt = NULL;
+
+	mylog("[SQLGetDiagRecW]");
+        if (szSqlState)
+                qst = malloc(8);
+        if (szErrorMsg)
+                mtxt = malloc(cbErrorMsgMax);
+        ret = PGAPI_GetDiagRec(fHandleType, handle, iRecord, qst,
+                pfNativeError, mtxt, cbErrorMsgMax, &tlen);
+        if (qst)
+                utf8_to_ucs2(qst, strlen(qst), szSqlState, 5);
+	if (pcbErrorMsg)
+        	*pcbErrorMsg = utf8_to_ucs2(mtxt, tlen, szErrorMsg, cbErrorMsgMax);
+        free(qst);
+        free(mtxt);
+        return ret;
+}
+
+RETCODE SQL_API SQLColAttributeW(
+    HSTMT           hstmt,
+    SQLUSMALLINT       icol,
+    SQLUSMALLINT       fDescType,
+    PTR			rgbDesc,
+    SQLSMALLINT        cbDescMax,
+    SQLSMALLINT 	  *pcbDesc,
+    SQLINTEGER 		  *pfDesc)
+{
+	RETCODE	ret;
+
+	mylog("[SQLColAttributeW]");
+	ret = PGAPI_ColAttributes(hstmt, icol, fDescType, rgbDesc,
+		cbDescMax, pcbDesc, pfDesc);
+	return ret;
+}

src/interfaces/odbc/win_unicode.c

+/*-------
+ * Module:			win_unicode.c
+ *
+ * Description:		This module contains utf8 <-> ucs2 conversion routines
+ *					under WIndows
+ *
+ *-------
+ */
+
+#include "psqlodbc.h"
+#include <stdio.h>
+#include <string.h>
+
+#define	byte3check	0xf800
+#define	byte2_base	0x80c0
+#define	byte2_mask1	0x07c0
+#define	byte2_mask2	0x003f
+#define	byte3_base	0x8080e0
+#define	byte3_mask1	0xf000
+#define	byte3_mask2	0x0fc0
+#define	byte3_mask3	0x003f
+
+char *ucs2_to_utf8(const SQLWCHAR *ucs2str, Int4 ilen, UInt4 *olen)
+{
+	char *	utf8str;
+/*mylog("ucs2_to_utf8 %x ilen=%d ", ucs2str, ilen);*/
+
+	if (!ucs2str)
+		return NULL;
+	if (ilen < 0)
+	{
+		for (ilen = 0; ucs2str[ilen]; ilen++)
+			;
+	}
+/*mylog(" newlen=%d", ilen);*/
+	utf8str = (char *) malloc(ilen * 3 + 1);
+	if (utf8str)
+	{
+		int	i, len = 0;
+		Int2		byte2code;
+		Int4		byte4code;
+
+		const SQLWCHAR	*wstr;
+		for (i = 0, wstr = ucs2str; i < ilen; i++, wstr++)
+		{
+			if (!*wstr)
+				break;
+			else if (iswascii(*wstr))
+				utf8str[len++] = (char) *wstr;
+			else if ((*wstr & byte3check) == 0)
+			{
+				byte2code = byte2_base |
+					    ((byte2_mask1 & *wstr) >> 6) |
+					    ((byte2_mask2 & *wstr) << 8);
+				memcpy(utf8str + len, (char *) &byte2code, sizeof(byte2code));
+				len += 2; 
+			}
+			else
+			{
+				byte4code = byte3_base |
+					    ((byte3_mask1 & *wstr) >> 12) | 
+					    ((byte3_mask2 & *wstr) << 2) | 
+					    ((byte3_mask3 & *wstr) << 16);
+				memcpy(utf8str + len, (char *) &byte4code, 3);
+				len += 3;
+			}
+		} 
+		utf8str[len] = '\0';
+		*olen = len;
+	}
+/*mylog(" olen=%d %s\n", *olen, utf8str ? utf8str : "");*/
+	return utf8str;
+}
+
+#define	byte3_m1	0x0f
+#define	byte3_m2	0x3f
+#define	byte3_m3	0x3f
+#define	byte2_m1	0x1f
+#define	byte2_m2	0x3f
+UInt4	utf8_to_ucs2(const char *utf8str, Int4 ilen, SQLWCHAR *ucs2str, UInt4 bufcount)
+{
+	int	i;
+	UInt4	ocount, wcode;
+	const unsigned char *str;
+
+/*mylog("utf8_to_ucs2 ilen=%d bufcount=%d", ilen, bufcount);*/
+	if (!utf8str || !ilen)
+		return 0;
+/*mylog(" string=%s\n", utf8str);*/
+	if (!bufcount)
+		ucs2str = NULL;
+	else if (!ucs2str)
+		bufcount = 0;
+	if (ilen < 0)
+		ilen = strlen(utf8str);
+	for (i = 0, ocount = 0, str = utf8str; i < ilen;)
+	{
+		if (iswascii(*str))
+		{
+			if (ocount < bufcount)
+				ucs2str[ocount] = *str;
+			ocount++;
+			i++;
+			str++;
+		}
+		else if (0xe0 == (*str & 0xe0)) /* 3 byte code */
+		{
+			if (ocount < bufcount)
+			{
+				wcode = ((((UInt4) *str) & byte3_m1) << 12) |
+					((((UInt4) str[1]) & byte3_m2) << 6) |
+				 	((UInt4) str[2]) & byte3_m3;
+				ucs2str[ocount] = (SQLWCHAR) wcode;
+			}
+			ocount++;
+			i += 3;
+			str += 3;
+		}
+		else
+		{
+			if (ocount < bufcount)
+			{
+				wcode = ((((UInt4) *str) & byte2_m1) << 6) |
+				 	((UInt4) str[1]) & byte2_m2;
+				ucs2str[ocount] = (SQLWCHAR) wcode;
+			}
+			ocount++;
+			i += 2;
+			str += 2;
+		}
+	}
+	if (ocount && ocount < bufcount && ucs2str)
+		ucs2str[ocount] = 0;
+/*mylog(" ocount=%d\n", ocount);*/
+	return ocount;
+}
+