Pick->Select rename. Integration tests changes. (#1725)

Pick->Select rename. Integration tests changes.
This commit is contained in:
Andrés N. Robalino
2020-05-07 06:03:43 -05:00
committed by GitHub
parent c3efdf2689
commit 96e5fc05a3
78 changed files with 380 additions and 411 deletions

View File

@ -285,7 +285,7 @@ pub fn create_default_context(
whole_stream_command(Parse),
// Column manipulation
whole_stream_command(Reject),
whole_stream_command(Pick),
whole_stream_command(Select),
whole_stream_command(Get),
whole_stream_command(Update),
whole_stream_command(Insert),

View File

@ -70,7 +70,6 @@ pub(crate) mod next;
pub(crate) mod nth;
pub(crate) mod open;
pub(crate) mod parse;
pub(crate) mod pick;
pub(crate) mod pivot;
pub(crate) mod plugin;
pub(crate) mod prepend;
@ -86,6 +85,7 @@ pub(crate) mod rm;
pub(crate) mod run_alias;
pub(crate) mod run_external;
pub(crate) mod save;
pub(crate) mod select;
pub(crate) mod shells;
pub(crate) mod shuffle;
pub(crate) mod size;
@ -194,7 +194,6 @@ pub(crate) use next::Next;
pub(crate) use nth::Nth;
pub(crate) use open::Open;
pub(crate) use parse::Parse;
pub(crate) use pick::Pick;
pub(crate) use pivot::Pivot;
pub(crate) use prepend::Prepend;
pub(crate) use prev::Previous;
@ -208,6 +207,7 @@ pub(crate) use reverse::Reverse;
pub(crate) use rm::Remove;
pub(crate) use run_external::RunExternalCommand;
pub(crate) use save::Save;
pub(crate) use select::Select;
pub(crate) use shells::Shells;
pub(crate) use shuffle::Shuffle;
pub(crate) use size::Size;

View File

@ -10,19 +10,19 @@ use nu_source::span_for_spanned_list;
use nu_value_ext::{as_string, get_data_by_column_path};
#[derive(Deserialize)]
struct PickArgs {
struct SelectArgs {
rest: Vec<ColumnPath>,
}
pub struct Pick;
pub struct Select;
impl WholeStreamCommand for Pick {
impl WholeStreamCommand for Select {
fn name(&self) -> &str {
"pick"
"select"
}
fn signature(&self) -> Signature {
Signature::build("pick").rest(
Signature::build("select").rest(
SyntaxShape::ColumnPath,
"the columns to select from the table",
)
@ -37,19 +37,19 @@ impl WholeStreamCommand for Pick {
args: CommandArgs,
registry: &CommandRegistry,
) -> Result<OutputStream, ShellError> {
args.process(registry, pick)?.run()
args.process(registry, select)?.run()
}
}
fn pick(
PickArgs { rest: mut fields }: PickArgs,
fn select(
SelectArgs { rest: mut fields }: SelectArgs,
RunnableContext {
mut input, name, ..
}: RunnableContext,
) -> Result<OutputStream, ShellError> {
if fields.is_empty() {
return Err(ShellError::labeled_error(
"Pick requires columns to pick",
"Select requires columns to select",
"needs parameter",
name,
));
@ -76,7 +76,7 @@ fn pick(
if let PathMember { unspanned: UnspannedPathMember::String(column), .. } = path_member_tried {
return ShellError::labeled_error_with_secondary(
"No data to fetch.",
format!("Couldn't pick column \"{}\"", column),
format!("Couldn't select column \"{}\"", column),
path_member_tried.span,
format!("How about exploring it with \"get\"? Check the input is appropriate originating from here"),
obj_source.tag.span)