views_update_nn() functions in views.install are out of sync

I'm not sure if this is a commit mistake or what but the views_update_nn() between D6 and D7 is out of sync making the upgrade path to look messy and apt to fail.

In 6.x.2.x-dev the file ends with this code:

/**
 * Correct the cache setting for exposed filter blocks.
 *
 * @see http://drupal.org/node/910864
 */
function views_update_6011() {
  $ret = array();

  // There is only one simple query to run.
  $ret[] = update_sql("UPDATE {blocks} SET cache = " . BLOCK_NO_CACHE . " WHERE module = 'views' AND delta LIKE '-exp-%'");
  
  return $ret;
}

function views_schema_6013() {
  $schema = views_schema(__FUNCTION__);
  $schema['views_view']['fields']['core'] = array(
    'type' => 'int',
    'default' => 0,
    'description' => 'Stores the drupal core version of the view.',
  );
  return $schema;
}

/**
 * Add a drupal core version field.
 */
function views_update_6013() {
  $ret = array();
  $new_field = array(
    'type' => 'int',
    'default' => 0,
    'description' => 'Stores the drupal core version of the view.',
  );

  db_add_field($ret, 'views_view', 'core', $new_field);

  return $ret;
}

Note the missing _6012

While in 7.x.3.x it is:

/**
 * Remove views_object_cache table and move the data to ctools_object_cache.
 */
function views_schema_6011() {
  $schema = views_schema(__FUNCTION__);
  unset($schema['views_object_cache']);
  return $schema;
}

/**
 * Remove views_object_cache table and move the data to ctools_object_cache.
 */
function views_update_6011() {
  $ret = array();

  $caches = db_query("SELECT * FROM {views_object_cache}")->fetch();
  foreach ($caches as $item) {
    drupal_write_record('ctools_object_cache', $item);
  }
  db_drop_table($ret, 'views_object_cache');

  return $ret;
}

/**
 * Correct the cache setting for exposed filter blocks.
 *
 * @see http://drupal.org/node/910864
 */
function views_update_6012() {
  $ret = array();

  // There is only one simple query to run.
  $update = db_update('blocks')
    ->condition('module', 'views')
    ->condition('delta', db_like('-exp-') . '%', 'LIKE')
    ->fields(array('cache' => DRUPAL_NO_CACHE));
  
  return $ret;
}


/**
 * Add a human readable name.
 */
function views_schema_6013() {
  $schema = views_schema(__FUNCTION__);
  $schema['views_view']['fields']['human_name'] = array(
    'type' => 'varchar',
    'length' => '255',
    'default' => '',
    'description' => 'A human readable name used to be displayed in the admin interface',
  );
  return $schema;
}

function views_update_6013() {
  $ret = array();

  $new_field = array(
    'type' => 'varchar',
    'length' => '255',
    'default' => '',
    'description' => 'A human readable name used to be displayed in the admin interface',
  );

  db_add_field('views_view', 'human_name', $new_field);

  return $ret;
}

function views_schema_6014() {
  $schema = views_schema(__FUNCTION__);
  $schema['views_view']['fields']['core'] = array(
    'type' => 'int',
    'default' => 0,
    'description' => 'Stores the drupal core version of the view.',
  );
  return $schema;
}

/**
 * Add a drupal core version field.
 */
function views_update_6014() {
  $ret = array();
  $new_field = array(
    'type' => 'int',
    'default' => 0,
    'description' => 'Stores the drupal core version of the view.',
  );

  db_add_field('views_view', 'core', $new_field);

  return $ret;
}

To summarize, ending _6013 in D6 do the same as ending _6014 in D7. The result of this is not only that update_6014() fails when upgrading, but also that D7 updates _6011, _6012 and _6013 never trigger and result in various errors are triggered after upgrade.

I wasn't sure if to file this as a D6 or D7 bug as it sort of affect both, and I became aware of this when I did a test upgrade to D7, but decided for D6 as views_update_6012() is missing and the new field 'core' created in _6013 never seem to be used, so I suspect this commit possibly have happened by mistake or we have a situation here were the left hand doesn't know what the right one does, so to speak.

The issue for both D6 and D7 still remains though with the inconsistency starting with 'function views_update_6011();' in both. Also, afaik D7 should start its numbered sequence with 7, but I assume there is a valid reason for not doing so yet, but still they need to be in sync.

Just for anyone else running in to this, I was able to successfully upgrade views-6.x-2.x-dev to 7.x-.3.x-dev by manually edit the database and change the value of schema_version field, from 6013 to 6010, to have all updates starting with 6011 applied. Not extensively tested yet though so I may have missed something, but so far seem to be ok.