<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[27072] trunk: Ensure compatibility with MySQL 5.6 which has stricter SQL modes by default.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27072">27072</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-02-02 21:38:34 +0000 (Sun, 02 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ensure compatibility with MySQL 5.6 which has stricter SQL modes by default.
Disables NO_ZERO_DATE, ONLY_FULL_GROUP_BY, STRICT_TRANS_TABLES, STRICT_ALL_TABLES, TRADITIONAL. Introduces wpdb::set_sql_mode() with an incompatible_sql_modes filter so a plugin can alter the set mode after the fact.
props pento.
fixes <a href="http://core.trac.wordpress.org/ticket/26847">#26847</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludeswpdbphp">trunk/src/wp-includes/wp-db.php</a></li>
<li><a href="#trunktestsphpunittestsdbphp">trunk/tests/phpunit/tests/db.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludeswpdbphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/wp-db.php (27071 => 27072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/wp-db.php 2014-02-02 21:11:24 UTC (rev 27071)
+++ trunk/src/wp-includes/wp-db.php 2014-02-02 21:38:34 UTC (rev 27072)
</span><span class="lines">@@ -510,6 +510,16 @@
</span><span class="cx"> public $is_mysql = null;
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * A list of incompatible SQL modes.
+ *
+ * @since 3.9.0
+ * @access protected
+ * @var array
+ */
+ protected $incompatible_modes = array( 'NO_ZERO_DATE', 'ONLY_FULL_GROUP_BY',
+ 'STRICT_TRANS_TABLES', 'STRICT_ALL_TABLES', 'TRADITIONAL' );
+
+ /**
</ins><span class="cx"> * Connects to the database server and selects a database
</span><span class="cx"> *
</span><span class="cx"> * PHP5 style constructor for compatibility with PHP5. Does
</span><span class="lines">@@ -649,6 +659,56 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Change the current SQL mode, and ensure its WordPress compatibility.
+ *
+ * If no modes are passed, it will ensure the current MySQL server
+ * modes are compatible.
+ *
+ * @since 3.9.0
+ *
+ * @param array $modes Optional. A list of SQL modes to set.
+ */
+ function set_sql_mode( $modes = array() ) {
+ if ( empty( $modes ) ) {
+ $res = mysql_query( 'SELECT @@SESSION.sql_mode;', $this->dbh );
+ if ( empty( $res ) ) {
+ return;
+ }
+
+ $modes_str = mysql_result( $res, 0 );
+
+ if ( empty( $modes_str ) ) {
+ return;
+ }
+
+ $modes = explode( ',', $modes_str );
+ }
+
+ $modes = array_change_key_case( $modes, CASE_UPPER );
+
+ /**
+ * Filter the list of incompatible SQL modes to exclude.
+ *
+ * @since 3.9.0
+ *
+ * @see wpdb::$incompatible_modes
+ *
+ * @param array $incompatible_modes An array of incompatible modes
+ */
+ $incompatible_modes = (array) apply_filters( 'incompatible_sql_modes', $this->incompatible_modes );
+
+ foreach( $modes as $i => $mode ) {
+ if ( in_array( $mode, $incompatible_modes ) ) {
+ unset( $modes[ $i ] );
+ }
+ }
+
+ $modes_str = implode( ',', $modes );
+
+ mysql_query( "SET SESSION sql_mode='$modes_str';", $this->dbh );
+ }
+
+ /**
</ins><span class="cx"> * Sets the table prefix for the WordPress tables.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.5.0
</span><span class="lines">@@ -1177,6 +1237,8 @@
</span><span class="cx">
</span><span class="cx"> $this->set_charset( $this->dbh );
</span><span class="cx">
</span><ins>+ $this->set_sql_mode();
+
</ins><span class="cx"> $this->ready = true;
</span><span class="cx">
</span><span class="cx"> $this->select( $this->dbname, $this->dbh );
</span></span></pre></div>
<a id="trunktestsphpunittestsdbphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/db.php (27071 => 27072)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/db.php 2014-02-02 21:11:24 UTC (rev 27071)
+++ trunk/tests/phpunit/tests/db.php 2014-02-02 21:38:34 UTC (rev 27072)
</span><span class="lines">@@ -126,4 +126,71 @@
</span><span class="cx"> $sql = $wpdb->prepare( "UPDATE test_table SET string_column = '%%f is a float, %%d is an int %d, %%s is a string', field = %s", 3, '4' );
</span><span class="cx"> $this->assertEquals( "UPDATE test_table SET string_column = '%f is a float, %d is an int 3, %s is a string', field = '4'", $sql );
</span><span class="cx"> }
</span><ins>+
+ /**
+ * Test that SQL modes are set correctly
+ * @ticket 26847
+ */
+ public function test_set_sql_mode() {
+ global $wpdb;
+
+ $current_modes = $wpdb->get_var( 'SELECT @@SESSION.sql_mode;' );
+
+ $new_modes = array( 'IGNORE_SPACE', 'NO_AUTO_CREATE_USER' );
+ $wpdb->set_sql_mode( $new_modes );
+ $check_new_modes = $wpdb->get_var( 'SELECT @@SESSION.sql_mode;' );
+ $this->assertEquals( implode( ',', $new_modes ), $check_new_modes );
+
+ $wpdb->set_sql_mode( explode( ',', $current_modes ) );
+ }
+
+ /**
+ * Test that incompatible SQL modes are blocked
+ * @ticket 26847
+ */
+ public function test_set_incompatible_sql_mode() {
+ global $wpdb;
+
+ $current_modes = $wpdb->get_var( 'SELECT @@SESSION.sql_mode;' );
+
+ $new_modes = array( 'IGNORE_SPACE', 'NO_ZERO_DATE', 'NO_AUTO_CREATE_USER' );
+ $wpdb->set_sql_mode( $new_modes );
+ $check_new_modes = $wpdb->get_var( 'SELECT @@SESSION.sql_mode;' );
+ $this->assertFalse( in_array( 'NO_ZERO_DATE', explode( ',', $check_new_modes ) ) );
+
+ $wpdb->set_sql_mode( explode( ',', $current_modes ) );
+ }
+
+ /**
+ * Test that incompatible SQL modes can be changed
+ * @ticket 26847
+ */
+ public function test_set_allowed_incompatible_sql_mode() {
+ global $wpdb;
+
+ $current_modes = $wpdb->get_var( 'SELECT @@SESSION.sql_mode;' );
+
+ $new_modes = array( 'IGNORE_SPACE', 'NO_ZERO_DATE', 'NO_AUTO_CREATE_USER' );
+
+ add_filter( 'incompatible_sql_modes', array( $this, 'filter_allowed_incompatible_sql_mode' ), 1, 1 );
+ $wpdb->set_sql_mode( $new_modes );
+ remove_filter( 'incompatible_sql_modes', array( $this, 'filter_allowed_incompatible_sql_mode' ), 1 );
+
+ $check_new_modes = $wpdb->get_var( 'SELECT @@SESSION.sql_mode;' );
+ $this->assertTrue( in_array( 'NO_ZERO_DATE', explode( ',', $check_new_modes ) ) );
+
+ $wpdb->set_sql_mode( explode( ',', $current_modes ) );
+ }
+
+ public function filter_allowed_incompatible_sql_mode( $modes ) {
+ $pos = array_search( 'NO_ZERO_DATE', $modes );
+ $this->assertGreaterThanOrEqual( 0, $pos );
+
+ if ( FALSE === $pos ) {
+ return $modes;
+ }
+
+ unset( $modes[ $pos ] );
+ return $modes;
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>