Optimize OracleSchemaManager::listTables

lib/Doctrine/DBAL/Platforms/OraclePlatform.php

@@ -353,6 +353,22 @@ public function getClobTypeDeclarationSQL(array $field)
  return 'CLOB';
  }
 
+ /**
+ * Returns the database condition for querying the schema.
+ *
+ * @param string $database The database schema. If NULL or '/', the currently active schema will be queried.
+ */
+ private function getDatabaseCondition(?string $database) : string
+ {
+ if ($database !== null && $database !== '/') {
+ $databaseIdentifier = $this->normalizeIdentifier($database);
+
+ return $this->quoteStringLiteral($databaseIdentifier->getName());
+ }
+
+ return "(SELECT SYS_CONTEXT('userenv', 'current_schema') FROM DUAL)";
+ }
+
  /**
  * {@inheritDoc}
  */
@@ -404,43 +420,57 @@ protected function _getCreateTableSQL($table, array $columns, array $options = [
  return $sql;
  }
 
+ /**
+ * Returns the SQL for a list of indexes in the database.
+ *
+ * @param string $database The database schema. If NULL or '/', the currently active schema will be queried.
+ * @param string $table The table. If left NULL, the SQL will return all the indexes in the database.
+ */
+ private function getListIndexesSQL(?string $database, ?string $table) : string
+ {
+ $databaseCondition = $this->getDatabaseCondition($database);
+ $tableCondition = '';
+
+ if ($table !== null) {
+ $tableIdentifier = $this->normalizeIdentifier($table);
+ $quotedTableIdentifier = $this->quoteStringLiteral($tableIdentifier->getName());
+ $tableCondition = ' AND ind_col.table_name = ' . $quotedTableIdentifier;
+ }
+
+ return <<<SQL
+ SELECT ind_col.table_name as table_name,
+ ind_col.index_name AS name,
+ ind.index_type AS type,
+ decode(ind.uniqueness, 'NONUNIQUE', 0, 'UNIQUE', 1) AS is_unique,
+ ind_col.column_name AS column_name,
+ ind_col.column_position AS column_pos,
+ con.constraint_type AS is_primary
+ FROM all_ind_columns ind_col
+ LEFT JOIN all_indexes ind ON ind.owner = ind_col.index_owner AND ind.index_name = ind_col.index_name
+ LEFT JOIN all_constraints con ON con.owner = ind_col.index_owner AND con.index_name = ind_col.index_name
+ WHERE ind_col.index_owner = $databaseCondition$tableCondition
+ ORDER BY ind_col.table_name, ind_col.index_name, ind_col.column_position
+SQL;
+ }
+
  /**
  * {@inheritDoc}
  *
  * @link http://ezcomponents.org/docs/api/trunk/DatabaseSchema/ezcDbSchemaOracleReader.html
  */
  public function getListTableIndexesSQL($table, $currentDatabase = null)
  {
- $table = $this->normalizeIdentifier($table);
-  $table = $this->quoteStringLiteral($table->getName());
+ return $this->getListIndexesSQL($currentDatabase, $table);
+ }
 
- return "SELECT uind_col.index_name AS name,
- (
- SELECT uind.index_type
- FROM user_indexes uind
- WHERE uind.index_name = uind_col.index_name
- ) AS type,
- decode(
- (
- SELECT uind.uniqueness
- FROM user_indexes uind
- WHERE uind.index_name = uind_col.index_name
- ),
- 'NONUNIQUE',
- 0,
- 'UNIQUE',
- 1
- ) AS is_unique,
- uind_col.column_name AS column_name,
- uind_col.column_position AS column_pos,
- (
- SELECT ucon.constraint_type
- FROM user_constraints ucon
- WHERE ucon.index_name = uind_col.index_name
- ) AS is_primary
- FROM user_ind_columns uind_col
- WHERE uind_col.table_name = " . $table . '
- ORDER BY uind_col.column_position ASC';
+ /**
+ * Returns the SQL for a list of all indexes in the database.
+ *
+ * @param string $database The database schema. If NULL or '/', the currently active schema will be queried.
+ */
+ public function getListAllIndexesSQL(?string $database = null) : string
+ {
+ return $this->getListIndexesSQL($database, null);
  }
 
  /**
@@ -598,36 +628,55 @@ private function getAutoincrementIdentifierName(Identifier $table)
  : $identifierName;
  }
 
+ /**
+ * Returns the SQL for a list of foreign keys in the database.
+ *
+ * @param string $database The database schema. If NULL or '/', the currently active schema will be queried.
+ * @param string $table The table. If left NULL, the SQL will return all the indexes in the database.
+ */
+ private function getListForeignKeysSQL(?string $database, ?string $table) : string
+ {
+ $databaseCondition = $this->getDatabaseCondition($database);
+ $tableCondition = '';
+
+ if ($table !== null) {
+ $tableIdentifier = $this->normalizeIdentifier($table);
+ $quotedTableIdentifier = $this->quoteStringLiteral($tableIdentifier->getName());
+ $tableCondition = ' AND cols.table_name = ' . $quotedTableIdentifier;
+ }
+
+ return <<<SQL
+ SELECT cols.table_name,
+ alc.constraint_name,
+ alc.DELETE_RULE,
+ cols.column_name "local_column",
+ cols.position,
+ r_cols.table_name "references_table",
+ r_cols.column_name "foreign_column"
+ FROM all_cons_columns cols
+ LEFT JOIN all_constraints alc ON alc.owner = cols.owner AND alc.constraint_name = cols.constraint_name
+ LEFT JOIN all_cons_columns r_cols ON r_cols.owner = alc.r_owner AND r_cols.constraint_name = alc.r_constraint_name AND r_cols.position = cols.position
+ WHERE cols.owner = $databaseCondition AND alc.constraint_type = 'R'$tableCondition
+ ORDER BY cols.table_name, cols.constraint_name, cols.position
+SQL;
+ }
+
  /**
  * {@inheritDoc}
  */
  public function getListTableForeignKeysSQL($table)
  {
- $table = $this->normalizeIdentifier($table);
-  $table = $this->quoteStringLiteral($table->getName());
+ return $this->getListForeignKeysSQL(null, $table);
+ }
 
- return "SELECT alc.constraint_name,
- alc.DELETE_RULE,
- cols.column_name \"local_column\",
- cols.position,
- (
- SELECT r_cols.table_name
- FROM user_cons_columns r_cols
- WHERE alc.r_constraint_name = r_cols.constraint_name
- AND r_cols.position = cols.position
- ) AS \"references_table\",
- (
- SELECT r_cols.column_name
- FROM user_cons_columns r_cols
- WHERE alc.r_constraint_name = r_cols.constraint_name
- AND r_cols.position = cols.position
- ) AS \"foreign_column\"
- FROM user_cons_columns cols
- JOIN user_constraints alc
- ON alc.constraint_name = cols.constraint_name
- AND alc.constraint_type = 'R'
- AND alc.table_name = " . $table . '
- ORDER BY cols.constraint_name ASC, cols.position ASC';
+ /**
+ * Returns the SQL for a list of all foreign keys in the database.
+ *
+ * @param string $database The database schema. If NULL or '/', the currently active schema will be queried.
+ */
+ public function getListAllForeignKeysSQL(?string $database = null) : string
+ {
+ return $this->getListForeignKeysSQL($database, null);
  }
 
  /**
@@ -642,47 +691,48 @@ public function getListTableConstraintsSQL($table)
  }
 
  /**
- * {@inheritDoc}
+ * Returns the SQL for a list of columns in the database.
+ *
+ * @param string $database The database schema. If NULL or '/', the currently active schema will be queried.
+ * @param string $table The table. If left NULL, the SQL will return all the indexes in the database.
  */
- public function getListTableColumnsSQL($table, $database = null)
+ private function getListColumnsSQL(?string $database, ?string $table) : string
  {
- $table = $this->normalizeIdentifier($table);
- $table = $this->quoteStringLiteral($table->getName());
-
- $tabColumnsTableName = 'user_tab_columns';
- $colCommentsTableName = 'user_col_comments';
- $tabColumnsOwnerCondition = '';
- $colCommentsOwnerCondition = '';
+ $databaseCondition = $this->getDatabaseCondition($database);
+ $tableCondition = '';
 
- if ($database !== null && $database !== '/') {
- $database = $this->normalizeIdentifier($database);
- $database = $this->quoteStringLiteral($database->getName());
- $tabColumnsTableName = 'all_tab_columns';
- $colCommentsTableName = 'all_col_comments';
- $tabColumnsOwnerCondition = ' AND c.owner = ' . $database;
- $colCommentsOwnerCondition = ' AND d.OWNER = c.OWNER';
+ if ($table !== null) {
+ $tableIdentifier = $this->normalizeIdentifier($table);
+ $quotedTableIdentifier = $this->quoteStringLiteral($tableIdentifier->getName());
+ $tableCondition = ' AND c.table_name = ' . $quotedTableIdentifier;
  }
 
- return sprintf(
- <<<'SQL'
-SELECT c.*,
- (
- SELECT d.comments
- FROM %s d
- WHERE d.TABLE_NAME = c.TABLE_NAME%s
- AND d.COLUMN_NAME = c.COLUMN_NAME
- ) AS comments
-FROM %s c
-WHERE c.table_name = %s%s
-ORDER BY c.column_id
-SQL
- ,
- $colCommentsTableName,
- $colCommentsOwnerCondition,
- $tabColumnsTableName,
- $table,
- $tabColumnsOwnerCondition
- );
+ return <<<SQL
+ SELECT c.*,
+ d.comments AS comments
+ FROM all_tab_columns c
+ LEFT JOIN all_col_comments d ON d.OWNER = c.OWNER AND d.TABLE_NAME = c.TABLE_NAME AND d.COLUMN_NAME = c.COLUMN_NAME
+ WHERE c.owner = $databaseCondition$tableCondition
+ ORDER BY c.table_name, c.column_id
+SQL;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function getListTableColumnsSQL($table, $database = null)
+ {
+ return $this->getListColumnsSQL($database, $table);
+ }
+
+ /**
+ * Returns the SQL for a list of all columns in the database.
+ *
+ * @param string $database The database schema. If NULL or '/', the currently active schema will be queried.
+ */
+ public function getListAllColumnsSQL(?string $database = null) : string
+ {
+ return $this->getListColumnsSQL($database, null);
  }
 
  /**

lib/Doctrine/DBAL/Schema/OracleSchemaManager.php

@@ -24,6 +24,73 @@
  */
 class OracleSchemaManager extends AbstractSchemaManager
 {
+ /**
+ * Holds instance of the database platform used for this schema manager.
+ *
+ * @var OraclePlatform
+ */
+ protected $_platform;
+
+ /**
+ * {@inheritdoc}
+ */
+ public function listTables()
+ {
+ $currentDatabase = $this->_conn->getDatabase();
+
+ $tableNames = $this->listTableNames();
+
+ // Get all column definitions in one database call.
+ $columnsByTable = $this->getAssetRecordsByTable($this->_platform->getListAllColumnsSQL($currentDatabase));
+
+ // Get all foreign keys definitions in one database call.
+ $foreignKeysByTable = $this->getAssetRecordsByTable($this->_platform->getListAllForeignKeysSQL($currentDatabase));
+
+ // Get all indexes definitions in one database call.
+ $indexesByTable = $this->getAssetRecordsByTable($this->_platform->getListAllIndexesSQL($currentDatabase));
+
+ $tables = [];
+ foreach ($tableNames as $quotedTableName) {
+ $tableName = trim($quotedTableName, $this->_platform->getIdentifierQuoteCharacter());
+
+ $columns = $this->_getPortableTableColumnList($quotedTableName, '', $columnsByTable[$tableName]);
+
+ $foreignKeys = [];
+ if (isset($foreignKeysByTable[$tableName])) {
+ $foreignKeys = $this->_getPortableTableForeignKeysList($foreignKeysByTable[$tableName]);
+ }
+
+ $indexes = [];
+ if (isset($indexesByTable[$tableName])) {
+ $indexes = $this->_getPortableTableIndexesList($indexesByTable[$tableName], $quotedTableName);
+ }
+
+ $tables[] = new Table($quotedTableName, $columns, $indexes, $foreignKeys);
+ }
+
+ return $tables;
+ }
+
+ /**
+ * Helper method to group a set of asset records by the table name.
+ *
+ * @param string $sql An SQL statement to be executed, that contains a
+ * TABLE_NAME field for grouping.
+ *
+ * @return mixed[] An associative array with key being the table name, and
+ * value a simple array of records associated with the table.
+ */
+ private function getAssetRecordsByTable(string $sql) : array
+ {
+ $input = $this->_conn->fetchAll($sql);
+ $output = [];
+ foreach ($input as $record) {
+ $output[$record['TABLE_NAME']][] = $record;
+ }
+
+ return $output;
+ }
+
  /**
  * {@inheritdoc}
  */

tests/Doctrine/Tests/DBAL/Functional/Schema/OracleSchemaManagerTest.php

@@ -285,4 +285,29 @@ public function testCreateAndListSequences() : void
  {
  self::markTestSkipped("Skipped for uppercase letters are contained in sequences' names. Fix the schema manager in 3.0.");
  }
+
+ /**
+ * @group DBAL-2766
+ */
+ public function testCreateSchemaNumberOfQueriesInvariable() : void
+ {
+ // Introspect the db schema.
+ $preCount = $this->sqlLoggerStack->currentQuery;
+ $schema = $this->schemaManager->createSchema();
+ $firstQueryCount = $this->sqlLoggerStack->currentQuery - $preCount;
+
+ // Create a couple of additional tables.
+ $this->connection->executeUpdate("CREATE TABLE tbl_test_2766_0 (x_id VARCHAR2(255) DEFAULT 'x' NOT NULL, x_data CLOB DEFAULT NULL NULL, x_number NUMBER(10) DEFAULT 0 NOT NULL, PRIMARY KEY(x_id))");
+ $this->connection->executeUpdate("CREATE TABLE tbl_test_2766_1 (x_id VARCHAR2(255) DEFAULT 'x' NOT NULL, x_data CLOB DEFAULT NULL NULL, x_number NUMBER(10) DEFAULT 0 NOT NULL, x_parent_id VARCHAR2(255) DEFAULT 'x' NOT NULL, CONSTRAINT tbl_test_2766_fk_1 FOREIGN KEY (x_parent_id) REFERENCES tbl_test_2766_0(x_id), PRIMARY KEY(x_id))");
+ $this->connection->executeUpdate('CREATE UNIQUE INDEX tbl_test_2766_uix_1 ON tbl_test_2766_1 (x_number)');
+
+ // Introspect the db schema again.
+ $preCount = $this->sqlLoggerStack->currentQuery;
+ $schema = $this->schemaManager->createSchema();
+ $secondQueryCount = $this->sqlLoggerStack->currentQuery - $preCount;
+
+ // The number of queries needed to execute createSchema should be the
+ // same regardless of additional tables added.
+ self::assertEquals($firstQueryCount, $secondQueryCount);
+ }
 }