mirror of
https://github.com/nushell/nushell.git
synced 2025-04-29 15:44:28 +02:00
Making sure into-dt and into-schema tests are actually run and work
This commit is contained in:
parent
51a05b9aa1
commit
9ba07ec76b
@ -27,8 +27,8 @@ impl PluginCommand for ToDataType {
|
|||||||
|
|
||||||
fn examples(&self) -> Vec<Example> {
|
fn examples(&self) -> Vec<Example> {
|
||||||
vec![Example {
|
vec![Example {
|
||||||
description: "Convert a string to a specific datatype",
|
description: "Convert a string to a specific datatype and back to a nu object",
|
||||||
example: r#""i64" | polars into-dtype"#,
|
example: r#"'i64' | polars into-dtype | polars into-nu"#,
|
||||||
result: Some(Value::string("i64", Span::test_data())),
|
result: Some(Value::string("i64", Span::test_data())),
|
||||||
}]
|
}]
|
||||||
}
|
}
|
||||||
@ -53,3 +53,16 @@ fn command(
|
|||||||
NuDataType::try_from_pipeline(plugin, input, call.head)?
|
NuDataType::try_from_pipeline(plugin, input, call.head)?
|
||||||
.to_pipeline_data(plugin, engine, call.head)
|
.to_pipeline_data(plugin, engine, call.head)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod test {
|
||||||
|
use crate::test::test_polars_plugin_command;
|
||||||
|
|
||||||
|
use super::*;
|
||||||
|
use nu_protocol::ShellError;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_into_dtype() -> Result<(), ShellError> {
|
||||||
|
test_polars_plugin_command(&ToDataType)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -5,8 +5,7 @@ use nu_protocol::{
|
|||||||
};
|
};
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
dataframe::values::NuExpression,
|
values::{cant_convert_err, CustomValueSupport, PolarsPluginObject, PolarsPluginType},
|
||||||
values::{CustomValueSupport, NuLazyFrame},
|
|
||||||
PolarsPlugin,
|
PolarsPlugin,
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -39,6 +38,8 @@ impl PluginCommand for ToNu {
|
|||||||
.input_output_types(vec![
|
.input_output_types(vec![
|
||||||
(Type::Custom("expression".into()), Type::Any),
|
(Type::Custom("expression".into()), Type::Any),
|
||||||
(Type::Custom("dataframe".into()), Type::table()),
|
(Type::Custom("dataframe".into()), Type::table()),
|
||||||
|
(Type::Custom("datatype".into()), Type::Any),
|
||||||
|
(Type::Custom("schema".into()), Type::Any),
|
||||||
])
|
])
|
||||||
.category(Category::Custom("dataframe".into()))
|
.category(Category::Custom("dataframe".into()))
|
||||||
}
|
}
|
||||||
@ -86,31 +87,54 @@ impl PluginCommand for ToNu {
|
|||||||
fn run(
|
fn run(
|
||||||
&self,
|
&self,
|
||||||
plugin: &Self::Plugin,
|
plugin: &Self::Plugin,
|
||||||
_engine: &EngineInterface,
|
engine: &EngineInterface,
|
||||||
call: &EvaluatedCall,
|
call: &EvaluatedCall,
|
||||||
input: PipelineData,
|
input: PipelineData,
|
||||||
) -> Result<PipelineData, LabeledError> {
|
) -> Result<PipelineData, LabeledError> {
|
||||||
let value = input.into_value(call.head)?;
|
command(plugin, engine, call, input).map_err(LabeledError::from)
|
||||||
if NuDataFrame::can_downcast(&value) || NuLazyFrame::can_downcast(&value) {
|
|
||||||
dataframe_command(plugin, call, value)
|
|
||||||
} else {
|
|
||||||
expression_command(plugin, call, value)
|
|
||||||
}
|
|
||||||
.map_err(|e| e.into())
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn dataframe_command(
|
fn command(
|
||||||
plugin: &PolarsPlugin,
|
plugin: &PolarsPlugin,
|
||||||
|
_engine: &EngineInterface,
|
||||||
call: &EvaluatedCall,
|
call: &EvaluatedCall,
|
||||||
input: Value,
|
input: PipelineData,
|
||||||
) -> Result<PipelineData, ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
|
let value = input.into_value(call.head)?;
|
||||||
|
match PolarsPluginObject::try_from_value(plugin, &value)? {
|
||||||
|
PolarsPluginObject::NuDataFrame(df) => dataframe_command(call, df),
|
||||||
|
PolarsPluginObject::NuLazyFrame(lazy) => dataframe_command(call, lazy.collect(call.head)?),
|
||||||
|
PolarsPluginObject::NuExpression(expr) => {
|
||||||
|
let value = expr.to_value(call.head)?;
|
||||||
|
Ok(PipelineData::Value(value, None))
|
||||||
|
}
|
||||||
|
PolarsPluginObject::NuDataType(dt) => {
|
||||||
|
let value = dt.base_value(call.head)?;
|
||||||
|
Ok(PipelineData::Value(value, None))
|
||||||
|
}
|
||||||
|
PolarsPluginObject::NuSchema(schema) => {
|
||||||
|
let value = schema.base_value(call.head)?;
|
||||||
|
Ok(PipelineData::Value(value, None))
|
||||||
|
}
|
||||||
|
_ => Err(cant_convert_err(
|
||||||
|
&value,
|
||||||
|
&[
|
||||||
|
PolarsPluginType::NuDataFrame,
|
||||||
|
PolarsPluginType::NuLazyFrame,
|
||||||
|
PolarsPluginType::NuExpression,
|
||||||
|
PolarsPluginType::NuDataType,
|
||||||
|
PolarsPluginType::NuSchema,
|
||||||
|
],
|
||||||
|
)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn dataframe_command(call: &EvaluatedCall, df: NuDataFrame) -> Result<PipelineData, ShellError> {
|
||||||
let rows: Option<usize> = call.get_flag("rows")?;
|
let rows: Option<usize> = call.get_flag("rows")?;
|
||||||
let tail: bool = call.has_flag("tail")?;
|
let tail: bool = call.has_flag("tail")?;
|
||||||
let index: bool = call.has_flag("index")?;
|
let index: bool = call.has_flag("index")?;
|
||||||
|
|
||||||
let df = NuDataFrame::try_from_value_coerce(plugin, &input, call.head)?;
|
|
||||||
|
|
||||||
let values = if tail {
|
let values = if tail {
|
||||||
df.tail(rows, index, call.head)?
|
df.tail(rows, index, call.head)?
|
||||||
} else {
|
} else {
|
||||||
@ -127,17 +151,6 @@ fn dataframe_command(
|
|||||||
Ok(PipelineData::Value(value, None))
|
Ok(PipelineData::Value(value, None))
|
||||||
}
|
}
|
||||||
|
|
||||||
fn expression_command(
|
|
||||||
plugin: &PolarsPlugin,
|
|
||||||
call: &EvaluatedCall,
|
|
||||||
input: Value,
|
|
||||||
) -> Result<PipelineData, ShellError> {
|
|
||||||
let expr = NuExpression::try_from_value(plugin, &input)?;
|
|
||||||
let value = expr.to_value(call.head)?;
|
|
||||||
|
|
||||||
Ok(PipelineData::Value(value, None))
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod test {
|
mod test {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
@ -27,8 +27,8 @@ impl PluginCommand for ToSchema {
|
|||||||
|
|
||||||
fn examples(&self) -> Vec<Example> {
|
fn examples(&self) -> Vec<Example> {
|
||||||
vec![Example {
|
vec![Example {
|
||||||
description: "Convert a record into a schema",
|
description: "Convert a record into a schema and back to a nu object",
|
||||||
example: r#"{a: str, b: u8} | polars into-schema"#,
|
example: r#"{a: str, b: u8} | polars into-schema | polars into-nu"#,
|
||||||
result: Some(Value::record(
|
result: Some(Value::record(
|
||||||
record! {
|
record! {
|
||||||
"a" => Value::string("str", Span::test_data()),
|
"a" => Value::string("str", Span::test_data()),
|
||||||
@ -59,3 +59,16 @@ fn command(
|
|||||||
NuSchema::try_from_pipeline(plugin, input, call.head)?
|
NuSchema::try_from_pipeline(plugin, input, call.head)?
|
||||||
.to_pipeline_data(plugin, engine, call.head)
|
.to_pipeline_data(plugin, engine, call.head)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod test {
|
||||||
|
use crate::test::test_polars_plugin_command;
|
||||||
|
|
||||||
|
use super::*;
|
||||||
|
use nu_protocol::ShellError;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_into_schema() -> Result<(), ShellError> {
|
||||||
|
test_polars_plugin_command(&ToSchema)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user