فهرست منبع

update wiki plugins for use utf8mb4

rajven 4 سال پیش
والد
کامیت
5404efd026
3فایلهای تغییر یافته به همراه6 افزوده شده و 2 حذف شده
  1. 1 1
      docs/wiki/foswiki/ShowStatPlugin.pm
  2. 1 1
      docs/wiki/foswiki/StatSyncPlugin.pm
  3. 4 0
      scripts/Rstat/mysql.pm

+ 1 - 1
docs/wiki/foswiki/ShowStatPlugin.pm

@@ -117,7 +117,7 @@ WHERE A.user_id = L.id and A.filter_group_id = G.id and Q.id = A.queue_id AND A.
 my $status = '';
 eval {
 if ( !defined $dbh ) { return "Cannot connect to mySQL server: $DBI::errstr\n"; }
-$dbh->do('SET NAMES utf8');
+$dbh->do('SET NAMES utf8mb4');
 $dbh->{'mysql_enable_utf8'} = 1;
 my $sth = $dbh->prepare($SQL);
 $sth->execute;

+ 1 - 1
docs/wiki/foswiki/StatSyncPlugin.pm

@@ -220,7 +220,7 @@ my $dbh = DBI->connect($connect_options,$connect_user,$connect_password);
 
 eval {
 if ( !defined $dbh ) { return "Cannot connect to mySQL server: $DBI::errstr\n"; }
-$dbh->do('SET NAMES utf8');
+$dbh->do('SET NAMES utf8mb4');
 $dbh->{'mysql_enable_utf8'} = 1;
 
 my $sth = $dbh->prepare($SQL);

+ 4 - 0
scripts/Rstat/mysql.pm

@@ -146,6 +146,8 @@ sub batch_db_sql_cached {
 
 my $db = DBI->connect("dbi:mysql:database=$DBNAME;host=$DBHOST","$DBUSER","$DBPASS", { RaiseError => 0, AutoCommit => 0 });
 if ( !defined $db ) { die "Cannot connect to mySQL server: $DBI::errstr\n"; }
+$db->do('SET NAMES utf8mb4');
+$db->{'mysql_enable_utf8'} = 1;
 $db->{mysql_auto_reconnect} = 1;
 my $table= shift;
 my $batch_sql=shift;
@@ -253,6 +255,8 @@ sub init_db {
 # Create new database handle. If we can't connect, die()
 my $db = DBI->connect("dbi:mysql:database=$DBNAME;host=$DBHOST","$DBUSER","$DBPASS", { RaiseError => 0, AutoCommit => 1 });
 if ( !defined $db ) { die "Cannot connect to mySQL server: $DBI::errstr\n"; }
+$db->do('SET NAMES utf8mb4');
+$db->{'mysql_enable_utf8'} = 1;
 $db->{mysql_auto_reconnect} = 1;
 return $db;
 }