diff --git a/core/modules/comment/comment.views.inc b/core/modules/comment/comment.views.inc index 79c3bc3..6167e58 100644 --- a/core/modules/comment/comment.views.inc +++ b/core/modules/comment/comment.views.inc @@ -546,7 +546,7 @@ function comment_views_data_alter(&$data) { ), ); - $data['node']['uid_touch'] = array( + $data['node_property_data']['uid_touch'] = array( 'title' => t('User posted or commented'), 'help' => t('Display nodes only if a user posted the node or commented on the node.'), 'argument' => array( diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/UidRevision.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument/UidRevision.php index d93611e..6d117e4 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/UidRevision.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument/UidRevision.php @@ -24,7 +24,7 @@ class UidRevision extends Uid { public function query($group_by = FALSE) { $this->ensureMyTable(); $placeholder = $this->placeholder(); - $this->query->add_where_expression(0, "$this->tableAlias.uid = $placeholder OR ((SELECT COUNT(*) FROM {node_revision} nr WHERE nr.uid = $placeholder AND nr.nid = $this->tableAlias.nid) > 0)", array($placeholder => $this->argument)); + $this->query->add_where_expression(0, "$this->tableAlias.uid = $placeholder OR ((SELECT COUNT(*) FROM {node_property_revision} npr WHERE npr.uid = $placeholder AND npr.nid = $this->tableAlias.nid) > 0)", array($placeholder => $this->argument)); } } diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/Vid.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument/Vid.php index d24c314..0466180 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/Vid.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument/Vid.php @@ -28,9 +28,9 @@ class Vid extends Numeric { function title_query() { $titles = array(); - $results = db_select('node_revision', 'nr') - ->fields('nr', array('vid', 'nid', 'title')) - ->condition('nr.vid', $this->value) + $results = db_select('node_property_revision', 'npr') + ->fields('npr', array('vid', 'nid', 'title')) + ->condition('npr.vid', $this->value) ->execute() ->fetchAllAssoc('vid', PDO::FETCH_ASSOC); $nids = array(); diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/HistoryUserTimestamp.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/HistoryUserTimestamp.php index 3617bc6..dabf788 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/field/HistoryUserTimestamp.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/HistoryUserTimestamp.php @@ -30,8 +30,8 @@ public function init(ViewExecutable $view, &$options) { parent::init($view, $options); global $user; if ($user->uid) { - $this->additional_fields['created'] = array('table' => 'node', 'field' => 'created'); - $this->additional_fields['changed'] = array('table' => 'node', 'field' => 'changed'); + $this->additional_fields['created'] = array('table' => 'node_property_data', 'field' => 'created'); + $this->additional_fields['changed'] = array('table' => 'node_property_data', 'field' => 'changed'); if (module_exists('comment') && !empty($this->options['comments'])) { $this->additional_fields['last_comment'] = array('table' => 'node_comment_statistics', 'field' => 'last_comment_timestamp'); } diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/Link.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/Link.php index 83c489a..b944ee5 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/field/Link.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/Link.php @@ -41,7 +41,12 @@ public function buildOptionsForm(&$form, &$form_state) { $form['alter']['external'] = array('#access' => FALSE); } - public function query() {} + /** + * Overrides \Drupal\views\Plugin\views\field\FieldPluginBase::query(). + */ + public function query() { + $this->add_additional_fields(); + } function render($values) { if ($entity = $this->get_entity($values)) { diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLink.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLink.php index 0701234..9db4975 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLink.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLink.php @@ -29,7 +29,7 @@ class RevisionLink extends Link { public function init(ViewExecutable $view, &$options) { parent::init($view, $options); - $this->additional_fields['node_vid'] = array('table' => 'node_revision', 'field' => 'vid'); + $this->additional_fields['node_vid'] = array('table' => 'node_property_revision', 'field' => 'vid'); } public function access() { @@ -44,7 +44,7 @@ function render_link($data, $values) { // Current revision uses the node view path. $path = 'node/' . $node->nid; - if ($node->vid != $vid) { + if (!$node->isDefaultRevision()) { $path .= "/revisions/$vid/view"; } @@ -69,7 +69,7 @@ function render_link($data, $values) { */ function get_revision_entity($values, $op) { $vid = $this->get_value($values, 'node_vid'); - $node = $this->get_value($values); + $node = $this->get_entity($values); // Unpublished nodes ignore access control. $node->status = 1; // Ensure user has access to perform the operation on this node. diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkDelete.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkDelete.php index 2bb53f1..1a315d9 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkDelete.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkDelete.php @@ -33,7 +33,7 @@ function render_link($data, $values) { } // Current revision cannot be deleted. - if ($node->vid == $vid) { + if ($node->isDefaultRevision()) { return; } diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkRevert.php b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkRevert.php index 11e66ff..ca8a32b 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkRevert.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/field/RevisionLinkRevert.php @@ -33,7 +33,7 @@ function render_link($data, $values) { } // Current revision cannot be reverted. - if ($node->vid == $vid) { + if ($node->isDefaultRevision()) { return; } diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/filter/UidRevision.php b/core/modules/node/lib/Drupal/node/Plugin/views/filter/UidRevision.php index f435e4d..2d9be91 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/filter/UidRevision.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/filter/UidRevision.php @@ -30,7 +30,7 @@ public function query($group_by = FALSE) { $args = array_values($this->value); $this->query->add_where_expression($this->options['group'], "$this->tableAlias.uid IN($placeholder) OR - ((SELECT COUNT(*) FROM {node_revision} nr WHERE nr.uid IN($placeholder) AND nr.nid = $this->tableAlias.nid) > 0)", array($placeholder => $args), + ((SELECT COUNT(*) FROM {node_property_revision} npr WHERE npr.uid IN($placeholder) AND npr.nid = $this->tableAlias.nid) > 0)", array($placeholder => $args), $args); } diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php b/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php index af28e1a..e1ece84 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/wizard/Node.php @@ -54,7 +54,7 @@ class Node extends WizardPluginBase { protected $filters = array( 'status' => array( 'value' => TRUE, - 'table' => 'node', + 'table' => 'node_property_data', 'field' => 'status' ) ); @@ -146,7 +146,7 @@ protected function default_display_options() { // to a row style that uses fields. /* Field: Content: Title */ $display_options['fields']['title']['id'] = 'title'; - $display_options['fields']['title']['table'] = 'node'; + $display_options['fields']['title']['table'] = 'node_property_data'; $display_options['fields']['title']['field'] = 'title'; $display_options['fields']['title']['label'] = ''; $display_options['fields']['title']['alter']['alter_text'] = 0; diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/wizard/NodeRevision.php b/core/modules/node/lib/Drupal/node/Plugin/views/wizard/NodeRevision.php index 9c5073f..961d29b 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/wizard/NodeRevision.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/wizard/NodeRevision.php @@ -21,7 +21,7 @@ * @Plugin( * id = "node_revision", * module = "node", - * base_table = "node_revision", + * base_table = "node_property_revision", * title = @Translation("Content revisions") * ) */ @@ -37,7 +37,7 @@ class NodeRevision extends WizardPluginBase { */ protected $pathField = array( 'id' => 'vid', - 'table' => 'node_revision', + 'table' => 'node_property_revision', 'field' => 'vid', 'exclude' => TRUE, 'alter' => array( @@ -65,7 +65,7 @@ class NodeRevision extends WizardPluginBase { protected $filters = array( 'status' => array( 'value' => TRUE, - 'table' => 'node_revision', + 'table' => 'node_property_revision', 'field' => 'status' ) ); @@ -97,7 +97,7 @@ protected function default_display_options() { /* Field: Content revision: Created date */ $display_options['fields']['timestamp']['id'] = 'timestamp'; - $display_options['fields']['timestamp']['table'] = 'node_revision'; + $display_options['fields']['timestamp']['table'] = 'node_property_revision'; $display_options['fields']['timestamp']['field'] = 'timestamp'; $display_options['fields']['timestamp']['alter']['alter_text'] = 0; $display_options['fields']['timestamp']['alter']['make_link'] = 0; @@ -112,7 +112,7 @@ protected function default_display_options() { /* Field: Content revision: Title */ $display_options['fields']['title']['id'] = 'title'; - $display_options['fields']['title']['table'] = 'node_revision'; + $display_options['fields']['title']['table'] = 'node_property_revision'; $display_options['fields']['title']['field'] = 'title'; $display_options['fields']['title']['label'] = ''; $display_options['fields']['title']['alter']['alter_text'] = 0; diff --git a/core/modules/node/node.views.inc b/core/modules/node/node.views.inc index bf30614..47e4c0a 100644 --- a/core/modules/node/node.views.inc +++ b/core/modules/node/node.views.inc @@ -31,6 +31,14 @@ function node_views_data() { ); $data['node']['table']['entity type'] = 'node'; + $data['node_property_data']['table']['group'] = t('Content'); + $data['node_property_data']['table']['entity type'] = 'node'; + $data['node_property_data']['table']['join']['node'] = array( + 'type' => 'INNER', + 'left_field' => 'nid', + 'field' => 'nid', + ); + // node table -- fields // nid @@ -61,7 +69,7 @@ function node_views_data() { // title // This definition has more items in it than it needs to as an example. - $data['node']['title'] = array( + $data['node_property_data']['title'] = array( 'title' => t('Title'), // The item it appears as on the UI, 'help' => t('The content title.'), // The help that appears on the UI, // Information for displaying a title as a field @@ -85,7 +93,7 @@ function node_views_data() { ); // created field - $data['node']['created'] = array( + $data['node_property_data']['created'] = array( 'title' => t('Post date'), // The item it appears as on the UI, 'help' => t('The date the content was posted.'), // The help that appears on the UI, 'field' => array( @@ -101,7 +109,7 @@ function node_views_data() { ); // changed field - $data['node']['changed'] = array( + $data['node_property_data']['changed'] = array( 'title' => t('Updated date'), // The item it appears as on the UI, 'help' => t('The date the content was last updated.'), // The help that appears on the UI, 'field' => array( @@ -135,8 +143,29 @@ function node_views_data() { ), ); + // Language field + if (module_exists('language')) { + $data['node']['langcode'] = array( + 'title' => t('Language'), + 'help' => t('The language the content is in.'), + 'field' => array( + 'id' => 'node_language', + 'click sortable' => TRUE, + ), + 'filter' => array( + 'id' => 'language', + ), + 'argument' => array( + 'id' => 'language', + ), + 'sort' => array( + 'id' => 'standard', + ), + ); + } + // published status - $data['node']['status'] = array( + $data['node_property_data']['status'] = array( 'title' => t('Published'), 'help' => t('Whether or not the content is published.'), 'field' => array( @@ -158,7 +187,7 @@ function node_views_data() { ); // published status + extra - $data['node']['status_extra'] = array( + $data['node_property_data']['status_extra'] = array( 'title' => t('Published or admin'), 'help' => t('Filters out unpublished content if the current user cannot view it.'), 'filter' => array( @@ -169,7 +198,7 @@ function node_views_data() { ); // promote status - $data['node']['promote'] = array( + $data['node_property_data']['promote'] = array( 'title' => t('Promoted to front page'), 'help' => t('Whether or not the content is promoted to the front page.'), 'field' => array( @@ -190,7 +219,7 @@ function node_views_data() { ); // sticky - $data['node']['sticky'] = array( + $data['node_property_data']['sticky'] = array( 'title' => t('Sticky'), // The item it appears as on the UI, 'help' => t('Whether or not the content is sticky.'), // The help that appears on the UI, // Information for displaying a title as a field @@ -212,27 +241,6 @@ function node_views_data() { ), ); - // Language field - if (module_exists('language')) { - $data['node']['langcode'] = array( - 'title' => t('Language'), - 'help' => t('The language the content is in.'), - 'field' => array( - 'id' => 'node_language', - 'click sortable' => TRUE, - ), - 'filter' => array( - 'id' => 'language', - ), - 'argument' => array( - 'id' => 'language', - ), - 'sort' => array( - 'id' => 'standard', - ), - ); - } - // Define some fields based upon views_handler_field_entity in the entity // table so they can be re-used with other query backends. // @see views_handler_field_entity @@ -273,7 +281,7 @@ function node_views_data() { // Bogus fields for aliasing purposes. - $data['node']['created_fulldate'] = array( + $data['node_property_data']['created_fulldate'] = array( 'title' => t('Created date'), 'help' => t('Date in the form of CCYYMMDD.'), 'argument' => array( @@ -282,7 +290,7 @@ function node_views_data() { ), ); - $data['node']['created_year_month'] = array( + $data['node_property_data']['created_year_month'] = array( 'title' => t('Created year + month'), 'help' => t('Date in the form of YYYYMM.'), 'argument' => array( @@ -291,7 +299,7 @@ function node_views_data() { ), ); - $data['node']['created_year'] = array( + $data['node_property_data']['created_year'] = array( 'title' => t('Created year'), 'help' => t('Date in the form of YYYY.'), 'argument' => array( @@ -300,7 +308,7 @@ function node_views_data() { ), ); - $data['node']['created_month'] = array( + $data['node_property_data']['created_month'] = array( 'title' => t('Created month'), 'help' => t('Date in the form of MM (01 - 12).'), 'argument' => array( @@ -309,7 +317,7 @@ function node_views_data() { ), ); - $data['node']['created_day'] = array( + $data['node_property_data']['created_day'] = array( 'title' => t('Created day'), 'help' => t('Date in the form of DD (01 - 31).'), 'argument' => array( @@ -318,7 +326,7 @@ function node_views_data() { ), ); - $data['node']['created_week'] = array( + $data['node_property_data']['created_week'] = array( 'title' => t('Created week'), 'help' => t('Date in the form of WW (01 - 53).'), 'argument' => array( @@ -327,7 +335,7 @@ function node_views_data() { ), ); - $data['node']['changed_fulldate'] = array( + $data['node_property_data']['changed_fulldate'] = array( 'title' => t('Updated date'), 'help' => t('Date in the form of CCYYMMDD.'), 'argument' => array( @@ -336,7 +344,7 @@ function node_views_data() { ), ); - $data['node']['changed_year_month'] = array( + $data['node_property_data']['changed_year_month'] = array( 'title' => t('Updated year + month'), 'help' => t('Date in the form of YYYYMM.'), 'argument' => array( @@ -345,7 +353,7 @@ function node_views_data() { ), ); - $data['node']['changed_year'] = array( + $data['node_property_data']['changed_year'] = array( 'title' => t('Updated year'), 'help' => t('Date in the form of YYYY.'), 'argument' => array( @@ -354,7 +362,7 @@ function node_views_data() { ), ); - $data['node']['changed_month'] = array( + $data['node_property_data']['changed_month'] = array( 'title' => t('Updated month'), 'help' => t('Date in the form of MM (01 - 12).'), 'argument' => array( @@ -363,7 +371,7 @@ function node_views_data() { ), ); - $data['node']['changed_day'] = array( + $data['node_property_data']['changed_day'] = array( 'title' => t('Updated day'), 'help' => t('Date in the form of DD (01 - 31).'), 'argument' => array( @@ -372,7 +380,7 @@ function node_views_data() { ), ); - $data['node']['changed_week'] = array( + $data['node_property_data']['changed_week'] = array( 'title' => t('Updated week'), 'help' => t('Date in the form of WW (01 - 53).'), 'argument' => array( @@ -382,7 +390,7 @@ function node_views_data() { ); // uid field - $data['node']['uid'] = array( + $data['node_property_data']['uid'] = array( 'title' => t('Author uid'), 'help' => t('The user authoring the content. If you need more fields than the uid add the content: author relationship'), 'relationship' => array( @@ -404,7 +412,7 @@ function node_views_data() { ), ); - $data['node']['uid_revision'] = array( + $data['node_property_data']['uid_revision'] = array( 'title' => t('User has a revision'), 'help' => t('All nodes where a certain user has a revision'), 'real field' => 'nid', @@ -420,11 +428,11 @@ function node_views_data() { // Define the base group of this table. Fields that don't // have a group defined will go into this field by default. - $data['node_revision']['table']['entity type'] = 'node'; - $data['node_revision']['table']['group'] = t('Content revision'); + $data['node_property_revision']['table']['entity type'] = 'node'; + $data['node_property_revision']['table']['group'] = t('Content revision'); // Advertise this table as a possible base table - $data['node_revision']['table']['base'] = array( + $data['node_property_revision']['table']['base'] = array( 'field' => 'vid', 'title' => t('Content revision'), 'help' => t('Content revision is a history of changes to content.'), @@ -434,7 +442,7 @@ function node_views_data() { ); // For other base tables, explain how we join - $data['node_revision']['table']['join'] = array( + $data['node_property_revision']['table']['join'] = array( // Directly links to node table. 'node' => array( 'left_field' => 'vid', @@ -443,7 +451,7 @@ function node_views_data() { ); // uid field for node revision - $data['node_revision']['uid'] = array( + $data['node_property_revision']['uid'] = array( 'title' => t('User'), 'help' => t('Relate a content revision to the user who created the revision.'), 'relationship' => array( @@ -455,7 +463,7 @@ function node_views_data() { ); // nid - $data['node_revision']['nid'] = array( + $data['node_property_revision']['nid'] = array( 'title' => t('Nid'), // The help that appears on the UI. 'help' => t('The revision NID of the content revision.'), @@ -488,7 +496,7 @@ function node_views_data() { ); // vid - $data['node_revision']['vid'] = array( + $data['node_property_revision']['vid'] = array( 'title' => t('Vid'), 'help' => t('The revision ID of the content revision.'), // Information for displaying the vid @@ -520,7 +528,7 @@ function node_views_data() { ); // published status - $data['node_revision']['status'] = array( + $data['node_property_revision']['status'] = array( 'title' => t('Published'), 'help' => t('Whether or not the content is published.'), 'field' => array( @@ -542,7 +550,7 @@ function node_views_data() { ); // title - $data['node_revision']['title'] = array( + $data['node_property_revision']['title'] = array( 'title' => t('Title'), // The item it appears as on the UI, 'help' => t('The content title.'), // The help that appears on the UI, // Information for displaying a title as a field @@ -563,7 +571,7 @@ function node_views_data() { ); // log field - $data['node_revision']['log'] = array( + $data['node_property_revision']['log'] = array( 'title' => t('Log message'), // The item it appears as on the UI, 'help' => t('The log message entered when the revision was created.'), // The help that appears on the UI, // Information for displaying a title as a field @@ -577,7 +585,7 @@ function node_views_data() { // revision timestamp // changed field - $data['node_revision']['timestamp'] = array( + $data['node_property_revision']['timestamp'] = array( 'title' => t('Updated date'), // The item it appears as on the UI, 'help' => t('The date the node was last updated.'), // The help that appears on the UI, 'field' => array( @@ -592,7 +600,7 @@ function node_views_data() { ), ); - $data['node_revision']['link_to_revision'] = array( + $data['node_property_revision']['link_to_revision'] = array( 'field' => array( 'title' => t('Link'), 'help' => t('Provide a simple link to the revision.'), @@ -600,7 +608,7 @@ function node_views_data() { ), ); - $data['node_revision']['revert_revision'] = array( + $data['node_property_revision']['revert_revision'] = array( 'field' => array( 'title' => t('Revert link'), 'help' => t('Provide a simple link to revert to the revision.'), @@ -608,7 +616,7 @@ function node_views_data() { ), ); - $data['node_revision']['delete_revision'] = array( + $data['node_property_revision']['delete_revision'] = array( 'field' => array( 'title' => t('Delete link'), 'help' => t('Provide a simple link to delete the content revision.'), diff --git a/core/modules/user/user.views.inc b/core/modules/user/user.views.inc index 295278a..bf58fc6 100644 --- a/core/modules/user/user.views.inc +++ b/core/modules/user/user.views.inc @@ -78,7 +78,7 @@ function user_views_data() { 'argument field' => 'uid', 'base' => 'node', 'field' => 'nid', - 'relationship' => 'node:uid' + 'relationship' => 'node_property_data:uid' ), ); diff --git a/core/modules/views/config/views.view.archive.yml b/core/modules/views/config/views.view.archive.yml index f2b3a62..db2151d 100644 --- a/core/modules/views/config/views.view.archive.yml +++ b/core/modules/views/config/views.view.archive.yml @@ -30,13 +30,13 @@ display: sorts: created: id: created - table: node + table: node_property_data field: created order: DESC arguments: created_year_month: id: created_year_month - table: node + table: node_property_data field: created_year_month default_action: summary exception: @@ -54,7 +54,7 @@ display: filters: status: id: status - table: node + table: node_property_data field: status value: 1 group: 0 @@ -88,7 +88,7 @@ display: arguments: created_year_month: id: created_year_month - table: node + table: node_property_data field: created_year_month default_action: summary exception: diff --git a/core/modules/views/config/views.view.backlinks.yml b/core/modules/views/config/views.view.backlinks.yml index 8c1f2a7..3c19752 100644 --- a/core/modules/views/config/views.view.backlinks.yml +++ b/core/modules/views/config/views.view.backlinks.yml @@ -39,7 +39,7 @@ display: fields: title: id: title - table: node + table: node_property_data field: title label: '' link_to_node: 1 @@ -60,7 +60,7 @@ display: filters: status: id: status - table: node + table: node_property_data field: status value: 1 group: 0 diff --git a/core/modules/views/config/views.view.comments_recent.yml b/core/modules/views/config/views.view.comments_recent.yml index 6e86a0c..d97628c 100644 --- a/core/modules/views/config/views.view.comments_recent.yml +++ b/core/modules/views/config/views.view.comments_recent.yml @@ -57,7 +57,7 @@ display: filters: status_extra: id: status_extra - table: node + table: node_property_data field: status_extra relationship: nid group: 0 @@ -83,7 +83,7 @@ display: fields: title: id: title - table: node + table: node_property_data field: title relationship: nid label: 'Reply to' diff --git a/core/modules/views/config/views.view.frontpage.yml b/core/modules/views/config/views.view.frontpage.yml index a635a0e..2706232 100644 --- a/core/modules/views/config/views.view.frontpage.yml +++ b/core/modules/views/config/views.view.frontpage.yml @@ -35,18 +35,18 @@ display: sorts: sticky: id: sticky - table: node + table: node_property_data field: sticky order: DESC created: id: created - table: node + table: node_property_data field: created order: DESC filters: promote: id: promote - table: node + table: node_property_data field: promote value: '1' group: 0 @@ -54,7 +54,7 @@ display: operator: false status: id: status - table: node + table: node_property_data field: status value: '1' group: 0 diff --git a/core/modules/views/config/views.view.glossary.yml b/core/modules/views/config/views.view.glossary.yml index 966da7c..dec6051 100644 --- a/core/modules/views/config/views.view.glossary.yml +++ b/core/modules/views/config/views.view.glossary.yml @@ -32,7 +32,7 @@ display: fields: title: id: title - table: node + table: node_property_data field: title link_to_node: 1 name: @@ -44,14 +44,14 @@ display: relationship: uid changed: id: changed - table: node + table: node_property_data field: changed label: 'Last update' date_format: large arguments: title: id: title - table: node + table: node_property_data field: title default_action: default exception: @@ -70,7 +70,7 @@ display: relationships: uid: id: uid - table: node + table: node_property_data field: uid style: type: table @@ -124,7 +124,7 @@ display: arguments: title: id: title - table: node + table: node_property_data field: title default_action: summary exception: diff --git a/core/modules/views/config/views.view.taxonomy_term.yml b/core/modules/views/config/views.view.taxonomy_term.yml index 742c5d7..0305f30 100644 --- a/core/modules/views/config/views.view.taxonomy_term.yml +++ b/core/modules/views/config/views.view.taxonomy_term.yml @@ -29,12 +29,12 @@ display: sorts: sticky: id: sticky - table: node + table: node_property_data field: sticky order: DESC created: id: created - table: node + table: node_property_data field: created order: DESC arguments: @@ -68,7 +68,7 @@ display: filters: status_extra: id: status_extra - table: node + table: node_property_data field: status_extra group: 0 expose: diff --git a/core/modules/views/config/views.view.tracker.yml b/core/modules/views/config/views.view.tracker.yml index 5d31e2f..5d0eeae 100644 --- a/core/modules/views/config/views.view.tracker.yml +++ b/core/modules/views/config/views.view.tracker.yml @@ -32,7 +32,7 @@ display: relationships: uid: id: uid - table: node + table: node_property_data field: uid fields: type: @@ -41,7 +41,7 @@ display: field: type title: id: title - table: node + table: node_property_data field: title name: id: name @@ -82,7 +82,7 @@ display: arguments: uid_touch: id: uid_touch - table: node + table: node_property_data field: uid_touch exception: title_enable: 1 @@ -95,7 +95,7 @@ display: filters: status: id: status - table: node + table: node_property_data field: status value: '1' group: 0 diff --git a/core/modules/views/lib/Drupal/views/Tests/Comment/FilterUserUIDTest.php b/core/modules/views/lib/Drupal/views/Tests/Comment/FilterUserUIDTest.php index 00ba08c..2c2c81c 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Comment/FilterUserUIDTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Comment/FilterUserUIDTest.php @@ -27,11 +27,11 @@ function testCommentUserUIDTest() { $options = array( 'id' => 'uid_touch', - 'table' => 'node', + 'table' => 'node_property_data', 'field' => 'uid_touch', 'value' => array($this->loggedInUser->uid), ); - $this->view->addItem('default', 'filter', 'node', 'uid_touch', $options); + $this->view->addItem('default', 'filter', 'node_property_data', 'uid_touch', $options); $this->executeView($this->view, array($this->account->uid)); $result_set = array( array( diff --git a/core/modules/views/lib/Drupal/views/Tests/Node/RevisionRelationships.php b/core/modules/views/lib/Drupal/views/Tests/Node/RevisionRelationships.php index c501bd5..7e8e832 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Node/RevisionRelationships.php +++ b/core/modules/views/lib/Drupal/views/Tests/Node/RevisionRelationships.php @@ -32,8 +32,8 @@ public function testNodeRevisionRelationship() { $node_revision->save(); $column_map = array( 'vid' => 'vid', - 'node_revision_nid' => 'node_revision_nid', - 'node_node_revision_nid' => 'node_node_revision_nid', + 'node_property_revision_nid' => 'node_property_revision_nid', + 'node_node_property_revision_nid' => 'node_node_property_revision_nid', ); // Here should be two rows. @@ -42,13 +42,13 @@ public function testNodeRevisionRelationship() { $resultset_nid = array( array( 'vid' => '1', - 'node_revision_nid' => '1', - 'node_node_revision_nid' => '1', + 'node_property_revision_nid' => '1', + 'node_node_property_revision_nid' => '1', ), array( 'vid' => '2', - 'node_revision_nid' => '1', - 'node_node_revision_nid' => '1', + 'node_property_revision_nid' => '1', + 'node_node_property_revision_nid' => '1', ), ); $this->assertIdenticalResultset($view_nid, $resultset_nid, $column_map); @@ -59,8 +59,8 @@ public function testNodeRevisionRelationship() { $resultset_vid = array( array( 'vid' => '2', - 'node_revision_nid' => '1', - 'node_node_revision_nid' => '1', + 'node_property_revision_nid' => '1', + 'node_node_property_revision_nid' => '1', ), ); $this->assertIdenticalResultset($view_vid, $resultset_vid, $column_map); diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_argument_default_fixed.yml b/core/modules/views/tests/views_test_config/config/views.view.test_argument_default_fixed.yml index 061b209..29080f9 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_argument_default_fixed.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_argument_default_fixed.yml @@ -36,7 +36,7 @@ display: hide_empty: '0' id: title link_to_node: '0' - table: node + table: node_property_data pager: options: id: '0' diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_comment_user_uid.yml b/core/modules/views/tests/views_test_config/config/views.view.test_comment_user_uid.yml index 4dca1cd..1f1db7d 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_comment_user_uid.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_comment_user_uid.yml @@ -19,7 +19,7 @@ display: number_of_records: '0' summary_options: items_per_page: '25' - table: node + table: node_property_data cache: type: none exposed_form: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_destroy.yml b/core/modules/views/tests/views_test_config/config/views.view.test_destroy.yml index a28c6b1..95ab36a 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_destroy.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_destroy.yml @@ -36,19 +36,19 @@ display: field: created_day id: created_day style_plugin: default_summary - table: node + table: node_property_data created_fulldate: default_argument_type: fixed field: created_fulldate id: created_fulldate style_plugin: default_summary - table: node + table: node_property_data created_month: default_argument_type: fixed field: created_month id: created_month style_plugin: default_summary - table: node + table: node_property_data cache: type: none empty: @@ -68,7 +68,7 @@ display: created: field: created id: created - table: node + table: node_property_data nid: field: nid id: nid @@ -85,11 +85,11 @@ display: status: field: status id: status - table: node + table: node_property_data title: field: title id: title - table: node + table: node_property_data footer: area: empty: '0' diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_display.yml b/core/modules/views/tests/views_test_config/config/views.view.test_display.yml index 5c44bb2..4257e06 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_display.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_display.yml @@ -44,13 +44,13 @@ display: title: field: title id: title - table: node + table: node_property_data filters: status: field: status group: '1' id: status - table: node + table: node_property_data value: '1' pager: options: @@ -68,7 +68,7 @@ display: field: created id: created order: DESC - table: node + table: node_property_data style_plugin: default title: 'Test Display' display_plugin: default diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_feed_display.yml b/core/modules/views/tests/views_test_config/config/views.view.test_feed_display.yml index 6ba9d11..fa2c99f 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_feed_display.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_feed_display.yml @@ -29,7 +29,7 @@ display: id: title label: '' link_to_node: '1' - table: node + table: node_property_data filters: status: expose: @@ -37,7 +37,7 @@ display: field: status group: '1' id: status - table: node + table: node_property_data value: '1' pager: options: @@ -56,7 +56,7 @@ display: field: created id: created order: DESC - table: node + table: node_property_data style: type: default title: test_feed_display diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_field_get_entity.yml b/core/modules/views/tests/views_test_config/config/views.view.test_field_get_entity.yml index 5ba2fc9..ef1c496 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_field_get_entity.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_field_get_entity.yml @@ -49,7 +49,7 @@ display: label: author relationship: nid required: '0' - table: node + table: node_property_data sorts: { } style: type: default diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_filter_date_between.yml b/core/modules/views/tests/views_test_config/config/views.view.test_filter_date_between.yml index 71f4b2f..2594086 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_filter_date_between.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_filter_date_between.yml @@ -21,7 +21,7 @@ display: created: field: created id: created - table: node + table: node_property_data pager: type: full query: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_filter_group_override.yml b/core/modules/views/tests/views_test_config/config/views.view.test_filter_group_override.yml index 379eff6..b8bf0dc 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_filter_group_override.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_filter_group_override.yml @@ -20,7 +20,7 @@ display: field: title id: title label: '' - table: node + table: node_property_data filters: status: expose: @@ -28,7 +28,7 @@ display: field: status group: '1' id: status - table: node + table: node_property_data value: '1' pager: type: full diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_filter_groups.yml b/core/modules/views/tests/views_test_config/config/views.view.test_filter_groups.yml index d71c02e..b6ff49b 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_filter_groups.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_filter_groups.yml @@ -20,7 +20,7 @@ display: field: title id: title label: '' - table: node + table: node_property_data filter_groups: groups: 1: AND @@ -46,7 +46,7 @@ display: field: status group: '1' id: status - table: node + table: node_property_data value: '1' pager: options: @@ -59,7 +59,7 @@ display: field: created id: created order: DESC - table: node + table: node_property_data title: test_filter_groups style: type: default @@ -99,7 +99,7 @@ display: field: status group: '1' id: status - table: node + table: node_property_data value: '1' path: test-filter-groups display_plugin: page diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_filter_node_uid_revision.yml b/core/modules/views/tests/views_test_config/config/views.view.test_filter_node_uid_revision.yml index 69000ec..1b12b9d 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_filter_node_uid_revision.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_filter_node_uid_revision.yml @@ -29,7 +29,7 @@ display: is_grouped: '0' operator: in relationship: none - table: node + table: node_property_data value: - '1' sorts: { } diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_glossary.yml b/core/modules/views/tests/views_test_config/config/views.view.test_glossary.yml index 33045e5..b6a1c55 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_glossary.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_glossary.yml @@ -20,7 +20,7 @@ display: number_of_records: '0' summary_options: items_per_page: '25' - table: node + table: node_property_data cache: type: none exposed_form: @@ -30,7 +30,7 @@ display: field: title id: title label: '' - table: node + table: node_property_data pager: type: full query: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_handler_relationships.yml b/core/modules/views/tests/views_test_config/config/views.view.test_handler_relationships.yml index 409fb2c..d7f7318 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_handler_relationships.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_handler_relationships.yml @@ -9,7 +9,7 @@ display: fields: title: id: title - table: node + table: node_property_data field: title relationships: cid: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_node_revision_nid.yml b/core/modules/views/tests/views_test_config/config/views.view.test_node_revision_nid.yml index cefedda..1047267 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_node_revision_nid.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_node_revision_nid.yml @@ -1,5 +1,5 @@ name: test_node_revision_nid -base_table: node_revision +base_table: node_property_revision core: 8 api_version: 3 display: @@ -8,17 +8,17 @@ display: relationships: nid: id: nid - table: node_revision + table: node_property_revision field: nid required: TRUE fields: vid: id: vid - table: node_revision + table: node_property_revision field: vid nid_1: id: nid_1 - table: node_revision + table: node_property_revision field: nid nid: id: nid @@ -28,7 +28,7 @@ display: arguments: nid: id: nid: - table: node_revision + table: node_property_revision field: nid display_plugin: default display_title: Master diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_node_revision_vid.yml b/core/modules/views/tests/views_test_config/config/views.view.test_node_revision_vid.yml index b36f549..f32a84a 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_node_revision_vid.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_node_revision_vid.yml @@ -1,5 +1,5 @@ name: test_node_revision_vid -base_table: node_revision +base_table: node_property_revision core: 8 api_version: 3 display: @@ -8,17 +8,17 @@ display: relationships: vid: id: vid - table: node_revision + table: node_property_revision field: vid required: TRUE fields: vid: id: vid - table: node_revision + table: node_property_revision field: vid nid_1: id: nid_1 - table: node_revision + table: node_property_revision field: nid nid: id: nid @@ -28,7 +28,7 @@ display: arguments: nid: id: nid: - table: node_revision + table: node_property_revision field: nid display_plugin: default display_title: Master diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_plugin_argument_default_current_user.yml b/core/modules/views/tests/views_test_config/config/views.view.test_plugin_argument_default_current_user.yml index 54180b6..3f857dc 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_plugin_argument_default_current_user.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_plugin_argument_default_current_user.yml @@ -36,7 +36,7 @@ display: hide_empty: '0' id: title link_to_node: '0' - table: node + table: node_property_data pager: options: id: '0' diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_redirect_view.yml b/core/modules/views/tests/views_test_config/config/views.view.test_redirect_view.yml index 1217693..4b62cfe 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_redirect_view.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_redirect_view.yml @@ -35,7 +35,7 @@ display: fields: title: id: title - table: node + table: node_property_data field: title label: '' alter: @@ -53,7 +53,7 @@ display: filters: status: value: '1' - table: node + table: node_property_data field: status id: status expose: @@ -62,7 +62,7 @@ display: sorts: created: id: created - table: node + table: node_property_data field: created order: DESC title: test_redirect_view diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_user_relationship.yml b/core/modules/views/tests/views_test_config/config/views.view.test_user_relationship.yml index 096fa16..2ca2f56 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_user_relationship.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_user_relationship.yml @@ -53,7 +53,7 @@ display: id: title label: '' link_to_node: '1' - table: node + table: node_property_data uid: alter: absolute: '0' diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_view_pager_full_zero_items_per_page.yml b/core/modules/views/tests/views_test_config/config/views.view.test_view_pager_full_zero_items_per_page.yml index 5b909ea..a9ea217 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_view_pager_full_zero_items_per_page.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_view_pager_full_zero_items_per_page.yml @@ -27,7 +27,7 @@ display: hide_empty: '0' id: title link_to_node: '0' - table: node + table: node_property_data pager: options: id: '0' diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_argument_default_current_user.yml b/core/modules/views/tests/views_test_data/config/views.view.test_argument_default_current_user.yml index 3cf754d..6ab101a 100644 --- a/core/modules/views/tests/views_test_data/config/views.view.test_argument_default_current_user.yml +++ b/core/modules/views/tests/views_test_data/config/views.view.test_argument_default_current_user.yml @@ -13,7 +13,7 @@ display: default_action: default field: uid id: uid - table: node + table: node_property_data cache: type: none exposed_form: @@ -33,7 +33,7 @@ display: hide_empty: '0' id: title link_to_node: '0' - table: node + table: node_property_data pager: options: id: '0' diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_exposed_admin_ui.yml b/core/modules/views/tests/views_test_data/config/views.view.test_exposed_admin_ui.yml index d73dfb8..f6f070d 100644 --- a/core/modules/views/tests/views_test_data/config/views.view.test_exposed_admin_ui.yml +++ b/core/modules/views/tests/views_test_data/config/views.view.test_exposed_admin_ui.yml @@ -29,7 +29,7 @@ display: created: field: created id: created - table: node + table: node_property_data style: type: default row: