Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
doctrine-dbal
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tomáš Trávníček
doctrine-dbal
Commits
8c0bf798
Unverified
Commit
8c0bf798
authored
Dec 02, 2018
by
Sergei Morozov
Committed by
GitHub
Dec 02, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3372 from BenMorel/travis_mysql8
Travis CI tests on MySQL 8.0
parents
2179996d
f7b41778
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
47 additions
and
11 deletions
+47
-11
.scrutinizer.yml
.scrutinizer.yml
+1
-1
.travis.yml
.travis.yml
+26
-8
MySqlPlatform.php
lib/Doctrine/DBAL/Platforms/MySqlPlatform.php
+4
-2
install-mysql-8.0.sh
tests/travis/install-mysql-8.0.sh
+16
-0
No files found.
.scrutinizer.yml
View file @
8c0bf798
...
...
@@ -21,7 +21,7 @@ before_commands:
tools
:
external_code_coverage
:
timeout
:
3600
runs
:
28
# 23
x Travis (jobs with COVERAGE=yes) + 3x AppVeyor (jobs with coverage=yes) + 2x ContinuousPHP
runs
:
30
# 25
x Travis (jobs with COVERAGE=yes) + 3x AppVeyor (jobs with coverage=yes) + 2x ContinuousPHP
filter
:
excluded_paths
:
...
...
.travis.yml
View file @
8c0bf798
...
...
@@ -47,16 +47,18 @@ jobs:
include
:
-
stage
:
Test
php
:
7.1
env
:
DB=mysql MYSQL_VERSION=5.7
env
:
DB=mysql MYSQL_VERSION=8.0
dist
:
xenial
sudo
:
required
before_script
:
-
bash ./tests/travis/install-mysql-
5.7
.sh
-
bash ./tests/travis/install-mysql-
8.0
.sh
-
stage
:
Test
php
:
7.1
env
:
DB=mysqli MYSQL_VERSION=5.7
env
:
DB=mysqli MYSQL_VERSION=8.0
dist
:
xenial
sudo
:
required
before_script
:
-
bash ./tests/travis/install-mysql-
5.7
.sh
-
bash ./tests/travis/install-mysql-
8.0
.sh
-
stage
:
Test
php
:
7.1
env
:
DB=mariadb MARIADB_VERSION=10.3
...
...
@@ -119,6 +121,13 @@ jobs:
sudo
:
required
before_script
:
-
bash ./tests/travis/install-mysql-5.7.sh
-
stage
:
Test
php
:
7.2
env
:
DB=mysql MYSQL_VERSION=8.0 COVERAGE=yes
dist
:
xenial
sudo
:
required
before_script
:
-
bash ./tests/travis/install-mysql-8.0.sh
-
stage
:
Test
php
:
7.2
env
:
DB=mysqli COVERAGE=yes
...
...
@@ -128,6 +137,13 @@ jobs:
sudo
:
required
before_script
:
-
bash ./tests/travis/install-mysql-5.7.sh
-
stage
:
Test
php
:
7.2
env
:
DB=mysqli MYSQL_VERSION=8.0 COVERAGE=yes
dist
:
xenial
sudo
:
required
before_script
:
-
bash ./tests/travis/install-mysql-8.0.sh
-
stage
:
Test
php
:
7.2
env
:
DB=mariadb MARIADB_VERSION=10.0 COVERAGE=yes
...
...
@@ -304,16 +320,18 @@ jobs:
-
bash ./tests/travis/install-mssql.sh
-
stage
:
Test
php
:
nightly
env
:
DB=mysql MYSQL_VERSION=5.7
env
:
DB=mysql MYSQL_VERSION=8.0
dist
:
xenial
sudo
:
required
before_script
:
-
bash ./tests/travis/install-mysql-
5.7
.sh
-
bash ./tests/travis/install-mysql-
8.0
.sh
-
stage
:
Test
php
:
nightly
env
:
DB=mysqli MYSQL_VERSION=5.7
env
:
DB=mysqli MYSQL_VERSION=8.0
dist
:
xenial
sudo
:
required
before_script
:
-
bash ./tests/travis/install-mysql-
5.7
.sh
-
bash ./tests/travis/install-mysql-
8.0
.sh
-
stage
:
Test
php
:
nightly
env
:
DB=mariadb MARIADB_VERSION=10.3
...
...
lib/Doctrine/DBAL/Platforms/MySqlPlatform.php
View file @
8c0bf798
...
...
@@ -158,7 +158,8 @@ class MySqlPlatform extends AbstractPlatform
'SEQ_IN_INDEX AS Seq_in_index, COLUMN_NAME AS Column_Name, COLLATION AS Collation, '
.
'CARDINALITY AS Cardinality, SUB_PART AS Sub_Part, PACKED AS Packed, '
.
'NULLABLE AS `Null`, INDEX_TYPE AS Index_Type, COMMENT AS Comment '
.
'FROM information_schema.STATISTICS WHERE TABLE_NAME = '
.
$table
.
' AND TABLE_SCHEMA = '
.
$currentDatabase
;
'FROM information_schema.STATISTICS WHERE TABLE_NAME = '
.
$table
.
' AND TABLE_SCHEMA = '
.
$currentDatabase
.
' ORDER BY SEQ_IN_INDEX ASC'
;
}
return
'SHOW INDEX FROM '
.
$table
;
...
...
@@ -376,7 +377,8 @@ class MySqlPlatform extends AbstractPlatform
return
'SELECT COLUMN_NAME AS Field, COLUMN_TYPE AS Type, IS_NULLABLE AS `Null`, '
.
'COLUMN_KEY AS `Key`, COLUMN_DEFAULT AS `Default`, EXTRA AS Extra, COLUMN_COMMENT AS Comment, '
.
'CHARACTER_SET_NAME AS CharacterSet, COLLATION_NAME AS Collation '
.
'FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = '
.
$database
.
' AND TABLE_NAME = '
.
$table
;
'FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = '
.
$database
.
' AND TABLE_NAME = '
.
$table
.
' ORDER BY ORDINAL_POSITION ASC'
;
}
public
function
getListTableMetadataSQL
(
string
$table
,
?
string
$database
=
null
)
:
string
...
...
tests/travis/install-mysql-8.0.sh
0 → 100644
View file @
8c0bf798
#!/usr/bin/env bash
set
-ex
echo
"Installing MySQL 8.0..."
echo
mysql-apt-config mysql-apt-config/select-server
select
mysql-8.0 |
sudo
debconf-set-selections
wget https://dev.mysql.com/get/mysql-apt-config_0.8.10-1_all.deb
sudo
dpkg
--install
mysql-apt-config_0.8.10-1_all.deb
sudo
apt-get update
-q
sudo
apt-get
install
-q
-y
--force-yes
-o
Dpkg::Options::
=
--force-confnew
mysql-server
echo
-e
"[mysqld]
\n
default_authentication_plugin=mysql_native_password"
|
sudo tee
--append
/etc/mysql/my.cnf
sudo
/etc/init.d/mysql start
sudo
mysql_upgrade
mysql
--version
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment