Add MySQL 8 which defaults to mb4 mode

owncloud · Nov 13, 2018 · 2592821 · 2592821
1 parent dddedc9
commit 2592821
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -434,7 +434,7 @@ services:
         DB_TYPE: mariadb
 
   mysql:
-    image: mysql:5.5
+    image: ${MYSQL_IMAGE=mysql:5.5}
     environment:
       - MYSQL_USER=owncloud
       - MYSQL_PASSWORD=owncloud
@@ -444,16 +444,18 @@ services:
       matrix:
         DB_TYPE: mysql
 
-  mysqlmb4:
-    image: mysql:5.7
+  mysql8:
+    image: ${MYSQL_IMAGE=mysql:8.0}
+    # see http://php.net/manual/en/mysqli.requirements.php
+    command: --default-authentication-plugin=mysql_native_password
     environment:
       - MYSQL_USER=owncloud
       - MYSQL_PASSWORD=owncloud
       - MYSQL_DATABASE=owncloud
       - MYSQL_ROOT_PASSWORD=owncloud
     when:
       matrix:
-        DB_TYPE: mysqlmb4
+        DB_TYPE: mysql8
 
   postgres:
     image: ${POSTGRES_IMAGE=postgres:9.4}
@@ -602,8 +604,17 @@ matrix:
       INSTALL_SERVER: true
 
     - PHP_VERSION: 7.1
-      DB_TYPE: mysqlmb4
+      DB_TYPE: mysql
+      # mb4 support, with innodb_file_format=Barracuda
+      MYSQL_IMAGE: mysql:5.7
+      TEST_SUITE: phpunit
+      INSTALL_SERVER: true
+
+    - PHP_VERSION: 7.1
+      # mb4 support by default
+      DB_TYPE: mysql8
       TEST_SUITE: phpunit
+      COVERAGE: false
       INSTALL_SERVER: true
 
 #    - PHP_VERSION: 7.1
@@ -627,6 +638,7 @@ matrix:
 
     - PHP_VERSION: 7.1
       DB_TYPE: mariadb
+      # mb4 support by default
       MARIADB_IMAGE: mariadb:10.3
       TEST_SUITE: phpunit
       COVERAGE: true

diff --git a/lib/private/DB/MySqlTools.php b/lib/private/DB/MySqlTools.php
@@ -23,6 +23,7 @@
 
 use OCP\IDBConnection;
 use Doctrine\DBAL\DBALException;
+use Doctrine\DBAL\Platforms\MySQL80Platform;
 
 /**
 * Various MySQL specific helper functions.
@@ -71,6 +72,11 @@ public function supports4ByteCharset(IDBConnection $connection) {
 			return true;
 		}
 
+		if ($connection->getDatabasePlatform() instanceof MySQL80Platform) {
+			// mb4 supported by default since MySQL 8.0 and innodb_file_format vars were removed
+			return true;
+		}
+
 		$version = $connection->getDatabaseVersionString();
 		$mariadb = \stripos($version, 'mariadb') !== false;
 		if ($mariadb && \version_compare($this->getMariaDbMysqlVersionNumber($version), '10.3.1', '>=')) {

diff --git a/tests/drone/install-server.sh b/tests/drone/install-server.sh
@@ -87,6 +87,10 @@ case "${DB_TYPE}" in
     wait-for-it mysqlmb4:3306
     DB=mysql
     ;;
+  mysql8)
+    wait-for-it mysql8:3306
+    DB=mysql
+    ;;
   postgres)
     wait-for-it postgres:5432
     DB=pgsql