Unverified Commit 1760fab7 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #2845571 by quietone, aerozeppelin, robertwb, Lendude: ViewsJoin ignores... 

Issue #2845571 by quietone, aerozeppelin, robertwb, Lendude: ViewsJoin ignores operator in configuration
parent 2a21bdae

core/modules/views/src/Plugin/views/join/JoinPluginBase.php

+2 −1
Changes for core/modules/views/src/Plugin/views/join/JoinPluginBase.php: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -258,6 +258,7 @@ public function __construct(array $configuration, $plugin_id, $plugin_definition 
    $configuration += [

      'type' => 'LEFT',

      'extra_operator' => 'AND',

      'operator' => '=',

    ];

    $this->configuration = $configuration;
@@ -310,7 +311,7 @@ public function buildJoin($select_query, $table, $view_query) { 
      $left_table = NULL;

    }



    $condition = "$left_field = $table[alias].$this->field";

    $condition = "$left_field " . $this->configuration['operator'] . " $table[alias].$this->field";

    $arguments = [];



    // Tack on the extra.

core/modules/views/tests/src/Kernel/Plugin/JoinTest.php

+20 −0
Changes for core/modules/views/tests/src/Kernel/Plugin/JoinTest.php: 20 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -218,6 +218,26 @@ public function testBasePlugin() { 
    $this->assertStringContainsString("views_test_data.status = :views_join_condition_8", $join_info['condition'], 'Make sure the second extra join condition appears in the query.');

    $this->assertStringContainsString("users6.name = views_test_data.name", $join_info['condition'], 'Make sure the third extra join condition appears in the query.');

    $this->assertEquals(['en', 0], array_values($join_info['arguments']), 'Make sure the arguments are in the right order');



    $configuration = [

      'left_table' => 'views_test_data',

      'left_field' => 'uid',

      'table' => 'users_field_data',

      'field' => 'uid',

      'adjusted' => TRUE,

      'operator' => '<>',

    ];

    $join = $this->manager->createInstance('standard', $configuration);

    $table = ['alias' => 'users_field_data'];

    $query = Database::getConnection()->select('views_test_data');

    $join->buildJoin($query, $table, $view->query);



    $tables = $query->getTables();

    $join_info = $tables['users_field_data'];

    $this->assertEquals('LEFT', $join_info['join type']);

    $this->assertEquals($configuration['table'], $join_info['table']);

    $this->assertEquals('users_field_data', $join_info['alias']);

    $this->assertEquals('views_test_data.uid <> users_field_data.uid', $join_info['condition']);

  }



}