Fix a bug about automatic client_encoding setting.

Hiroshi Inoue · Hiroshi Inoue · commit 67d0cb2d7718 · 2002-07-30T00:48:02.000Z
diff --git a/src/interfaces/odbc/connection.c b/src/interfaces/odbc/connection.c
@@ -999,6 +999,7 @@ CC_connect(ConnectionClass *self, char password_req, char *salt_para)
 				if (res = CC_send_query(self, "set client_encoding to 'UTF8'", NULL, CLEAR_RESULT_ON_ABORT), res)
 				{
 					self->client_encoding = strdup("UNICODE");
+					self->ccsc = pg_CS_code(self->client_encoding);
 					QR_Destructor(res);
 					
 				}
diff --git a/src/interfaces/odbc/multibyte.c b/src/interfaces/odbc/multibyte.c
@@ -401,6 +401,7 @@ CC_lookup_characterset(ConnectionClass *self)
 			if (res)
 			{
 				self->client_encoding = strdup(wenc);
+				self->ccsc = pg_CS_code(self->client_encoding);
 				QR_Destructor(res);
 				free(encstr);
 				return;

Original file line number	Diff line number	Diff line change
`@@ -999,6 +999,7 @@ CC_connect(ConnectionClass self, char password_req, char salt_para)`
`999`	`999`	`if (res = CC_send_query(self, "set client_encoding to 'UTF8'", NULL, CLEAR_RESULT_ON_ABORT), res)`
`1000`	`1000`	`{`
`1001`	`1001`	`self->client_encoding = strdup("UNICODE");`
	`1002`	`+ self->ccsc = pg_CS_code(self->client_encoding);`
`1002`	`1003`	`QR_Destructor(res);`
`1003`	`1004`
`1004`	`1005`	`}`
Original file line number	Diff line number	Diff line change
`@@ -401,6 +401,7 @@ CC_lookup_characterset(ConnectionClass *self)`
`401`	`401`	`if (res)`
`402`	`402`	`{`
`403`	`403`	`self->client_encoding = strdup(wenc);`
	`404`	`+ self->ccsc = pg_CS_code(self->client_encoding);`
`404`	`405`	`QR_Destructor(res);`
`405`	`406`	`free(encstr);`
`406`	`407`	`return;`