Commitc9f8704

Hiroshi Inoue

committed

1) prevent setting of KSQO on 7.3+ servers(Thanks to Dave Page).

2) Allow LF->CR/LF conversion under UNICODE driver.

1 parent23e5da8 commitc9f8704Copy full SHA for c9f8704

File tree

+22

-9

lines changed

+22

-9

lines changed

Lines changed: 9 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -952,6 +952,13 @@ CC_connect(ConnectionClass self, char password_req, char salt_para)`
`952`	`952`	`* Send any initial settings`
`953`	`953`	`*/`
`954`	`954`
	`955`	`+/*`
	`956`	`+ * Get the version number first so we can check it before sending options`
	`957`	`+ * that are now obsolete. DJP 21/06/2002`
	`958`	`+ */`
	`959`	`+`
	`960`	`+CC_lookup_pg_version(self);/* Get PostgreSQL version for`
	`961`	`+ SQLGetInfo use */`
`955`	`962`	`/*`
`956`	`963`	`* Since these functions allocate statements, and since the connection`
`957`	`964`	`* is not established yet, it would violate odbc state transition`
`@@ -961,8 +968,6 @@ CC_connect(ConnectionClass self, char password_req, char salt_para)`
`961`	`968`	`CC_send_settings(self);`
`962`	`969`	`CC_lookup_lo(self);/* a hack to get the oid of`
`963`	`970`	`our large object oid type */`
`964`		`-CC_lookup_pg_version(self);/* Get PostgreSQL version for`
`965`		`- SQLGetInfo use */`
`966`	`971`
`967`	`972`	`/*`
`968`	`973`	`*Multibyte handling is available ?`
`@@ -1802,8 +1807,8 @@ CC_send_settings(ConnectionClass *self)`
`1802`	`1807`
`1803`	`1808`	`}`
`1804`	`1809`
`1805`		`-/* KSQO */`
`1806`		`-if (ci->drivers.ksqo)`
	`1810`	`+/* KSQO(not applicable to 7.1+ - DJP 21/06/2002)*/`
	`1811`	`+if (ci->drivers.ksqo&&PG_VERSION_LT(self,7.1))`
`1807`	`1812`	`{`
`1808`	`1813`	`result=PGAPI_ExecDirect(hstmt,"set ksqo to 'ON'",SQL_NTS);`
`1809`	`1814`	`if ((result!=SQL_SUCCESS)&& (result!=SQL_SUCCESS_WITH_INFO))`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -702,7 +702,7 @@ copy_and_convert_field(StatementClass stmt, Int4 field_type, void value, Int2`
`702`	`702`	`#ifdefUNICODE_SUPPORT`
`703`	`703`	`if (fCType==SQL_C_WCHAR)`
`704`	`704`	`{`
`705`		`-len=utf8_to_ucs2(neut_str,-1,NULL,0);`
	`705`	`+len=utf8_to_ucs2_lf(neut_str,-1,lf_conv,NULL,0);`
`706`	`706`	`len *=2;`
`707`	`707`	`wchanged=changed= TRUE;`
`708`	`708`	`}`
`@@ -728,7 +728,7 @@ copy_and_convert_field(StatementClass stmt, Int4 field_type, void value, Int2`
`728`	`728`	`#ifdefUNICODE_SUPPORT`
`729`	`729`	`if (fCType==SQL_C_WCHAR)`
`730`	`730`	`{`
`731`		`-utf8_to_ucs2(neut_str,-1, (SQLWCHAR*)pbic->ttlbuf,len /2);`
	`731`	`+utf8_to_ucs2_lf(neut_str,-1,lf_conv, (SQLWCHAR*)pbic->ttlbuf,len /2);`
`732`	`732`	`}`
`733`	`733`	`else`
`734`	`734`	`#endif/* UNICODE_SUPPORT */`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*`
`6`	`6`	`* Comments:See "notice.txt" for copyright and license information.`
`7`	`7`	`*`
`8`		`- * $Id: psqlodbc.h,v 1.67 2002/06/06 04:50:47 inoue Exp $`
	`8`	`+ * $Id: psqlodbc.h,v 1.68 2002/06/28 02:44:15 inoue Exp $`
`9`	`9`	`*`
`10`	`10`	`*/`
`11`	`11`
`@@ -255,7 +255,8 @@ voidlogs_on_off(int cnopen, int, int);`
`255`	`255`	`#ifdefUNICODE_SUPPORT`
`256`	`256`	`UInt4ucs2strlen(constSQLWCHAR*ucs2str);`
`257`	`257`	`charucs2_to_utf8(constSQLWCHARucs2str,Int4ilen,UInt4*olen);`
`258`		`-UInt4utf8_to_ucs2(constcharutf8str,Int4ilen,SQLWCHARucs2str,UInt4buflen);`
	`258`	`+UInt4utf8_to_ucs2_lf(constcharutf8str,Int4ilen,BOOLlfconv,SQLWCHARucs2str,UInt4buflen);`
	`259`	`+#defineutf8_to_ucs2(utf8str,ilen,ucs2str,buflen) utf8_to_ucs2_lf(utf8str, ilen, FALSE, ucs2str, buflen)`
`259`	`260`	`#endif/* UNICODE_SUPPORT */`
`260`	`261`	`/#define_MEMORY_DEBUG_ /`
`261`	`262`	`#ifdef_MEMORY_DEBUG_`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ char ucs2_to_utf8(const SQLWCHAR ucs2str, Int4 ilen, UInt4 *olen)`
`82`	`82`	`#definebyte3_m30x3f`
`83`	`83`	`#definebyte2_m10x1f`
`84`	`84`	`#definebyte2_m20x3f`
`85`		`-UInt4utf8_to_ucs2(constcharutf8str,Int4ilen,SQLWCHARucs2str,UInt4bufcount)`
	`85`	`+UInt4utf8_to_ucs2_lf(constcharutf8str,Int4ilen,BOOLlfconv,SQLWCHARucs2str,UInt4bufcount)`
`86`	`86`	`{`
`87`	`87`	`inti;`
`88`	`88`	`UInt4ocount,wcode;`
`@@ -102,6 +102,13 @@ UInt4utf8_to_ucs2(const char utf8str, Int4 ilen, SQLWCHAR ucs2str, UInt4 bufc`
`102`	`102`	`{`
`103`	`103`	`if (iswascii(*str))`
`104`	`104`	`{`
	`105`	`+if (lfconv&&*str=='\n'&&`
	`106`	`+ (i==0\|\|str[-1]!='\r'))`
	`107`	`+{`
	`108`	`+if (ocount<bufcount)`
	`109`	`+ucs2str[ocount]='\r';`
	`110`	`+ocount++;`
	`111`	`+}`
`105`	`112`	`if (ocount<bufcount)`
`106`	`113`	`ucs2str[ocount]=*str;`
`107`	`114`	`ocount++;`

Comments

(0)