Add multibyte support.

	Provide an extenisible scheme of encoding conversion.
	As the first step, SJIS and BIG5 are supported.
	From now on multibyte people would be happy to use
	this psqlodbc driver.

Eiji Tokuya e-tokuya@mail.sankyo-unyu.co.jp

Author: Hiroshi Inoue

src/interfaces/odbc/connection.c

@@ -12,6 +12,11 @@
  * Comments:        See "notice.txt" for copyright and license information.
  *
  */
+/* Multibyte support	Eiji Tokuya 2001-03-15 */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "environ.h"
 #include "connection.h"
@@ -20,6 +25,11 @@
 #include "qresult.h"
 #include "lobj.h"
 #include "dlg_specific.h"
+
+#ifdef MULTIBYTE
+#include "multibyte.h"
+#endif
+
 #include <stdio.h>
 #include <string.h>
 
@@ -496,9 +506,18 @@ static char *func="CC_connect";
 			globals.text_as_longvarchar, 
 			globals.unknowns_as_longvarchar, 
 			globals.bools_as_char);
+
+#ifdef MULTIBYTE
+		check_client_encoding(globals.conn_settings);
+		qlog("                extra_systable_prefixes='%s', conn_settings='%s' conn_encoding='%s'\n",
+			globals.extra_systable_prefixes,
+			globals.conn_settings,
+			check_client_encoding(globals.conn_settings));
+#else
 		qlog("                extra_systable_prefixes='%s', conn_settings='%s'\n",
 			globals.extra_systable_prefixes, 
 			globals.conn_settings);
+#endif
 
 		if (self->status != CONN_NOT_CONNECTED) {
 			self->errormsg = "Already connected.";

src/interfaces/odbc/convert.c

@@ -15,6 +15,7 @@
  * Comments:       See "notice.txt" for copyright and license information.
  *
  */
+/* Multibyte support  Eiji Tokuya	2001-03-15	*/
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -26,6 +27,10 @@
 
 #include "psqlodbc.h"
 
+#ifdef MULTIBYTE
+#include "multibyte.h"
+#endif
+
 #ifndef WIN32
 #include "iodbc.h"
 #include "isql.h"
@@ -690,6 +695,9 @@ int lobj_fd, retval;
     param_number = -1;
 
 	oldstmtlen = strlen(old_statement);
+#ifdef MULTIBYTE
+    multibyte_init();
+#endif
 
     for (opos = 0; opos < oldstmtlen; opos++) {
 
@@ -700,10 +708,18 @@ int lobj_fd, retval;
 		}
 
 		/*	Handle literals (date, time, timestamp) and ODBC scalar functions */
+#ifdef MULTIBYTE
+		else if (multibyte_char_check(old_statement[opos]) == 0 && old_statement[opos] == '{') {
+#else
 		else if (old_statement[opos] == '{') {
+#endif
 			char *esc;
 			char *begin = &old_statement[opos + 1];
+#ifdef MULTIBYTE
+			char *end = multibyte_strchr(begin, '}');
+#else
 			char *end = strchr(begin, '}');
+#endif
 
 			if ( ! end)
 				continue;
@@ -1334,11 +1350,18 @@ char *p;
 		max = strlen(si);
 	else
 		max = used;
+#ifdef MULTIBYTE
+	multibyte_init();
+#endif
 
 	for (i = 0; i < max; i++) {
 		if (si[i] == '\r' && i+1 < strlen(si) && si[i+1] == '\n') 
 			continue;
+#ifdef MULTIBYTE
+		else if (multibyte_char_check(si[i]) == 0 && (si[i] == '\'' || si[i] == '\\'))
+#else
 		else if (si[i] == '\'' || si[i] == '\\')
+#endif
 			p[out++] = '\\';
 
 		p[out++] = si[i];

src/interfaces/odbc/dlg_specific.c

@@ -15,6 +15,7 @@
  * Comments:        See "notice.txt" for copyright and license information.
  *
  */
+/* Multibyte support	Eiji Tokuya 2001-03-15 */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -34,6 +35,10 @@
 #include "dlg_specific.h"
 #include "convert.h"
 
+#ifdef MULTIBYTE
+#include "multibyte.h"
+#endif
+
 #ifndef BOOL
 #define BOOL	int
 #endif
@@ -507,8 +512,17 @@ char encoded_conn_settings[LARGE_REGISTRY_LEN];
 		ci->show_oid_column,
 		ci->fake_oid_index,
 		ci->show_system_tables);
+
+#ifdef MULTIBYTE
+	check_client_encoding(ci->conn_settings);
+	qlog("          conn_settings='%s',conn_encoding='%s'\n",
+		ci->conn_settings,
+		check_client_encoding(ci->conn_settings));
+#else
 	qlog("          conn_settings='%s'\n",
 		ci->conn_settings);
+#endif
+
 	qlog("          translation_dll='%s',translation_option='%s'\n",
 		ci->translation_dll,
 		ci->translation_option);

src/interfaces/odbc/parse.c

@@ -17,6 +17,11 @@
  * Comments:        See "notice.txt" for copyright and license information.
  *
  */
+/* Multibyte support	Eiji Tokuya 2001-03-15 */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <stdio.h>
 #include <string.h>
@@ -27,6 +32,10 @@
 #include "qresult.h"
 #include "pgtypes.h"
 
+#ifdef MULTIBYTE
+#include "multibyte.h"
+#endif
+
 #ifndef WIN32
 #ifndef HAVE_STRICMP
 #define stricmp(s1,s2) 		strcasecmp(s1,s2)
@@ -88,7 +97,11 @@ char qc, in_escape = FALSE;
 				if (s[i] == qc && ! in_escape) {
 					break;
 				}
+#ifdef MULTIBYTE
+				if (multibyte_char_check(s[i]) == 0 && s[i] == '\\' && ! in_escape) {
+#else
 				if (s[i] == '\\' && ! in_escape) {
+#endif
 					in_escape = TRUE;
 				}
 				else {

src/interfaces/odbc/psqlodbc.h

@@ -6,7 +6,7 @@
  *
  * Comments:        See "notice.txt" for copyright and license information.
  *
- * $Id: psqlodbc.h,v 1.38 2001/02/15 05:32:00 inoue Exp $
+ * $Id: psqlodbc.h,v 1.39 2001/03/16 01:17:23 inoue Exp $
  */
 
 #ifndef __PSQLODBC_H__
@@ -41,7 +41,7 @@ typedef UInt4 Oid;
 #define DRIVERNAME             "PostgreSQL ODBC"
 #define DBMS_NAME              "PostgreSQL"
 
-#define POSTGRESDRIVERVERSION  "07.01.0003"
+#define POSTGRESDRIVERVERSION  "07.01.0004"
 
 #ifdef WIN32
 #define DRIVER_FILE_NAME		"PSQLODBC.DLL"
@@ -134,6 +134,7 @@ typedef struct GlobalValues_
 	char				conn_settings[LARGE_REGISTRY_LEN];
 	char				protocol[SMALL_REGISTRY_LEN];
 
+
 	FILE*				mylogFP;
 	FILE*				qlogFP;	
 } GLOBAL_VALUES;