2006-11-27
2006-11-27 16:32:43 by Martin Stjernholm <mast@lysator.liu.se>
-
77ac70416d02a7a74b3951e1f43c8b18517addf8
(63 lines)
(+41/-22)
[
Show
| Annotate
]
Branch: 7.9
Added bug compatibility for unicode decode mode when an old mysql client lib
is used: Set PIKE_BROKEN_MYSQL_UNICODE_MODE in the environment to get the
old buggy implementation in this case.
Also fixed a typo that caused the wrong unicode result wrapper to be used in
unicode decode mode.
Rev: lib/modules/Sql.pmod/mysql.pike:1.35
Rev: lib/modules/Sql.pmod/sql_util.pmod:1.17
1:
/*
- * $Id: mysql.pike,v 1.34 2006/11/17 18:43:17 mast Exp $
+ * $Id: mysql.pike,v 1.35 2006/11/27 16:32:41 mast Exp $
*
* Glue for the Mysql-module
*/
138: Inside #if constant (Mysql.mysql.HAVE_MYSQL_FIELD_CHARSETNR)
#if constant (Mysql.mysql.HAVE_MYSQL_FIELD_CHARSETNR)
void set_unicode_decode_mode (int enable)
+ #else
+ static void broken_set_unicode_decode_mode (int enable)
+ #endif
//! Enable or disable unicode decode mode.
//!
//! In this mode, if the server supports UTF-8 then non-binary text
175: Inside #if constant (Mysql.mysql.HAVE_MYSQL_FIELD_CHARSETNR)
utf8_mode &= ~UNICODE_DECODE_MODE;
}
}
+
+ #if !constant (Mysql.mysql.HAVE_MYSQL_FIELD_CHARSETNR)
+ // See blurb at MySQLBrokenUnicodeWrapper in sql_util.pmod. The
+ // PIKE_BROKEN_MYSQL_UNICODE_MODE thingy ought to be a define, but
+ // it's an environment variable instead to avoid problems with
+ // overcaching in dumped files.
+ function(int:void) set_unicode_decode_mode =
+ getenv ("PIKE_BROKEN_MYSQL_UNICODE_MODE") &&
+ broken_set_unicode_decode_mode;
#endif
int get_unicode_decode_mode()
266: Inside #if constant (Mysql.mysql.HAVE_MYSQL_FIELD_CHARSETNR)
#if constant (Mysql.mysql.HAVE_MYSQL_FIELD_CHARSETNR)
utf8_mode |= UNICODE_DECODE_MODE;
#else
+ if (set_unicode_decode_mode)
+ utf8_mode |= UNICODE_DECODE_MODE;
+ else
predef::error ("Unicode decode mode not supported - "
"compiled with MySQL client library < 4.1.0.\n");
#endif
}
- #if constant (Mysql.mysql.HAVE_MYSQL_FIELD_CHARSETNR)
+
else if (utf8_mode & UNICODE_DECODE_MODE && charset != "utf8")
// This setting has been overridden by ::set_charset, so we need
// to reinstate it.
::big_query ("SET character_set_results = utf8");
- #endif
+
}
string get_charset()
564:
}
#if constant (Mysql.mysql.HAVE_MYSQL_FIELD_CHARSETNR)
- #define HAVE_MYSQL_FIELD_CHARSETNR_DO(X...) X
+ #define HAVE_MYSQL_FIELD_CHARSETNR_IFELSE(TRUE, FALSE) TRUE
#else
- #define HAVE_MYSQL_FIELD_CHARSETNR_DO(X...)
+ #define HAVE_MYSQL_FIELD_CHARSETNR_IFELSE(TRUE, FALSE) FALSE
#endif
#define QUERY_BODY(do_query) \
647:
\
if (!objectp(res)) return res; \
\
- HAVE_MYSQL_FIELD_CHARSETNR_DO ( \
+
if (utf8_mode & UNICODE_DECODE_MODE) { \
- CH_DEBUG ("Using UnicodeWrapper for result.\n"); \
- return .sql_util.UnicodeWrapper(res); \
+ CH_DEBUG ("Using unicode wrapper for result.\n"); \
+ return \
+ HAVE_MYSQL_FIELD_CHARSETNR_IFELSE ( \
+ .sql_util.MySQLUnicodeWrapper(res), \
+ .sql_util.MySQLBrokenUnicodeWrapper (res)); \
} \
- ); \
+
return res;
Mysql.mysql_result big_query (string query,
764:
update_unicode_encode_mode_from_charset (lower_case (charset));
- #if constant (Mysql.mysql.HAVE_MYSQL_FIELD_CHARSETNR)
+ #if !constant (Mysql.mysql.HAVE_MYSQL_FIELD_CHARSETNR)
+ if (set_unicode_encode_mode) {
+ #endif
if (charset == "unicode")
utf8_mode |= UNICODE_DECODE_MODE;
else if (options->unicode_decode_mode)
set_unicode_decode_mode (1);
- #else
+ #if !constant (Mysql.mysql.HAVE_MYSQL_FIELD_CHARSETNR)
+ }
+ else
if (charset == "unicode" || options->unicode_decode_mode)
predef::error ("Unicode decode mode not supported - "
"compiled with MySQL client library < 4.1.0.\n");