diff --git a/.travis.yml b/.travis.yml index 6be26170ae5..09181656a83 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,279 +45,6 @@ jobs: - php: nightly include: - - stage: Test - php: 7.1 - env: DB=mysql MYSQL_VERSION=8.0 - dist: xenial - sudo: required - before_script: - - bash ./tests/travis/install-mysql-8.0.sh - - stage: Test - php: 7.1 - env: DB=mysqli MYSQL_VERSION=8.0 - dist: xenial - sudo: required - before_script: - - bash ./tests/travis/install-mysql-8.0.sh - - stage: Test - php: 7.1 - env: DB=mariadb MARIADB_VERSION=10.3 - addons: - mariadb: 10.3 - - stage: Test - php: 7.1 - env: DB=mariadb.mysqli MARIADB_VERSION=10.3 - addons: - mariadb: 10.3 - - stage: Test - php: 7.1 - env: DB=pgsql POSTGRESQL_VERSION=11.0 - sudo: required - services: - - docker - before_script: - - bash ./tests/travis/install-postgres-11.sh - - stage: Test - php: 7.1 - env: DB=sqlite - - stage: Test - php: 7.1 - env: DB=sqlsrv - sudo: required - services: - - docker - before_script: - - bash ./tests/travis/install-mssql-sqlsrv.sh - - bash ./tests/travis/install-mssql.sh - - stage: Test - php: 7.1 - env: DB=pdo_sqlsrv - sudo: required - services: - - docker - before_script: - - bash ./tests/travis/install-mssql-pdo_sqlsrv.sh - - bash ./tests/travis/install-mssql.sh - - stage: Test - php: 7.1 - env: DB=ibm_db2 - sudo: required - services: - - docker - before_script: - - bash ./tests/travis/install-db2.sh - - bash ./tests/travis/install-db2-ibm_db2.sh - - stage: Test - php: 7.1 - env: DB=sqlite DEPENDENCIES=low - install: - - travis_retry composer update --prefer-dist --prefer-lowest - - stage: Test - php: 7.2 - env: DB=mysql COVERAGE=yes - - stage: Test - php: 7.2 - env: DB=mysql MYSQL_VERSION=5.7 COVERAGE=yes - 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 - - stage: Test - php: 7.2 - env: DB=mysqli MYSQL_VERSION=5.7 COVERAGE=yes - 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 - addons: - mariadb: 10.0 - - stage: Test - php: 7.2 - env: DB=mariadb MARIADB_VERSION=10.1 COVERAGE=yes - addons: - mariadb: 10.1 - - stage: Test - php: 7.2 - env: DB=mariadb MARIADB_VERSION=10.2 COVERAGE=yes - addons: - mariadb: 10.2 - - stage: Test - php: 7.2 - env: DB=mariadb MARIADB_VERSION=10.3 COVERAGE=yes - addons: - mariadb: 10.3 - - stage: Test - php: 7.2 - env: DB=mariadb.mysqli MARIADB_VERSION=10.0 COVERAGE=yes - addons: - mariadb: 10.0 - - stage: Test - php: 7.2 - env: DB=mariadb.mysqli MARIADB_VERSION=10.1 COVERAGE=yes - addons: - mariadb: 10.1 - - stage: Test - php: 7.2 - env: DB=mariadb.mysqli MARIADB_VERSION=10.2 COVERAGE=yes - addons: - mariadb: 10.2 - - stage: Test - php: 7.2 - env: DB=mariadb.mysqli MARIADB_VERSION=10.3 COVERAGE=yes - addons: - mariadb: 10.3 - - stage: Test - php: 7.2 - env: DB=pgsql POSTGRESQL_VERSION=9.2 COVERAGE=yes - services: - - postgresql - addons: - postgresql: "9.2" - - stage: Test - php: 7.2 - env: DB=pgsql POSTGRESQL_VERSION=9.3 COVERAGE=yes - services: - - postgresql - addons: - postgresql: "9.3" - - stage: Test - php: 7.2 - env: DB=pgsql POSTGRESQL_VERSION=9.4 COVERAGE=yes - services: - - postgresql - addons: - postgresql: "9.4" - - stage: Test - php: 7.2 - env: DB=pgsql POSTGRESQL_VERSION=9.5 COVERAGE=yes - services: - - postgresql - addons: - postgresql: "9.5" - - stage: Test - php: 7.2 - env: DB=pgsql POSTGRESQL_VERSION=9.6 COVERAGE=yes - services: - - postgresql - addons: - postgresql: "9.6" - - stage: Test - php: 7.2 - env: DB=pgsql POSTGRESQL_VERSION=10.0 COVERAGE=yes - sudo: required - services: - - postgresql - addons: - postgresql: "9.6" - before_script: - - bash ./tests/travis/install-postgres-10.sh - - stage: Test - php: 7.2 - env: DB=pgsql POSTGRESQL_VERSION=11.0 COVERAGE=yes - sudo: required - services: - - docker - before_script: - - bash ./tests/travis/install-postgres-11.sh - - stage: Test - php: 7.2 - env: DB=sqlite COVERAGE=yes - - stage: Test - php: 7.2 - env: DB=sqlsrv COVERAGE=yes - sudo: required - services: - - docker - before_script: - - bash ./tests/travis/install-mssql-sqlsrv.sh - - bash ./tests/travis/install-mssql.sh - - stage: Test - php: 7.2 - env: DB=pdo_sqlsrv COVERAGE=yes - sudo: required - services: - - docker - before_script: - - bash ./tests/travis/install-mssql-pdo_sqlsrv.sh - - bash ./tests/travis/install-mssql.sh - - stage: Test - php: 7.2 - env: DB=ibm_db2 COVERAGE=yes - sudo: required - services: - - docker - before_script: - - bash ./tests/travis/install-db2.sh - - bash ./tests/travis/install-db2-ibm_db2.sh - - stage: Test - php: 7.3 - env: DB=mysql MYSQL_VERSION=5.7 - sudo: required - before_script: - - bash ./tests/travis/install-mysql-5.7.sh - - stage: Test - php: 7.3 - env: DB=mysqli MYSQL_VERSION=5.7 - sudo: required - before_script: - - bash ./tests/travis/install-mysql-5.7.sh - - stage: Test - php: 7.3 - env: DB=mariadb MARIADB_VERSION=10.3 - addons: - mariadb: 10.3 - - stage: Test - php: 7.3 - env: DB=mariadb.mysqli MARIADB_VERSION=10.3 - addons: - mariadb: 10.3 - - stage: Test - php: 7.3 - env: DB=pgsql POSTGRESQL_VERSION=11.0 - sudo: required - services: - - docker - before_script: - - bash ./tests/travis/install-postgres-11.sh - - stage: Test - php: 7.3 - env: DB=sqlite - - stage: Test - php: 7.3 - env: DB=sqlsrv - sudo: required - services: - - docker - before_script: - - bash ./tests/travis/install-mssql-sqlsrv.sh - - bash ./tests/travis/install-mssql.sh - - stage: Test - php: 7.3 - env: DB=pdo_sqlsrv - sudo: required - services: - - docker - before_script: - - bash ./tests/travis/install-mssql-pdo_sqlsrv.sh - - bash ./tests/travis/install-mssql.sh - stage: Test php: nightly env: DB=mysql MYSQL_VERSION=8.0 @@ -332,62 +59,3 @@ jobs: sudo: required before_script: - bash ./tests/travis/install-mysql-8.0.sh - - stage: Test - php: nightly - env: DB=mariadb MARIADB_VERSION=10.3 - addons: - mariadb: 10.3 - - stage: Test - php: nightly - env: DB=mariadb.mysqli MARIADB_VERSION=10.3 - addons: - mariadb: 10.3 - - stage: Test - php: nightly - env: DB=pgsql POSTGRESQL_VERSION=11.0 - sudo: required - services: - - docker - before_script: - - bash ./tests/travis/install-postgres-11.sh - - stage: Test - php: nightly - env: DB=sqlite - - stage: Test - php: nightly - env: DB=sqlsrv - sudo: required - services: - - docker - before_script: - - bash ./tests/travis/install-mssql-sqlsrv.sh - - bash ./tests/travis/install-mssql.sh - - stage: Test - php: nightly - env: DB=pdo_sqlsrv - sudo: required - services: - - docker - before_script: - - bash ./tests/travis/install-mssql-pdo_sqlsrv.sh - - bash ./tests/travis/install-mssql.sh - - - stage: Test - if: type = cron - php: 7.2 - env: DB=sqlite DEPENDENCIES=dev - install: - - composer config minimum-stability dev - - travis_retry composer update --prefer-dist - - - stage: Code Quality - php: 7.2 - env: DB=none STATIC_ANALYSIS - install: travis_retry composer install --prefer-dist - script: vendor/bin/phpstan analyse - - - stage: Coding standard - php: 7.2 - install: travis_retry composer install --prefer-dist - script: - - ./vendor/bin/phpcs diff --git a/lib/Doctrine/DBAL/Platforms/MySqlPlatform.php b/lib/Doctrine/DBAL/Platforms/MySqlPlatform.php index 541c4ac55f8..98228fc50b3 100644 --- a/lib/Doctrine/DBAL/Platforms/MySqlPlatform.php +++ b/lib/Doctrine/DBAL/Platforms/MySqlPlatform.php @@ -158,7 +158,8 @@ public function getListTableIndexesSQL($table, $currentDatabase = null) '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;