From 09cf942787cc395d9aca9be4460ef972e3bfcc1e Mon Sep 17 00:00:00 2001 From: Shane Archer Date: Fri, 31 Jul 2015 11:31:02 -0700 Subject: [PATCH] Final cleanup before squashing. --- .travis.yml | 4 ++-- lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b3ac28f9569..6dffaf89733 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ install: - composer update --prefer-source before_script: - - if [ $DB = 'pgsql' ]; then sudo service postgresql stop; sudo service postgresql start $POSTGRESQL_VERSION; fi + - if [ '$DB' = 'pgsql' ]; then sudo service postgresql stop; sudo service postgresql start $POSTGRESQL_VERSION; fi script: ./vendor/bin/phpunit --configuration tests/travis/$DB.travis.xml @@ -45,4 +45,4 @@ matrix: addons: postgresql: '9.4' -sudo: required +sudo: false diff --git a/lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php b/lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php index aaf6eea617d..19dfa9369b4 100644 --- a/lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php +++ b/lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php @@ -169,6 +169,7 @@ public function listTableColumns($table, $database = null) } $sql = $this->_platform->getListTableColumnsSQL($table, $database); + $tableColumns = $this->_conn->fetchAll($sql); return $this->_getPortableTableColumnList($table, $database, $tableColumns);