Author: byterock
Date: Wed Dec 5 04:24:29 2007
New Revision: 10367
Modified:
dbd-oracle/trunk/dbdimp.c
Log:
Added fix to dbdimp.c for SQLCS_NCHAR, and index use on varchar2s from Peter
J. Holzer
Modified: dbd-oracle/trunk/dbdimp.c
==============================================================================
--- dbd-oracle/trunk/dbdimp.c (original)
+++ dbd-oracle/trunk/dbdimp.c Wed Dec 5 04:24:29 2007
@@ -2301,16 +2301,15 @@
if (!csform && SvUTF8(phs->sv)) {
/* try to default csform to avoid translation through non-unicode */
- if (CSFORM_IMPLIES_UTF8(SQLCS_IMPLICIT)) /* prefer IMPLICIT!
*/
- csform = SQLCS_IMPLICIT;
+ if (CSFORM_IMPLIES_UTF8(SQLCS_IMPLICIT)) /*
prefer IMPLICIT */
+ csform = SQLCS_IMPLICIT;
else if (CSFORM_IMPLIES_UTF8(SQLCS_NCHAR))
- csform = SQLCS_NCHAR;
- /* else leave csform == 0 */
+ csform = SQLCS_NCHAR; /* else leave csform == 0 */
if (trace_level)
PerlIO_printf(DBILOGFP, "dbd_rebind_ph() (2): rebinding %s with
UTF8 value %s", phs->name,
- (csform == SQLCS_NCHAR) ? "so setting csform=SQLCS_IMPLICIT"
:
- (csform == SQLCS_IMPLICIT) ? "so setting csform=SQLCS_NCHAR" :
- "but neither CHAR nor NCHAR are unicode\n");
+ (csform == SQLCS_IMPLICIT) ? "so setting csform=SQLCS_IMPLICIT"
:
+ (csform == SQLCS_NCHAR) ? "so setting csform=SQLCS_NCHAR" :
+ "but neither CHAR nor NCHAR are unicode\n");
}
if (csform) {
