* subversion/libsvn_wc/wc-metadata.sql (EXTERNALS): Fix column names. ###TODO: skim entire externals API (private&public) and adjust (e.g. svn_wc__read_external_info()), changing 'operational' to 'peg' and 'revision' to 'operative'. Index: subversion/libsvn_wc/wc-metadata.sql =================================================================== --- subversion/libsvn_wc/wc-metadata.sql (revision 1174085) +++ subversion/libsvn_wc/wc-metadata.sql (working copy) @@ -559,10 +559,11 @@ CREATE TABLE EXTERNALS ( /* The url of the external as used in the definition */ def_repos_relpath TEXT NOT NULL, - /* The operational (peg) and node revision if this is a revision fixed - external; otherwise NULL. (Usually these will both have the same value) */ - def_operational_revision TEXT, - def_revision TEXT, + /* The peg and operative revision if this is a revision fixed external + * (-r foo@); otherwise NULL. The comment for + * svn_wc__read_external_info() describes which values appear when. */ + def_peg_revision TEXT, + def_operative_revision TEXT, PRIMARY KEY (wc_id, local_relpath) ); Index: subversion/libsvn_wc/wc-queries.sql =================================================================== --- subversion/libsvn_wc/wc-queries.sql (revision 1174085) +++ subversion/libsvn_wc/wc-queries.sql (working copy) @@ -947,13 +947,13 @@ LIMIT 1 -- STMT_INSERT_EXTERNAL INSERT OR REPLACE INTO externals ( wc_id, local_relpath, parent_relpath, presence, kind, def_local_relpath, - repos_id, def_repos_relpath, def_operational_revision, def_revision) + repos_id, def_repos_relpath, def_peg_revision, def_operative_revision) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10) -- STMT_INSERT_EXTERNAL_UPGRADE INSERT OR REPLACE INTO externals ( wc_id, local_relpath, parent_relpath, presence, kind, def_local_relpath, - repos_id, def_repos_relpath, def_operational_revision, def_revision) + repos_id, def_repos_relpath, def_peg_revision, def_operative_revision) VALUES (?1, ?2, ?3, ?4, CASE WHEN (SELECT file_external FROM nodes WHERE wc_id = ?1 AND local_relpath = ?2 AND op_depth = 0) @@ -962,7 +962,7 @@ VALUES (?1, ?2, ?3, ?4, -- STMT_SELECT_EXTERNAL_INFO SELECT presence, kind, def_local_relpath, repos_id, - def_repos_relpath, def_operational_revision, def_revision + def_repos_relpath, def_peg_revision, def_operative_revision FROM externals WHERE wc_id = ?1 AND local_relpath = ?2 LIMIT 1