Projet

Général

Profil

Révision 01dfd3b5

Ajouté par Assos Assos il y a plus de 3 ans

Udpate to 7.77

Voir les différences:

drupal7/includes/database/select.inc
1520 1520 
    $fields = array();
1521 1521 
    foreach ($this->tables as $alias => $table) {
1522 1522 
      if (!empty($table['all_fields'])) {
1523 
        $fields[] = $this->connection->escapeTable($alias) . '.*';
1523 
        $fields[] = $this->connection->escapeAlias($alias) . '.*';
1524 1524 
      }
1525 1525 
    }
1526 1526 
    foreach ($this->fields as $alias => $field) {
1527 
      // Note that $field['table'] holds the table alias.
1528 
      // @see \SelectQuery::addField
1529 
      $table = isset($field['table']) ? $this->connection->escapeAlias($field['table']) . '.' : '';
1527 1530 
      // Always use the AS keyword for field aliases, as some
1528 1531 
      // databases require it (e.g., PostgreSQL).
1529 
      $fields[] = (isset($field['table']) ? $this->connection->escapeTable($field['table']) . '.' : '') . $this->connection->escapeField($field['field']) . ' AS ' . $this->connection->escapeAlias($field['alias']);
1532 
      $fields[] = $table . $this->connection->escapeField($field['field']) . ' AS ' . $this->connection->escapeAlias($field['alias']);
1530 1533 
    }
1531 1534 
    foreach ($this->expressions as $alias => $expression) {
1532 1535 
      $fields[] = $expression['expression'] . ' AS ' . $this->connection->escapeAlias($expression['alias']);
......
1555 1558 

  		




  1556
  1559
  
    
      // Don't use the AS keyword for table aliases, as some


  		




  1557
  1560
  
    
      // databases don't support it (e.g., Oracle).


  		




  1558
  
  
    
      $query .=  $table_string . ' ' . $this->connection->escapeTable($table['alias']);


  		




  
  1561
  
    
      $query .=  $table_string . ' ' . $this->connection->escapeAlias($table['alias']);


  		




  1559
  1562
  
    

  		




  1560
  1563
  
    
      if (!empty($table['condition'])) {


  		




  1561
  1564
  
    
        $query .= ' ON ' . $table['condition'];


  		












Formats disponibles :  Unified diff